refactor(NodeAuthoringComponent): Extract NodeAuthoringParentComponent (

#1454)
WISE-Community · Oct 8, 2023 · c6ecce6 · c6ecce6
1 parent 44a0995
commit c6ecce6
Show file tree

Hide file tree

Showing 17 changed files with 294 additions and 300 deletions.
diff --git a/src/app/teacher/authoring-routing.module.ts b/src/app/teacher/authoring-routing.module.ts
@@ -36,6 +36,7 @@ import { ChooseMoveNodeLocationComponent } from '../../assets/wise5/authoringToo
 import { ChooseCopyNodeLocationComponent } from '../../assets/wise5/authoringTool/choose-node-location/choose-copy-node-location/choose-copy-node-location.component';
 import { ProjectAuthoringParentComponent } from '../../assets/wise5/authoringTool/project-authoring-parent/project-authoring-parent.component';
 import { ChooseImportUnitComponent } from '../authoring-tool/import-step/choose-import-unit/choose-import-unit.component';
+import { NodeAuthoringParentComponent } from '../../assets/wise5/authoringTool/node/node-authoring-parent/node-authoring-parent.component';
 
 const routes: Routes = [
   {
@@ -124,8 +125,24 @@ const routes: Routes = [
           { path: 'milestones', component: MilestonesAuthoringComponent },
           {
             path: 'node/:nodeId',
-            component: NodeAuthoringComponent,
+            component: NodeAuthoringParentComponent,
             children: [
+              {
+                path: '',
+                component: NodeAuthoringComponent
+              },
+              {
+                path: 'advanced',
+                component: NodeAdvancedAuthoringComponent,
+                children: [
+                  { path: 'branch', component: NodeAdvancedBranchAuthoringComponent },
+                  { path: 'constraint', component: NodeAdvancedConstraintAuthoringComponent },
+                  { path: 'general', component: NodeAdvancedGeneralAuthoringComponent },
+                  { path: 'json', component: NodeAdvancedJsonAuthoringComponent },
+                  { path: 'path', component: NodeAdvancedPathAuthoringComponent },
+                  { path: 'rubric', component: EditNodeRubricComponent }
+                ]
+              },
               {
                 path: 'choose-component-location',
                 component: ChooseComponentLocationComponent
@@ -136,19 +153,6 @@ const routes: Routes = [
               }
             ]
           },
-
-          {
-            path: 'node/:nodeId/advanced',
-            component: NodeAdvancedAuthoringComponent,
-            children: [
-              { path: 'branch', component: NodeAdvancedBranchAuthoringComponent },
-              { path: 'constraint', component: NodeAdvancedConstraintAuthoringComponent },
-              { path: 'general', component: NodeAdvancedGeneralAuthoringComponent },
-              { path: 'json', component: NodeAdvancedJsonAuthoringComponent },
-              { path: 'path', component: NodeAdvancedPathAuthoringComponent },
-              { path: 'rubric', component: EditNodeRubricComponent }
-            ]
-          },
           { path: 'notebook', component: NotebookAuthoringComponent },
           { path: 'recovery', component: RecoveryAuthoringComponent },
           {

diff --git a/src/app/teacher/authoring-tool.module.ts b/src/app/teacher/authoring-tool.module.ts
@@ -50,6 +50,7 @@ import { NodeIconAndTitleComponent } from '../../assets/wise5/authoringTool/choo
 import { NodeWithMoveAfterButtonComponent } from '../../assets/wise5/authoringTool/choose-node-location/node-with-move-after-button/node-with-move-after-button.component';
 import { ProjectAuthoringParentComponent } from '../../assets/wise5/authoringTool/project-authoring-parent/project-authoring-parent.component';
 import { ChooseImportUnitComponent } from '../authoring-tool/import-step/choose-import-unit/choose-import-unit.component';
+import { NodeAuthoringParentComponent } from '../../assets/wise5/authoringTool/node/node-authoring-parent/node-authoring-parent.component';
 
 @NgModule({
   declarations: [
@@ -78,6 +79,7 @@ import { ChooseImportUnitComponent } from '../authoring-tool/import-step/choose-
     InsertNodeInsideButtonComponent,
     MilestonesAuthoringComponent,
     NodeAuthoringComponent,
+    NodeAuthoringParentComponent,
     NodeIconChooserDialog,
     NodeIconAndTitleComponent,
     NodeWithMoveAfterButtonComponent,

diff --git a/...sets/wise5/authoringTool/node/advanced/branch/node-advanced-branch-authoring.component.ts b/...sets/wise5/authoringTool/node/advanced/branch/node-advanced-branch-authoring.component.ts
@@ -53,7 +53,7 @@ export class NodeAdvancedBranchAuthoringComponent implements OnInit {
   ) {}
 
   ngOnInit() {
-    this.route.parent.params.subscribe((params) => {
+    this.route.parent.parent.params.subscribe((params) => {
       this.nodeId = params.nodeId;
       this.node = this.projectService.getNodeById(this.nodeId);
       this.nodeIds = this.projectService.getFlattenedProjectAsNodeIds(true);

diff --git a/...thoringTool/node/advanced/constraint/node-advanced-constraint-authoring.component.spec.ts b/...thoringTool/node/advanced/constraint/node-advanced-constraint-authoring.component.spec.ts
@@ -38,7 +38,7 @@ describe('NodeAdvancedConstraintAuthoringComponent', () => {
         {
           provide: ActivatedRoute,
           useValue: {
-            parent: { params: of({ nodeId: 'node1' }) }
+            parent: { parent: { params: of({ nodeId: 'node1' }) } }
           }
         }
       ]

diff --git a/...e5/authoringTool/node/advanced/constraint/node-advanced-constraint-authoring.component.ts b/...e5/authoringTool/node/advanced/constraint/node-advanced-constraint-authoring.component.ts
@@ -16,7 +16,7 @@ export class NodeAdvancedConstraintAuthoringComponent extends ConstraintsAuthori
   }
 
   ngOnInit() {
-    this.route.parent.params.subscribe((params) => {
+    this.route.parent.parent.params.subscribe((params) => {
       const node = this.projectService.getNodeById(params.nodeId);
       if (node.constraints == null) {
         node.constraints = [];

diff --git a/...ts/wise5/authoringTool/node/advanced/general/node-advanced-general-authoring.component.ts b/...ts/wise5/authoringTool/node/advanced/general/node-advanced-general-authoring.component.ts
@@ -12,7 +12,7 @@ export class NodeAdvancedGeneralAuthoringComponent implements OnInit {
   constructor(private projectService: TeacherProjectService, private route: ActivatedRoute) {}
 
   ngOnInit() {
-    this.route.parent.params.subscribe((params) => {
+    this.route.parent.parent.params.subscribe((params) => {
       this.node = this.projectService.getNodeById(params.nodeId);
     });
   }

diff --git a/src/assets/wise5/authoringTool/node/advanced/json/node-advanced-json-authoring.component.ts b/src/assets/wise5/authoringTool/node/advanced/json/node-advanced-json-authoring.component.ts
@@ -23,7 +23,7 @@ export class NodeAdvancedJsonAuthoringComponent implements OnInit {
   ) {}
 
   ngOnInit() {
-    this.route.parent.params.subscribe((params) => {
+    this.route.parent.parent.params.subscribe((params) => {
       this.nodeId = params.nodeId;
       this.node = this.projectService.getNodeById(this.nodeId);
       this.nodeContentJSONString = JSON.stringify(this.node, null, 4);

diff --git a/...uthoringTool/node/advanced/node-advanced-authoring/node-advanced-authoring.component.html b/...uthoringTool/node/advanced/node-advanced-authoring/node-advanced-authoring.component.html
@@ -2,7 +2,7 @@
   <button
     mat-raised-button
     color="primary"
-    [routerLink]="['/teacher/edit/unit', projectId, 'node', nodeId]"
+    routerLink=".."
     matTooltip="Back"
     matTooltipPosition="above"
     i18n-matTooltip

diff --git a/...ets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.spec.ts b/...ets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.spec.ts
@@ -37,7 +37,7 @@ describe('NodeAdvancedPathAuthoringComponent', () => {
         {
           provide: ActivatedRoute,
           useValue: {
-            parent: { params: of({ nodeId: 'node1' }) }
+            parent: { parent: { params: of({ nodeId: 'node1' }) } }
           }
         }
       ]

diff --git a/src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts b/src/assets/wise5/authoringTool/node/advanced/path/node-advanced-path-authoring.component.ts
@@ -60,7 +60,7 @@ export class NodeAdvancedPathAuthoringComponent implements OnInit {
   constructor(private projectService: TeacherProjectService, private route: ActivatedRoute) {}
 
   ngOnInit() {
-    this.route.parent.params.subscribe((params) => {
+    this.route.parent.parent.params.subscribe((params) => {
       this.node = this.projectService.getNodeById(params.nodeId);
       this.nodeIds = this.projectService.getFlattenedProjectAsNodeIds(true);
     });

diff --git a/src/assets/wise5/authoringTool/node/editRubric/edit-node-rubric.component.spec.ts b/src/assets/wise5/authoringTool/node/editRubric/edit-node-rubric.component.spec.ts
@@ -39,7 +39,7 @@ describe('EditNodeRubricComponent', () => {
         {
           provide: ActivatedRoute,
           useValue: {
-            parent: { params: of({ nodeId: 'node1' }) }
+            parent: { parent: { params: of({ nodeId: 'node1' }) } }
           }
         }
       ],

diff --git a/src/assets/wise5/authoringTool/node/editRubric/edit-node-rubric.component.ts b/src/assets/wise5/authoringTool/node/editRubric/edit-node-rubric.component.ts
@@ -19,7 +19,7 @@ export class EditNodeRubricComponent implements OnInit {
   ) {}
 
   ngOnInit(): void {
-    this.route.parent.params.subscribe((params) => {
+    this.route.parent.parent.params.subscribe((params) => {
       this.node = this.projectService.getNodeById(params.nodeId);
       this.rubric = this.projectService.replaceAssetPaths(replaceWiseLinks(this.node.rubric));
     });

diff --git a/...ssets/wise5/authoringTool/node/node-authoring-parent/node-authoring-parent.component.html b/...ssets/wise5/authoringTool/node/node-authoring-parent/node-authoring-parent.component.html
@@ -0,0 +1 @@
+<router-outlet></router-outlet>
diff --git a/src/assets/wise5/authoringTool/node/node-authoring-parent/node-authoring-parent.component.ts b/src/assets/wise5/authoringTool/node/node-authoring-parent/node-authoring-parent.component.ts
@@ -0,0 +1,6 @@
+import { Component } from '@angular/core';
+
+@Component({
+  templateUrl: './node-authoring-parent.component.html'
+})
+export class NodeAuthoringParentComponent {}