-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into issue-1513-multiple-languages-per-unit
- Loading branch information
Showing
10 changed files
with
318 additions
and
309 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
src/assets/wise5/authoringTool/node/add-component-button/add-component-button.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <button | ||
| mat-icon-button | ||
| color="primary" | ||
| matTooltip="Add a new component" | ||
| i18n-matTooltip | ||
| matTooltipPosition="above" | ||
| (click)="addComponent()" | ||
| > | ||
| <mat-icon>add_circle</mat-icon> | ||
| </button> |
53 changes: 53 additions & 0 deletions
53
...sets/wise5/authoringTool/node/add-component-button/add-component-button.component.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| import { ComponentFixture, TestBed } from '@angular/core/testing'; | ||
| import { AddComponentButtonComponent } from './add-component-button.component'; | ||
| import { MatDialog, MatDialogModule } from '@angular/material/dialog'; | ||
| import { TeacherProjectService } from '../../../services/teacherProjectService'; | ||
| import { RouterTestingModule } from '@angular/router/testing'; | ||
| import { MatIconModule } from '@angular/material/icon'; | ||
| import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; | ||
| import { HarnessLoader } from '@angular/cdk/testing'; | ||
| import { MatButtonHarness } from '@angular/material/button/testing'; | ||
| import { ChooseNewComponent } from '../../../../../app/authoring-tool/add-component/choose-new-component/choose-new-component.component'; | ||
| import { of } from 'rxjs'; | ||
| import { Node } from '../../../common/Node'; | ||
|
|
||
| class MockTeacherProjectService { | ||
| createComponent() {} | ||
| saveProject() {} | ||
| } | ||
| let loader: HarnessLoader; | ||
| describe('AddComponentButtonComponent', () => { | ||
| let component: AddComponentButtonComponent; | ||
| let fixture: ComponentFixture<AddComponentButtonComponent>; | ||
|
|
||
| beforeEach(async () => { | ||
| await TestBed.configureTestingModule({ | ||
| declarations: [AddComponentButtonComponent], | ||
| imports: [MatDialogModule, MatIconModule, RouterTestingModule], | ||
| providers: [{ provide: TeacherProjectService, useClass: MockTeacherProjectService }] | ||
| }); | ||
| fixture = TestBed.createComponent(AddComponentButtonComponent); | ||
| component = fixture.componentInstance; | ||
| component.node = { id: 'node1' } as Node; | ||
| loader = TestbedHarnessEnvironment.loader(fixture); | ||
| fixture.detectChanges(); | ||
| }); | ||
|
|
||
| describe('clicking on the button', () => { | ||
| it('shows add component dialog, create selected component, and save project', async () => { | ||
| const dialogSpy = spyOn(TestBed.inject(MatDialog), 'open').and.returnValue({ | ||
| afterClosed: () => of({ action: 'create', componentType: 'OpenResponse' }) | ||
| } as any); | ||
| const projectService = TestBed.inject(TeacherProjectService); | ||
| const createComponentSpy = spyOn(projectService, 'createComponent'); | ||
| const saveProjectSpy = spyOn(projectService, 'saveProject'); | ||
| await (await loader.getHarness(MatButtonHarness)).click(); | ||
| expect(dialogSpy).toHaveBeenCalledWith(ChooseNewComponent, { | ||
| data: null, | ||
| width: '80%' | ||
| }); | ||
| expect(createComponentSpy).toHaveBeenCalled(); | ||
| expect(saveProjectSpy).toHaveBeenCalled(); | ||
| }); | ||
| }); | ||
| }); |
52 changes: 52 additions & 0 deletions
52
src/assets/wise5/authoringTool/node/add-component-button/add-component-button.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| import { Component, EventEmitter, Input, Output } from '@angular/core'; | ||
| import { TeacherProjectService } from '../../../services/teacherProjectService'; | ||
| import { MatDialog } from '@angular/material/dialog'; | ||
| import { ChooseNewComponent } from '../../../../../app/authoring-tool/add-component/choose-new-component/choose-new-component.component'; | ||
| import { filter } from 'rxjs'; | ||
| import { ActivatedRoute, Router } from '@angular/router'; | ||
| import { Node } from '../../../common/Node'; | ||
|
|
||
| @Component({ | ||
| selector: 'add-component-button', | ||
| templateUrl: './add-component-button.component.html' | ||
| }) | ||
| export class AddComponentButtonComponent { | ||
| @Input() insertAfterComponentId: string = null; | ||
| @Input() node: Node; | ||
| @Output() newComponentsEvent: EventEmitter<any> = new EventEmitter<any>(); | ||
|
|
||
| constructor( | ||
| private dialog: MatDialog, | ||
| private projectService: TeacherProjectService, | ||
| private route: ActivatedRoute, | ||
| private router: Router | ||
| ) {} | ||
|
|
||
| protected addComponent(): void { | ||
| this.dialog | ||
| .open(ChooseNewComponent, { | ||
| data: this.insertAfterComponentId, | ||
| width: '80%' | ||
| }) | ||
| .afterClosed() | ||
| .pipe(filter((componentType) => componentType != null)) | ||
| .subscribe(({ action, componentType }) => { | ||
| if (action === 'import') { | ||
| this.router.navigate(['import-component/choose-component'], { | ||
| relativeTo: this.route, | ||
| state: { | ||
| insertAfterComponentId: this.insertAfterComponentId | ||
| } | ||
| }); | ||
| } else { | ||
| const component = this.projectService.createComponent( | ||
| this.node.id, | ||
| componentType, | ||
| this.insertAfterComponentId | ||
| ); | ||
| this.projectService.saveProject(); | ||
| this.newComponentsEvent.emit([component]); | ||
| } | ||
| }); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.