feat(Import Step): Move to Create New Step Menu (#1445)

Co-authored-by: Jonathan Lim-Breitbart <breity10@gmail.com>
WISE-Community · Oct 12, 2023 · 2ff3f69 · 2ff3f69
1 parent 8addd6b
commit 2ff3f69
Show file tree

Hide file tree

Showing 11 changed files with 64 additions and 93 deletions.
diff --git a/...g-tool/import-step/choose-import-step-location/choose-import-step-location.component.html b/...g-tool/import-step/choose-import-step-location/choose-import-step-location.component.html
@@ -40,6 +40,6 @@ <h5 i18n>Choose a location for the imported steps.</h5>
 <div class="nav-controls">
   <mat-divider></mat-divider>
   <div fxLayout="row" fxLayoutAlign="end center">
-    <button mat-button color="primary" routerLink="../.." aria-label="Cancel" i18n>Cancel</button>
+    <button mat-button color="primary" routerLink="../../.." i18n>Cancel</button>
   </div>
 </div>
diff --git a/...ing-tool/import-step/choose-import-step-location/choose-import-step-location.component.ts b/...ing-tool/import-step/choose-import-step-location/choose-import-step-location.component.ts
@@ -39,14 +39,14 @@ export class ChooseImportStepLocationComponent {
           this.projectService.refreshProject();
           if (nodesWithNewNodeIds.length === 1) {
             const newNode = nodesWithNewNodeIds[0];
-            this.router.navigate(['../../node', newNode.id], {
+            this.router.navigate(['../../../node', newNode.id], {
               relativeTo: this.route,
               state: {
                 newComponents: newNode.components
               }
             });
           } else {
-            this.router.navigate(['../..'], { relativeTo: this.route });
+            this.router.navigate(['../../..'], { relativeTo: this.route });
           }
         });
       });

diff --git a/src/app/authoring-tool/import-step/choose-import-step/choose-import-step.component.html b/src/app/authoring-tool/import-step/choose-import-step/choose-import-step.component.html
@@ -55,7 +55,7 @@ <h6 *ngIf="item.order != 0 && item.node.type == 'group'">
       Back
     </button>
     <span fxFlex></span>
-    <button mat-button color="primary" routerLink="../.." aria-label="cancel" i18n>Cancel</button>
+    <button mat-button color="primary" routerLink="../../.." i18n>Cancel</button>
     <button
       mat-raised-button
       color="primary"

diff --git a/src/app/authoring-tool/import-step/choose-import-unit/choose-import-unit.component.html b/src/app/authoring-tool/import-step/choose-import-unit/choose-import-unit.component.html
@@ -25,6 +25,8 @@ <h5 i18n>Choose a unit from which to import step(s).</h5>
 <div class="nav-controls">
   <mat-divider></mat-divider>
   <div fxLayout="row" fxLayoutGap="16px" fxLayoutAlign="end center">
-    <button mat-button color="primary" routerLink="../.." aria-label="cancel" i18n>Cancel</button>
+    <button mat-button color="primary" routerLink="../../choose-template" i18n>Back</button>
+    <span fxFlex></span>
+    <button mat-button color="primary" routerLink="../../.." i18n>Cancel</button>
   </div>
 </div>
diff --git a/src/app/teacher/authoring-routing.module.ts b/src/app/teacher/authoring-routing.module.ts
@@ -91,6 +91,23 @@ const routes: Routes = [
                 path: 'choose-location',
                 component: ChooseNewNodeLocation
               },
+              {
+                path: 'import-step',
+                children: [
+                  {
+                    path: 'choose-location',
+                    component: ChooseImportStepLocationComponent
+                  },
+                  {
+                    path: 'choose-step',
+                    component: ChooseImportStepComponent
+                  },
+                  {
+                    path: 'choose-unit',
+                    component: ChooseImportUnitComponent
+                  }
+                ]
+              },
               {
                 path: 'simulation',
                 children: [{ path: 'choose-item', component: ChooseSimulationComponent }]
@@ -104,23 +121,6 @@ const routes: Routes = [
           },
           { path: 'choose-copy-location', component: ChooseCopyNodeLocationComponent },
           { path: 'choose-move-location', component: ChooseMoveNodeLocationComponent },
-          {
-            path: 'import-step',
-            children: [
-              {
-                path: 'choose-location',
-                component: ChooseImportStepLocationComponent
-              },
-              {
-                path: 'choose-step',
-                component: ChooseImportStepComponent
-              },
-              {
-                path: 'choose-unit',
-                component: ChooseImportUnitComponent
-              }
-            ]
-          },
           { path: 'info', component: ProjectInfoAuthoringComponent },
           { path: 'milestones', component: MilestonesAuthoringComponent },
           {

diff --git a/src/assets/wise5/authoringTool/addNode/NewNodeTemplate.ts b/src/assets/wise5/authoringTool/addNode/NewNodeTemplate.ts
@@ -1,6 +1,5 @@
 export interface NewNodeTemplate {
   label: string;
-  description: string;
   icon: string;
   route: string;
 }
diff --git a/...e5/authoringTool/addNode/choose-new-node-template/choose-new-node-template.component.html b/...e5/authoringTool/addNode/choose-new-node-template/choose-new-node-template.component.html
@@ -1,4 +1,4 @@
-<h5 i18n>Start from scratch or choose a step template:</h5>
+<h5 i18n>Start from scratch, import from another unit, or choose a step template:</h5>
 <div fxLayout="row wrap" fxLayout.xs="column">
   <div
     class="template"

diff --git a/...ise5/authoringTool/addNode/choose-new-node-template/choose-new-node-template.component.ts b/...ise5/authoringTool/addNode/choose-new-node-template/choose-new-node-template.component.ts
@@ -11,19 +11,21 @@ export class ChooseNewNodeTemplate {
   protected templates: NewNodeTemplate[] = [
     {
       label: $localize`Create Your Own`,
-      description: $localize`Create Your Own Description`,
       icon: 'mode_edit',
       route: 'add-your-own'
     },
+    {
+      label: $localize`Import From Another Unit`,
+      icon: 'system_update_alt',
+      route: 'import-step/choose-unit'
+    },
     {
       label: $localize`Automated Assessment`,
-      description: $localize`Automated Assessment Description`,
       icon: 'fact_check',
       route: 'automated-assessment/choose-item'
     },
     {
       label: $localize`Interactive Simulation`,
-      description: $localize`Add an existing interactive simulation`,
       icon: 'video_settings',
       route: 'simulation/choose-item'
     }

diff --git a/src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html b/src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html
@@ -13,9 +13,9 @@
     <button
       mat-raised-button
       color="primary"
-      (click)="createNewLesson()"
+      (click)="addNewLesson()"
       [disabled]="stepNodeSelected || groupNodeSelected"
-      matTooltip="Create New Lesson"
+      matTooltip="Add New Lesson"
       matTooltipPosition="above"
       i18n-matTooltip
     >
@@ -24,9 +24,9 @@
     <button
       mat-raised-button
       color="primary"
-      (click)="createNewStep()"
+      (click)="addNewStep()"
       [disabled]="stepNodeSelected || groupNodeSelected"
-      matTooltip="Create New Step"
+      matTooltip="Add New Step"
       matTooltipPosition="above"
       i18n-matTooltip
     >
@@ -43,17 +43,6 @@
     >
       <mat-icon>widgets</mat-icon>
     </button>
-    <button
-      mat-raised-button
-      color="primary"
-      (click)="importStep()"
-      [disabled]="stepNodeSelected || groupNodeSelected"
-      matTooltip="Import Step"
-      matTooltipPosition="above"
-      i18n-matTooltip
-    >
-      <mat-icon>system_update_alt</mat-icon>
-    </button>
     <button
       mat-raised-button
       color="primary"

diff --git a/src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts b/src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts
@@ -141,22 +141,18 @@ export class ProjectAuthoringComponent {
     this.groupNodeSelected = false;
   }
 
-  protected createNewLesson(): void {
+  protected addNewLesson(): void {
     this.router.navigate([`/teacher/edit/unit/${this.projectId}/add-lesson/configure`]);
   }
 
-  protected createNewStep(): void {
+  protected addNewStep(): void {
     this.router.navigate([`/teacher/edit/unit/${this.projectId}/add-node/choose-template`]);
   }
 
   protected addStructure(): void {
     this.router.navigate([`/teacher/edit/unit/${this.projectId}/structure/choose`]);
   }
 
-  protected importStep(): void {
-    this.router.navigate([`/teacher/edit/unit/${this.projectId}/import-step/choose-unit`]);
-  }
-
   protected goToAdvancedAuthoring(): void {
     this.router.navigate([`/teacher/edit/unit/${this.projectId}/advanced`]);
   }