Moved teacher related code from ProjectService to TeacherProjectService. #2676

Author: geoffreykwan

src/main/webapp/site/src/app/authoring-tool/add-component/choose-new-component-location/choose-new-component-location.component.spec.ts

@@ -2,8 +2,8 @@ import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 import { UpgradeModule } from '@angular/upgrade/static';
 import { ConfigService } from '../../../../../../wise5/services/configService';
-import { ProjectService } from '../../../../../../wise5/services/projectService';
 import { TeacherDataService } from '../../../../../../wise5/services/teacherDataService';
+import { TeacherProjectService } from '../../../../../../wise5/services/teacherProjectService';
 import { UtilService } from '../../../../../../wise5/services/utilService';
 import { ChooseNewComponentLocation } from './choose-new-component-location.component';
 
@@ -42,7 +42,7 @@ class MockUpgradeModule {
 }
 
 let component: ChooseNewComponentLocation;
-let projectService: ProjectService;
+let teacherProjectService: TeacherProjectService;
 
 describe('ChooseNewComponentLocation', () => {
   beforeEach(() => {
@@ -51,14 +51,14 @@ describe('ChooseNewComponentLocation', () => {
       providers: [
         ChooseNewComponentLocation,
         ConfigService,
-        { provide: ProjectService, useClass: MockProjectService },
+        { provide: TeacherProjectService, useClass: MockProjectService },
         { provide: TeacherDataService, useClass: MockTeacherDataService },
         { provide: UpgradeModule, useClass: MockUpgradeModule },
         UtilService
       ]
     });
     component = TestBed.inject(ChooseNewComponentLocation);
-    projectService = TestBed.inject(ProjectService);
+    teacherProjectService = TestBed.inject(TeacherProjectService);
   });
 
   it('should have nodeId and components set after initialization', () => {
@@ -68,10 +68,10 @@ describe('ChooseNewComponentLocation', () => {
   });
 
   it('insertComponentAfter() should create a new component and save the project', () => {
-    spyOn(projectService, 'createComponent').and.returnValue({ id: 'comp3', type: 'Discussion' });
-    spyOn(projectService, 'saveProject').and.returnValue(new Promise(() => {}));
+    spyOn(teacherProjectService, 'createComponent').and.returnValue({ id: 'comp3', type: 'Discussion' });
+    spyOn(teacherProjectService, 'saveProject').and.returnValue(new Promise(() => {}));
     component.insertComponentAfter('comp2');
-    expect(projectService.createComponent).toHaveBeenCalled();
-    expect(projectService.saveProject).toHaveBeenCalled();
+    expect(teacherProjectService.createComponent).toHaveBeenCalled();
+    expect(teacherProjectService.saveProject).toHaveBeenCalled();
   });
 });

src/main/webapp/site/src/app/authoring-tool/add-component/choose-new-component-location/choose-new-component-location.component.ts

@@ -1,9 +1,9 @@
 import { UtilService } from '../../../../../../wise5/services/utilService';
-import { ProjectService } from '../../../../../../wise5/services/projectService';
 import { TeacherDataService } from '../../../../../../wise5/services/teacherDataService';
 import { ConfigService } from '../../../../../../wise5/services/configService';
 import { Component } from '@angular/core';
 import { UpgradeModule } from '@angular/upgrade/static';
+import { TeacherProjectService } from '../../../../../../wise5/services/teacherProjectService';
 
 @Component({
   selector: 'choose-new-component-location',
@@ -16,14 +16,14 @@ export class ChooseNewComponentLocation {
   constructor(
     private upgrade: UpgradeModule,
     private ConfigService: ConfigService,
-    private ProjectService: ProjectService,
+    private TeacherProjectService: TeacherProjectService,
     private TeacherDataService: TeacherDataService,
     private UtilService: UtilService
   ) {}
 
   ngOnInit() {
     this.nodeId = this.TeacherDataService.getCurrentNodeId();
-    this.components = this.ProjectService.getComponentsByNodeId(this.nodeId);
+    this.components = this.TeacherProjectService.getComponentsByNodeId(this.nodeId);
   }
 
   getComponentTypeLabel(componentType) {
@@ -35,20 +35,18 @@ export class ChooseNewComponentLocation {
   }
 
   insertComponentAfter(insertAfterComponentId = null) {
-    const newComponent = this.ProjectService.createComponent(
+    const newComponent = this.TeacherProjectService.createComponent(
       this.nodeId,
       this.upgrade.$injector.get('$stateParams').componentType,
       insertAfterComponentId
     );
-    this.ProjectService.saveProject().then(() => {
+    this.TeacherProjectService.saveProject().then(() => {
       this.saveAddComponentEvent(newComponent);
-      this.upgrade.$injector
-        .get('$state')
-        .go('root.at.project.node', {
-          projectId: this.ConfigService.getProjectId(),
-          nodeId: this.nodeId,
-          newComponents: [newComponent]
-        });
+      this.upgrade.$injector.get('$state').go('root.at.project.node', {
+        projectId: this.ConfigService.getProjectId(),
+        nodeId: this.nodeId,
+        newComponents: [newComponent]
+      });
     });
   }
 
@@ -74,11 +72,9 @@ export class ChooseNewComponentLocation {
   }
 
   cancel() {
-    this.upgrade.$injector
-      .get('$state')
-      .go('root.at.project.node', {
-        projectId: this.ConfigService.getProjectId(),
-        nodeId: this.nodeId
-      });
+    this.upgrade.$injector.get('$state').go('root.at.project.node', {
+      projectId: this.ConfigService.getProjectId(),
+      nodeId: this.nodeId
+    });
   }
 }

src/main/webapp/site/src/app/preview/modules/choose-branch-path-dialog/choose-branch-path-dialog.component.ts

@@ -1,7 +1,5 @@
 import { Component, OnInit, Inject } from '@angular/core';
 import { MAT_DIALOG_DATA } from '@angular/material/dialog';
-import { NodeService } from '../../../../../../wise5/services/nodeService';
-import { ProjectService } from '../../../../../../wise5/services/projectService';
 
 @Component({
   selector: 'app-choose-branch-path-dialog',