Skip to content

refactor(MatchStudentDefault): Convert to standalone #2082

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.

Sign up for GitHub

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

Merged
hirokiterashima merged 8 commits into from
Feb 11, 2025
Merged

refactor(MatchStudentDefault): Convert to standalone #2082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e4d16d1
Converted to standalone (drag and drop is broken)
Aaron-Detre Feb 4, 2025
39853d4
refactor(MatchStudentDefault): Convert to standalone
Aaron-Detre Feb 4, 2025
bfcd4a3
Added Component suffix to spec file
Aaron-Detre Feb 5, 2025
146dd20
Added spy for getThemeSettings
Aaron-Detre Feb 6, 2025
91d14f7
Merge branch 'develop' into issue-2074-MatchStudentDefault-Standalone
Aaron-Detre Feb 6, 2025
f2d523b
Remove redundant deps
hirokiterashima Feb 11, 2025
5a7e013
Simplified getCorrectness()
hirokiterashima Feb 11, 2025
709ba33
Update test to match new getCorrectness() behavior.
hirokiterashima Feb 11, 2025
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
4 changes: 2 additions & 2 deletions ...5/components/match/match-student/match-student-choice-reuse/match-student-choice-reuse.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component } from '@angular/core';
import { MatchStudentDefault } from '../match-student-default/match-student-default.component';
import { MatchStudentDefaultComponent } from '../match-student-default/match-student-default.component';
import { moveItem } from '../move-item';
import { MatchCdkDragDrop } from '../MatchCdkDragDrop';
import { Container } from '../container';
Expand All @@ -10,7 +10,7 @@ import { copy } from '../../../../common/object/object';
styleUrls: ['../match-student-default/match-student-default.component.scss'],
templateUrl: '../match-student-default/match-student-default.component.html'
})
export class MatchStudentChoiceReuse extends MatchStudentDefault {
export class MatchStudentChoiceReuse extends MatchStudentDefaultComponent {
protected drop(event: MatchCdkDragDrop<Container, Item>): void {
moveItem(event);
event.container.element.nativeElement.classList.remove('primary-bg');
Expand Down
161 changes: 81 additions & 80 deletions ...components/match/match-student/match-student-default/match-student-default.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<component-header [component]="component"></component-header>
<component-header [component]="component" />
<div class="match" fxLayout="row wrap" cdkDropListGroup>
<div
fxFlex="100"
Expand All @@ -12,9 +12,9 @@
>
<div class="bucket-title" fxLayout="row wrap" fxLayoutAlign="start center" fxLayoutGap="8px">
<h3 class="mat-subtitle-2" [innerHTML]="buckets[0].value"></h3>
<div *ngIf="componentContent.canCreateChoices">
@if (componentContent.canCreateChoices) {
<add-choice-button [isDisabled]="isDisabled" (onClick)="addChoice()" />
</div>
}
</div>
<ul
class="items"
Expand All @@ -24,65 +24,13 @@ <h3 class="mat-subtitle-2" [innerHTML]="buckets[0].value"></h3>
[cdkDropListData]="{ isSourceBucket: true, items: buckets[0].items }"
(cdkDropListDropped)="drop($event)"
>
<li
class="item"
[ngClass]="{ disabled: isDisabled }"
cdkDrag
[cdkDragDisabled]="isDisabled"
(cdkDragEntered)="dragEnter($event)"
(cdkDragExited)="dragExit($event)"
*ngFor="let item of buckets[0].items; let position = index"
[cdkDragData]="{ position: position, item: item }"
>
<match-choice-item
[buckets]="buckets"
[item]="item"
[hasCorrectAnswer]="hasCorrectAnswer"
[isDisabled]="isDisabled"
(onStudentDataChanged)="studentDataChanged()"
/>
</li>
</ul>
</div>
</div>
<div
fxLayout="column"
fxLayout.gt-xs="{{ componentContent.horizontal ? 'column' : 'row wrap' }}"
fxLayoutAlign="start stretch"
fxFlex="100"
fxFlex.gt-xs="{{ componentContent.horizontal ? 50 : 100 }}"
fxFlexOrder="{{ componentContent.choicesAfter ? 1 : 2 }}"
>
<div
*ngFor="let bucket of buckets.slice(1)"
fxLayout="column"
fxFlex="100"
fxFlex.gt-xs="{{ componentContent.horizontal ? 100 : 50 }}"
fxFlex.gt-md="{{ componentContent.horizontal ? 100 : 33.33 }}"
>
<div class="bucket target notice-bg-bg" fxLayout="column" fxLayoutAlign="stretch">
<div
class="bucket-title"
fxLayout="row wrap"
fxLayoutAlign="start center"
fxLayoutGap="8px"
>
<h3 class="mat-subtitle-2" [innerHTML]="bucket.value"></h3>
</div>
<ul
class="items"
cdkDropList
[cdkDropListData]="{ isSourceBucket: false, items: bucket.items }"
(cdkDropListDropped)="drop($event)"
>
@for (item of buckets[0].items; track item.id; let position = $index) {
<li
class="item"
[ngClass]="{ disabled: isDisabled }"
[ngClass]="{ item: true, disabled: isDisabled }"
cdkDrag
[cdkDragDisabled]="isDisabled"
(cdkDragEntered)="dragEnter($event)"
(cdkDragExited)="dragExit($event)"
*ngFor="let item of bucket.items; let position = index"
[cdkDragData]="{ position: position, item: item }"
>
<match-choice-item
Expand All @@ -93,10 +41,63 @@ <h3 class="mat-subtitle-2" [innerHTML]="bucket.value"></h3>
(onStudentDataChanged)="studentDataChanged()"
/>
</li>
</ul>
</div>
}
</ul>
</div>
</div>
<div
fxLayout="column"
fxLayout.gt-xs="{{ componentContent.horizontal ? 'column' : 'row wrap' }}"
fxLayoutAlign="start stretch"
fxFlex="100"
fxFlex.gt-xs="{{ componentContent.horizontal ? 50 : 100 }}"
fxFlexOrder="{{ componentContent.choicesAfter ? 1 : 2 }}"
>
@for (bucket of buckets.slice(1); track bucket.id) {
<div
fxLayout="column"
fxFlex="100"
fxFlex.gt-xs="{{ componentContent.horizontal ? 100 : 50 }}"
fxFlex.gt-md="{{ componentContent.horizontal ? 100 : 33.33 }}"
>
<div class="bucket target notice-bg-bg" fxLayout="column" fxLayoutAlign="stretch">
<div
class="bucket-title"
fxLayout="row wrap"
fxLayoutAlign="start center"
fxLayoutGap="8px"
>
<h3 class="mat-subtitle-2" [innerHTML]="bucket.value"></h3>
</div>
<ul
class="items"
cdkDropList
[cdkDropListData]="{ isSourceBucket: false, items: bucket.items }"
(cdkDropListDropped)="drop($event)"
>
@for (item of bucket.items; track item.id; let position = $index) {
<li
[ngClass]="{ item: true, disabled: isDisabled }"
cdkDrag
[cdkDragDisabled]="isDisabled"
(cdkDragEntered)="dragEnter($event)"
(cdkDragExited)="dragExit($event)"
[cdkDragData]="{ position: position, item: item }"
>
<match-choice-item
[buckets]="buckets"
[item]="item"
[hasCorrectAnswer]="hasCorrectAnswer"
[isDisabled]="isDisabled"
(onStudentDataChanged)="studentDataChanged()"
/>
</li>
}
</ul>
</div>
</div>
}
</div>
</div>
<match-feedback-section
[componentContent]="componentContent"
Expand All @@ -105,24 +106,24 @@ <h3 class="mat-subtitle-2" [innerHTML]="bucket.value"></h3>
[isLatestComponentStateSubmit]="isLatestComponentStateSubmit"
[submitCounter]="submitCounter"
/>
<component-save-submit-buttons
*ngIf="isSaveOrSubmitButtonVisible"
[componentState]="latestComponentState"
[isDirty]="isDirty"
[isDisabled]="isDisabled"
[isSaveButtonVisible]="isSaveButtonVisible"
[isSubmitButtonDisabled]="isSubmitButtonDisabled"
[isSubmitButtonVisible]="isSubmitButtonVisible"
[isSubmitDirty]="isSubmitDirty"
(saveButtonClicked)="saveButtonClicked($event)"
(submitButtonClicked)="submitButtonClicked($event)"
>
</component-save-submit-buttons>
<component-annotations
*ngIf="mode === 'student'"
[annotations]="latestAnnotations"
[maxScore]="componentContent.maxScore"
[nodeId]="nodeId"
[componentId]="componentId"
>
</component-annotations>
@if (isSaveOrSubmitButtonVisible) {
<component-save-submit-buttons
[componentState]="latestComponentState"
[isDirty]="isDirty"
[isDisabled]="isDisabled"
[isSaveButtonVisible]="isSaveButtonVisible"
[isSubmitButtonDisabled]="isSubmitButtonDisabled"
[isSubmitButtonVisible]="isSubmitButtonVisible"
[isSubmitDirty]="isSubmitDirty"
(saveButtonClicked)="saveButtonClicked($event)"
(submitButtonClicked)="submitButtonClicked($event)"
/>
}
@if (mode === 'student') {
<component-annotations
[annotations]="latestAnnotations"
[maxScore]="componentContent.maxScore"
[nodeId]="nodeId"
[componentId]="componentId"
/>
}
27 changes: 10 additions & 17 deletions ...ponents/match/match-student/match-student-default/match-student-default.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
// @ts-nocheck
import { NO_ERRORS_SCHEMA } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { StudentTeacherCommonServicesModule } from '../../../../../../app/student-teacher-common-services.module';
import { Component } from '../../../../common/Component';
import { copy } from '../../../../common/object/object';
import { ClickToSnipImageService } from '../../../../services/clickToSnipImageService';
import { ProjectService } from '../../../../services/projectService';
import { MatchStudentDefault } from './match-student-default.component';
import { MatchStudentDefaultComponent } from './match-student-default.component';
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';

let component: MatchStudentDefault;
let fixture: ComponentFixture<MatchStudentDefault>;
let component: MatchStudentDefaultComponent;
let fixture: ComponentFixture<MatchStudentDefaultComponent>;
let bucket1: any;
let bucket2: any;
let bucket3: any;
Expand Down Expand Up @@ -49,12 +48,10 @@ let starterBucketLabel = 'Starter Choices';
describe('MatchStudentDefaultComponent', () => {
beforeEach(() => {
TestBed.configureTestingModule({
declarations: [MatchStudentDefault],
schemas: [NO_ERRORS_SCHEMA],
imports: [StudentTeacherCommonServicesModule],
imports: [MatchStudentDefaultComponent, StudentTeacherCommonServicesModule],
providers: [provideHttpClient(withInterceptorsFromDi())]
});
fixture = TestBed.createComponent(MatchStudentDefault);
fixture = TestBed.createComponent(MatchStudentDefaultComponent);
component = fixture.componentInstance;
choice1 = createChoice(choiceId1, choiceValue1);
choice2 = createChoice(choiceId2, choiceValue2);
Expand Down Expand Up @@ -94,6 +91,7 @@ describe('MatchStudentDefaultComponent', () => {
};
component.component = new Component(componentContent, nodeId);
spyOn(TestBed.inject(ProjectService), 'getComponent').and.returnValue(copy(componentContent));
spyOn(TestBed.inject(ProjectService), 'getThemeSettings').and.returnValue({});
spyOn(component, 'subscribeToSubscriptions').and.callFake(() => {});
spyOn(component, 'broadcastDoneRenderingComponent').and.callFake(() => {});
spyOn(component, 'isAddToNotebookEnabled').and.callFake(() => {
Expand Down Expand Up @@ -381,32 +379,27 @@ function getCorrectness() {
it('should get correctness from feedback object when it is true', () => {
const isCorrect = true;
const feedbackObject = createFeedback(choiceId1, '', isCorrect);
expect(component.getCorrectness(feedbackObject, true, 0)).toEqual(isCorrect);
expect(component.getCorrectness(feedbackObject, 0)).toEqual(isCorrect);
});

it('should get correctness from feedback object when it is false', () => {
const isCorrect = false;
const feedbackObject = createFeedback(choiceId1, '', isCorrect);
expect(component.getCorrectness(feedbackObject, true, 0)).toEqual(isCorrect);
expect(component.getCorrectness(feedbackObject, 0)).toEqual(isCorrect);
});

it(`should get correctness from feedback object when position matters and it is in the correct
position`, () => {
const isCorrect = true;
const feedbackObject = createFeedback(choiceId1, '', isCorrect, 1);
expect(component.getCorrectness(feedbackObject, true, 1)).toEqual(isCorrect);
expect(component.getCorrectness(feedbackObject, 1)).toEqual(isCorrect);
});

it(`should get correctness from feedback object when position matters and it is not in the
correct position`, () => {
const isCorrect = false;
const feedbackObject = createFeedback(choiceId1, '', isCorrect, 1);
expect(component.getCorrectness(feedbackObject, true, 2)).toEqual(isCorrect);
});

it('should get correctness from feedback object there is not correct answer', () => {
const feedbackObject = createFeedback(choiceId1, '', false, 1);
expect(component.getCorrectness(feedbackObject, false, 1)).toEqual(null);
expect(component.getCorrectness(feedbackObject, 2)).toEqual(isCorrect);
});
});
}
Expand Down
Loading
Loading