Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(EditComponentConstraintsComponent): Convert to standalone #1955

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@
(connectedComponentsChanged)="connectedComponentsChanged($event)"
>
</edit-connected-components>
<edit-component-constraints [componentContent]="component.content"></edit-component-constraints>
<edit-component-constraints [componentContent]="component.content" />
<edit-component-json [component]="component"></edit-component-json>
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,7 @@ <h2 mat-dialog-title i18n>Advanced Settings</h2>
: ''
"
>
<edit-component-constraints
[componentContent]="component.content"
></edit-component-constraints>
<edit-component-constraints [componentContent]="component.content" />
<edit-component-json [component]="component"></edit-component-json>
</ng-container>
<edit-summary-advanced
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,21 @@
<mat-icon>add</mat-icon>
</button>
</div>
<div
*ngFor="let constraint of content.constraints; index as constraintIndex"
class="constraints-div"
fxLayoutGap="16px"
>
<b i18n>Constraint</b>
<button
mat-raised-button
color="primary"
(click)="deleteConstraint(constraintIndex)"
matTooltip="Delete Constraint"
matTooltipPosition="above"
i18n-matTooltip
>
<mat-icon>delete</mat-icon>
</button>
<br />
<component-constraint-authoring [constraint]="constraint" />
</div>
@for (constraint of content.constraints; track constraint; let constraintIndex = $index) {
<div class="constraints-div" fxLayoutGap="16px">
<b i18n>Constraint</b>
<button
mat-raised-button
color="primary"
(click)="deleteConstraint(constraintIndex)"
matTooltip="Delete Constraint"
matTooltipPosition="above"
i18n-matTooltip
>
<mat-icon>delete</mat-icon>
</button>
<br />
<component-constraint-authoring [constraint]="constraint" />
</div>
}
</div>
Original file line number Diff line number Diff line change
@@ -1,28 +1,23 @@
import { provideHttpClientTesting } from '@angular/common/http/testing';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatIconModule } from '@angular/material/icon';
import { TeacherProjectService } from '../../../assets/wise5/services/teacherProjectService';
import { StudentTeacherCommonServicesModule } from '../../student-teacher-common-services.module';
import { EditComponentConstraintsComponent } from './edit-component-constraints.component';
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { ComponentContent } from '../../../assets/wise5/common/ComponentContent';

describe('EditComponentConstraintsComponent', () => {
let component: EditComponentConstraintsComponent;
let fixture: ComponentFixture<EditComponentConstraintsComponent>;

beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [EditComponentConstraintsComponent],
imports: [MatFormFieldModule,
MatIconModule,
StudentTeacherCommonServicesModule],
providers: [TeacherProjectService, provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()]
}).compileComponents();
imports: [EditComponentConstraintsComponent, StudentTeacherCommonServicesModule],
providers: [TeacherProjectService, provideHttpClient(withInterceptorsFromDi())]
}).compileComponents();

fixture = TestBed.createComponent(EditComponentConstraintsComponent);
component = fixture.componentInstance;
component.componentContent = {};
component.componentContent = {} as ComponentContent;
fixture.detectChanges();
});

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,31 @@
import { Component, Input } from '@angular/core';
import { ConstraintsAuthoringComponent } from '../../../assets/wise5/authoringTool/constraint/constraints-authoring/constraints-authoring.component';
import { CommonModule } from '@angular/common';
import { FlexLayoutModule } from '@angular/flex-layout';
import { MatButtonModule } from '@angular/material/button';
import { MatTooltipModule } from '@angular/material/tooltip';
import { MatIconModule } from '@angular/material/icon';
import { ComponentConstraintAuthoringComponent } from '../../../assets/wise5/authoringTool/constraint/component-constraint-authoring/component-constraint-authoring.component';
import { MatFormFieldModule } from '@angular/material/form-field';
import { ComponentContent } from '../../../assets/wise5/common/ComponentContent';

@Component({
imports: [
CommonModule,
ComponentConstraintAuthoringComponent,
FlexLayoutModule,
MatButtonModule,
MatFormFieldModule,
MatIconModule,
MatTooltipModule
],
selector: 'edit-component-constraints',
templateUrl: './edit-component-constraints.component.html',
styleUrls: ['./edit-component-constraints.component.scss']
standalone: true,
styleUrl: './edit-component-constraints.component.scss',
templateUrl: './edit-component-constraints.component.html'
})
export class EditComponentConstraintsComponent extends ConstraintsAuthoringComponent {
@Input() componentContent: any;
@Input() componentContent: ComponentContent;

ngOnInit(): void {
if (this.componentContent.constraints == null) {
Expand Down
4 changes: 1 addition & 3 deletions src/app/teacher/component-authoring.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ import { EditQuestionBankComponent } from '../authoring-tool/edit-question-bank/
import { EditQuestionBankRulesComponent } from '../authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component';
import { SelectStepAndComponentComponent } from '../authoring-tool/select-step-and-component/select-step-and-component.component';
import { EditComponentConstraintsComponent } from '../authoring-tool/edit-component-constraints/edit-component-constraints.component';
import { ComponentConstraintAuthoringComponent } from '../../assets/wise5/authoringTool/constraint/component-constraint-authoring/component-constraint-authoring.component';
import { EditComponentAdvancedComponent } from '../authoring-tool/edit-component-advanced/edit-component-advanced.component';
import { ComponentAuthoringComponent } from '../../assets/wise5/authoringTool/components/component-authoring.component';
import { WiseTinymceEditorModule } from '../../assets/wise5/directives/wise-tinymce-editor/wise-tinymce-editor.module';
Expand Down Expand Up @@ -108,7 +107,6 @@ import { RequiredErrorLabelComponent } from '../../assets/wise5/authoringTool/no
EditCommonAdvancedComponent,
EditComponentAdvancedComponent,
EditComponentAddToNotebookButtonComponent,
EditComponentConstraintsComponent,
EditComponentDefaultFeedback,
EditComponentExcludeFromTotalScoreComponent,
EditComponentJsonComponent,
Expand Down Expand Up @@ -173,8 +171,8 @@ import { RequiredErrorLabelComponent } from '../../assets/wise5/authoringTool/no
],
imports: [
ComponentAuthoringComponent,
ComponentConstraintAuthoringComponent,
EditComponentAdvancedButtonComponent,
EditComponentConstraintsComponent,
EditComponentPrompt,
EditComponentWidthComponent,
PeerGroupingAuthoringModule,
Expand Down
1 change: 1 addition & 0 deletions src/assets/wise5/common/ComponentContent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { DynamicPrompt } from '../directives/dynamic-prompt/DynamicPrompt';
export interface ComponentContent {
id: string;
connectedComponents?: any[];
constraints?: any[];
dynamicPrompt?: DynamicPrompt;
excludeFromTotalScore?: boolean;
maxScore?: number;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<edit-component-constraints [componentContent]="component.content"></edit-component-constraints>
<edit-component-constraints [componentContent]="component.content" />
<edit-component-json [component]="component"></edit-component-json>
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
(connectedComponentsChanged)="connectedComponentsChanged($event)"
>
</edit-discussion-connected-components>
<edit-component-constraints [componentContent]="component.content"></edit-component-constraints>
<edit-component-constraints [componentContent]="component.content" />
<edit-component-json [component]="component"></edit-component-json>
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@
(connectedComponentsChanged)="connectedComponentsChanged($event)"
>
</edit-draw-connected-components>
<edit-component-constraints [componentContent]="component.content"></edit-component-constraints>
<edit-component-constraints [componentContent]="component.content" />
<edit-component-json [component]="component"></edit-component-json>
Original file line number Diff line number Diff line change
Expand Up @@ -200,5 +200,5 @@
(connectedComponentsChanged)="connectedComponentsChanged($event)"
>
</edit-graph-connected-components>
<edit-component-constraints [componentContent]="component.content"></edit-component-constraints>
<edit-component-constraints [componentContent]="component.content" />
<edit-component-json [component]="component"></edit-component-json>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<edit-component-width [componentContent]="componentContent" />
<edit-component-rubric [componentContent]="componentContent"></edit-component-rubric>
<edit-component-constraints [componentContent]="component.content"></edit-component-constraints>
<edit-component-constraints [componentContent]="component.content" />
<edit-component-json [component]="component"></edit-component-json>
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@
(connectedComponentsChanged)="connectedComponentsChanged($event)"
>
</edit-label-connected-components>
<edit-component-constraints [componentContent]="component.content"></edit-component-constraints>
<edit-component-constraints [componentContent]="component.content" />
<edit-component-json [component]="component"></edit-component-json>
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,5 @@
(connectedComponentsChanged)="connectedComponentsChanged($event)"
>
</edit-match-connected-components>
<edit-component-constraints [componentContent]="component.content"></edit-component-constraints>
<edit-component-constraints [componentContent]="component.content" />
<edit-component-json [component]="component"></edit-component-json>
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
(connectedComponentsChanged)="connectedComponentsChanged($event)"
>
</edit-multiple-choice-connected-components>
<edit-component-constraints [componentContent]="component.content"></edit-component-constraints>
<edit-component-constraints [componentContent]="component.content" />
<edit-component-json [component]="component"></edit-component-json>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<edit-component-width [componentContent]="componentContent" />
<edit-component-rubric [componentContent]="componentContent"></edit-component-rubric>
<edit-component-constraints [componentContent]="component.content"></edit-component-constraints>
<edit-component-constraints [componentContent]="component.content" />
<edit-component-json [component]="component"></edit-component-json>
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<edit-component-constraints [componentContent]="component.content"></edit-component-constraints>
<edit-component-constraints [componentContent]="component.content" />
<edit-component-json [component]="component"></edit-component-json>
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<edit-component-width [componentContent]="componentContent" />
<edit-component-rubric [componentContent]="componentContent"></edit-component-rubric>
<edit-component-tags [componentContent]="componentContent"></edit-component-tags>
<edit-component-constraints [componentContent]="component.content"></edit-component-constraints>
<edit-component-constraints [componentContent]="component.content" />
<edit-component-json [component]="component"></edit-component-json>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -277,5 +277,5 @@
(connectedComponentsChanged)="connectedComponentsChanged($event)"
>
</edit-table-connected-components>
<edit-component-constraints [componentContent]="component.content"></edit-component-constraints>
<edit-component-constraints [componentContent]="component.content" />
<edit-component-json [component]="component"></edit-component-json>
6 changes: 3 additions & 3 deletions src/messages.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -844,7 +844,7 @@
<source> Close </source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.html</context>
<context context-type="linenumber">111,113</context>
<context context-type="linenumber">109,111</context>
</context-group>
</trans-unit>
<trans-unit id="b1fa4e5073c0229ba88f70784a0aa77615380bec" datatype="html">
Expand Down Expand Up @@ -873,14 +873,14 @@
<source>Constraint</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/authoring-tool/edit-component-constraints/edit-component-constraints.component.html</context>
<context context-type="linenumber">21</context>
<context context-type="linenumber">18</context>
</context-group>
</trans-unit>
<trans-unit id="52c6c4d683a29f54ae1d4aed4f460f698bd20cf2" datatype="html">
<source>Delete Constraint</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/authoring-tool/edit-component-constraints/edit-component-constraints.component.html</context>
<context context-type="linenumber">26</context>
<context context-type="linenumber">23</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/assets/wise5/authoringTool/node/advanced/constraint/node-advanced-constraint-authoring.component.html</context>
Expand Down
Loading