refactor(Authoring): Rename nodeIdToInsertInsideOrAfter to targetLoca…

…tion (#1739)

src/app/authoring-tool/import-step/choose-import-step/choose-import-step.component.html

@@ -48,7 +48,7 @@ <h6 *ngIf="item.order != 0 && item.node.type == 'group'">
       mat-button
       color="primary"
       routerLink="../choose-unit"
-      [state]="{ nodeIdToInsertInsideOrAfter: nodeIdToInsertInsideOrAfter }"
+      [state]="{ targetId: targetId }"
       aria-label="Back"
       i18n-aria-label
       i18n

src/app/authoring-tool/import-step/choose-import-unit/choose-import-unit.component.html

@@ -29,7 +29,7 @@ <h5 i18n>Choose a unit from which to import step(s).</h5>
       mat-button
       color="primary"
       routerLink="../../choose-template"
-      [state]="{ nodeIdToInsertInsideOrAfter: nodeIdToInsertInsideOrAfter }"
+      [state]="{ targetId: targetId }"
       i18n
     >
       Back

src/app/authoring-tool/import-step/choose-import-unit/choose-import-unit.component.ts

@@ -12,7 +12,7 @@ import { Subscription } from 'rxjs';
 export class ChooseImportUnitComponent {
   protected libraryProjects: any[];
   protected myProjects: any[];
-  protected nodeIdToInsertInsideOrAfter: string;
+  protected targetId: string;
   private subscriptions: Subscription = new Subscription();
 
   constructor(
@@ -23,7 +23,7 @@ export class ChooseImportUnitComponent {
   ) {}
 
   ngOnInit(): void {
-    this.nodeIdToInsertInsideOrAfter = history.state.nodeIdToInsertInsideOrAfter;
+    this.targetId = history.state.targetId;
     this.myProjects = this.configService.getAuthorableProjects();
     this.subscriptions.add(
       this.projectLibraryService.getLibraryProjects().subscribe((libraryProjects) => {
@@ -41,7 +41,7 @@ export class ChooseImportUnitComponent {
       relativeTo: this.route,
       state: {
         importProjectId: project.id,
-        nodeIdToInsertInsideOrAfter: this.nodeIdToInsertInsideOrAfter
+        targetId: this.targetId
       }
     });
   }

src/assets/wise5/authoringTool/add-step-button/add-step-button.component.ts

@@ -35,7 +35,7 @@ export class AddStepButtonComponent {
     this.router.navigate(['add-node', 'choose-template'], {
       relativeTo: this.route,
       state: {
-        nodeIdToInsertInsideOrAfter: nodeId
+        targetId: nodeId
       }
     });
   }

src/assets/wise5/authoringTool/addNode/abstract-import-step/abstract-import-step.component.ts

@@ -8,7 +8,7 @@ import { TeacherProjectService } from '../../../services/teacherProjectService';
 @Directive()
 export abstract class AbstractImportStepComponent implements OnInit {
   protected importProjectId: number;
-  protected nodeIdToInsertInsideOrAfter: string;
+  protected targetId: string;
 
   constructor(
     protected configService: ConfigService,
@@ -20,7 +20,7 @@ export abstract class AbstractImportStepComponent implements OnInit {
   ) {}
 
   ngOnInit(): void {
-    this.nodeIdToInsertInsideOrAfter = history.state.nodeIdToInsertInsideOrAfter;
+    this.targetId = history.state.targetId;
     this.importProjectId = history.state.importProjectId;
   }
 
@@ -29,7 +29,7 @@ export abstract class AbstractImportStepComponent implements OnInit {
       .copyNodes(nodesToImport, this.importProjectId, this.configService.getProjectId())
       .subscribe((copiedNodes: any[]) => {
         const nodesWithNewNodeIds = this.projectService.getNodesWithNewIds(copiedNodes);
-        this.insertNodesService.insertNodes(nodesWithNewNodeIds, this.nodeIdToInsertInsideOrAfter);
+        this.insertNodesService.insertNodes(nodesWithNewNodeIds, this.targetId);
         this.projectService.checkPotentialStartNodeIdChangeThenSaveProject().then(() => {
           this.projectService.refreshProject();
           this.router.navigate(['../../..'], { relativeTo: this.route });

src/assets/wise5/authoringTool/addNode/add-your-own-node/add-your-own-node.component.html

@@ -59,7 +59,7 @@ <h5 i18n>Select components to add to your new step (optional):</h5>
         mat-button
         class="mat-primary"
         routerLink="../choose-template"
-        [state]="{ nodeIdToInsertInsideOrAfter: nodeIdToInsertInsideOrAfter }"
+        [state]="{ targetId: targetId }"
         i18n
       >
         Back

src/assets/wise5/authoringTool/addNode/add-your-own-node/add-your-own-node.component.ts

@@ -16,7 +16,7 @@ export class AddYourOwnNode {
   });
   protected componentTypes: any[];
   protected initialComponents: string[] = [];
-  protected nodeIdToInsertInsideOrAfter: string;
+  protected targetId: string;
 
   constructor(
     private componentTypeService: ComponentTypeService,
@@ -27,7 +27,7 @@ export class AddYourOwnNode {
   ) {}
 
   ngOnInit() {
-    this.nodeIdToInsertInsideOrAfter = history.state.nodeIdToInsertInsideOrAfter;
+    this.targetId = history.state.targetId;
     this.componentTypes = this.componentTypeService.getComponentTypes();
   }
 
@@ -45,10 +45,10 @@ export class AddYourOwnNode {
 
   protected submit(): void {
     const newNode = this.projectService.createNode(this.addNodeFormGroup.controls['title'].value);
-    if (this.isGroupNode(this.nodeIdToInsertInsideOrAfter)) {
-      this.projectService.createNodeInside(newNode, this.nodeIdToInsertInsideOrAfter);
+    if (this.isGroupNode(this.targetId)) {
+      this.projectService.createNodeInside(newNode, this.targetId);
     } else {
-      this.projectService.createNodeAfter(newNode, this.nodeIdToInsertInsideOrAfter);
+      this.projectService.createNodeAfter(newNode, this.targetId);
     }
     this.addInitialComponents(newNode.id, this.initialComponents);
     this.save().then(() => {

src/assets/wise5/authoringTool/addNode/choose-automated-assessment/choose-automated-assessment.component.html

@@ -39,7 +39,7 @@ <h6 i18n>Choose an assessment item:</h6>
       mat-button
       color="primary"
       routerLink="../../choose-template"
-      [state]="{ nodeIdToInsertInsideOrAfter: nodeIdToInsertInsideOrAfter }"
+      [state]="{ targetId: targetId }"
       i18n
     >
       Back

src/assets/wise5/authoringTool/addNode/choose-automated-assessment/choose-automated-assessment.component.ts

@@ -10,7 +10,7 @@ import { ActivatedRoute, Router } from '@angular/router';
 export class ChooseAutomatedAssessmentComponent {
   private importProjectId: number;
   protected node: any;
-  protected nodeIdToInsertInsideOrAfter: string;
+  protected targetId: string;
   private project: any;
   protected projectItems: any;
 
@@ -21,7 +21,7 @@ export class ChooseAutomatedAssessmentComponent {
   ) {}
 
   ngOnInit(): void {
-    this.nodeIdToInsertInsideOrAfter = history.state.nodeIdToInsertInsideOrAfter;
+    this.targetId = history.state.targetId;
     this.importProjectId = this.projectService.getAutomatedAssessmentProjectId();
     this.showAutomatedAssessmentProject();
   }
@@ -50,7 +50,7 @@ export class ChooseAutomatedAssessmentComponent {
       state: {
         importProjectId: this.importProjectId,
         node: this.node,
-        nodeIdToInsertInsideOrAfter: this.nodeIdToInsertInsideOrAfter
+        targetId: this.targetId
       }
     });
   }

src/assets/wise5/authoringTool/addNode/choose-new-node-template/choose-new-node-template.component.ts

@@ -37,7 +37,7 @@ export class ChooseNewNodeTemplate {
     this.router.navigate(['..', ...template.route.split('/')], {
       relativeTo: this.route,
       state: {
-        nodeIdToInsertInsideOrAfter: history.state.nodeIdToInsertInsideOrAfter
+        targetId: history.state.targetId
       }
     });
   }

src/assets/wise5/authoringTool/addNode/choose-simulation/choose-simulation.component.html

@@ -41,7 +41,7 @@ <h5 i18n>Interactive Simulation</h5>
       mat-button
       color="primary"
       routerLink="../../choose-template"
-      [state]="{ nodeIdToInsertInsideOrAfter: nodeIdToInsertInsideOrAfter }"
+      [state]="{ targetId: targetId }"
       i18n
     >
       Back

src/assets/wise5/authoringTool/addNode/configure-automated-assessment/configure-automated-assessment.component.html

@@ -32,7 +32,7 @@ <h5 i18n>Customize Feedback (optional)</h5>
       mat-button
       color="primary"
       routerLink="../choose-item"
-      [state]="{ nodeIdToInsertInsideOrAfter: nodeIdToInsertInsideOrAfter }"
+      [state]="{ targetId: targetId }"
       i18n
     >
       Back

src/assets/wise5/authoringTool/project-authoring-lesson/project-authoring-lesson.component.ts

@@ -67,7 +67,7 @@ export class ProjectAuthoringLessonComponent {
     this.router.navigate(['add-node', 'choose-template'], {
       relativeTo: this.route,
       state: {
-        nodeIdToInsertInsideOrAfter: nodeId
+        targetId: nodeId
       }
     });
   }

src/assets/wise5/services/insertNodesService.ts

@@ -8,34 +8,34 @@ export class InsertNodesService {
   /**
    * Insert nodes in specified location. Modifies project.
    * @param nodes nodes to insert
-   * @param nodeIdToInsertInsideOrAfter id of node or group. If this is a group, we will make the
+   * @param targetId id of node or group. If this is a group, we will make the
    * new step the first step in the group. If this is a step, we will place the new step after it.
    */
-  insertNodes(nodes: any[], nodeIdToInsertInsideOrAfter: string) {
-    if (nodeIdToInsertInsideOrAfter == null) {
+  insertNodes(nodes: any[], targetId: string) {
+    if (targetId == null) {
       /*
        * Insert the node after the last inactive node. If there
        * are no inactive nodes it will just be placed in the
        * inactive nodes section. In the latter case we do this by
-       * setting nodeIdToInsertInsideOrAfter to 'inactiveSteps'.
+       * setting targetId to 'inactiveSteps'.
        */
       const inactiveNodes = this.ProjectService.getInactiveNodes();
       if (inactiveNodes != null && inactiveNodes.length > 0) {
-        nodeIdToInsertInsideOrAfter = inactiveNodes[inactiveNodes.length - 1];
+        targetId = inactiveNodes[inactiveNodes.length - 1];
       } else {
-        nodeIdToInsertInsideOrAfter = 'inactiveSteps';
+        targetId = 'inactiveSteps';
       }
     }
 
     for (const node of nodes) {
-      if (this.ProjectService.isGroupNode(nodeIdToInsertInsideOrAfter)) {
-        this.ProjectService.createNodeInside(node, nodeIdToInsertInsideOrAfter);
+      if (this.ProjectService.isGroupNode(targetId)) {
+        this.ProjectService.createNodeInside(node, targetId);
       } else {
-        this.ProjectService.createNodeAfter(node, nodeIdToInsertInsideOrAfter);
+        this.ProjectService.createNodeAfter(node, targetId);
       }
 
       /*
-       * Update the nodeIdToInsertInsideOrAfter so that when we are
+       * Update the targetId so that when we are
        * importing multiple steps, the steps get placed in the correct
        * order.
        *
@@ -48,10 +48,10 @@ export class InsertNodesService {
        * nodeB
        *
        * This means after we add nodeA, we must update
-       * nodeIdToInsertInsideOrAfter to be nodeA so that when we add
+       * targetId to be nodeA so that when we add
        * nodeB, it will be placed after nodeA.
        */
-      nodeIdToInsertInsideOrAfter = node.id;
+      targetId = node.id;
     }
   }
 }