feat(Authoring): Collapse components (#1201)

Co-authored-by: Jonathan Lim-Breitbart <[email protected]>
WISE-Community · Apr 28, 2023 · 1ce0124 · 1ce0124
1 parent 47b3c84
commit 1ce0124
Show file tree

Hide file tree

Showing 7 changed files with 221 additions and 138 deletions.
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
@@ -34,9 +34,10 @@ export class ChooseImportStepLocationComponent {
       this.ProjectService.checkPotentialStartNodeIdChangeThenSaveProject().then(() => {
         this.ProjectService.refreshProject();
         if (nodesWithNewNodeIds.length === 1) {
+          const newNode = nodesWithNewNodeIds[0];
           this.upgrade.$injector
             .get('$state')
-            .go('root.at.project.node', { nodeId: nodesWithNewNodeIds[0].id });
+            .go('root.at.project.node', { nodeId: newNode.id, newComponents: newNode.components });
         } else {
           this.upgrade.$injector.get('$state').go('root.at.project');
         }

diff --git a/...ise5/authoringTool/addNode/choose-new-node-location/choose-new-node-location.component.ts b/...ise5/authoringTool/addNode/choose-new-node-location/choose-new-node-location.component.ts
@@ -34,7 +34,7 @@ export class ChooseNewNodeLocation {
       this.upgrade.$injector.get('$stateParams').initialComponents
     );
     this.save(newNode.id).then(() => {
-      this.goToNode(newNode.id);
+      this.goToNode(newNode);
     });
   }
 
@@ -54,8 +54,10 @@ export class ChooseNewNodeLocation {
     });
   }
 
-  goToNode(nodeId: string) {
-    this.upgrade.$injector.get('$state').go('root.at.project.node', { nodeId: nodeId });
+  private goToNode(node: any): void {
+    this.upgrade.$injector
+      .get('$state')
+      .go('root.at.project.node', { nodeId: node.id, newComponents: node.components });
   }
 
   isGroupNode(nodeId: string) {

diff --git a/...authoringTool/components/preview-component-button/preview-component-button.component.html b/...authoringTool/components/preview-component-button/preview-component-button.component.html
@@ -4,7 +4,7 @@
   matTooltip="Preview Component"
   matTooltipPosition="above"
   i18n-matTooltip
-  (click)="popUpComponentPreview()"
+  (click)="popUpComponentPreview($event)"
 >
   <mat-icon>visibility</mat-icon>
 </button>
diff --git a/...5/authoringTool/components/preview-component-button/preview-component-button.component.ts b/...5/authoringTool/components/preview-component-button/preview-component-button.component.ts
@@ -16,7 +16,8 @@ export class PreviewComponentButtonComponent implements OnInit {
 
   ngOnInit(): void {}
 
-  popUpComponentPreview(): void {
+  popUpComponentPreview(event: any): void {
+    event.stopPropagation();
     const dialogRef = this.dialog.open(PreviewComponentDialogComponent, {
       panelClass: 'dialog-lg'
     });

diff --git a/src/assets/wise5/authoringTool/i18n/i18n_en.json b/src/assets/wise5/authoringTool/i18n/i18n_en.json
@@ -334,6 +334,7 @@
   "scriptFilename": "Script Filename",
   "selectAStepToImport": "Please select a step a import.",
   "selectAuthorableProject": "Select Authorable Unit",
+  "selectComponent": "Select component",
   "selectLibraryProject": "Select Library Unit",
   "selectMyProject": "Select My Unit",
   "selfDirectedInvestigation.label": "Self-Directed Investigation",
@@ -376,6 +377,7 @@
   "thisComponent": "This Component",
   "thisProjectDoesNotHaveAProjectIcon": "This unit does not have a unit icon.",
   "title": "Title",
+  "toggleComponentAuthoring": "Toggle component authoring",
   "toStep": "To Step",
   "transitionCriteria": "Which criteria should match to use this path",
   "transitionCriteriaComponent": "Which Component in this step to check for criteria",