Saved TeacherProjectService related files again to have prettier format them again. #2676

Author: geoffreykwan

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

@@ -68,7 +68,10 @@ describe('ChooseNewComponentLocation', () => {
   });
 
   it('insertComponentAfter() should create a new component and save the project', () => {
-    spyOn(teacherProjectService, 'createComponent').and.returnValue({ id: 'comp3', type: 'Discussion' });
+    spyOn(teacherProjectService, 'createComponent').and.returnValue({
+      id: 'comp3',
+      type: 'Discussion'
+    });
     spyOn(teacherProjectService, 'saveProject').and.returnValue(new Promise(() => {}));
     component.insertComponentAfter('comp2');
     expect(teacherProjectService.createComponent).toHaveBeenCalled();

src/main/webapp/site/src/app/services/projectService.spec.ts

@@ -108,7 +108,7 @@ describe('ProjectService', () => {
 });
 
 function createNormalSpy() {
-  spyOn(configService, 'getConfigParam').and.callFake(param => {
+  spyOn(configService, 'getConfigParam').and.callFake((param) => {
     if (param === 'projectBaseURL') {
       return projectBaseURL;
     } else if (param === 'projectURL') {
@@ -162,10 +162,8 @@ function shouldNotReplaceAssetPathsInHtmlComponentContent() {
 
 function shouldRetrieveProjectWhenConfigProjectURLIsValid() {
   it('should retrieve project when Config.projectURL is valid', () => {
-    spyOn(configService, 'getConfigParam')
-      .withArgs('projectURL')
-      .and.returnValue(projectURL);
-    service.retrieveProject().then(response => {
+    spyOn(configService, 'getConfigParam').withArgs('projectURL').and.returnValue(projectURL);
+    service.retrieveProject().then((response) => {
       expect(response).toEqual(scootersProjectJSON);
     });
     http.expectOne(projectURL);
@@ -353,7 +351,7 @@ function shouldIdentifyBranchStartAndMergePoints() {
 }
 
 function expectFunctionCallToReturnValue(func, nodeIdArray, expectedValue) {
-  nodeIdArray.forEach(nodeId => {
+  nodeIdArray.forEach((nodeId) => {
     expect(service[func](nodeId)).toEqual(expectedValue);
   });
 }

src/main/webapp/site/src/app/services/teacherProjectService.spec.ts

@@ -106,7 +106,7 @@ describe('TeacherProjectService', () => {
 });
 
 function createNormalSpy() {
-  spyOn(configService, 'getConfigParam').and.callFake(param => {
+  spyOn(configService, 'getConfigParam').and.callFake((param) => {
     if (param === 'projectBaseURL') {
       return projectBaseURL;
     } else if (param === 'projectURL') {
@@ -120,7 +120,7 @@ function createNormalSpy() {
 }
 
 function createConfigServiceGetConfigParamSpy() {
-  spyOn(configService, 'getConfigParam').and.callFake(param => {
+  spyOn(configService, 'getConfigParam').and.callFake((param) => {
     if (param === 'projectBaseURL') {
       return projectBaseURL;
     } else if (param === 'projectURL') {
@@ -147,7 +147,7 @@ function registerNewProject() {
         scootersProjectJSONString
       );
       http.expectOne(registerNewProjectURL).flush(newProjectIdExpected);
-      newProjectIdActual.then(result => {
+      newProjectIdActual.then((result) => {
         expect(result).toEqual(newProjectIdExpected);
       });
     });
@@ -249,7 +249,7 @@ function getLibraryProjects() {
       createConfigServiceGetConfigParamSpy();
       const result = service.getLibraryProjects();
       http.expectOne(getLibraryProjectsURL).flush(libraryProjects);
-      result.then(projects => {
+      result.then((projects) => {
         expect(projects).toEqual(libraryProjects);
       });
     });
@@ -936,9 +936,7 @@ function shouldHandleSaveProjectResponseHelper(
 function shouldNotSaveProjectWhenTheUserDoesNotHavePermissionToEditTheProject() {
   it('should not save project when the user does not have permission to edit the project', () => {
     service.setProject(scootersProjectJSON);
-    spyOn(configService, 'getConfigParam')
-      .withArgs('canEditProject')
-      .and.returnValue(false);
+    spyOn(configService, 'getConfigParam').withArgs('canEditProject').and.returnValue(false);
     expect(service.saveProject()).toEqual(null);
   });
 }

src/main/webapp/wise5/components/componentController.ts

@@ -230,12 +230,12 @@ class ComponentController {
   }
 
   initializeScopeGetComponentState(scope, childControllerName) {
-    scope.getComponentState = isSubmit => {
+    scope.getComponentState = (isSubmit) => {
       const deferred = this.$q.defer();
       const childController = scope[childControllerName];
       if (this.hasDirtyWorkToSendToParent(childController, isSubmit)) {
         const action = this.getDirtyWorkToSendToParentAction(childController, isSubmit);
-        childController.createComponentState(action).then(componentState => {
+        childController.createComponentState(action).then((componentState) => {
           deferred.resolve(componentState);
         });
       } else {
@@ -460,7 +460,7 @@ class ComponentController {
    * data has changed.
    */
   createComponentStateAndBroadcast(action) {
-    this.createComponentState(action).then(componentState => {
+    this.createComponentState(action).then((componentState) => {
       this.emitComponentStudentDataChanged(componentState);
     });
   }
@@ -670,7 +670,7 @@ class ComponentController {
   }
 
   importWorkByStudentWorkId(studentWorkId) {
-    this.StudentDataService.getStudentWorkById(studentWorkId).then(componentState => {
+    this.StudentDataService.getStudentWorkById(studentWorkId).then((componentState) => {
       if (componentState != null) {
         this.setStudentWork(componentState);
         this.setParentStudentWorkIdToCurrentStudentWork(studentWorkId);
@@ -751,7 +751,7 @@ class ComponentController {
   }
 
   attachStudentAsset(studentAsset) {
-    return this.StudentAssetService.copyAssetForReference(studentAsset).then(copiedAsset => {
+    return this.StudentAssetService.copyAssetForReference(studentAsset).then((copiedAsset) => {
       const attachment = {
         studentAssetId: copiedAsset.id,
         iconURL: copiedAsset.iconURL,
@@ -829,7 +829,7 @@ class ComponentController {
     this.audioRecordedSubscription = this.AudioRecorderService.audioRecorded$.subscribe(
       ({ requester, audioFile }) => {
         if (requester === `${this.nodeId}-${this.componentId}`) {
-          this.StudentAssetService.uploadAsset(audioFile).then(studentAsset => {
+          this.StudentAssetService.uploadAsset(audioFile).then((studentAsset) => {
             this.attachStudentAsset(studentAsset).then(() => {
               this.StudentAssetService.deleteAsset(studentAsset);
             });
@@ -871,7 +871,7 @@ class ComponentController {
       $scope.nodeId = nodeId;
       $scope.componentId = componentId;
       $scope.componentState = componentState;
-      $scope.closeDialog = function() {
+      $scope.closeDialog = function () {
         $mdDialog.hide();
       };
     }
@@ -882,12 +882,14 @@ class ComponentController {
         if (componentState.nodeId == nodeId && componentState.componentId == componentId) {
           setTimeout(() => {
             const componentService = this.$injector.get(componentState.componentType + 'Service');
-            componentService.generateImageFromRenderedComponentState(componentState).then(image => {
-              clearTimeout(destroyDoneRenderingComponentListenerTimeout);
-              doneRenderingComponentSubscription.unsubscribe();
-              deferred.resolve(image);
-              this.$mdDialog.hide();
-            });
+            componentService
+              .generateImageFromRenderedComponentState(componentState)
+              .then((image) => {
+                clearTimeout(destroyDoneRenderingComponentListenerTimeout);
+                doneRenderingComponentSubscription.unsubscribe();
+                deferred.resolve(image);
+                this.$mdDialog.hide();
+              });
           }, 1000);
         }
       }

src/main/webapp/wise5/components/conceptMap/conceptMapService.ts

@@ -776,7 +776,7 @@ export class ConceptMapService extends ComponentService {
         let svgString = svgElement.innerHTML;
 
         // find all the images in the svg and replace them with Base64 images
-        this.getHrefToBase64ImageReplacements(svgString, true).then(images => {
+        this.getHrefToBase64ImageReplacements(svgString, true).then((images) => {
           /*
            * Loop through all the image objects. Each object contains
            * an image href and a Base64 image.
@@ -826,7 +826,7 @@ export class ConceptMapService extends ComponentService {
           const thisUtilService = this.UtilService;
 
           // the function that is called after the image is fully loaded
-          image.onload = event => {
+          image.onload = (event) => {
             // get the image that was loaded
             const image: any = event.target;
 
@@ -842,13 +842,13 @@ export class ConceptMapService extends ComponentService {
             const imageObject = thisUtilService.getImageObjectFromBase64String(base64Image);
 
             // create a student asset image
-            this.StudentAssetService.uploadAsset(imageObject).then(unreferencedAsset => {
+            this.StudentAssetService.uploadAsset(imageObject).then((unreferencedAsset) => {
               /*
                * make a copy of the unreferenced asset so that we
                * get a referenced asset
                */
               this.StudentAssetService.copyAssetForReference(unreferencedAsset).then(
-                referencedAsset => {
+                (referencedAsset) => {
                   if (referencedAsset != null) {
                     /*
                      * get the asset url
@@ -970,7 +970,7 @@ export class ConceptMapService extends ComponentService {
       const ctx = myCanvas.getContext('2d');
 
       // the function that is called after the image is fully loaded
-      image.onload = function(event) {
+      image.onload = function (event) {
         // get the image that was loaded
         const image: any = event.target;
 
@@ -1147,7 +1147,7 @@ export class ConceptMapService extends ComponentService {
         let svgString = serializer.serializeToString(svgElement);
 
         // find all the images in the svg and replace them with Base64 images
-        this.getHrefToBase64ImageReplacements(svgString).then(images => {
+        this.getHrefToBase64ImageReplacements(svgString).then((images) => {
           /*
            * Loop through all the image objects. Each object contains
            * an image href and a Base64 image.
@@ -1183,7 +1183,7 @@ export class ConceptMapService extends ComponentService {
           const image = new Image();
 
           // the function that is called after the image is fully loaded
-          image.onload = event => {
+          image.onload = (event) => {
             // get the image that was loaded
             let image: any = event.target;
 
@@ -1199,7 +1199,7 @@ export class ConceptMapService extends ComponentService {
             const imageObject = this.UtilService.getImageObjectFromBase64String(base64Image);
 
             // add the image to the student assets
-            this.StudentAssetService.uploadAsset(imageObject).then(asset => {
+            this.StudentAssetService.uploadAsset(imageObject).then((asset) => {
               resolve(asset);
             });
           };

src/main/webapp/wise5/components/label/labelService.ts

@@ -288,7 +288,7 @@ export class LabelService extends ComponentService {
     const image = new Image();
     const thisUtilService = this.UtilService;
     return new Promise((resolve, reject) => {
-      image.onload = event => {
+      image.onload = (event) => {
         const image: any = event.target;
         myCanvas.width = image.width;
         myCanvas.height = image.height;
@@ -297,13 +297,13 @@ export class LabelService extends ComponentService {
         const imageObject = thisUtilService.getImageObjectFromBase64String(base64Image);
 
         // create a student asset image
-        this.StudentAssetService.uploadAsset(imageObject).then(unreferencedAsset => {
+        this.StudentAssetService.uploadAsset(imageObject).then((unreferencedAsset) => {
           /*
            * make a copy of the unreferenced asset so that we
            * get a referenced asset
            */
           this.StudentAssetService.copyAssetForReference(unreferencedAsset).then(
-            referencedAsset => {
+            (referencedAsset) => {
               if (referencedAsset != null) {
                 /*
                  * get the asset url

src/main/webapp/wise5/services/notificationService.ts

@@ -18,11 +18,9 @@ export class NotificationService {
   private setIsJSONValidSource: Subject<any> = new Subject<any>();
   public setIsJSONValid$: Observable<any> = this.setIsJSONValidSource.asObservable();
   private serverConnectionStatusSource: Subject<any> = new Subject<any>();
-  public serverConnectionStatus$: Observable<any> =
-      this.serverConnectionStatusSource.asObservable();
+  public serverConnectionStatus$: Observable<any> = this.serverConnectionStatusSource.asObservable();
   private viewCurrentAmbientNotificationSource: Subject<any> = new Subject<any>();
-  public viewCurrentAmbientNotification$: Observable<any> =
-      this.viewCurrentAmbientNotificationSource.asObservable();
+  public viewCurrentAmbientNotification$: Observable<any> = this.viewCurrentAmbientNotificationSource.asObservable();
 
   constructor(
     private upgrade: UpgradeModule,
@@ -138,7 +136,7 @@ export class NotificationService {
           this.ConfigService.getWorkgroupId(),
           notificationData,
           notificationGroupId
-        ).then(notification => {
+        ).then((notification) => {
           this.addNotification(notification);
         });
       }
@@ -228,7 +226,7 @@ export class NotificationService {
     let notifications = this.notifications;
     for (const p in args) {
       if (args.hasOwnProperty(p) && args[p] !== null) {
-        notifications = notifications.filter(notification => {
+        notifications = notifications.filter((notification) => {
           return notification[p] === args[p];
         });
       }

src/main/webapp/wise5/services/projectService.ts

@@ -414,7 +414,7 @@ export class ProjectService {
 
   getGroupNodesIdToOrder() {
     const idToOrder = {};
-    const onlyGroupNodes = Object.entries(this.idToOrder).filter(item => {
+    const onlyGroupNodes = Object.entries(this.idToOrder).filter((item) => {
       return this.isGroupNode(item[0]);
     });
     for (const [key, value] of onlyGroupNodes) {
@@ -520,7 +520,7 @@ export class ProjectService {
             '(\'|"|\\\\\'|\\\\")',
           'gi'
         ),
-        matchedString => {
+        (matchedString) => {
           /*
            * once found, we prepend the contentBaseURL + "assets/" to the string within the quotes
            * and keep everything else the same.
@@ -866,7 +866,7 @@ export class ProjectService {
    * the target ids show up in the project.
    */
   constraintsComparatorGenerator(orderedNodeIds) {
-    return function(constraintA, constraintB) {
+    return function (constraintA, constraintB) {
       let constraintAIndex = orderedNodeIds.indexOf(constraintA.targetId);
       let constraintBIndex = orderedNodeIds.indexOf(constraintB.targetId);
       if (constraintAIndex < constraintBIndex) {
@@ -1002,7 +1002,7 @@ export class ProjectService {
    * @returns an array with all the node ids
    */
   getNodeIds() {
-    return this.applicationNodes.map(node => {
+    return this.applicationNodes.map((node) => {
       return node.id;
     });
   }
@@ -1102,7 +1102,7 @@ export class ProjectService {
     return this.http
       .get(projectURL, { headers: headers })
       .toPromise()
-      .then(projectJSON => {
+      .then((projectJSON) => {
         this.setProject(projectJSON);
         return projectJSON;
       });