From d53c12e78f70c7f212850adbe040db4775e0f986 Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Tue, 31 Mar 2026 16:00:28 -0700
Subject: [PATCH 01/33] Organize MC advanced component authoring using tabs

---
 ...it-multiple-choice-advanced.component.html | 96 ++++++++++++-------
 ...edit-multiple-choice-advanced.component.ts | 16 ++--
 2 files changed, 72 insertions(+), 40 deletions(-)

diff --git a/src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.html b/src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.html
index 591002240fe..d999ae30de8 100644
--- a/src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.html
+++ b/src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.html
@@ -1,34 +1,62 @@
-<div class="show-feedback-checkbox">
-  <mat-checkbox
-    color="primary"
-    [(ngModel)]="componentContent.showFeedback"
-    (ngModelChange)="componentChanged()"
-    i18n
-  >
-    Show Feedback
-  </mat-checkbox>
-</div>
-<edit-component-save-button [componentContent]="componentContent" />
-<br />
-<edit-component-submit-button [componentContent]="componentContent" />
-@if (componentContent.showSubmitButton) {
-  <edit-component-max-submit [componentContent]="componentContent" />
-}
-<edit-component-default-feedback [componentContent]="componentContent" />
-<div class="flex flex-col justify-start items-start">
-  <edit-component-max-score [componentContent]="componentContent" />
-  <edit-component-exclude-from-total-score [componentContent]="componentContent" />
-  <edit-component-width [componentContent]="componentContent" />
-  <edit-component-rubric [componentContent]="componentContent" />
-  <edit-component-tags [componentContent]="componentContent" />
-</div>
-<edit-multiple-choice-connected-components
-  [nodeId]="nodeId"
-  [componentId]="componentId"
-  [allowedConnectedComponentTypes]="allowedConnectedComponentTypes"
-  [componentContent]="componentContent"
-  [connectedComponents]="componentContent.connectedComponents"
-  (connectedComponentsChanged)="connectedComponentsChanged($event)"
-/>
-<edit-component-constraints [componentContent]="component.content" />
-<edit-component-json [component]="component" />
+<mat-tab-group>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
+    </ng-template>
+    <div class="show-feedback-checkbox">
+      <mat-checkbox
+        color="primary"
+        [(ngModel)]="componentContent.showFeedback"
+        (ngModelChange)="componentChanged()"
+        i18n
+      >
+        Show Feedback
+      </mat-checkbox>
+    </div>
+    <edit-component-save-button [componentContent]="componentContent" />
+    <br />
+    <edit-component-submit-button [componentContent]="componentContent" />
+    @if (componentContent.showSubmitButton) {
+      <edit-component-max-submit [componentContent]="componentContent" />
+    }
+    <edit-component-default-feedback [componentContent]="componentContent" />
+    <div class="flex flex-col justify-start items-start">
+      <edit-component-max-score [componentContent]="componentContent" />
+      <edit-component-exclude-from-total-score [componentContent]="componentContent" />
+      <edit-component-width [componentContent]="componentContent" />
+    </div>
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>visibility</mat-icon>&nbsp;<span i18n>Visibility</span>
+    </ng-template>
+    <edit-component-constraints [componentContent]="component.content" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>join_inner</mat-icon>&nbsp;<span i18n>Connections</span>
+    </ng-template>
+    <edit-multiple-choice-connected-components
+      [nodeId]="nodeId"
+      [componentId]="componentId"
+      [allowedConnectedComponentTypes]="allowedConnectedComponentTypes"
+      [componentContent]="componentContent"
+      [connectedComponents]="componentContent.connectedComponents"
+      (connectedComponentsChanged)="connectedComponentsChanged($event)"
+    />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
+    </ng-template>
+    <edit-component-rubric [componentContent]="componentContent" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label> <mat-icon>sell</mat-icon>&nbsp;<span i18n>Tags</span></ng-template>
+    <edit-component-tags [componentContent]="componentContent" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label> <mat-icon>code</mat-icon>&nbsp;<span i18n>JSON</span></ng-template>
+    <edit-component-json [component]="component" />
+  </mat-tab>
+</mat-tab-group>
diff --git a/src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.ts b/src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.ts
index 5c98775c4c0..67f0c0a027a 100644
--- a/src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.ts
+++ b/src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.ts
@@ -15,13 +15,11 @@ import { EditComponentTagsComponent } from '../../../../../app/authoring-tool/ed
 import { EditComponentWidthComponent } from '../../../../../app/authoring-tool/edit-component-width/edit-component-width.component';
 import { EditMultipleChoiceConnectedComponentsComponent } from '../edit-multiple-choice-connected-components/edit-multiple-choice-connected-components.component';
 import { MultipleChoiceContent } from '../MultipleChoiceContent';
+import { MatTabsModule } from '@angular/material/tabs';
+import { MatIconModule } from '@angular/material/icon';
 
 @Component({
-  templateUrl: 'edit-multiple-choice-advanced.component.html',
-  styles: ['.show-feedback-checkbox { margin-top: 4px; margin-bottom: 4px; }'],
   imports: [
-    MatCheckbox,
-    FormsModule,
     EditComponentSaveButtonComponent,
     EditComponentSubmitButtonComponent,
     EditComponentMaxSubmitComponent,
@@ -33,8 +31,14 @@ import { MultipleChoiceContent } from '../MultipleChoiceContent';
     EditComponentTagsComponent,
     EditMultipleChoiceConnectedComponentsComponent,
     EditComponentConstraintsComponent,
-    EditComponentJsonComponent
-  ]
+    EditComponentJsonComponent,
+    FormsModule,
+    MatCheckbox,
+    MatIconModule,
+    MatTabsModule
+  ],
+  styles: ['.show-feedback-checkbox { margin-top: 4px; margin-bottom: 4px; }'],
+  templateUrl: 'edit-multiple-choice-advanced.component.html'
 })
 export class EditMultipleChoiceAdvancedComponent extends EditAdvancedComponentComponent {
   allowedConnectedComponentTypes = ['MultipleChoice'];

From b349c0bd86e29044a280421e6e183dabe6ee0cf2 Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Tue, 31 Mar 2026 16:09:09 -0700
Subject: [PATCH 02/33] Added "Activity" in the dialog title

---
 .../edit-component-advanced.component.html                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.html b/src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.html
index 7bc636ac70f..0f6f23ab223 100644
--- a/src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.html
+++ b/src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.html
@@ -1,4 +1,4 @@
-<h2 mat-dialog-title i18n>Advanced Settings</h2>
+<h2 mat-dialog-title i18n>Advanced Activity Settings</h2>
 <mat-divider />
 <div mat-dialog-content>
   <div #component></div>

From 53e42d488ffc0b01298cf0b1f46edc4a87eeff5d Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Tue, 31 Mar 2026 16:30:40 -0700
Subject: [PATCH 03/33] Created shared module.

---
 .../edit-component-advanced-shared.module.ts  | 54 +++++++++++++++++++
 ...edit-multiple-choice-advanced.component.ts | 35 +-----------
 2 files changed, 56 insertions(+), 33 deletions(-)
 create mode 100644 src/app/authoring-tool/edit-component-advanced/edit-component-advanced-shared.module.ts

diff --git a/src/app/authoring-tool/edit-component-advanced/edit-component-advanced-shared.module.ts b/src/app/authoring-tool/edit-component-advanced/edit-component-advanced-shared.module.ts
new file mode 100644
index 00000000000..ed4250c395c
--- /dev/null
+++ b/src/app/authoring-tool/edit-component-advanced/edit-component-advanced-shared.module.ts
@@ -0,0 +1,54 @@
+import { NgModule } from '@angular/core';
+import { EditComponentDefaultFeedback } from '../edit-advanced-component/edit-component-default-feedback/edit-component-default-feedback.component';
+import { EditComponentExcludeFromTotalScoreComponent } from '../edit-component-exclude-from-total-score/edit-component-exclude-from-total-score.component';
+import { EditComponentMaxScoreComponent } from '../edit-component-max-score/edit-component-max-score.component';
+import { EditComponentMaxSubmitComponent } from '../edit-component-max-submit/edit-component-max-submit.component';
+import { EditComponentRubricComponent } from '../edit-component-rubric/edit-component-rubric.component';
+import { EditComponentSaveButtonComponent } from '../edit-component-save-button/edit-component-save-button.component';
+import { EditComponentSubmitButtonComponent } from '../edit-component-submit-button/edit-component-submit-button.component';
+import { EditComponentTagsComponent } from '../edit-component-tags/edit-component-tags.component';
+import { EditComponentWidthComponent } from '../edit-component-width/edit-component-width.component';
+import { EditComponentConstraintsComponent } from '../edit-component-constraints/edit-component-constraints.component';
+import { EditComponentJsonComponent } from '../edit-component-json/edit-component-json.component';
+import { MatTabsModule } from '@angular/material/tabs';
+import { MatIconModule } from '@angular/material/icon';
+import { MatCheckboxModule } from '@angular/material/checkbox';
+import { FormsModule } from '@angular/forms';
+
+@NgModule({
+  imports: [
+    EditComponentSaveButtonComponent,
+    EditComponentSubmitButtonComponent,
+    EditComponentMaxSubmitComponent,
+    EditComponentDefaultFeedback,
+    EditComponentMaxScoreComponent,
+    EditComponentExcludeFromTotalScoreComponent,
+    EditComponentWidthComponent,
+    EditComponentRubricComponent,
+    EditComponentTagsComponent,
+    EditComponentConstraintsComponent,
+    EditComponentJsonComponent,
+    FormsModule,
+    MatCheckboxModule,
+    MatIconModule,
+    MatTabsModule
+  ],
+  exports: [
+    EditComponentSaveButtonComponent,
+    EditComponentSubmitButtonComponent,
+    EditComponentMaxSubmitComponent,
+    EditComponentDefaultFeedback,
+    EditComponentMaxScoreComponent,
+    EditComponentExcludeFromTotalScoreComponent,
+    EditComponentWidthComponent,
+    EditComponentRubricComponent,
+    EditComponentTagsComponent,
+    EditComponentConstraintsComponent,
+    EditComponentJsonComponent,
+    FormsModule,
+    MatCheckboxModule,
+    MatIconModule,
+    MatTabsModule
+  ]
+})
+export class EditComponentAdvancedSharedModule {}
diff --git a/src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.ts b/src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.ts
index 67f0c0a027a..46b375cedab 100644
--- a/src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.ts
+++ b/src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.ts
@@ -1,42 +1,11 @@
 import { Component } from '@angular/core';
-import { FormsModule } from '@angular/forms';
-import { MatCheckbox } from '@angular/material/checkbox';
 import { EditAdvancedComponentComponent } from '../../../../../app/authoring-tool/edit-advanced-component/edit-advanced-component.component';
-import { EditComponentDefaultFeedback } from '../../../../../app/authoring-tool/edit-advanced-component/edit-component-default-feedback/edit-component-default-feedback.component';
-import { EditComponentConstraintsComponent } from '../../../../../app/authoring-tool/edit-component-constraints/edit-component-constraints.component';
-import { EditComponentExcludeFromTotalScoreComponent } from '../../../../../app/authoring-tool/edit-component-exclude-from-total-score/edit-component-exclude-from-total-score.component';
-import { EditComponentJsonComponent } from '../../../../../app/authoring-tool/edit-component-json/edit-component-json.component';
-import { EditComponentMaxScoreComponent } from '../../../../../app/authoring-tool/edit-component-max-score/edit-component-max-score.component';
-import { EditComponentMaxSubmitComponent } from '../../../../../app/authoring-tool/edit-component-max-submit/edit-component-max-submit.component';
-import { EditComponentRubricComponent } from '../../../../../app/authoring-tool/edit-component-rubric/edit-component-rubric.component';
-import { EditComponentSaveButtonComponent } from '../../../../../app/authoring-tool/edit-component-save-button/edit-component-save-button.component';
-import { EditComponentSubmitButtonComponent } from '../../../../../app/authoring-tool/edit-component-submit-button/edit-component-submit-button.component';
-import { EditComponentTagsComponent } from '../../../../../app/authoring-tool/edit-component-tags/edit-component-tags.component';
-import { EditComponentWidthComponent } from '../../../../../app/authoring-tool/edit-component-width/edit-component-width.component';
 import { EditMultipleChoiceConnectedComponentsComponent } from '../edit-multiple-choice-connected-components/edit-multiple-choice-connected-components.component';
 import { MultipleChoiceContent } from '../MultipleChoiceContent';
-import { MatTabsModule } from '@angular/material/tabs';
-import { MatIconModule } from '@angular/material/icon';
+import { EditComponentAdvancedSharedModule } from '../../../../../app/authoring-tool/edit-component-advanced/edit-component-advanced-shared.module';
 
 @Component({
-  imports: [
-    EditComponentSaveButtonComponent,
-    EditComponentSubmitButtonComponent,
-    EditComponentMaxSubmitComponent,
-    EditComponentDefaultFeedback,
-    EditComponentMaxScoreComponent,
-    EditComponentExcludeFromTotalScoreComponent,
-    EditComponentWidthComponent,
-    EditComponentRubricComponent,
-    EditComponentTagsComponent,
-    EditMultipleChoiceConnectedComponentsComponent,
-    EditComponentConstraintsComponent,
-    EditComponentJsonComponent,
-    FormsModule,
-    MatCheckbox,
-    MatIconModule,
-    MatTabsModule
-  ],
+  imports: [EditComponentAdvancedSharedModule, EditMultipleChoiceConnectedComponentsComponent],
   styles: ['.show-feedback-checkbox { margin-top: 4px; margin-bottom: 4px; }'],
   templateUrl: 'edit-multiple-choice-advanced.component.html'
 })

From 19d54eef9d309a69d10353b0391f416d62db6770 Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Tue, 31 Mar 2026 17:00:34 -0700
Subject: [PATCH 04/33] Organize OR advanced component authoring using tabs

---
 .../edit-component-advanced-shared.module.ts  |    6 +
 ...edit-open-response-advanced.component.html | 1040 +++++++++--------
 .../edit-open-response-advanced.component.ts  |   12 +-
 3 files changed, 557 insertions(+), 501 deletions(-)

diff --git a/src/app/authoring-tool/edit-component-advanced/edit-component-advanced-shared.module.ts b/src/app/authoring-tool/edit-component-advanced/edit-component-advanced-shared.module.ts
index ed4250c395c..d0e6ffee11e 100644
--- a/src/app/authoring-tool/edit-component-advanced/edit-component-advanced-shared.module.ts
+++ b/src/app/authoring-tool/edit-component-advanced/edit-component-advanced-shared.module.ts
@@ -14,12 +14,16 @@ import { MatTabsModule } from '@angular/material/tabs';
 import { MatIconModule } from '@angular/material/icon';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { FormsModule } from '@angular/forms';
+import { EditComponentAddToNotebookButtonComponent } from '../edit-component-add-to-notebook-button/edit-component-add-to-notebook-button.component';
+import { EditConnectedComponentsComponent } from '../edit-connected-components/edit-connected-components.component';
 
 @NgModule({
   imports: [
+    EditComponentAddToNotebookButtonComponent,
     EditComponentSaveButtonComponent,
     EditComponentSubmitButtonComponent,
     EditComponentMaxSubmitComponent,
+    EditConnectedComponentsComponent,
     EditComponentDefaultFeedback,
     EditComponentMaxScoreComponent,
     EditComponentExcludeFromTotalScoreComponent,
@@ -34,9 +38,11 @@ import { FormsModule } from '@angular/forms';
     MatTabsModule
   ],
   exports: [
+    EditComponentAddToNotebookButtonComponent,
     EditComponentSaveButtonComponent,
     EditComponentSubmitButtonComponent,
     EditComponentMaxSubmitComponent,
+    EditConnectedComponentsComponent,
     EditComponentDefaultFeedback,
     EditComponentMaxScoreComponent,
     EditComponentExcludeFromTotalScoreComponent,
diff --git a/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html b/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html
index 086f1655389..2b0d27bb61d 100644
--- a/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html
+++ b/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html
@@ -1,553 +1,611 @@
-<translatable-textarea
-  [content]="componentContent"
-  key="starterSentence"
-  label="Starter Sentence"
-  i18n-label
-  (defaultLanguageTextChanged)="componentChanged()"
-/>
-<div>
-  <mat-checkbox
-    color="primary"
-    class="checkbox"
-    [(ngModel)]="componentContent.isStudentAudioRecordingEnabled"
-    (ngModelChange)="componentChanged()"
-    i18n
-  >
-    Allow students to record audio response
-  </mat-checkbox>
-</div>
-<div>
-  <mat-checkbox
-    color="primary"
-    class="checkbox"
-    [(ngModel)]="componentContent.enableCRater"
-    (ngModelChange)="enableCRaterClicked()"
-    i18n
-  >
-    Enable AI Model
-  </mat-checkbox>
-</div>
-@if (componentContent.enableCRater) {
-  <c-rater-item-select [componentContent]="componentContent" />
-  <div>
-    <mat-form-field>
-      <mat-label i18n>Score On</mat-label>
-      <mat-select
-        [(ngModel)]="componentContent.cRater.scoreOn"
+<mat-tab-group>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
+    </ng-template>
+    <translatable-textarea
+      [content]="componentContent"
+      key="starterSentence"
+      label="Starter Sentence"
+      i18n-label
+      (defaultLanguageTextChanged)="componentChanged()"
+    />
+    <div>
+      <mat-checkbox
+        color="primary"
+        class="checkbox"
+        [(ngModel)]="componentContent.isStudentAudioRecordingEnabled"
         (ngModelChange)="componentChanged()"
+        i18n
       >
-        <mat-option value="submit" i18n>Submit</mat-option>
-        <mat-option value="save" i18n>Save</mat-option>
-        <mat-option value="change" i18n>Change</mat-option>
-      </mat-select>
-    </mat-form-field>
-  </div>
-  <div>
-    <mat-checkbox
-      color="primary"
-      class="checkbox"
-      [(ngModel)]="componentContent.cRater.showScore"
-      (ngModelChange)="componentChanged()"
-      i18n
-    >
-      Show Score
-    </mat-checkbox>
-  </div>
-  <mat-checkbox
-    color="primary"
-    class="checkbox"
-    [(ngModel)]="componentContent.cRater.showFeedback"
-    (ngModelChange)="componentChanged()"
-    i18n
-  >
-    Show Feedback
-  </mat-checkbox>
-  <div class="section-container">
-    <mat-checkbox
-      color="primary"
-      class="checkbox"
-      [ngModel]="componentContent.cRater.feedback?.enabled"
-      (ngModelChange)="setFeedbackEnabled($event)"
-      i18n
-    >
-      Enable Feedback Rules
-    </mat-checkbox>
-    @if (componentContent.cRater.feedback?.enabled) {
-      <edit-feedback-rules [feedbackRules]="componentContent.cRater.feedback.rules" />
+        Allow students to record audio response
+      </mat-checkbox>
+    </div>
+
+    @if (isNotebookEnabled()) {
+      <edit-component-add-to-notebook-button [componentContent]="componentContent" />
+      <br />
     }
-  </div>
-  @if (
-    !componentContent.cRater.feedback?.enabled && componentContent.cRater.scoringRules.length > 0
-  ) {
-    <div class="section-container">
-      <div class="flex gap-2 section-label">
-        <span i18n>Scoring Rule</span>
-        <button
-          mat-raised-button
-          color="primary"
-          (click)="addScoringRule()"
-          matTooltip="Add Scoring Rule"
-          matTooltipPosition="above"
-          i18n-matTooltip
-        >
-          <mat-icon>add</mat-icon>
-        </button>
-      </div>
-      @for (
-        scoringRule of componentContent.cRater.scoringRules;
-        track $index;
-        let scoringRuleIndex = $index;
-        let isFirst = $first;
-        let isLast = $last
-      ) {
-        <div class="flex flex-row flex-wrap items-start justify-start gap-4 section-item">
-          <mat-form-field class="scoring-rule-score">
-            <mat-label i18n>Score</mat-label>
-            <input
-              matInput
-              type="number"
-              min="0"
-              [(ngModel)]="scoringRule.score"
-              (ngModelChange)="componentChanged()"
-            />
-          </mat-form-field>
-          <translatable-textarea
-            [content]="scoringRule"
-            key="feedbackText"
-            label="Feedback Text"
-            i18n-label
-            (defaultLanguageTextChanged)="componentChanged()"
-            class="scoring-rule-feedback-text"
-          />
-          <div class="flex gap-2">
-            <button
-              mat-raised-button
-              color="primary"
-              (click)="moveObjectUp(componentContent.cRater.scoringRules, scoringRuleIndex)"
-              [disabled]="isFirst"
-              matTooltip="Move Scoring Rule Up"
-              matTooltipPosition="above"
-              i18n-matTooltip
-            >
-              <mat-icon>arrow_upward</mat-icon>
-            </button>
-            <button
-              mat-raised-button
-              color="primary"
-              (click)="moveObjectDown(componentContent.cRater.scoringRules, scoringRuleIndex)"
-              [disabled]="isLast"
-              matTooltip="Move Scoring Rule Down"
-              matTooltipPosition="above"
-              i18n-matTooltip
-            >
-              <mat-icon>arrow_downward</mat-icon>
-            </button>
-            <button
-              mat-raised-button
-              color="primary"
-              (click)="scoringRuleDeleteClicked(scoringRuleIndex)"
-              matTooltip="Delete Scoring Rule"
-              matTooltipPosition="above"
-              i18n-matTooltip
-            >
-              <mat-icon>delete</mat-icon>
-            </button>
-          </div>
-        </div>
+    <div class="flex flex-col justify-start items-start">
+      <edit-component-save-button [componentContent]="component.content" />
+      <edit-component-submit-button [componentContent]="component.content" />
+      @if (component.content.showSubmitButton) {
+        <edit-component-max-submit [componentContent]="component.content" />
       }
+      <edit-component-default-feedback [componentContent]="component.content" />
+      <edit-component-max-score [componentContent]="component.content" />
+      <edit-component-exclude-from-total-score [componentContent]="component.content" />
+      <edit-component-width [componentContent]="component.content" />
     </div>
-  }
-  <div class="section-container">
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>auto_awesome</mat-icon>&nbsp;<span i18n>AI</span>
+    </ng-template>
     <div>
       <mat-checkbox
         color="primary"
         class="checkbox"
-        [(ngModel)]="componentContent.cRater.enableMultipleAttemptScoringRules"
-        (click)="enableMultipleAttemptScoringRulesClicked()"
+        [(ngModel)]="componentContent.enableCRater"
+        (ngModelChange)="enableCRaterClicked()"
         i18n
       >
-        Enable Multiple Attempt Feedback
+        Enable AI Model
       </mat-checkbox>
     </div>
-    @if (componentContent.cRater.enableMultipleAttemptScoringRules) {
-      <div class="flex gap-2 section-label">
-        <span i18n>Multiple Attempt Scoring Rules</span>
-        <button
-          mat-raised-button
+    @if (componentContent.enableCRater) {
+      <c-rater-item-select [componentContent]="componentContent" />
+      <div>
+        <mat-form-field>
+          <mat-label i18n>Score On</mat-label>
+          <mat-select
+            [(ngModel)]="componentContent.cRater.scoreOn"
+            (ngModelChange)="componentChanged()"
+          >
+            <mat-option value="submit" i18n>Submit</mat-option>
+            <mat-option value="save" i18n>Save</mat-option>
+            <mat-option value="change" i18n>Change</mat-option>
+          </mat-select>
+        </mat-form-field>
+      </div>
+      <div>
+        <mat-checkbox
           color="primary"
-          (click)="addMultipleAttemptScoringRule()"
-          matTooltip="Add Multiple Attempt Scoring Rule"
-          matTooltipPosition="above"
-          i18n-matTooltip
+          class="checkbox"
+          [(ngModel)]="componentContent.cRater.showScore"
+          (ngModelChange)="componentChanged()"
+          i18n
         >
-          <mat-icon>add</mat-icon>
-        </button>
+          Show Score
+        </mat-checkbox>
       </div>
-      @for (
-        multipleAttemptScoringRule of componentContent.cRater.multipleAttemptScoringRules;
-        track $index;
-        let multipleAttemptScoringRuleIndex = $index;
-        let isFirst = $first;
-        let isLast = $last
-      ) {
-        <div class="flex flex-row flex-wrap items-center justify-start gap-4 section-item">
-          <mat-form-field class="previous-score">
-            <mat-label i18n>Previous Score</mat-label>
-            <input
-              matInput
-              [(ngModel)]="multipleAttemptScoringRule.scoreSequence[0]"
-              (ngModelChange)="componentChanged()"
-              min="0"
-            />
-          </mat-form-field>
-          <mat-form-field class="current-score">
-            <mat-label i18n>Current Score</mat-label>
-            <input
-              matInput
-              [(ngModel)]="multipleAttemptScoringRule.scoreSequence[1]"
-              (ngModelChange)="componentChanged()"
-              min="0"
-            />
-          </mat-form-field>
-          <translatable-textarea
-            [content]="multipleAttemptScoringRule"
-            key="feedbackText"
-            label="Feedback to Student"
-            i18n-label
-            (defaultLanguageTextChanged)="componentChanged()"
-            class="multiple-attempt-feedback"
-          />
-          <div class="flex gap-2">
-            <button
-              mat-raised-button
-              color="primary"
-              (click)="
-                moveObjectUp(
-                  componentContent.cRater.multipleAttemptScoringRules,
-                  multipleAttemptScoringRuleIndex
-                )
-              "
-              [disabled]="isFirst"
-              matTooltip="Move Multiple Attempt Scoring Rule Up"
-              matTooltipPosition="above"
-              i18n-matTooltip
-            >
-              <mat-icon>arrow_upward</mat-icon>
-            </button>
-            <button
-              mat-raised-button
-              color="primary"
-              (click)="
-                moveObjectDown(
-                  componentContent.cRater.multipleAttemptScoringRules,
-                  multipleAttemptScoringRuleIndex
-                )
-              "
-              [disabled]="isLast"
-              matTooltip="Move Multiple Attempt Scoring Rule Down"
-              matTooltipPosition="above"
-              i18n-matTooltip
-            >
-              <mat-icon>arrow_downward</mat-icon>
-            </button>
-            <button
-              mat-raised-button
-              color="primary"
-              (click)="multipleAttemptScoringRuleDeleteClicked(multipleAttemptScoringRuleIndex)"
-              matTooltip="Delet Multiple Attempt Scoring"
-              matTooltipPosition="above"
-              i18n-matTooltip
-            >
-              <mat-icon>delete</mat-icon>
-            </button>
-          </div>
-        </div>
-      }
-    }
-  </div>
-  <div class="section-container">
-    <div>
       <mat-checkbox
         color="primary"
         class="checkbox"
-        [(ngModel)]="componentContent.enableNotifications"
-        (ngModelChange)="enableNotificationsClicked()"
+        [(ngModel)]="componentContent.cRater.showFeedback"
+        (ngModelChange)="componentChanged()"
         i18n
       >
-        Enable Notifications
+        Show Feedback
       </mat-checkbox>
-    </div>
-    @if (componentContent.enableNotifications) {
-      <div class="flex gap-2 section-label">
-        <span i18n>Notifications</span>
-        <button
-          mat-raised-button
+      <div class="section-container">
+        <mat-checkbox
           color="primary"
-          (click)="addNotification()"
-          matTooltip="Add New Notification"
-          matTooltipPosition="above"
+          class="checkbox"
+          [ngModel]="componentContent.cRater.feedback?.enabled"
+          (ngModelChange)="setFeedbackEnabled($event)"
           i18n
         >
-          <mat-icon>add</mat-icon>
-        </button>
+          Enable Feedback Rules
+        </mat-checkbox>
+        @if (componentContent.cRater.feedback?.enabled) {
+          <edit-feedback-rules [feedbackRules]="componentContent.cRater.feedback.rules" />
+        }
       </div>
-      @for (
-        notification of componentContent.notificationSettings.notifications;
-        track $index;
-        let notificationIndex = $index;
-        let isFirst = $first;
-        let isLast = $last
+      @if (
+        !componentContent.cRater.feedback?.enabled &&
+        componentContent.cRater.scoringRules.length > 0
       ) {
-        <div class="section-item">
-          <div class="flex gap-4">
-            <mat-form-field class="notification-score">
-              <mat-label i18n>Previous Score</mat-label>
-              <input
-                matInput
-                type="number"
-                min="0"
-                [(ngModel)]="notification.enableCriteria.scoreSequence[0]"
-                (ngModelChange)="componentChanged()"
-              />
-            </mat-form-field>
-            <mat-form-field class="notification-score">
-              <mat-label i18n>Current Score</mat-label>
-              <input
-                matInput
-                type="number"
-                min="0"
-                [(ngModel)]="notification.enableCriteria.scoreSequence[1]"
-                (ngModelChange)="componentChanged()"
-              />
-            </mat-form-field>
-            <div class="flex-grow"></div>
-            <div class="flex gap-2">
-              <button
-                mat-raised-button
-                color="primary"
-                (click)="
-                  moveObjectUp(
-                    componentContent.notificationSettings.notifications,
-                    notificationIndex
-                  )
-                "
-                [disabled]="isFirst"
-                matTooltip="Move Notification Up"
-                matTooltipPosition="above"
-                i18n-matTooltip
-              >
-                <mat-icon>arrow_upward</mat-icon>
-              </button>
-              <button
-                mat-raised-button
-                color="primary"
-                (click)="
-                  moveObjectDown(
-                    componentContent.notificationSettings.notifications,
-                    notificationIndex
-                  )
-                "
-                [disabled]="isLast"
-                matTooltip="Move Notification Down"
-                matTooltipPosition="above"
-                i18n-matTooltip
-              >
-                <mat-icon>arrow_downward</mat-icon>
-              </button>
-              <button
-                mat-raised-button
-                color="primary"
-                (click)="notificationDeleteClicked(notificationIndex)"
-                matTooltip="Delete Notification"
-                matTooltipPosition="above"
-                i18n-matTooltip
-              >
-                <mat-icon>delete</mat-icon>
-              </button>
-            </div>
-          </div>
-          <div class="flex items-start justify-start gap-4">
-            <mat-checkbox
+        <div class="section-container">
+          <div class="flex gap-2 section-label">
+            <span i18n>Scoring Rule</span>
+            <button
+              mat-raised-button
               color="primary"
-              class="checkbox"
-              [(ngModel)]="notification.isAmbient"
-              i18n
+              (click)="addScoringRule()"
+              matTooltip="Add Scoring Rule"
+              matTooltipPosition="above"
+              i18n-matTooltip
             >
-              Enable Ambient Display Dismiss Mode
-            </mat-checkbox>
-            @if (notification.isAmbient) {
-              <mat-form-field>
-                <mat-label i18n>Dismiss Code</mat-label>
+              <mat-icon>add</mat-icon>
+            </button>
+          </div>
+          @for (
+            scoringRule of componentContent.cRater.scoringRules;
+            track $index;
+            let scoringRuleIndex = $index;
+            let isFirst = $first;
+            let isLast = $last
+          ) {
+            <div class="flex flex-row flex-wrap items-start justify-start gap-4 section-item">
+              <mat-form-field class="scoring-rule-score">
+                <mat-label i18n>Score</mat-label>
                 <input
                   matInput
-                  [(ngModel)]="notification.dismissCode"
+                  type="number"
+                  min="0"
+                  [(ngModel)]="scoringRule.score"
                   (ngModelChange)="componentChanged()"
                 />
               </mat-form-field>
-            }
-          </div>
-          <div class="flex items-start justify-start gap-4">
-            <mat-checkbox
-              color="primary"
-              class="checkbox"
-              [(ngModel)]="notification.isNotifyStudent"
-              i18n
-            >
-              Notify Student
-            </mat-checkbox>
-            @if (notification.isNotifyStudent) {
-              <translatable-textarea
-                [content]="notification"
-                key="notificationMessageToStudent"
-                label="Feedback to Student"
-                i18n-label
-                (defaultLanguageTextChanged)="componentChanged()"
-                class="notification-feedback"
-              />
-            }
-          </div>
-          <div class="flex items-start justify-start gap-4">
-            <mat-checkbox
-              color="primary"
-              class="checkbox"
-              [(ngModel)]="notification.isNotifyTeacher"
-              i18n
-            >
-              Notify Teacher
-            </mat-checkbox>
-            @if (notification.isNotifyTeacher) {
               <translatable-textarea
-                [content]="notification"
-                key="notificationMessageToTeacher"
-                label="Feedback to Teacher"
+                [content]="scoringRule"
+                key="feedbackText"
+                label="Feedback Text"
                 i18n-label
                 (defaultLanguageTextChanged)="componentChanged()"
-                class="notification-feedback"
+                class="scoring-rule-feedback-text"
               />
-            }
-          </div>
+              <div class="flex gap-2">
+                <button
+                  mat-raised-button
+                  color="primary"
+                  (click)="moveObjectUp(componentContent.cRater.scoringRules, scoringRuleIndex)"
+                  [disabled]="isFirst"
+                  matTooltip="Move Scoring Rule Up"
+                  matTooltipPosition="above"
+                  i18n-matTooltip
+                >
+                  <mat-icon>arrow_upward</mat-icon>
+                </button>
+                <button
+                  mat-raised-button
+                  color="primary"
+                  (click)="moveObjectDown(componentContent.cRater.scoringRules, scoringRuleIndex)"
+                  [disabled]="isLast"
+                  matTooltip="Move Scoring Rule Down"
+                  matTooltipPosition="above"
+                  i18n-matTooltip
+                >
+                  <mat-icon>arrow_downward</mat-icon>
+                </button>
+                <button
+                  mat-raised-button
+                  color="primary"
+                  (click)="scoringRuleDeleteClicked(scoringRuleIndex)"
+                  matTooltip="Delete Scoring Rule"
+                  matTooltipPosition="above"
+                  i18n-matTooltip
+                >
+                  <mat-icon>delete</mat-icon>
+                </button>
+              </div>
+            </div>
+          }
         </div>
       }
-    }
-  </div>
-  <div class="section-container">
-    <mat-checkbox
-      color="primary"
-      class="checkbox"
-      [(ngModel)]="useCustomCompletionCriteria"
-      (click)="useCustomCompletionCriteriaClicked($event)"
-      i18n
-    >
-      Use Custom Completion Criteria
-    </mat-checkbox>
-    @if (useCustomCompletionCriteria && componentContent.completionCriteria != null) {
-      <div class="flex gap-2 section-label">
-        <span i18n>Custom Completion Criteria</span>
-        <button
-          mat-raised-button
-          color="primary"
-          (click)="addCompletionCriteria()"
-          matTooltip="Add Completion Criteria"
-          matTooltipPosition="above"
-          i18n-matTooltip
-        >
-          <mat-icon>add</mat-icon>
-        </button>
-      </div>
-      @for (
-        criteria of componentContent.completionCriteria.criteria;
-        track $index;
-        let criteriaIndex = $index;
-        let isFirst = $first;
-        let isLast = $last
-      ) {
-        <div class="flex flex-row flex-wrap items-center justify-start gap-4 section-item">
-          <mat-form-field class="custom-completion-criteria-step">
-            <mat-label i18n>Step</mat-label>
-            <mat-select [(ngModel)]="criteria.nodeId" (ngModelChange)="componentChanged()">
-              @for (nodeId of nodeIds; track $index) {
-                @if (isApplicationNode(nodeId)) {
-                  <mat-option [value]="nodeId">
-                    {{ getNodePositionAndTitle(nodeId) }}
-                  </mat-option>
-                }
-              }
-            </mat-select>
-          </mat-form-field>
-          <mat-form-field class="custom-completion-criteria-component">
-            <mat-label i18n>Activity</mat-label>
-            <mat-select [(ngModel)]="criteria.componentId" (ngModelChange)="componentChanged()">
-              @for (
-                component of getComponents(criteria.nodeId);
-                let componentIndex = $index;
-                track component.id
-              ) {
-                <mat-option [value]="component.id">
-                  {{ componentIndex + 1 }}. {{ component.type }}
-                  @if (component.id === componentId) {
-                    <span i18n>(This activity)</span>
-                  }
-                </mat-option>
-              }
-            </mat-select>
-          </mat-form-field>
-          <mat-form-field class="custom-completion-criteria-action">
-            <mat-label>Action</mat-label>
-            <mat-select [(ngModel)]="criteria.name" (ngModelChange)="componentChanged()">
-              <mat-option value="isSubmitted" i18n>Submit</mat-option>
-              <mat-option value="isSaved" i18n>Save</mat-option>
-            </mat-select>
-          </mat-form-field>
-          <div class="flex-grow"></div>
-          <div class="flex gap-2">
+      <div class="section-container">
+        <div>
+          <mat-checkbox
+            color="primary"
+            class="checkbox"
+            [(ngModel)]="componentContent.cRater.enableMultipleAttemptScoringRules"
+            (click)="enableMultipleAttemptScoringRulesClicked()"
+            i18n
+          >
+            Enable Multiple Attempt Feedback
+          </mat-checkbox>
+        </div>
+        @if (componentContent.cRater.enableMultipleAttemptScoringRules) {
+          <div class="flex gap-2 section-label">
+            <span i18n>Multiple Attempt Scoring Rules</span>
             <button
               mat-raised-button
               color="primary"
-              (click)="moveObjectUp(componentContent.completionCriteria.criteria, criteriaIndex)"
-              [disabled]="isFirst"
-              matTooltip="Move Completion Criteria Up"
+              (click)="addMultipleAttemptScoringRule()"
+              matTooltip="Add Multiple Attempt Scoring Rule"
               matTooltipPosition="above"
               i18n-matTooltip
             >
-              <mat-icon>arrow_upward</mat-icon>
+              <mat-icon>add</mat-icon>
             </button>
+          </div>
+          @for (
+            multipleAttemptScoringRule of componentContent.cRater.multipleAttemptScoringRules;
+            track $index;
+            let multipleAttemptScoringRuleIndex = $index;
+            let isFirst = $first;
+            let isLast = $last
+          ) {
+            <div class="flex flex-row flex-wrap items-center justify-start gap-4 section-item">
+              <mat-form-field class="previous-score">
+                <mat-label i18n>Previous Score</mat-label>
+                <input
+                  matInput
+                  [(ngModel)]="multipleAttemptScoringRule.scoreSequence[0]"
+                  (ngModelChange)="componentChanged()"
+                  min="0"
+                />
+              </mat-form-field>
+              <mat-form-field class="current-score">
+                <mat-label i18n>Current Score</mat-label>
+                <input
+                  matInput
+                  [(ngModel)]="multipleAttemptScoringRule.scoreSequence[1]"
+                  (ngModelChange)="componentChanged()"
+                  min="0"
+                />
+              </mat-form-field>
+              <translatable-textarea
+                [content]="multipleAttemptScoringRule"
+                key="feedbackText"
+                label="Feedback to Student"
+                i18n-label
+                (defaultLanguageTextChanged)="componentChanged()"
+                class="multiple-attempt-feedback"
+              />
+              <div class="flex gap-2">
+                <button
+                  mat-raised-button
+                  color="primary"
+                  (click)="
+                    moveObjectUp(
+                      componentContent.cRater.multipleAttemptScoringRules,
+                      multipleAttemptScoringRuleIndex
+                    )
+                  "
+                  [disabled]="isFirst"
+                  matTooltip="Move Multiple Attempt Scoring Rule Up"
+                  matTooltipPosition="above"
+                  i18n-matTooltip
+                >
+                  <mat-icon>arrow_upward</mat-icon>
+                </button>
+                <button
+                  mat-raised-button
+                  color="primary"
+                  (click)="
+                    moveObjectDown(
+                      componentContent.cRater.multipleAttemptScoringRules,
+                      multipleAttemptScoringRuleIndex
+                    )
+                  "
+                  [disabled]="isLast"
+                  matTooltip="Move Multiple Attempt Scoring Rule Down"
+                  matTooltipPosition="above"
+                  i18n-matTooltip
+                >
+                  <mat-icon>arrow_downward</mat-icon>
+                </button>
+                <button
+                  mat-raised-button
+                  color="primary"
+                  (click)="multipleAttemptScoringRuleDeleteClicked(multipleAttemptScoringRuleIndex)"
+                  matTooltip="Delet Multiple Attempt Scoring"
+                  matTooltipPosition="above"
+                  i18n-matTooltip
+                >
+                  <mat-icon>delete</mat-icon>
+                </button>
+              </div>
+            </div>
+          }
+        }
+      </div>
+      <div class="section-container">
+        <div>
+          <mat-checkbox
+            color="primary"
+            class="checkbox"
+            [(ngModel)]="componentContent.enableNotifications"
+            (ngModelChange)="enableNotificationsClicked()"
+            i18n
+          >
+            Enable Notifications
+          </mat-checkbox>
+        </div>
+        @if (componentContent.enableNotifications) {
+          <div class="flex gap-2 section-label">
+            <span i18n>Notifications</span>
             <button
               mat-raised-button
               color="primary"
-              (click)="moveObjectDown(componentContent.completionCriteria.criteria, criteriaIndex)"
-              [disabled]="isLast"
-              matTooltip="Move Completion Criteria Down"
+              (click)="addNotification()"
+              matTooltip="Add New Notification"
               matTooltipPosition="above"
-              i18n-matTooltip
+              i18n
             >
-              <mat-icon>arrow_downward</mat-icon>
+              <mat-icon>add</mat-icon>
             </button>
+          </div>
+          @for (
+            notification of componentContent.notificationSettings.notifications;
+            track $index;
+            let notificationIndex = $index;
+            let isFirst = $first;
+            let isLast = $last
+          ) {
+            <div class="section-item">
+              <div class="flex gap-4">
+                <mat-form-field class="notification-score">
+                  <mat-label i18n>Previous Score</mat-label>
+                  <input
+                    matInput
+                    type="number"
+                    min="0"
+                    [(ngModel)]="notification.enableCriteria.scoreSequence[0]"
+                    (ngModelChange)="componentChanged()"
+                  />
+                </mat-form-field>
+                <mat-form-field class="notification-score">
+                  <mat-label i18n>Current Score</mat-label>
+                  <input
+                    matInput
+                    type="number"
+                    min="0"
+                    [(ngModel)]="notification.enableCriteria.scoreSequence[1]"
+                    (ngModelChange)="componentChanged()"
+                  />
+                </mat-form-field>
+                <div class="flex-grow"></div>
+                <div class="flex gap-2">
+                  <button
+                    mat-raised-button
+                    color="primary"
+                    (click)="
+                      moveObjectUp(
+                        componentContent.notificationSettings.notifications,
+                        notificationIndex
+                      )
+                    "
+                    [disabled]="isFirst"
+                    matTooltip="Move Notification Up"
+                    matTooltipPosition="above"
+                    i18n-matTooltip
+                  >
+                    <mat-icon>arrow_upward</mat-icon>
+                  </button>
+                  <button
+                    mat-raised-button
+                    color="primary"
+                    (click)="
+                      moveObjectDown(
+                        componentContent.notificationSettings.notifications,
+                        notificationIndex
+                      )
+                    "
+                    [disabled]="isLast"
+                    matTooltip="Move Notification Down"
+                    matTooltipPosition="above"
+                    i18n-matTooltip
+                  >
+                    <mat-icon>arrow_downward</mat-icon>
+                  </button>
+                  <button
+                    mat-raised-button
+                    color="primary"
+                    (click)="notificationDeleteClicked(notificationIndex)"
+                    matTooltip="Delete Notification"
+                    matTooltipPosition="above"
+                    i18n-matTooltip
+                  >
+                    <mat-icon>delete</mat-icon>
+                  </button>
+                </div>
+              </div>
+              <div class="flex items-start justify-start gap-4">
+                <mat-checkbox
+                  color="primary"
+                  class="checkbox"
+                  [(ngModel)]="notification.isAmbient"
+                  i18n
+                >
+                  Enable Ambient Display Dismiss Mode
+                </mat-checkbox>
+                @if (notification.isAmbient) {
+                  <mat-form-field>
+                    <mat-label i18n>Dismiss Code</mat-label>
+                    <input
+                      matInput
+                      [(ngModel)]="notification.dismissCode"
+                      (ngModelChange)="componentChanged()"
+                    />
+                  </mat-form-field>
+                }
+              </div>
+              <div class="flex items-start justify-start gap-4">
+                <mat-checkbox
+                  color="primary"
+                  class="checkbox"
+                  [(ngModel)]="notification.isNotifyStudent"
+                  i18n
+                >
+                  Notify Student
+                </mat-checkbox>
+                @if (notification.isNotifyStudent) {
+                  <translatable-textarea
+                    [content]="notification"
+                    key="notificationMessageToStudent"
+                    label="Feedback to Student"
+                    i18n-label
+                    (defaultLanguageTextChanged)="componentChanged()"
+                    class="notification-feedback"
+                  />
+                }
+              </div>
+              <div class="flex items-start justify-start gap-4">
+                <mat-checkbox
+                  color="primary"
+                  class="checkbox"
+                  [(ngModel)]="notification.isNotifyTeacher"
+                  i18n
+                >
+                  Notify Teacher
+                </mat-checkbox>
+                @if (notification.isNotifyTeacher) {
+                  <translatable-textarea
+                    [content]="notification"
+                    key="notificationMessageToTeacher"
+                    label="Feedback to Teacher"
+                    i18n-label
+                    (defaultLanguageTextChanged)="componentChanged()"
+                    class="notification-feedback"
+                  />
+                }
+              </div>
+            </div>
+          }
+        }
+      </div>
+      <div class="section-container">
+        <mat-checkbox
+          color="primary"
+          class="checkbox"
+          [(ngModel)]="useCustomCompletionCriteria"
+          (click)="useCustomCompletionCriteriaClicked($event)"
+          i18n
+        >
+          Use Custom Completion Criteria
+        </mat-checkbox>
+        @if (useCustomCompletionCriteria && componentContent.completionCriteria != null) {
+          <div class="flex gap-2 section-label">
+            <span i18n>Custom Completion Criteria</span>
             <button
               mat-raised-button
               color="primary"
-              (click)="deleteCompletionCriteria(criteriaIndex)"
-              matTooltip="Delete Completion Criteria"
+              (click)="addCompletionCriteria()"
+              matTooltip="Add Completion Criteria"
               matTooltipPosition="above"
               i18n-matTooltip
             >
-              <mat-icon>delete</mat-icon>
+              <mat-icon>add</mat-icon>
             </button>
           </div>
-        </div>
-      }
-    }
-  </div>
-  <div class="section-container">
-    @if (componentContent.enableCRater) {
-      <edit-crater-info [cRaterRubric]="componentContent.cRater.rubric" />
+          @for (
+            criteria of componentContent.completionCriteria.criteria;
+            track $index;
+            let criteriaIndex = $index;
+            let isFirst = $first;
+            let isLast = $last
+          ) {
+            <div class="flex flex-row flex-wrap items-center justify-start gap-4 section-item">
+              <mat-form-field class="custom-completion-criteria-step">
+                <mat-label i18n>Step</mat-label>
+                <mat-select [(ngModel)]="criteria.nodeId" (ngModelChange)="componentChanged()">
+                  @for (nodeId of nodeIds; track $index) {
+                    @if (isApplicationNode(nodeId)) {
+                      <mat-option [value]="nodeId">
+                        {{ getNodePositionAndTitle(nodeId) }}
+                      </mat-option>
+                    }
+                  }
+                </mat-select>
+              </mat-form-field>
+              <mat-form-field class="custom-completion-criteria-component">
+                <mat-label i18n>Activity</mat-label>
+                <mat-select [(ngModel)]="criteria.componentId" (ngModelChange)="componentChanged()">
+                  @for (
+                    component of getComponents(criteria.nodeId);
+                    let componentIndex = $index;
+                    track component.id
+                  ) {
+                    <mat-option [value]="component.id">
+                      {{ componentIndex + 1 }}. {{ component.type }}
+                      @if (component.id === componentId) {
+                        <span i18n>(This activity)</span>
+                      }
+                    </mat-option>
+                  }
+                </mat-select>
+              </mat-form-field>
+              <mat-form-field class="custom-completion-criteria-action">
+                <mat-label>Action</mat-label>
+                <mat-select [(ngModel)]="criteria.name" (ngModelChange)="componentChanged()">
+                  <mat-option value="isSubmitted" i18n>Submit</mat-option>
+                  <mat-option value="isSaved" i18n>Save</mat-option>
+                </mat-select>
+              </mat-form-field>
+              <div class="flex-grow"></div>
+              <div class="flex gap-2">
+                <button
+                  mat-raised-button
+                  color="primary"
+                  (click)="
+                    moveObjectUp(componentContent.completionCriteria.criteria, criteriaIndex)
+                  "
+                  [disabled]="isFirst"
+                  matTooltip="Move Completion Criteria Up"
+                  matTooltipPosition="above"
+                  i18n-matTooltip
+                >
+                  <mat-icon>arrow_upward</mat-icon>
+                </button>
+                <button
+                  mat-raised-button
+                  color="primary"
+                  (click)="
+                    moveObjectDown(componentContent.completionCriteria.criteria, criteriaIndex)
+                  "
+                  [disabled]="isLast"
+                  matTooltip="Move Completion Criteria Down"
+                  matTooltipPosition="above"
+                  i18n-matTooltip
+                >
+                  <mat-icon>arrow_downward</mat-icon>
+                </button>
+                <button
+                  mat-raised-button
+                  color="primary"
+                  (click)="deleteCompletionCriteria(criteriaIndex)"
+                  matTooltip="Delete Completion Criteria"
+                  matTooltipPosition="above"
+                  i18n-matTooltip
+                >
+                  <mat-icon>delete</mat-icon>
+                </button>
+              </div>
+            </div>
+          }
+        }
+      </div>
+      <div class="section-container">
+        @if (componentContent.enableCRater) {
+          <edit-crater-info [cRaterRubric]="componentContent.cRater.rubric" />
+        }
+      </div>
     }
-  </div>
-}
-@if (isNotebookEnabled()) {
-  <edit-component-add-to-notebook-button [componentContent]="componentContent" />
-  <br />
-}
-<edit-common-advanced
-  [component]="component"
-  [allowedConnectedComponentTypes]="allowedConnectedComponentTypes"
-/>
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>visibility</mat-icon>&nbsp;<span i18n>Visibility</span>
+    </ng-template>
+    <edit-component-constraints [componentContent]="component.content" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>join_inner</mat-icon>&nbsp;<span i18n>Connections</span>
+    </ng-template>
+    <edit-connected-components
+      [nodeId]="component.nodeId"
+      [componentId]="component.id"
+      [allowedConnectedComponentTypes]="allowedConnectedComponentTypes"
+      [componentContent]="component.content"
+      [connectedComponents]="component.content.connectedComponents"
+      (connectedComponentsChanged)="connectedComponentsChanged($event)"
+    />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
+    </ng-template>
+    <edit-component-rubric [componentContent]="component.content" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label> <mat-icon>sell</mat-icon>&nbsp;<span i18n>Tags</span></ng-template>
+    <edit-component-tags [componentContent]="component.content" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label> <mat-icon>code</mat-icon>&nbsp;<span i18n>JSON</span></ng-template>
+    <edit-component-json [component]="component" />
+  </mat-tab>
+</mat-tab-group>
diff --git a/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts b/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts
index f61c973c81d..a00d710d9be 100644
--- a/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts
+++ b/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts
@@ -1,15 +1,10 @@
 import { Component } from '@angular/core';
-import { FormsModule } from '@angular/forms';
 import { MatButton } from '@angular/material/button';
-import { MatCheckbox } from '@angular/material/checkbox';
 import { MatFormFieldModule } from '@angular/material/form-field';
-import { MatIcon } from '@angular/material/icon';
 import { MatInput } from '@angular/material/input';
 import { MatSelectModule } from '@angular/material/select';
 import { MatTooltip } from '@angular/material/tooltip';
 import { EditAdvancedComponentComponent } from '../../../../../app/authoring-tool/edit-advanced-component/edit-advanced-component.component';
-import { EditCommonAdvancedComponent } from '../../../../../app/authoring-tool/edit-common-advanced/edit-common-advanced.component';
-import { EditComponentAddToNotebookButtonComponent } from '../../../../../app/authoring-tool/edit-component-add-to-notebook-button/edit-component-add-to-notebook-button.component';
 import { TranslatableTextareaComponent } from '../../../authoringTool/components/translatable-textarea/translatable-textarea.component';
 import { ComponentContent } from '../../../common/ComponentContent';
 import { EditFeedbackRulesComponent } from '../../common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component';
@@ -17,21 +12,18 @@ import { OpenResponseContent } from '../OpenResponseContent';
 import { CRaterItemSelectComponent } from '../../common/cRater/crater-item-select/crater-item-select.component';
 import { EditCRaterInfoComponent } from '../../common/cRater/edit-crater-info/edit-crater-info.component';
 import { DEFAULT_IDEAS_SUMMARY_GROUPS } from '../../common/cRater/CRaterRubric';
+import { EditComponentAdvancedSharedModule } from '../../../../../app/authoring-tool/edit-component-advanced/edit-component-advanced-shared.module';
 
 @Component({
   imports: [
+    EditComponentAdvancedSharedModule,
     TranslatableTextareaComponent,
-    MatCheckbox,
-    FormsModule,
     MatFormFieldModule,
     MatInput,
     MatButton,
     MatSelectModule,
     EditFeedbackRulesComponent,
     MatTooltip,
-    MatIcon,
-    EditComponentAddToNotebookButtonComponent,
-    EditCommonAdvancedComponent,
     EditCRaterInfoComponent,
     CRaterItemSelectComponent
   ],

From 80d7f01a19b2575fbbac38f62eec7d9e7fe0fbad Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Wed, 1 Apr 2026 08:36:01 -0700
Subject: [PATCH 05/33] Organize HTML advanced component authoring using tabs

---
 .../edit-html-advanced.component.html         | 24 +++++++++++++++++++
 .../edit-html-advanced.component.ts           | 17 +++----------
 2 files changed, 27 insertions(+), 14 deletions(-)
 create mode 100644 src/assets/wise5/components/html/edit-html-advanced/edit-html-advanced.component.html

diff --git a/src/assets/wise5/components/html/edit-html-advanced/edit-html-advanced.component.html b/src/assets/wise5/components/html/edit-html-advanced/edit-html-advanced.component.html
new file mode 100644
index 00000000000..0667831856b
--- /dev/null
+++ b/src/assets/wise5/components/html/edit-html-advanced/edit-html-advanced.component.html
@@ -0,0 +1,24 @@
+<mat-tab-group>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
+    </ng-template>
+    <edit-component-width [componentContent]="componentContent" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>visibility</mat-icon>&nbsp;<span i18n>Visibility</span>
+    </ng-template>
+    <edit-component-constraints [componentContent]="component.content" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
+    </ng-template>
+    <edit-component-rubric [componentContent]="componentContent" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label> <mat-icon>code</mat-icon>&nbsp;<span i18n>JSON</span></ng-template>
+    <edit-component-json [component]="component" />
+  </mat-tab>
+</mat-tab-group>
diff --git a/src/assets/wise5/components/html/edit-html-advanced/edit-html-advanced.component.ts b/src/assets/wise5/components/html/edit-html-advanced/edit-html-advanced.component.ts
index 4dbf3a3b170..c7c23fc66c0 100644
--- a/src/assets/wise5/components/html/edit-html-advanced/edit-html-advanced.component.ts
+++ b/src/assets/wise5/components/html/edit-html-advanced/edit-html-advanced.component.ts
@@ -1,20 +1,9 @@
 import { Component } from '@angular/core';
 import { EditAdvancedComponentComponent } from '../../../../../app/authoring-tool/edit-advanced-component/edit-advanced-component.component';
-import { EditComponentWidthComponent } from '../../../../../app/authoring-tool/edit-component-width/edit-component-width.component';
-import { EditComponentConstraintsComponent } from '../../../../../app/authoring-tool/edit-component-constraints/edit-component-constraints.component';
-import { EditComponentJsonComponent } from '../../../../../app/authoring-tool/edit-component-json/edit-component-json.component';
-import { EditComponentRubricComponent } from '../../../../../app/authoring-tool/edit-component-rubric/edit-component-rubric.component';
+import { EditComponentAdvancedSharedModule } from '../../../../../app/authoring-tool/edit-component-advanced/edit-component-advanced-shared.module';
 
 @Component({
-  imports: [
-    EditComponentConstraintsComponent,
-    EditComponentJsonComponent,
-    EditComponentRubricComponent,
-    EditComponentWidthComponent
-  ],
-  template: `<edit-component-width [componentContent]="componentContent" />
-    <edit-component-rubric [componentContent]="componentContent" />
-    <edit-component-constraints [componentContent]="component.content" />
-    <edit-component-json [component]="component" />`
+  imports: [EditComponentAdvancedSharedModule],
+  templateUrl: './edit-html-advanced.component.html'
 })
 export class EditHTMLAdvancedComponent extends EditAdvancedComponentComponent {}

From c0a2fd795222eb1b8475c5cfba7d044a145a01e6 Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Wed, 1 Apr 2026 08:43:40 -0700
Subject: [PATCH 06/33] Organize Match advanced component authoring using tabs

---
 .../edit-match-advanced.component.html        | 118 +++++++++++-------
 .../edit-match-advanced.component.ts          |  33 +----
 2 files changed, 76 insertions(+), 75 deletions(-)

diff --git a/src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html b/src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html
index b6303c6bbc5..5692bae0935 100644
--- a/src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html
+++ b/src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html
@@ -1,45 +1,73 @@
-<mat-checkbox
-  color="primary"
-  class="checkbox"
-  [(ngModel)]="componentContent.canCreateChoices"
-  (ngModelChange)="componentChanged()"
-  i18n
->
-  Student Can Create Choices
-</mat-checkbox>
-<br />
-@if (isNotebookEnabled()) {
-  <mat-checkbox
-    color="primary"
-    class="checkbox"
-    [(ngModel)]="componentContent.importPrivateNotes"
-    (ngModelChange)="componentChanged()"
-  >
-    Show Private Notes As Choices
-  </mat-checkbox>
-}
-<br />
-<edit-component-save-button [componentContent]="componentContent" />
-<br />
-<edit-component-submit-button [componentContent]="componentContent" />
-@if (componentContent.showSubmitButton) {
-  <edit-component-max-submit [componentContent]="componentContent" />
-}
-<edit-component-default-feedback [componentContent]="componentContent" />
-<div class="flex flex-col justify-start items-start">
-  <edit-component-max-score [componentContent]="componentContent" />
-  <edit-component-exclude-from-total-score [componentContent]="componentContent" />
-  <edit-component-width [componentContent]="componentContent" />
-  <edit-component-rubric [componentContent]="componentContent" />
-  <edit-component-tags [componentContent]="componentContent" />
-</div>
-<edit-match-connected-components
-  [nodeId]="nodeId"
-  [componentId]="componentId"
-  [allowedConnectedComponentTypes]="allowedConnectedComponentTypes"
-  [componentContent]="componentContent"
-  [connectedComponents]="componentContent.connectedComponents"
-  (connectedComponentsChanged)="connectedComponentsChanged($event)"
-/>
-<edit-component-constraints [componentContent]="component.content" />
-<edit-component-json [component]="component" />
+<mat-tab-group>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
+    </ng-template>
+    <mat-checkbox
+      color="primary"
+      class="checkbox"
+      [(ngModel)]="componentContent.canCreateChoices"
+      (ngModelChange)="componentChanged()"
+      i18n
+    >
+      Student Can Create Choices
+    </mat-checkbox>
+    <br />
+    @if (isNotebookEnabled()) {
+      <mat-checkbox
+        color="primary"
+        class="checkbox"
+        [(ngModel)]="componentContent.importPrivateNotes"
+        (ngModelChange)="componentChanged()"
+      >
+        Show Private Notes As Choices
+      </mat-checkbox>
+      <br />
+    }
+    <edit-component-save-button [componentContent]="componentContent" />
+    <br />
+    <edit-component-submit-button [componentContent]="componentContent" />
+    @if (componentContent.showSubmitButton) {
+      <edit-component-max-submit [componentContent]="componentContent" />
+    }
+    <edit-component-default-feedback [componentContent]="componentContent" />
+    <div class="flex flex-col justify-start items-start">
+      <edit-component-max-score [componentContent]="componentContent" />
+      <edit-component-exclude-from-total-score [componentContent]="componentContent" />
+      <edit-component-width [componentContent]="componentContent" />
+    </div>
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>visibility</mat-icon>&nbsp;<span i18n>Visibility</span>
+    </ng-template>
+    <edit-component-constraints [componentContent]="component.content" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>join_inner</mat-icon>&nbsp;<span i18n>Connections</span>
+    </ng-template>
+    <edit-match-connected-components
+      [nodeId]="nodeId"
+      [componentId]="componentId"
+      [allowedConnectedComponentTypes]="allowedConnectedComponentTypes"
+      [componentContent]="componentContent"
+      [connectedComponents]="componentContent.connectedComponents"
+      (connectedComponentsChanged)="connectedComponentsChanged($event)"
+    />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
+    </ng-template>
+    <edit-component-rubric [componentContent]="componentContent" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label> <mat-icon>sell</mat-icon>&nbsp;<span i18n>Tags</span></ng-template>
+    <edit-component-tags [componentContent]="componentContent" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label> <mat-icon>code</mat-icon>&nbsp;<span i18n>JSON</span></ng-template>
+    <edit-component-json [component]="component" />
+  </mat-tab>
+</mat-tab-group>
diff --git a/src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.ts b/src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.ts
index 5e28c4e98a3..9b50f73d409 100644
--- a/src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.ts
+++ b/src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.ts
@@ -1,40 +1,13 @@
 import { Component } from '@angular/core';
 import { EditAdvancedComponentComponent } from '../../../../../app/authoring-tool/edit-advanced-component/edit-advanced-component.component';
 import { MatchContent } from '../MatchContent';
-import { MatCheckbox } from '@angular/material/checkbox';
-import { FormsModule } from '@angular/forms';
-import { EditComponentSaveButtonComponent } from '../../../../../app/authoring-tool/edit-component-save-button/edit-component-save-button.component';
-import { EditComponentSubmitButtonComponent } from '../../../../../app/authoring-tool/edit-component-submit-button/edit-component-submit-button.component';
-import { EditComponentMaxSubmitComponent } from '../../../../../app/authoring-tool/edit-component-max-submit/edit-component-max-submit.component';
-import { EditComponentDefaultFeedback } from '../../../../../app/authoring-tool/edit-advanced-component/edit-component-default-feedback/edit-component-default-feedback.component';
-import { EditComponentMaxScoreComponent } from '../../../../../app/authoring-tool/edit-component-max-score/edit-component-max-score.component';
-import { EditComponentExcludeFromTotalScoreComponent } from '../../../../../app/authoring-tool/edit-component-exclude-from-total-score/edit-component-exclude-from-total-score.component';
-import { EditComponentWidthComponent } from '../../../../../app/authoring-tool/edit-component-width/edit-component-width.component';
-import { EditComponentRubricComponent } from '../../../../../app/authoring-tool/edit-component-rubric/edit-component-rubric.component';
-import { EditComponentTagsComponent } from '../../../../../app/authoring-tool/edit-component-tags/edit-component-tags.component';
 import { EditMatchConnectedComponentsComponent } from '../edit-match-connected-components/edit-match-connected-components.component';
-import { EditComponentConstraintsComponent } from '../../../../../app/authoring-tool/edit-component-constraints/edit-component-constraints.component';
-import { EditComponentJsonComponent } from '../../../../../app/authoring-tool/edit-component-json/edit-component-json.component';
+import { EditComponentAdvancedSharedModule } from '../../../../../app/authoring-tool/edit-component-advanced/edit-component-advanced-shared.module';
 
 @Component({
-  templateUrl: 'edit-match-advanced.component.html',
+  imports: [EditComponentAdvancedSharedModule, EditMatchConnectedComponentsComponent],
   styles: ['.checkbox { margin-top: 4px; margin-bottom: 4px; }'],
-  imports: [
-    MatCheckbox,
-    FormsModule,
-    EditComponentSaveButtonComponent,
-    EditComponentSubmitButtonComponent,
-    EditComponentMaxSubmitComponent,
-    EditComponentDefaultFeedback,
-    EditComponentMaxScoreComponent,
-    EditComponentExcludeFromTotalScoreComponent,
-    EditComponentWidthComponent,
-    EditComponentRubricComponent,
-    EditComponentTagsComponent,
-    EditMatchConnectedComponentsComponent,
-    EditComponentConstraintsComponent,
-    EditComponentJsonComponent
-  ]
+  templateUrl: './edit-match-advanced.component.html'
 })
 export class EditMatchAdvancedComponent extends EditAdvancedComponentComponent {
   allowedConnectedComponentTypes = ['DialogGuidance', 'Match'];

From cca2728bc0017005f90da4ce7bcc5d01ccda0239 Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Wed, 1 Apr 2026 08:48:28 -0700
Subject: [PATCH 07/33] Organize Discussion advanced component authoring using
 tabs

---
 .../edit-discussion-advanced.component.html   | 62 ++++++++++++++-----
 .../edit-discussion-advanced.component.ts     | 21 +------
 2 files changed, 48 insertions(+), 35 deletions(-)

diff --git a/src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html b/src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html
index 6de4c5cd0a1..fd19123d3b5 100644
--- a/src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html
+++ b/src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html
@@ -1,17 +1,45 @@
-<div class="flex flex-col">
-  <edit-component-max-score [componentContent]="componentContent" />
-  <edit-component-exclude-from-total-score [componentContent]="componentContent" />
-  <edit-component-width [componentContent]="componentContent" />
-  <edit-component-rubric [componentContent]="componentContent" />
-  <edit-component-tags [componentContent]="componentContent" />
-</div>
-<edit-discussion-connected-components
-  [nodeId]="nodeId"
-  [componentId]="componentId"
-  [allowedConnectedComponentTypes]="allowedConnectedComponentTypes"
-  [componentContent]="componentContent"
-  [connectedComponents]="componentContent.connectedComponents"
-  (connectedComponentsChanged)="connectedComponentsChanged($event)"
-/>
-<edit-component-constraints [componentContent]="component.content" />
-<edit-component-json [component]="component" />
+<mat-tab-group>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
+    </ng-template>
+    <div class="flex flex-col">
+      <edit-component-max-score [componentContent]="componentContent" />
+      <edit-component-exclude-from-total-score [componentContent]="componentContent" />
+      <edit-component-width [componentContent]="componentContent" />
+    </div>
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>visibility</mat-icon>&nbsp;<span i18n>Visibility</span>
+    </ng-template>
+    <edit-component-constraints [componentContent]="component.content" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>join_inner</mat-icon>&nbsp;<span i18n>Connections</span>
+    </ng-template>
+    <edit-discussion-connected-components
+      [nodeId]="nodeId"
+      [componentId]="componentId"
+      [allowedConnectedComponentTypes]="allowedConnectedComponentTypes"
+      [componentContent]="componentContent"
+      [connectedComponents]="componentContent.connectedComponents"
+      (connectedComponentsChanged)="connectedComponentsChanged($event)"
+    />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
+    </ng-template>
+    <edit-component-rubric [componentContent]="componentContent" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label> <mat-icon>sell</mat-icon>&nbsp;<span i18n>Tags</span></ng-template>
+    <edit-component-tags [componentContent]="componentContent" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label> <mat-icon>code</mat-icon>&nbsp;<span i18n>JSON</span></ng-template>
+    <edit-component-json [component]="component" />
+  </mat-tab>
+</mat-tab-group>
diff --git a/src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.ts b/src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.ts
index b879432e1fc..a1446dcf324 100644
--- a/src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.ts
+++ b/src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.ts
@@ -1,26 +1,11 @@
 import { Component } from '@angular/core';
 import { EditAdvancedComponentComponent } from '../../../../../app/authoring-tool/edit-advanced-component/edit-advanced-component.component';
-import { EditComponentMaxScoreComponent } from '../../../../../app/authoring-tool/edit-component-max-score/edit-component-max-score.component';
-import { EditComponentExcludeFromTotalScoreComponent } from '../../../../../app/authoring-tool/edit-component-exclude-from-total-score/edit-component-exclude-from-total-score.component';
-import { EditComponentWidthComponent } from '../../../../../app/authoring-tool/edit-component-width/edit-component-width.component';
-import { EditComponentRubricComponent } from '../../../../../app/authoring-tool/edit-component-rubric/edit-component-rubric.component';
-import { EditComponentTagsComponent } from '../../../../../app/authoring-tool/edit-component-tags/edit-component-tags.component';
 import { EditDiscussionConnectedComponentsComponent } from '../edit-discussion-connected-components/edit-discussion-connected-components.component';
-import { EditComponentConstraintsComponent } from '../../../../../app/authoring-tool/edit-component-constraints/edit-component-constraints.component';
-import { EditComponentJsonComponent } from '../../../../../app/authoring-tool/edit-component-json/edit-component-json.component';
+import { EditComponentAdvancedSharedModule } from '../../../../../app/authoring-tool/edit-component-advanced/edit-component-advanced-shared.module';
 
 @Component({
-  templateUrl: 'edit-discussion-advanced.component.html',
-  imports: [
-    EditComponentMaxScoreComponent,
-    EditComponentExcludeFromTotalScoreComponent,
-    EditComponentWidthComponent,
-    EditComponentRubricComponent,
-    EditComponentTagsComponent,
-    EditDiscussionConnectedComponentsComponent,
-    EditComponentConstraintsComponent,
-    EditComponentJsonComponent
-  ]
+  imports: [EditComponentAdvancedSharedModule, EditDiscussionConnectedComponentsComponent],
+  templateUrl: './edit-discussion-advanced.component.html'
 })
 export class EditDiscussionAdvancedComponent extends EditAdvancedComponentComponent {
   allowedConnectedComponentTypes = ['Discussion'];

From f5cb57b1251c45a5605610a4e024422cf3a21535 Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Wed, 1 Apr 2026 09:46:38 -0700
Subject: [PATCH 08/33] Organize AiChat advanced component authoring using tabs

---
 .../edit-ai-chat-advanced.component.html      | 69 ++++++++++++++-----
 .../edit-ai-chat-advanced.component.ts        | 14 +---
 2 files changed, 52 insertions(+), 31 deletions(-)

diff --git a/src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html b/src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html
index 75a935bc6aa..0a4c2273468 100644
--- a/src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html
+++ b/src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html
@@ -1,19 +1,50 @@
-<mat-form-field>
-  <mat-label i18n>Model</mat-label>
-  <mat-select [(ngModel)]="componentContent.model" (ngModelChange)="this.componentChanged()">
-    @for (model of models; track model) {
-      <mat-option [value]="model">{{ model }}</mat-option>
-    }
-  </mat-select>
-</mat-form-field>
-<br />
-<edit-component-width [componentContent]="component.content" />
-<edit-connected-components
-  [nodeId]="component.nodeId"
-  [componentId]="component.id"
-  [allowedConnectedComponentTypes]="allowedConnectedComponentTypes"
-  [componentContent]="component.content"
-  [connectedComponents]="component.content.connectedComponents"
-  (connectedComponentsChanged)="connectedComponentsChanged($event)"
-/>
-<edit-component-json [component]="component" />
+<mat-tab-group>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
+    </ng-template>
+    <mat-form-field>
+      <mat-label i18n>Model</mat-label>
+      <mat-select [(ngModel)]="componentContent.model" (ngModelChange)="this.componentChanged()">
+        @for (model of models; track model) {
+          <mat-option [value]="model">{{ model }}</mat-option>
+        }
+      </mat-select>
+    </mat-form-field>
+    <br />
+    <edit-component-width [componentContent]="component.content" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>visibility</mat-icon>&nbsp;<span i18n>Visibility</span>
+    </ng-template>
+    <edit-component-constraints [componentContent]="component.content" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>join_inner</mat-icon>&nbsp;<span i18n>Connections</span>
+    </ng-template>
+    <edit-connected-components
+      [nodeId]="component.nodeId"
+      [componentId]="component.id"
+      [allowedConnectedComponentTypes]="allowedConnectedComponentTypes"
+      [componentContent]="component.content"
+      [connectedComponents]="component.content.connectedComponents"
+      (connectedComponentsChanged)="connectedComponentsChanged($event)"
+    />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
+    </ng-template>
+    <edit-component-rubric [componentContent]="componentContent" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label> <mat-icon>sell</mat-icon>&nbsp;<span i18n>Tags</span></ng-template>
+    <edit-component-tags [componentContent]="componentContent" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label> <mat-icon>code</mat-icon>&nbsp;<span i18n>JSON</span></ng-template>
+    <edit-component-json [component]="component" />
+  </mat-tab>
+</mat-tab-group>
diff --git a/src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.ts b/src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.ts
index d6e4d613a4f..b114ca4beeb 100644
--- a/src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.ts
+++ b/src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.ts
@@ -1,22 +1,12 @@
 import { Component } from '@angular/core';
-import { FormsModule } from '@angular/forms';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatSelectModule } from '@angular/material/select';
 import { EditAdvancedComponentComponent } from '../../../../../app/authoring-tool/edit-advanced-component/edit-advanced-component.component';
-import { EditComponentJsonComponent } from '../../../../../app/authoring-tool/edit-component-json/edit-component-json.component';
-import { EditConnectedComponentsComponent } from '../../../../../app/authoring-tool/edit-connected-components/edit-connected-components.component';
 import { AiChatContent } from '../AiChatContent';
-import { EditComponentWidthComponent } from '../../../../../app/authoring-tool/edit-component-width/edit-component-width.component';
+import { EditComponentAdvancedSharedModule } from '../../../../../app/authoring-tool/edit-component-advanced/edit-component-advanced-shared.module';
 
 @Component({
-  imports: [
-    EditComponentJsonComponent,
-    EditComponentWidthComponent,
-    EditConnectedComponentsComponent,
-    FormsModule,
-    MatFormFieldModule,
-    MatSelectModule
-  ],
+  imports: [EditComponentAdvancedSharedModule, MatFormFieldModule, MatSelectModule],
   templateUrl: './edit-ai-chat-advanced.component.html'
 })
 export class EditAiChatAdvancedComponent extends EditAdvancedComponentComponent {

From ce6f31df35c45d65c6609c66106dea89b448f183 Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Wed, 1 Apr 2026 10:03:59 -0700
Subject: [PATCH 09/33] Organize Animation advanced component authoring using
 tabs

---
 .../edit-animation-advanced.component.html    | 51 +++++++++++++++++++
 .../edit-animation-advanced.component.ts      |  9 ++--
 2 files changed, 54 insertions(+), 6 deletions(-)
 create mode 100644 src/assets/wise5/components/animation/edit-animation-advanced/edit-animation-advanced.component.html

diff --git a/src/assets/wise5/components/animation/edit-animation-advanced/edit-animation-advanced.component.html b/src/assets/wise5/components/animation/edit-animation-advanced/edit-animation-advanced.component.html
new file mode 100644
index 00000000000..aece545b3e5
--- /dev/null
+++ b/src/assets/wise5/components/animation/edit-animation-advanced/edit-animation-advanced.component.html
@@ -0,0 +1,51 @@
+<mat-tab-group>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
+    </ng-template>
+    <div class="flex flex-col justify-start items-start">
+      <edit-component-save-button [componentContent]="component.content" />
+      <edit-component-submit-button [componentContent]="component.content" />
+      @if (component.content.showSubmitButton) {
+        <edit-component-max-submit [componentContent]="component.content" />
+      }
+      <edit-component-default-feedback [componentContent]="component.content" />
+      <edit-component-max-score [componentContent]="component.content" />
+      <edit-component-exclude-from-total-score [componentContent]="component.content" />
+      <edit-component-width [componentContent]="component.content" />
+    </div>
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>visibility</mat-icon>&nbsp;<span i18n>Visibility</span>
+    </ng-template>
+    <edit-component-constraints [componentContent]="component.content" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>join_inner</mat-icon>&nbsp;<span i18n>Connections</span>
+    </ng-template>
+    <edit-connected-components
+      [nodeId]="component.nodeId"
+      [componentId]="component.id"
+      [allowedConnectedComponentTypes]="allowedConnectedComponentTypes"
+      [componentContent]="component.content"
+      [connectedComponents]="component.content.connectedComponents"
+      (connectedComponentsChanged)="connectedComponentsChanged($event)"
+    />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
+    </ng-template>
+    <edit-component-rubric [componentContent]="component.content" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label> <mat-icon>sell</mat-icon>&nbsp;<span i18n>Tags</span></ng-template>
+    <edit-component-tags [componentContent]="component.content" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label> <mat-icon>code</mat-icon>&nbsp;<span i18n>JSON</span></ng-template>
+    <edit-component-json [component]="component" />
+  </mat-tab>
+</mat-tab-group>
diff --git a/src/assets/wise5/components/animation/edit-animation-advanced/edit-animation-advanced.component.ts b/src/assets/wise5/components/animation/edit-animation-advanced/edit-animation-advanced.component.ts
index cdcede2f79b..c559ba68c85 100644
--- a/src/assets/wise5/components/animation/edit-animation-advanced/edit-animation-advanced.component.ts
+++ b/src/assets/wise5/components/animation/edit-animation-advanced/edit-animation-advanced.component.ts
@@ -1,13 +1,10 @@
 import { Component } from '@angular/core';
 import { EditAdvancedComponentComponent } from '../../../../../app/authoring-tool/edit-advanced-component/edit-advanced-component.component';
-import { EditCommonAdvancedComponent } from '../../../../../app/authoring-tool/edit-common-advanced/edit-common-advanced.component';
+import { EditComponentAdvancedSharedModule } from '../../../../../app/authoring-tool/edit-component-advanced/edit-component-advanced-shared.module';
 
 @Component({
-  imports: [EditCommonAdvancedComponent],
-  template: `<edit-common-advanced
-    [component]="component"
-    [allowedConnectedComponentTypes]="allowedConnectedComponentTypes"
-  /> `
+  imports: [EditComponentAdvancedSharedModule],
+  templateUrl: './edit-animation-advanced.component.html'
 })
 export class EditAnimationAdvancedComponent extends EditAdvancedComponentComponent {
   allowedConnectedComponentTypes = ['Animation', 'Graph'];

From b6dbe43a79dfd0c69b280b7d4bd149d8efa282cd Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Wed, 1 Apr 2026 12:10:15 -0700
Subject: [PATCH 10/33] Organize AudioOscillator advanced component authoring
 using tabs

---
 ...t-audio-oscillator-advanced.component.html | 51 +++++++++++++++++++
 ...dit-audio-oscillator-advanced.component.ts |  9 ++--
 2 files changed, 54 insertions(+), 6 deletions(-)
 create mode 100644 src/assets/wise5/components/audioOscillator/edit-audio-oscillator-advanced/edit-audio-oscillator-advanced.component.html

diff --git a/src/assets/wise5/components/audioOscillator/edit-audio-oscillator-advanced/edit-audio-oscillator-advanced.component.html b/src/assets/wise5/components/audioOscillator/edit-audio-oscillator-advanced/edit-audio-oscillator-advanced.component.html
new file mode 100644
index 00000000000..aece545b3e5
--- /dev/null
+++ b/src/assets/wise5/components/audioOscillator/edit-audio-oscillator-advanced/edit-audio-oscillator-advanced.component.html
@@ -0,0 +1,51 @@
+<mat-tab-group>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
+    </ng-template>
+    <div class="flex flex-col justify-start items-start">
+      <edit-component-save-button [componentContent]="component.content" />
+      <edit-component-submit-button [componentContent]="component.content" />
+      @if (component.content.showSubmitButton) {
+        <edit-component-max-submit [componentContent]="component.content" />
+      }
+      <edit-component-default-feedback [componentContent]="component.content" />
+      <edit-component-max-score [componentContent]="component.content" />
+      <edit-component-exclude-from-total-score [componentContent]="component.content" />
+      <edit-component-width [componentContent]="component.content" />
+    </div>
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>visibility</mat-icon>&nbsp;<span i18n>Visibility</span>
+    </ng-template>
+    <edit-component-constraints [componentContent]="component.content" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>join_inner</mat-icon>&nbsp;<span i18n>Connections</span>
+    </ng-template>
+    <edit-connected-components
+      [nodeId]="component.nodeId"
+      [componentId]="component.id"
+      [allowedConnectedComponentTypes]="allowedConnectedComponentTypes"
+      [componentContent]="component.content"
+      [connectedComponents]="component.content.connectedComponents"
+      (connectedComponentsChanged)="connectedComponentsChanged($event)"
+    />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
+    </ng-template>
+    <edit-component-rubric [componentContent]="component.content" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label> <mat-icon>sell</mat-icon>&nbsp;<span i18n>Tags</span></ng-template>
+    <edit-component-tags [componentContent]="component.content" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label> <mat-icon>code</mat-icon>&nbsp;<span i18n>JSON</span></ng-template>
+    <edit-component-json [component]="component" />
+  </mat-tab>
+</mat-tab-group>
diff --git a/src/assets/wise5/components/audioOscillator/edit-audio-oscillator-advanced/edit-audio-oscillator-advanced.component.ts b/src/assets/wise5/components/audioOscillator/edit-audio-oscillator-advanced/edit-audio-oscillator-advanced.component.ts
index 31f2f14f65c..eabd407910d 100644
--- a/src/assets/wise5/components/audioOscillator/edit-audio-oscillator-advanced/edit-audio-oscillator-advanced.component.ts
+++ b/src/assets/wise5/components/audioOscillator/edit-audio-oscillator-advanced/edit-audio-oscillator-advanced.component.ts
@@ -1,13 +1,10 @@
 import { Component } from '@angular/core';
-import { EditCommonAdvancedComponent } from '../../../../../app/authoring-tool/edit-common-advanced/edit-common-advanced.component';
 import { EditAdvancedComponentComponent } from '../../../../../app/authoring-tool/edit-advanced-component/edit-advanced-component.component';
+import { EditComponentAdvancedSharedModule } from '../../../../../app/authoring-tool/edit-component-advanced/edit-component-advanced-shared.module';
 
 @Component({
-  imports: [EditCommonAdvancedComponent],
-  template: `<edit-common-advanced
-    [component]="component"
-    [allowedConnectedComponentTypes]="allowedConnectedComponentTypes"
-  />`
+  imports: [EditComponentAdvancedSharedModule],
+  templateUrl: './edit-audio-oscillator-advanced.component.html'
 })
 export class EditAudioOscillatorAdvancedComponent extends EditAdvancedComponentComponent {
   allowedConnectedComponentTypes = ['AudioOscillator'];

From 2a709e278d3978b75fc51a2861902866ee358fcb Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Wed, 1 Apr 2026 12:40:22 -0700
Subject: [PATCH 11/33] Update tests

---
 .../edit-graph-advanced.component.spec.ts        |  7 +------
 ...edit-open-response-advanced.component.spec.ts | 16 ----------------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.spec.ts b/src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.spec.ts
index c3d8be8f4c9..194ad8826b9 100644
--- a/src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.spec.ts
+++ b/src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.spec.ts
@@ -1,6 +1,5 @@
 import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { EditCommonAdvancedComponent } from '../../../../../app/authoring-tool/edit-common-advanced/edit-common-advanced.component';
 import { ProjectLocale } from '../../../../../app/domain/projectLocale';
 import { StudentTeacherCommonServicesModule } from '../../../../../app/student-teacher-common-services.module';
 import { NotebookService } from '../../../services/notebookService';
@@ -15,11 +14,7 @@ let fixture: ComponentFixture<EditGraphAdvancedComponent>;
 describe('EditGraphAdvancedComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [
-        EditGraphAdvancedComponent,
-        EditCommonAdvancedComponent,
-        StudentTeacherCommonServicesModule
-      ],
+      imports: [EditGraphAdvancedComponent, StudentTeacherCommonServicesModule],
       providers: [
         TeacherNodeService,
         TeacherProjectService,
diff --git a/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.spec.ts b/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.spec.ts
index 0da3e77baa2..26aece523b2 100644
--- a/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.spec.ts
+++ b/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.spec.ts
@@ -1,7 +1,5 @@
-import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
 import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { MatCheckboxHarness } from '@angular/material/checkbox/testing';
 import { ProjectLocale } from '../../../../../app/domain/projectLocale';
 import { StudentTeacherCommonServicesModule } from '../../../../../app/student-teacher-common-services.module';
 import { ComponentContent } from '../../../common/ComponentContent';
@@ -48,7 +46,6 @@ describe('EditOpenResponseAdvancedComponent', () => {
     fixture.detectChanges();
   });
 
-  enableCRaterClicked();
   addScoringRule();
   scoringRuleDeleteClicked();
   addMultipleAttemptScoringRule();
@@ -63,19 +60,6 @@ describe('EditOpenResponseAdvancedComponent', () => {
   setFeedbackEnabled();
 });
 
-function enableCRaterClicked() {
-  describe('enableCRaterClicked', () => {
-    it('should handle enable CRater clicked', async () => {
-      expect(component.componentContent.enableCRater).toBeFalsy();
-      const loader = TestbedHarnessEnvironment.loader(fixture);
-      const checkboxes = await loader.getAllHarnesses(MatCheckboxHarness);
-      await checkboxes[1].check();
-      expect(component.componentContent.enableCRater).toBeTruthy();
-      expect(component.componentContent.cRater).toEqual(component.createCRaterObject());
-    });
-  });
-}
-
 function addScoringRule() {
   describe('addScoringRule', () => {
     it('should add scoring rule', () => {

From 52f3b768ec2e936b296b590a93c2c7f5e941c134 Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Wed, 1 Apr 2026 12:59:11 -0700
Subject: [PATCH 12/33] Organize ConceptMap advanced component authoring using
 tabs

---
 .../edit-concept-map-advanced.component.html  | 403 ++++++++++--------
 .../edit-concept-map-advanced.component.ts    |  18 +-
 2 files changed, 231 insertions(+), 190 deletions(-)

diff --git a/src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html b/src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html
index 27261d09002..384b2448dcd 100644
--- a/src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html
+++ b/src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html
@@ -1,197 +1,244 @@
-<div class="flex flex-col gap-2">
-  <div>
-    <mat-checkbox
-      color="primary"
-      [(ngModel)]="componentContent.showAutoScore"
-      (ngModelChange)="componentChanged()"
-      i18n
-    >
-      Show Auto Score
-    </mat-checkbox>
-  </div>
-  <div>
-    <mat-checkbox
-      color="primary"
-      [(ngModel)]="componentContent.showAutoFeedback"
-      (ngModelChange)="componentChanged()"
-      i18n
-    >
-      Show Auto Feedback
-    </mat-checkbox>
-  </div>
-  <div class="flex flex-row items-center gap-4">
-    <div i18n>Rules</div>
-    <button mat-raised-button color="primary" (click)="addRule()" i18n>
-      <mat-icon>add</mat-icon>
-    </button>
-  </div>
-  @for (rule of componentContent.rules; track rule; let ruleIndex = $index) {
-    <div class="rule-container">
-      <mat-form-field>
-        <mat-label i18n>Rule Name</mat-label>
-        <input matInput [(ngModel)]="rule.name" (ngModelChange)="componentChanged()" />
-      </mat-form-field>
-      <div class="flex flex-row flex-wrap gap-2 items-center">
-        <mat-form-field>
-          <mat-label i18n>Rule Type</mat-label>
-          <mat-select [(ngModel)]="rule.not" (ngModelChange)="componentChanged()">
-            <mat-option [value]="false" i18n>should contain</mat-option>
-            <mat-option [value]="true" i18n>should not contain</mat-option>
-          </mat-select>
-        </mat-form-field>
-        <mat-form-field>
-          <mat-label i18n>Comparison</mat-label>
-          <mat-select [(ngModel)]="rule.comparison" (ngModelChange)="componentChanged()">
-            <mat-option value="exactly" i18n>exactly</mat-option>
-            <mat-option value="more than" i18n>more than</mat-option>
-            <mat-option value="less than" i18n>less than</mat-option>
-          </mat-select>
-        </mat-form-field>
-        <mat-form-field>
-          <mat-label i18n>Count</mat-label>
-          <input
-            matInput
-            type="number"
-            min="0"
-            [(ngModel)]="rule.number"
-            (ngModelChange)="componentChanged()"
-          />
-        </mat-form-field>
+<mat-tab-group>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
+    </ng-template>
+    <div class="flex flex-col gap-2">
+      <div>
+        <mat-checkbox
+          color="primary"
+          [(ngModel)]="componentContent.showAutoScore"
+          (ngModelChange)="componentChanged()"
+          i18n
+        >
+          Show Auto Score
+        </mat-checkbox>
       </div>
-      <div class="flex flex-row flex-wrap gap-2 items-center">
-        <mat-form-field>
-          <mat-label i18n>Node</mat-label>
-          <mat-select [(ngModel)]="rule.nodeLabel" (ngModelChange)="componentChanged()">
-            <mat-option></mat-option>
-            <mat-option value="any" i18n>Any</mat-option>
-            @for (node of componentContent.nodes; track node) {
-              <mat-option [value]="node.label">
-                {{ node.label }}
-              </mat-option>
-            }
-          </mat-select>
-        </mat-form-field>
-        <mat-form-field>
-          <mat-label i18n>Link Connection</mat-label>
-          <mat-select [(ngModel)]="rule.type" (ngModelChange)="ruleTypeChanged(ruleIndex)">
-            <mat-option value="node" i18n>with any or no link</mat-option>
-            <mat-option value="link" i18n>with specific link</mat-option>
-          </mat-select>
-        </mat-form-field>
-        @if (rule.type === 'link') {
-          <mat-form-field>
-            <mat-label i18n>Link</mat-label>
-            <mat-select [(ngModel)]="rule.linkLabel" (ngModelChange)="componentChanged()">
-              <mat-option></mat-option>
-              <mat-option value="any" i18n>Any</mat-option>
-              @for (link of componentContent.links; track link) {
-                <mat-option [value]="link.label">
-                  {{ link.label }}
-                </mat-option>
-              }
-            </mat-select>
-          </mat-form-field>
-          <span i18n>to</span>
+      <div>
+        <mat-checkbox
+          color="primary"
+          [(ngModel)]="componentContent.showAutoFeedback"
+          (ngModelChange)="componentChanged()"
+          i18n
+        >
+          Show Auto Feedback
+        </mat-checkbox>
+      </div>
+      <div class="flex flex-row items-center gap-4">
+        <div i18n>Rules</div>
+        <button mat-raised-button color="primary" (click)="addRule()" i18n>
+          <mat-icon>add</mat-icon>
+        </button>
+      </div>
+      @for (rule of componentContent.rules; track rule; let ruleIndex = $index) {
+        <div class="rule-container">
           <mat-form-field>
-            <mat-label i18n>Node</mat-label>
-            <mat-select [(ngModel)]="rule.otherNodeLabel" (ngModelChange)="componentChanged()">
-              <mat-option></mat-option>
-              <mat-option value="any" i18n>Any</mat-option>
-              @for (node of componentContent.nodes; track node) {
-                <mat-option [value]="node.label">
-                  {{ node.label }}
-                </mat-option>
-              }
-            </mat-select>
+            <mat-label i18n>Rule Name</mat-label>
+            <input matInput [(ngModel)]="rule.name" (ngModelChange)="componentChanged()" />
           </mat-form-field>
-        }
-      </div>
-      <div class="flex flex-row flex-wrap items-center gap-4 mb-4">
-        <div>
-          <button mat-raised-button color="primary" (click)="addCategoryToRule(rule)" i18n>
-            Add Category (Optional)
-          </button>
-        </div>
-        @for (category of rule.categories; track customTrackBy; let categoryIndex = $index) {
-          <div class="flex flex-row items-center gap-2">
-            <mat-form-field class="form-field-no-hint">
-              <mat-label i18n>Category Name</mat-label>
+          <div class="flex flex-row flex-wrap gap-2 items-center">
+            <mat-form-field>
+              <mat-label i18n>Rule Type</mat-label>
+              <mat-select [(ngModel)]="rule.not" (ngModelChange)="componentChanged()">
+                <mat-option [value]="false" i18n>should contain</mat-option>
+                <mat-option [value]="true" i18n>should not contain</mat-option>
+              </mat-select>
+            </mat-form-field>
+            <mat-form-field>
+              <mat-label i18n>Comparison</mat-label>
+              <mat-select [(ngModel)]="rule.comparison" (ngModelChange)="componentChanged()">
+                <mat-option value="exactly" i18n>exactly</mat-option>
+                <mat-option value="more than" i18n>more than</mat-option>
+                <mat-option value="less than" i18n>less than</mat-option>
+              </mat-select>
+            </mat-form-field>
+            <mat-form-field>
+              <mat-label i18n>Count</mat-label>
               <input
                 matInput
-                [(ngModel)]="rule.categories[categoryIndex]"
+                type="number"
+                min="0"
+                [(ngModel)]="rule.number"
                 (ngModelChange)="componentChanged()"
               />
             </mat-form-field>
+          </div>
+          <div class="flex flex-row flex-wrap gap-2 items-center">
+            <mat-form-field>
+              <mat-label i18n>Node</mat-label>
+              <mat-select [(ngModel)]="rule.nodeLabel" (ngModelChange)="componentChanged()">
+                <mat-option></mat-option>
+                <mat-option value="any" i18n>Any</mat-option>
+                @for (node of componentContent.nodes; track node) {
+                  <mat-option [value]="node.label">
+                    {{ node.label }}
+                  </mat-option>
+                }
+              </mat-select>
+            </mat-form-field>
+            <mat-form-field>
+              <mat-label i18n>Link Connection</mat-label>
+              <mat-select [(ngModel)]="rule.type" (ngModelChange)="ruleTypeChanged(ruleIndex)">
+                <mat-option value="node" i18n>with any or no link</mat-option>
+                <mat-option value="link" i18n>with specific link</mat-option>
+              </mat-select>
+            </mat-form-field>
+            @if (rule.type === 'link') {
+              <mat-form-field>
+                <mat-label i18n>Link</mat-label>
+                <mat-select [(ngModel)]="rule.linkLabel" (ngModelChange)="componentChanged()">
+                  <mat-option></mat-option>
+                  <mat-option value="any" i18n>Any</mat-option>
+                  @for (link of componentContent.links; track link) {
+                    <mat-option [value]="link.label">
+                      {{ link.label }}
+                    </mat-option>
+                  }
+                </mat-select>
+              </mat-form-field>
+              <span i18n>to</span>
+              <mat-form-field>
+                <mat-label i18n>Node</mat-label>
+                <mat-select [(ngModel)]="rule.otherNodeLabel" (ngModelChange)="componentChanged()">
+                  <mat-option></mat-option>
+                  <mat-option value="any" i18n>Any</mat-option>
+                  @for (node of componentContent.nodes; track node) {
+                    <mat-option [value]="node.label">
+                      {{ node.label }}
+                    </mat-option>
+                  }
+                </mat-select>
+              </mat-form-field>
+            }
+          </div>
+          <div class="flex flex-row flex-wrap items-center gap-4 mb-4">
+            <div>
+              <button mat-raised-button color="primary" (click)="addCategoryToRule(rule)" i18n>
+                Add Category (Optional)
+              </button>
+            </div>
+            @for (category of rule.categories; track customTrackBy; let categoryIndex = $index) {
+              <div class="flex flex-row items-center gap-2">
+                <mat-form-field class="form-field-no-hint">
+                  <mat-label i18n>Category Name</mat-label>
+                  <input
+                    matInput
+                    [(ngModel)]="rule.categories[categoryIndex]"
+                    (ngModelChange)="componentChanged()"
+                  />
+                </mat-form-field>
+                <button
+                  mat-raised-button
+                  color="primary"
+                  (click)="deleteCategoryFromRule(rule, categoryIndex)"
+                  matTooltip="Delete Catagory"
+                  matTooltipPosition="above"
+                  i18n-matTooltip
+                >
+                  <mat-icon>clear</mat-icon>
+                </button>
+              </div>
+            }
+          </div>
+          <div class="flex flex-row gap-2 w-full">
+            <button
+              mat-raised-button
+              color="primary"
+              (click)="moveObjectUp(componentContent.rules, ruleIndex)"
+              matTooltip="Move Up"
+              matTooltipPosition="above"
+              i18n-matTooltip
+              i18n
+            >
+              <mat-icon>arrow_upward</mat-icon>
+            </button>
+            <button
+              mat-raised-button
+              color="primary"
+              (click)="moveObjectDown(componentContent.rules, ruleIndex)"
+              matTooltip="Move Down"
+              matTooltipPosition="above"
+              i18n-matTooltip
+              i18n
+            >
+              <mat-icon>arrow_downward</mat-icon>
+            </button>
             <button
               mat-raised-button
               color="primary"
-              (click)="deleteCategoryFromRule(rule, categoryIndex)"
-              matTooltip="Delete Catagory"
+              (click)="ruleDeleteButtonClicked(ruleIndex)"
+              matTooltip="Delete"
               matTooltipPosition="above"
               i18n-matTooltip
+              i18n
             >
-              <mat-icon>clear</mat-icon>
+              <mat-icon>delete</mat-icon>
             </button>
           </div>
-        }
-      </div>
-      <div class="flex flex-row gap-2 w-full">
-        <button
-          mat-raised-button
-          color="primary"
-          (click)="moveObjectUp(componentContent.rules, ruleIndex)"
-          matTooltip="Move Up"
-          matTooltipPosition="above"
-          i18n-matTooltip
-          i18n
-        >
-          <mat-icon>arrow_upward</mat-icon>
-        </button>
-        <button
-          mat-raised-button
-          color="primary"
-          (click)="moveObjectDown(componentContent.rules, ruleIndex)"
-          matTooltip="Move Down"
-          matTooltipPosition="above"
-          i18n-matTooltip
-          i18n
-        >
-          <mat-icon>arrow_downward</mat-icon>
-        </button>
-        <button
-          mat-raised-button
-          color="primary"
-          (click)="ruleDeleteButtonClicked(ruleIndex)"
-          matTooltip="Delete"
-          matTooltipPosition="above"
-          i18n-matTooltip
-          i18n
-        >
-          <mat-icon>delete</mat-icon>
-        </button>
+        </div>
+      }
+      <div>
+        <mat-form-field class="mt-4">
+          <mat-label i18n>Custom Rule Evaluator</mat-label>
+          <textarea
+            matInput
+            [(ngModel)]="componentContent.customRuleEvaluator"
+            (ngModelChange)="componentChanged()"
+            rows="10"
+            cols="100"
+          >
+          </textarea>
+        </mat-form-field>
       </div>
+      @if (isNotebookEnabled()) {
+        <div>
+          <edit-component-add-to-notebook-button [componentContent]="componentContent" />
+        </div>
+      }
     </div>
-  }
-  <div>
-    <mat-form-field class="mt-4">
-      <mat-label i18n>Custom Rule Evaluator</mat-label>
-      <textarea
-        matInput
-        [(ngModel)]="componentContent.customRuleEvaluator"
-        (ngModelChange)="componentChanged()"
-        rows="10"
-        cols="100"
-      >
-      </textarea>
-    </mat-form-field>
-  </div>
-  @if (isNotebookEnabled()) {
-    <div>
-      <edit-component-add-to-notebook-button [componentContent]="componentContent" />
+    <div class="flex flex-col justify-start items-start">
+      <edit-component-save-button [componentContent]="component.content" />
+      <edit-component-submit-button [componentContent]="component.content" />
+      @if (component.content.showSubmitButton) {
+        <edit-component-max-submit [componentContent]="component.content" />
+      }
+      <edit-component-default-feedback [componentContent]="component.content" />
+      <edit-component-max-score [componentContent]="component.content" />
+      <edit-component-exclude-from-total-score [componentContent]="component.content" />
+      <edit-component-width [componentContent]="component.content" />
     </div>
-  }
-</div>
-<edit-common-advanced
-  [component]="component"
-  [allowedConnectedComponentTypes]="allowedConnectedComponentTypes"
-/>
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>visibility</mat-icon>&nbsp;<span i18n>Visibility</span>
+    </ng-template>
+    <edit-component-constraints [componentContent]="component.content" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>join_inner</mat-icon>&nbsp;<span i18n>Connections</span>
+    </ng-template>
+    <edit-connected-components
+      [nodeId]="component.nodeId"
+      [componentId]="component.id"
+      [allowedConnectedComponentTypes]="allowedConnectedComponentTypes"
+      [componentContent]="component.content"
+      [connectedComponents]="component.content.connectedComponents"
+      (connectedComponentsChanged)="connectedComponentsChanged($event)"
+    />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
+    </ng-template>
+    <edit-component-rubric [componentContent]="component.content" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label> <mat-icon>sell</mat-icon>&nbsp;<span i18n>Tags</span></ng-template>
+    <edit-component-tags [componentContent]="component.content" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label> <mat-icon>code</mat-icon>&nbsp;<span i18n>JSON</span></ng-template>
+    <edit-component-json [component]="component" />
+  </mat-tab>
+</mat-tab-group>
diff --git a/src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.ts b/src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.ts
index 29e8e351aaa..e40dacf4eaf 100644
--- a/src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.ts
+++ b/src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.ts
@@ -1,32 +1,26 @@
 import { Component } from '@angular/core';
-import { FormsModule } from '@angular/forms';
 import { MatButton } from '@angular/material/button';
-import { MatCheckbox } from '@angular/material/checkbox';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatIcon } from '@angular/material/icon';
 import { MatInput } from '@angular/material/input';
 import { MatSelectModule } from '@angular/material/select';
 import { MatTooltip } from '@angular/material/tooltip';
 import { EditAdvancedComponentComponent } from '../../../../../app/authoring-tool/edit-advanced-component/edit-advanced-component.component';
-import { EditCommonAdvancedComponent } from '../../../../../app/authoring-tool/edit-common-advanced/edit-common-advanced.component';
-import { EditComponentAddToNotebookButtonComponent } from '../../../../../app/authoring-tool/edit-component-add-to-notebook-button/edit-component-add-to-notebook-button.component';
 import { ConceptMapContent } from '../ConceptMapContent';
+import { EditComponentAdvancedSharedModule } from '../../../../../app/authoring-tool/edit-component-advanced/edit-component-advanced-shared.module';
 
 @Component({
-  templateUrl: 'edit-concept-map-advanced.component.html',
-  styleUrl: 'edit-concept-map-advanced.component.scss',
   imports: [
-    MatCheckbox,
-    FormsModule,
+    EditComponentAdvancedSharedModule,
     MatButton,
     MatIcon,
     MatFormFieldModule,
     MatInput,
     MatSelectModule,
-    MatTooltip,
-    EditComponentAddToNotebookButtonComponent,
-    EditCommonAdvancedComponent
-  ]
+    MatTooltip
+  ],
+  styleUrl: 'edit-concept-map-advanced.component.scss',
+  templateUrl: 'edit-concept-map-advanced.component.html'
 })
 export class EditConceptMapAdvancedComponent extends EditAdvancedComponentComponent {
   componentContent: ConceptMapContent;

From aa598170ba03365902c71e626341affbaf90d657 Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Wed, 1 Apr 2026 13:04:34 -0700
Subject: [PATCH 13/33] Organize Embedded advanced component authoring using
 tabs

---
 .../edit-embedded-advanced.component.html     | 81 +++++++++++++++----
 .../edit-embedded-advanced.component.ts       | 11 +--
 2 files changed, 67 insertions(+), 25 deletions(-)

diff --git a/src/assets/wise5/components/embedded/edit-embedded-advanced/edit-embedded-advanced.component.html b/src/assets/wise5/components/embedded/edit-embedded-advanced/edit-embedded-advanced.component.html
index 3d9a32df8dd..559748e7f23 100644
--- a/src/assets/wise5/components/embedded/edit-embedded-advanced/edit-embedded-advanced.component.html
+++ b/src/assets/wise5/components/embedded/edit-embedded-advanced/edit-embedded-advanced.component.html
@@ -1,17 +1,64 @@
-<div class="flex flex-col">
-  <translatable-input
-    [content]="componentContent"
-    key="parameters"
-    label="Model Parameters"
-    i18n-label
-    (defaultLanguageTextChanged)="componentChanged()"
-    class="model-parameters"
-  />
-  @if (isNotebookEnabled()) {
-    <edit-component-add-to-notebook-button [componentContent]="componentContent" />
-  }
-  <edit-common-advanced
-    [component]="component"
-    [allowedConnectedComponentTypes]="allowedConnectedComponentTypes"
-  />
-</div>
+<mat-tab-group>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
+    </ng-template>
+    <div class="flex flex-col">
+      <translatable-input
+        [content]="componentContent"
+        key="parameters"
+        label="Model Parameters"
+        i18n-label
+        (defaultLanguageTextChanged)="componentChanged()"
+        class="model-parameters"
+      />
+      @if (isNotebookEnabled()) {
+        <edit-component-add-to-notebook-button [componentContent]="componentContent" />
+      }
+      <div class="flex flex-col justify-start items-start">
+        <edit-component-save-button [componentContent]="component.content" />
+        <edit-component-submit-button [componentContent]="component.content" />
+        @if (component.content.showSubmitButton) {
+          <edit-component-max-submit [componentContent]="component.content" />
+        }
+        <edit-component-default-feedback [componentContent]="component.content" />
+        <edit-component-max-score [componentContent]="component.content" />
+        <edit-component-exclude-from-total-score [componentContent]="component.content" />
+        <edit-component-width [componentContent]="component.content" />
+      </div>
+    </div>
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>visibility</mat-icon>&nbsp;<span i18n>Visibility</span>
+    </ng-template>
+    <edit-component-constraints [componentContent]="component.content" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>join_inner</mat-icon>&nbsp;<span i18n>Connections</span>
+    </ng-template>
+    <edit-connected-components
+      [nodeId]="component.nodeId"
+      [componentId]="component.id"
+      [allowedConnectedComponentTypes]="allowedConnectedComponentTypes"
+      [componentContent]="component.content"
+      [connectedComponents]="component.content.connectedComponents"
+      (connectedComponentsChanged)="connectedComponentsChanged($event)"
+    />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
+    </ng-template>
+    <edit-component-rubric [componentContent]="component.content" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label> <mat-icon>sell</mat-icon>&nbsp;<span i18n>Tags</span></ng-template>
+    <edit-component-tags [componentContent]="component.content" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label> <mat-icon>code</mat-icon>&nbsp;<span i18n>JSON</span></ng-template>
+    <edit-component-json [component]="component" />
+  </mat-tab>
+</mat-tab-group>
diff --git a/src/assets/wise5/components/embedded/edit-embedded-advanced/edit-embedded-advanced.component.ts b/src/assets/wise5/components/embedded/edit-embedded-advanced/edit-embedded-advanced.component.ts
index cfe91d6556d..af55eb9cfbe 100644
--- a/src/assets/wise5/components/embedded/edit-embedded-advanced/edit-embedded-advanced.component.ts
+++ b/src/assets/wise5/components/embedded/edit-embedded-advanced/edit-embedded-advanced.component.ts
@@ -2,17 +2,12 @@ import { Component } from '@angular/core';
 import { EditAdvancedComponentComponent } from '../../../../../app/authoring-tool/edit-advanced-component/edit-advanced-component.component';
 import { EmbeddedContent } from '../EmbeddedContent';
 import { TranslatableInputComponent } from '../../../authoringTool/components/translatable-input/translatable-input.component';
-import { EditComponentAddToNotebookButtonComponent } from '../../../../../app/authoring-tool/edit-component-add-to-notebook-button/edit-component-add-to-notebook-button.component';
-import { EditCommonAdvancedComponent } from '../../../../../app/authoring-tool/edit-common-advanced/edit-common-advanced.component';
+import { EditComponentAdvancedSharedModule } from '../../../../../app/authoring-tool/edit-component-advanced/edit-component-advanced-shared.module';
 
 @Component({
-  templateUrl: 'edit-embedded-advanced.component.html',
+  imports: [EditComponentAdvancedSharedModule, TranslatableInputComponent],
   styles: ['.model-parameters { width: 100%; }'],
-  imports: [
-    TranslatableInputComponent,
-    EditComponentAddToNotebookButtonComponent,
-    EditCommonAdvancedComponent
-  ]
+  templateUrl: 'edit-embedded-advanced.component.html'
 })
 export class EditEmbeddedAdvancedComponent extends EditAdvancedComponentComponent {
   allowedConnectedComponentTypes = [

From ea8f344cc17c682637269b81ec70b3685c5b7443 Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Wed, 1 Apr 2026 13:06:53 -0700
Subject: [PATCH 14/33] Remove EditCommonAdvanced. No longer used.

---
 .../edit-common-advanced.component.html       | 23 ----------
 .../edit-common-advanced.component.spec.ts    | 31 -------------
 .../edit-common-advanced.component.ts         | 45 -------------------
 3 files changed, 99 deletions(-)
 delete mode 100644 src/app/authoring-tool/edit-common-advanced/edit-common-advanced.component.html
 delete mode 100644 src/app/authoring-tool/edit-common-advanced/edit-common-advanced.component.spec.ts
 delete mode 100644 src/app/authoring-tool/edit-common-advanced/edit-common-advanced.component.ts

diff --git a/src/app/authoring-tool/edit-common-advanced/edit-common-advanced.component.html b/src/app/authoring-tool/edit-common-advanced/edit-common-advanced.component.html
deleted file mode 100644
index 3afe7d28661..00000000000
--- a/src/app/authoring-tool/edit-common-advanced/edit-common-advanced.component.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<div class="flex flex-col justify-start items-start">
-  <edit-component-save-button [componentContent]="component.content" />
-  <edit-component-submit-button [componentContent]="component.content" />
-  @if (component.content.showSubmitButton) {
-    <edit-component-max-submit [componentContent]="component.content" />
-  }
-  <edit-component-default-feedback [componentContent]="component.content" />
-  <edit-component-max-score [componentContent]="component.content" />
-  <edit-component-exclude-from-total-score [componentContent]="component.content" />
-  <edit-component-width [componentContent]="component.content" />
-  <edit-component-rubric [componentContent]="component.content" />
-  <edit-component-tags [componentContent]="component.content" />
-  <edit-connected-components
-    [nodeId]="component.nodeId"
-    [componentId]="component.id"
-    [allowedConnectedComponentTypes]="allowedConnectedComponentTypes"
-    [componentContent]="component.content"
-    [connectedComponents]="component.content.connectedComponents"
-    (connectedComponentsChanged)="connectedComponentsChanged($event)"
-  />
-  <edit-component-constraints [componentContent]="component.content" />
-  <edit-component-json [component]="component" />
-</div>
diff --git a/src/app/authoring-tool/edit-common-advanced/edit-common-advanced.component.spec.ts b/src/app/authoring-tool/edit-common-advanced/edit-common-advanced.component.spec.ts
deleted file mode 100644
index 589f7400e66..00000000000
--- a/src/app/authoring-tool/edit-common-advanced/edit-common-advanced.component.spec.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { Component } from '../../../assets/wise5/common/Component';
-import { TeacherProjectService } from '../../../assets/wise5/services/teacherProjectService';
-import { EditCommonAdvancedComponent } from './edit-common-advanced.component';
-import { MockComponent, MockProviders } from 'ng-mocks';
-import { ProjectService } from '../../../assets/wise5/services/projectService';
-import { NotificationService } from '../../../assets/wise5/services/notificationService';
-import { EditComponentJsonComponent } from '../edit-component-json/edit-component-json.component';
-
-describe('EditCommonAdvancedComponent', () => {
-  let component: EditCommonAdvancedComponent;
-  let fixture: ComponentFixture<EditCommonAdvancedComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-    imports: [EditCommonAdvancedComponent, MockComponent(EditComponentJsonComponent)],
-    providers: [MockProviders(NotificationService, ProjectService, TeacherProjectService)]
-}).compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(EditCommonAdvancedComponent);
-    component = fixture.componentInstance;
-    component.component = { content: {} } as Component;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/authoring-tool/edit-common-advanced/edit-common-advanced.component.ts b/src/app/authoring-tool/edit-common-advanced/edit-common-advanced.component.ts
deleted file mode 100644
index cd5ab289ac2..00000000000
--- a/src/app/authoring-tool/edit-common-advanced/edit-common-advanced.component.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { Component, Input } from '@angular/core';
-import { Component as WISEComponent } from '../../../assets/wise5/common/Component';
-import { TeacherProjectService } from '../../../assets/wise5/services/teacherProjectService';
-import { EditConnectedComponentsComponent } from '../edit-connected-components/edit-connected-components.component';
-import { EditComponentWidthComponent } from '../edit-component-width/edit-component-width.component';
-import { EditComponentTagsComponent } from '../edit-component-tags/edit-component-tags.component';
-import { EditComponentSaveButtonComponent } from '../edit-component-save-button/edit-component-save-button.component';
-import { EditComponentSubmitButtonComponent } from '../edit-component-submit-button/edit-component-submit-button.component';
-import { EditComponentRubricComponent } from '../edit-component-rubric/edit-component-rubric.component';
-import { EditComponentJsonComponent } from '../edit-component-json/edit-component-json.component';
-import { EditComponentMaxSubmitComponent } from '../edit-component-max-submit/edit-component-max-submit.component';
-import { EditComponentMaxScoreComponent } from '../edit-component-max-score/edit-component-max-score.component';
-import { EditComponentExcludeFromTotalScoreComponent } from '../edit-component-exclude-from-total-score/edit-component-exclude-from-total-score.component';
-import { EditComponentDefaultFeedback } from '../edit-advanced-component/edit-component-default-feedback/edit-component-default-feedback.component';
-import { EditComponentConstraintsComponent } from '../edit-component-constraints/edit-component-constraints.component';
-
-@Component({
-  imports: [
-    EditComponentConstraintsComponent,
-    EditComponentDefaultFeedback,
-    EditComponentExcludeFromTotalScoreComponent,
-    EditComponentMaxScoreComponent,
-    EditComponentMaxSubmitComponent,
-    EditComponentJsonComponent,
-    EditComponentRubricComponent,
-    EditComponentSaveButtonComponent,
-    EditComponentSubmitButtonComponent,
-    EditComponentTagsComponent,
-    EditComponentWidthComponent,
-    EditConnectedComponentsComponent
-  ],
-  selector: 'edit-common-advanced',
-  templateUrl: './edit-common-advanced.component.html'
-})
-export class EditCommonAdvancedComponent {
-  @Input() allowedConnectedComponentTypes: string[] = [];
-  @Input() component: WISEComponent;
-
-  constructor(protected projectService: TeacherProjectService) {}
-
-  protected connectedComponentsChanged(connectedComponents: any[]): void {
-    this.component.content.connectedComponents = connectedComponents;
-    this.projectService.nodeChanged();
-  }
-}

From cbebc6207fcd7231107d0479c093c37910fde47b Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Wed, 1 Apr 2026 13:14:21 -0700
Subject: [PATCH 15/33] Organize DialogGuidance advanced component authoring
 using tabs

---
 ...it-dialog-guidance-advanced.component.html | 43 +++++++++++++++++++
 ...edit-dialog-guidance-advanced.component.ts | 14 +++---
 2 files changed, 49 insertions(+), 8 deletions(-)
 create mode 100644 src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-advanced/edit-dialog-guidance-advanced.component.html

diff --git a/src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-advanced/edit-dialog-guidance-advanced.component.html b/src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-advanced/edit-dialog-guidance-advanced.component.html
new file mode 100644
index 00000000000..5d12b79a580
--- /dev/null
+++ b/src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-advanced/edit-dialog-guidance-advanced.component.html
@@ -0,0 +1,43 @@
+<mat-tab-group>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
+    </ng-template>
+    <div class="flex flex-col justify-start items-start">
+      <edit-component-width [componentContent]="componentContent" />
+    </div>
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>visibility</mat-icon>&nbsp;<span i18n>Visibility</span>
+    </ng-template>
+    <edit-component-constraints [componentContent]="component.content" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>join_inner</mat-icon>&nbsp;<span i18n>Connections</span>
+    </ng-template>
+    <edit-connected-components
+      [nodeId]="component.nodeId"
+      [componentId]="component.id"
+      [allowedConnectedComponentTypes]="allowedConnectedComponentTypes"
+      [componentContent]="component.content"
+      [connectedComponents]="component.content.connectedComponents"
+      (connectedComponentsChanged)="connectedComponentsChanged($event)"
+    />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
+    </ng-template>
+    <edit-component-rubric [componentContent]="componentContent" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label> <mat-icon>sell</mat-icon>&nbsp;<span i18n>Tags</span></ng-template>
+    <edit-component-tags [componentContent]="componentContent" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label> <mat-icon>code</mat-icon>&nbsp;<span i18n>JSON</span></ng-template>
+    <edit-component-json [component]="component" />
+  </mat-tab>
+</mat-tab-group>
diff --git a/src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-advanced/edit-dialog-guidance-advanced.component.ts b/src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-advanced/edit-dialog-guidance-advanced.component.ts
index c76214f2fb5..d304bf634d5 100644
--- a/src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-advanced/edit-dialog-guidance-advanced.component.ts
+++ b/src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-advanced/edit-dialog-guidance-advanced.component.ts
@@ -1,13 +1,11 @@
 import { Component } from '@angular/core';
 import { EditAdvancedComponentComponent } from '../../../../../app/authoring-tool/edit-advanced-component/edit-advanced-component.component';
-import { EditComponentConstraintsComponent } from '../../../../../app/authoring-tool/edit-component-constraints/edit-component-constraints.component';
-import { EditComponentJsonComponent } from '../../../../../app/authoring-tool/edit-component-json/edit-component-json.component';
+import { EditComponentAdvancedSharedModule } from '../../../../../app/authoring-tool/edit-component-advanced/edit-component-advanced-shared.module';
 
 @Component({
-  imports: [EditComponentConstraintsComponent, EditComponentJsonComponent],
-  template: `
-    <edit-component-constraints [componentContent]="component.content" />
-    <edit-component-json [component]="component" />
-  `
+  imports: [EditComponentAdvancedSharedModule],
+  templateUrl: './edit-dialog-guidance-advanced.component.html'
 })
-export class EditDialogGuidanceAdvancedComponent extends EditAdvancedComponentComponent {}
+export class EditDialogGuidanceAdvancedComponent extends EditAdvancedComponentComponent {
+  allowedConnectedComponentTypes = [];
+}

From bde0def300baa728a1c4d6d5a8512d87ed350b56 Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Thu, 2 Apr 2026 14:43:04 -0700
Subject: [PATCH 16/33] Organize Draw advanced component authoring using tabs

---
 .../edit-draw-advanced.component.html         | 86 ++++++++++++-------
 .../edit-draw-advanced.component.ts           | 31 +------
 2 files changed, 60 insertions(+), 57 deletions(-)

diff --git a/src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html b/src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html
index 83f6806ce7b..31c5ca97a89 100644
--- a/src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html
+++ b/src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html
@@ -1,29 +1,57 @@
-@if (isNotebookEnabled()) {
-  <div>
-    <edit-component-add-to-notebook-button [componentContent]="componentContent" />
-  </div>
-}
-<edit-component-save-button [componentContent]="componentContent" />
-<br />
-<edit-component-submit-button [componentContent]="componentContent" />
-@if (componentContent.showSubmitButton) {
-  <edit-component-max-submit [componentContent]="componentContent" />
-}
-<edit-component-default-feedback [componentContent]="componentContent" />
-<div class="flex flex-col justify-start items-start">
-  <edit-component-max-score [componentContent]="componentContent" />
-  <edit-component-exclude-from-total-score [componentContent]="componentContent" />
-  <edit-component-width [componentContent]="componentContent" />
-  <edit-component-rubric [componentContent]="componentContent" />
-  <edit-component-tags [componentContent]="componentContent" />
-</div>
-<edit-draw-connected-components
-  [nodeId]="nodeId"
-  [componentId]="componentId"
-  [allowedConnectedComponentTypes]="allowedConnectedComponentTypes"
-  [componentContent]="componentContent"
-  [connectedComponents]="componentContent.connectedComponents"
-  (connectedComponentsChanged)="connectedComponentsChanged($event)"
-/>
-<edit-component-constraints [componentContent]="component.content" />
-<edit-component-json [component]="component" />
+<mat-tab-group>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
+    </ng-template>
+    @if (isNotebookEnabled()) {
+      <div>
+        <edit-component-add-to-notebook-button [componentContent]="componentContent" />
+      </div>
+    }
+    <edit-component-save-button [componentContent]="componentContent" />
+    <br />
+    <edit-component-submit-button [componentContent]="componentContent" />
+    @if (componentContent.showSubmitButton) {
+      <edit-component-max-submit [componentContent]="componentContent" />
+    }
+    <edit-component-default-feedback [componentContent]="componentContent" />
+    <div class="flex flex-col justify-start items-start">
+      <edit-component-max-score [componentContent]="componentContent" />
+      <edit-component-exclude-from-total-score [componentContent]="componentContent" />
+      <edit-component-width [componentContent]="componentContent" />
+    </div>
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>visibility</mat-icon>&nbsp;<span i18n>Visibility</span>
+    </ng-template>
+    <edit-component-constraints [componentContent]="component.content" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>join_inner</mat-icon>&nbsp;<span i18n>Connections</span>
+    </ng-template>
+    <edit-draw-connected-components
+      [nodeId]="nodeId"
+      [componentId]="componentId"
+      [allowedConnectedComponentTypes]="allowedConnectedComponentTypes"
+      [componentContent]="componentContent"
+      [connectedComponents]="componentContent.connectedComponents"
+      (connectedComponentsChanged)="connectedComponentsChanged($event)"
+    />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
+    </ng-template>
+    <edit-component-rubric [componentContent]="component.content" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label> <mat-icon>sell</mat-icon>&nbsp;<span i18n>Tags</span></ng-template>
+    <edit-component-tags [componentContent]="component.content" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label> <mat-icon>code</mat-icon>&nbsp;<span i18n>JSON</span></ng-template>
+    <edit-component-json [component]="component" />
+  </mat-tab>
+</mat-tab-group>
diff --git a/src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.ts b/src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.ts
index 6ba34c45030..5bdd066684e 100644
--- a/src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.ts
+++ b/src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.ts
@@ -1,36 +1,11 @@
 import { Component } from '@angular/core';
 import { EditAdvancedComponentComponent } from '../../../../../app/authoring-tool/edit-advanced-component/edit-advanced-component.component';
-import { EditComponentDefaultFeedback } from '../../../../../app/authoring-tool/edit-advanced-component/edit-component-default-feedback/edit-component-default-feedback.component';
-import { EditComponentAddToNotebookButtonComponent } from '../../../../../app/authoring-tool/edit-component-add-to-notebook-button/edit-component-add-to-notebook-button.component';
-import { EditComponentConstraintsComponent } from '../../../../../app/authoring-tool/edit-component-constraints/edit-component-constraints.component';
-import { EditComponentExcludeFromTotalScoreComponent } from '../../../../../app/authoring-tool/edit-component-exclude-from-total-score/edit-component-exclude-from-total-score.component';
-import { EditComponentJsonComponent } from '../../../../../app/authoring-tool/edit-component-json/edit-component-json.component';
-import { EditComponentMaxScoreComponent } from '../../../../../app/authoring-tool/edit-component-max-score/edit-component-max-score.component';
-import { EditComponentMaxSubmitComponent } from '../../../../../app/authoring-tool/edit-component-max-submit/edit-component-max-submit.component';
-import { EditComponentRubricComponent } from '../../../../../app/authoring-tool/edit-component-rubric/edit-component-rubric.component';
-import { EditComponentSaveButtonComponent } from '../../../../../app/authoring-tool/edit-component-save-button/edit-component-save-button.component';
-import { EditComponentSubmitButtonComponent } from '../../../../../app/authoring-tool/edit-component-submit-button/edit-component-submit-button.component';
-import { EditComponentTagsComponent } from '../../../../../app/authoring-tool/edit-component-tags/edit-component-tags.component';
-import { EditComponentWidthComponent } from '../../../../../app/authoring-tool/edit-component-width/edit-component-width.component';
+import { EditComponentAdvancedSharedModule } from '../../../../../app/authoring-tool/edit-component-advanced/edit-component-advanced-shared.module';
 import { EditDrawConnectedComponentsComponent } from '../edit-draw-connected-components/edit-draw-connected-components.component';
 
 @Component({
-  templateUrl: 'edit-draw-advanced.component.html',
-  imports: [
-    EditComponentAddToNotebookButtonComponent,
-    EditComponentSaveButtonComponent,
-    EditComponentSubmitButtonComponent,
-    EditComponentMaxSubmitComponent,
-    EditComponentDefaultFeedback,
-    EditComponentMaxScoreComponent,
-    EditComponentExcludeFromTotalScoreComponent,
-    EditComponentWidthComponent,
-    EditComponentRubricComponent,
-    EditComponentTagsComponent,
-    EditDrawConnectedComponentsComponent,
-    EditComponentConstraintsComponent,
-    EditComponentJsonComponent
-  ]
+  imports: [EditComponentAdvancedSharedModule, EditDrawConnectedComponentsComponent],
+  templateUrl: './edit-draw-advanced.component.html'
 })
 export class EditDrawAdvancedComponent extends EditAdvancedComponentComponent {
   allowedConnectedComponentTypes = ['ConceptMap', 'Draw', 'Embedded', 'Graph', 'Label', 'Table'];

From 2b7e96aa4a2088613db3c8ba2766dbf233595d41 Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Thu, 2 Apr 2026 14:47:21 -0700
Subject: [PATCH 17/33] Organize Graph advanced component authoring using tabs

---
 .../edit-graph-advanced.component.html        | 432 ++++++++++--------
 .../edit-graph-advanced.component.ts          |  44 +-
 2 files changed, 238 insertions(+), 238 deletions(-)

diff --git a/src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html b/src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html
index d8fd04bae11..38008d62112 100644
--- a/src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html
+++ b/src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html
@@ -1,213 +1,241 @@
-<div class="flex flex-col gap-2">
-  <translatable-input
-    [content]="componentContent"
-    key="subtitle"
-    label="Subtitle"
-    i18n-label
-    (defaultLanguageTextChanged)="componentChanged()"
-    class="subtitle"
-  />
-  <div>
-    <mat-checkbox
-      color="primary"
-      [(ngModel)]="componentContent.showMouseXPlotLine"
-      (ngModelChange)="componentChanged()"
-      i18n
-    >
-      Show Mouse X Plot Line
-    </mat-checkbox>
-  </div>
-  <div class="highlight-x-range-from-zero">
-    <mat-checkbox
-      color="primary"
-      [disabled]="!componentContent.showMouseXPlotLine"
-      [(ngModel)]="componentContent.highlightXRangeFromZero"
-      (ngModelChange)="componentChanged()"
-      i18n
-    >
-      Highlight X Range From Zero
-    </mat-checkbox>
-  </div>
-  <div>
-    <mat-checkbox
-      color="primary"
-      [(ngModel)]="componentContent.showMouseYPlotLine"
-      (ngModelChange)="componentChanged()"
-      i18n
-    >
-      Show Mouse Y Plot Line
-    </mat-checkbox>
-  </div>
-  <div>
-    <mat-checkbox
-      color="primary"
-      [(ngModel)]="componentContent.saveMouseOverPoints"
-      (ngModelChange)="componentChanged()"
-      i18n
-    >
-      Save Mouse Over Points
-    </mat-checkbox>
-  </div>
-  <div>
-    <mat-checkbox
-      color="primary"
-      [(ngModel)]="componentContent.hideTrialSelect"
-      (ngModelChange)="componentChanged()"
-      i18n
-    >
-      Hide Trial Select
-    </mat-checkbox>
-  </div>
-  <div>
-    <mat-checkbox
-      color="primary"
-      [(ngModel)]="componentContent.useCustomLegend"
-      (ngModelChange)="componentChanged()"
-      i18n
-    >
-      Use Custom Legend
-    </mat-checkbox>
-  </div>
-  @if (componentContent.useCustomLegend) {
-    <translatable-input
-      [content]="componentContent"
-      key="customLegend"
-      label="Custom Legend"
-      i18n-label
-      (defaultLanguageTextChanged)="componentChanged()"
-      class="custom-legend"
-    />
-  }
-  <div class="flex gap-4">
-    <span i18n>X Axis Plot Line</span>
-    <button
-      mat-raised-button
-      color="primary"
-      (click)="addXAxisPlotLine()"
-      matTooltip="Add X Axis Plot Line"
-      matTooltipPosition="above"
-      i18n-matTooltip
-    >
-      <mat-icon>add</mat-icon>
-    </button>
-  </div>
-  @for (
-    plotLine of componentContent.xAxis.plotLines;
-    track plotLine;
-    let xAxisPlotLineIndex = $index
-  ) {
-    <div>
-      <div class="flex flex-row flex-wrap gap-4">
+<mat-tab-group>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
+    </ng-template>
+    <div class="flex flex-col gap-2">
+      <translatable-input
+        [content]="componentContent"
+        key="subtitle"
+        label="Subtitle"
+        i18n-label
+        (defaultLanguageTextChanged)="componentChanged()"
+        class="subtitle"
+      />
+      <div>
+        <mat-checkbox
+          color="primary"
+          [(ngModel)]="componentContent.showMouseXPlotLine"
+          (ngModelChange)="componentChanged()"
+          i18n
+        >
+          Show Mouse X Plot Line
+        </mat-checkbox>
+      </div>
+      <div class="highlight-x-range-from-zero">
+        <mat-checkbox
+          color="primary"
+          [disabled]="!componentContent.showMouseXPlotLine"
+          [(ngModel)]="componentContent.highlightXRangeFromZero"
+          (ngModelChange)="componentChanged()"
+          i18n
+        >
+          Highlight X Range From Zero
+        </mat-checkbox>
+      </div>
+      <div>
+        <mat-checkbox
+          color="primary"
+          [(ngModel)]="componentContent.showMouseYPlotLine"
+          (ngModelChange)="componentChanged()"
+          i18n
+        >
+          Show Mouse Y Plot Line
+        </mat-checkbox>
+      </div>
+      <div>
+        <mat-checkbox
+          color="primary"
+          [(ngModel)]="componentContent.saveMouseOverPoints"
+          (ngModelChange)="componentChanged()"
+          i18n
+        >
+          Save Mouse Over Points
+        </mat-checkbox>
+      </div>
+      <div>
+        <mat-checkbox
+          color="primary"
+          [(ngModel)]="componentContent.hideTrialSelect"
+          (ngModelChange)="componentChanged()"
+          i18n
+        >
+          Hide Trial Select
+        </mat-checkbox>
+      </div>
+      <div>
+        <mat-checkbox
+          color="primary"
+          [(ngModel)]="componentContent.useCustomLegend"
+          (ngModelChange)="componentChanged()"
+          i18n
+        >
+          Use Custom Legend
+        </mat-checkbox>
+      </div>
+      @if (componentContent.useCustomLegend) {
         <translatable-input
-          [content]="plotLine.label"
-          key="text"
-          label="Text"
+          [content]="componentContent"
+          key="customLegend"
+          label="Custom Legend"
           i18n-label
           (defaultLanguageTextChanged)="componentChanged()"
-          class="plot-line-text"
+          class="custom-legend"
         />
-        <mat-form-field class="plot-line-value">
-          <mat-label i18n>X Value</mat-label>
-          <input matInput [(ngModel)]="plotLine.value" (ngModelChange)="componentChanged()" />
-        </mat-form-field>
-        <mat-form-field class="plot-line-color">
-          <mat-label i18n>Color</mat-label>
-          <input matInput [(ngModel)]="plotLine.color" (ngModelChange)="componentChanged()" />
-        </mat-form-field>
+      }
+      <div class="flex gap-4">
+        <span i18n>X Axis Plot Line</span>
+        <button
+          mat-raised-button
+          color="primary"
+          (click)="addXAxisPlotLine()"
+          matTooltip="Add X Axis Plot Line"
+          matTooltipPosition="above"
+          i18n-matTooltip
+        >
+          <mat-icon>add</mat-icon>
+        </button>
+      </div>
+      @for (
+        plotLine of componentContent.xAxis.plotLines;
+        track plotLine;
+        let xAxisPlotLineIndex = $index
+      ) {
         <div>
-          <button
-            mat-raised-button
-            color="primary"
-            (click)="deleteXAxisPlotLine(xAxisPlotLineIndex)"
-            matTooltip="Delete"
-            matTooltipPosition="above"
-            i18n-matTooltip
-          >
-            <mat-icon>delete</mat-icon>
-          </button>
+          <div class="flex flex-row flex-wrap gap-4">
+            <translatable-input
+              [content]="plotLine.label"
+              key="text"
+              label="Text"
+              i18n-label
+              (defaultLanguageTextChanged)="componentChanged()"
+              class="plot-line-text"
+            />
+            <mat-form-field class="plot-line-value">
+              <mat-label i18n>X Value</mat-label>
+              <input matInput [(ngModel)]="plotLine.value" (ngModelChange)="componentChanged()" />
+            </mat-form-field>
+            <mat-form-field class="plot-line-color">
+              <mat-label i18n>Color</mat-label>
+              <input matInput [(ngModel)]="plotLine.color" (ngModelChange)="componentChanged()" />
+            </mat-form-field>
+            <div>
+              <button
+                mat-raised-button
+                color="primary"
+                (click)="deleteXAxisPlotLine(xAxisPlotLineIndex)"
+                matTooltip="Delete"
+                matTooltipPosition="above"
+                i18n-matTooltip
+              >
+                <mat-icon>delete</mat-icon>
+              </button>
+            </div>
+          </div>
         </div>
+      }
+      <div class="flex gap-4">
+        <span i18n>Y Axis Plot Line</span>
+        <button
+          mat-raised-button
+          color="primary"
+          (click)="addYAxisPlotLine()"
+          matTooltip="Add Y Axis Plot Line"
+          matTooltipPosition="above"
+          i18n-matTooltip
+        >
+          <mat-icon>add</mat-icon>
+        </button>
       </div>
-    </div>
-  }
-  <div class="flex gap-4">
-    <span i18n>Y Axis Plot Line</span>
-    <button
-      mat-raised-button
-      color="primary"
-      (click)="addYAxisPlotLine()"
-      matTooltip="Add Y Axis Plot Line"
-      matTooltipPosition="above"
-      i18n-matTooltip
-    >
-      <mat-icon>add</mat-icon>
-    </button>
-  </div>
-  @for (
-    plotLine of componentContent.yAxis.plotLines;
-    track plotLine;
-    let yAxisPlotLineIndex = $index
-  ) {
-    <div>
-      <div class="flex flex-row flex-wrap gap-4">
-        <translatable-input
-          [content]="plotLine.label"
-          key="text"
-          label="Text"
-          i18n-label
-          (defaultLanguageTextChanged)="componentChanged()"
-          class="plot-line-text"
-        />
-        <mat-form-field class="plot-line-value">
-          <mat-label i18n>Y Value</mat-label>
-          <input matInput [(ngModel)]="plotLine.value" (ngModelChange)="componentChanged()" />
-        </mat-form-field>
-        <mat-form-field class="plot-line-color">
-          <mat-label i18n>Color</mat-label>
-          <input matInput [(ngModel)]="plotLine.color" (ngModelChange)="componentChanged()" />
-        </mat-form-field>
+      @for (
+        plotLine of componentContent.yAxis.plotLines;
+        track plotLine;
+        let yAxisPlotLineIndex = $index
+      ) {
         <div>
-          <button
-            mat-raised-button
-            color="primary"
-            (click)="deleteYAxisPlotLine(yAxisPlotLineIndex)"
-            matTooltip="Delete"
-            matTooltipPosition="above"
-            i18n-matTooltip
-          >
-            <mat-icon>delete</mat-icon>
-          </button>
+          <div class="flex flex-row flex-wrap gap-4">
+            <translatable-input
+              [content]="plotLine.label"
+              key="text"
+              label="Text"
+              i18n-label
+              (defaultLanguageTextChanged)="componentChanged()"
+              class="plot-line-text"
+            />
+            <mat-form-field class="plot-line-value">
+              <mat-label i18n>Y Value</mat-label>
+              <input matInput [(ngModel)]="plotLine.value" (ngModelChange)="componentChanged()" />
+            </mat-form-field>
+            <mat-form-field class="plot-line-color">
+              <mat-label i18n>Color</mat-label>
+              <input matInput [(ngModel)]="plotLine.color" (ngModelChange)="componentChanged()" />
+            </mat-form-field>
+            <div>
+              <button
+                mat-raised-button
+                color="primary"
+                (click)="deleteYAxisPlotLine(yAxisPlotLineIndex)"
+                matTooltip="Delete"
+                matTooltipPosition="above"
+                i18n-matTooltip
+              >
+                <mat-icon>delete</mat-icon>
+              </button>
+            </div>
+          </div>
         </div>
-      </div>
+      }
     </div>
-  }
-</div>
-@if (isNotebookEnabled()) {
-  <div>
-    <edit-component-add-to-notebook-button [componentContent]="componentContent" />
-  </div>
-}
-<edit-component-save-button [componentContent]="componentContent" />
-<br />
-<edit-component-submit-button [componentContent]="componentContent" />
+    @if (isNotebookEnabled()) {
+      <div>
+        <edit-component-add-to-notebook-button [componentContent]="componentContent" />
+      </div>
+    }
+    <edit-component-save-button [componentContent]="componentContent" />
+    <br />
+    <edit-component-submit-button [componentContent]="componentContent" />
 
-@if (componentContent.showSubmitButton) {
-  <edit-component-max-submit [componentContent]="componentContent" />
-}
-<edit-component-default-feedback class="block my-4" [componentContent]="componentContent" />
-<div class="flex flex-col items-start">
-  <edit-component-max-score [componentContent]="componentContent" />
-  <edit-component-exclude-from-total-score [componentContent]="componentContent" />
-  <edit-component-width [componentContent]="componentContent" />
-  <edit-component-rubric [componentContent]="componentContent" />
-  <edit-component-tags [componentContent]="componentContent" />
-</div>
-<edit-graph-connected-components
-  [nodeId]="nodeId"
-  [componentId]="componentId"
-  [allowedConnectedComponentTypes]="allowedConnectedComponentTypes"
-  [componentContent]="componentContent"
-  [connectedComponents]="componentContent.connectedComponents"
-  (connectedComponentsChanged)="connectedComponentsChanged($event)"
-/>
-<edit-component-constraints [componentContent]="component.content" />
-<edit-component-json [component]="component" />
+    @if (componentContent.showSubmitButton) {
+      <edit-component-max-submit [componentContent]="componentContent" />
+    }
+    <edit-component-default-feedback class="block my-4" [componentContent]="componentContent" />
+    <div class="flex flex-col items-start">
+      <edit-component-max-score [componentContent]="componentContent" />
+      <edit-component-exclude-from-total-score [componentContent]="componentContent" />
+      <edit-component-width [componentContent]="componentContent" />
+    </div>
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>visibility</mat-icon>&nbsp;<span i18n>Visibility</span>
+    </ng-template>
+    <edit-component-constraints [componentContent]="component.content" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>join_inner</mat-icon>&nbsp;<span i18n>Connections</span>
+    </ng-template>
+    <edit-graph-connected-components
+      [nodeId]="nodeId"
+      [componentId]="componentId"
+      [allowedConnectedComponentTypes]="allowedConnectedComponentTypes"
+      [componentContent]="componentContent"
+      [connectedComponents]="componentContent.connectedComponents"
+      (connectedComponentsChanged)="connectedComponentsChanged($event)"
+    />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
+    </ng-template>
+    <edit-component-rubric [componentContent]="component.content" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label> <mat-icon>sell</mat-icon>&nbsp;<span i18n>Tags</span></ng-template>
+    <edit-component-tags [componentContent]="component.content" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label> <mat-icon>code</mat-icon>&nbsp;<span i18n>JSON</span></ng-template>
+    <edit-component-json [component]="component" />
+  </mat-tab>
+</mat-tab-group>
diff --git a/src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.ts b/src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.ts
index b0ffc84eb3d..6a936b0df26 100644
--- a/src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.ts
+++ b/src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.ts
@@ -1,54 +1,26 @@
 import { Component } from '@angular/core';
-import { FormsModule } from '@angular/forms';
 import { MatButton } from '@angular/material/button';
-import { MatCheckbox } from '@angular/material/checkbox';
 import { MatFormFieldModule } from '@angular/material/form-field';
-import { MatIcon } from '@angular/material/icon';
 import { MatInput } from '@angular/material/input';
 import { MatTooltip } from '@angular/material/tooltip';
 import { EditAdvancedComponentComponent } from '../../../../../app/authoring-tool/edit-advanced-component/edit-advanced-component.component';
-import { EditComponentDefaultFeedback } from '../../../../../app/authoring-tool/edit-advanced-component/edit-component-default-feedback/edit-component-default-feedback.component';
-import { EditComponentAddToNotebookButtonComponent } from '../../../../../app/authoring-tool/edit-component-add-to-notebook-button/edit-component-add-to-notebook-button.component';
-import { EditComponentConstraintsComponent } from '../../../../../app/authoring-tool/edit-component-constraints/edit-component-constraints.component';
-import { EditComponentExcludeFromTotalScoreComponent } from '../../../../../app/authoring-tool/edit-component-exclude-from-total-score/edit-component-exclude-from-total-score.component';
-import { EditComponentJsonComponent } from '../../../../../app/authoring-tool/edit-component-json/edit-component-json.component';
-import { EditComponentMaxScoreComponent } from '../../../../../app/authoring-tool/edit-component-max-score/edit-component-max-score.component';
-import { EditComponentMaxSubmitComponent } from '../../../../../app/authoring-tool/edit-component-max-submit/edit-component-max-submit.component';
-import { EditComponentRubricComponent } from '../../../../../app/authoring-tool/edit-component-rubric/edit-component-rubric.component';
-import { EditComponentSaveButtonComponent } from '../../../../../app/authoring-tool/edit-component-save-button/edit-component-save-button.component';
-import { EditComponentSubmitButtonComponent } from '../../../../../app/authoring-tool/edit-component-submit-button/edit-component-submit-button.component';
-import { EditComponentTagsComponent } from '../../../../../app/authoring-tool/edit-component-tags/edit-component-tags.component';
-import { EditComponentWidthComponent } from '../../../../../app/authoring-tool/edit-component-width/edit-component-width.component';
 import { TranslatableInputComponent } from '../../../authoringTool/components/translatable-input/translatable-input.component';
 import { EditGraphConnectedComponentsComponent } from '../edit-graph-connected-components/edit-graph-connected-components.component';
 import { GraphContent } from '../GraphContent';
+import { EditComponentAdvancedSharedModule } from '../../../../../app/authoring-tool/edit-component-advanced/edit-component-advanced-shared.module';
 
 @Component({
-  templateUrl: 'edit-graph-advanced.component.html',
-  styleUrl: 'edit-graph-advanced.component.scss',
   imports: [
-    TranslatableInputComponent,
-    MatCheckbox,
-    FormsModule,
+    EditComponentAdvancedSharedModule,
+    EditGraphConnectedComponentsComponent,
     MatButton,
-    MatTooltip,
-    MatIcon,
     MatFormFieldModule,
     MatInput,
-    EditComponentAddToNotebookButtonComponent,
-    EditComponentSaveButtonComponent,
-    EditComponentSubmitButtonComponent,
-    EditComponentMaxSubmitComponent,
-    EditComponentDefaultFeedback,
-    EditComponentMaxScoreComponent,
-    EditComponentExcludeFromTotalScoreComponent,
-    EditComponentWidthComponent,
-    EditComponentRubricComponent,
-    EditComponentTagsComponent,
-    EditGraphConnectedComponentsComponent,
-    EditComponentConstraintsComponent,
-    EditComponentJsonComponent
-  ]
+    MatTooltip,
+    TranslatableInputComponent
+  ],
+  styleUrl: 'edit-graph-advanced.component.scss',
+  templateUrl: 'edit-graph-advanced.component.html'
 })
 export class EditGraphAdvancedComponent extends EditAdvancedComponentComponent {
   allowedConnectedComponentTypes = [

From 5701fdb0308c7e7209f4d816ee6d279b75b0cfb7 Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Thu, 2 Apr 2026 14:52:44 -0700
Subject: [PATCH 18/33] Organize Table advanced component authoring using tabs

---
 .../edit-table-advanced.component.html        | 542 +++++++++---------
 .../edit-table-advanced.component.ts          |  46 +-
 2 files changed, 294 insertions(+), 294 deletions(-)

diff --git a/src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html b/src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html
index 39f5605f11d..58444eab3ed 100644
--- a/src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html
+++ b/src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html
@@ -1,279 +1,307 @@
-<div class="data-explorer-authoring flex flex-col gap-2">
-  <div>
-    <mat-checkbox
-      color="primary"
-      [(ngModel)]="componentContent.isDataExplorerEnabled"
-      (ngModelChange)="toggleDataExplorer()"
-      i18n
-    >
-      Enable Data Explorer
-    </mat-checkbox>
-  </div>
-  @if (componentContent.isDataExplorerEnabled) {
-    <div class="flex flex-col gap-2">
-      <div class="flex flex-wrap gap-5">
-        <span i18n>Allowed Graph Types:</span>
-        <mat-checkbox
-          color="primary"
-          [(ngModel)]="isDataExplorerScatterPlotEnabled"
-          (ngModelChange)="dataExplorerToggleScatterPlot()"
-          i18n
-        >
-          Scatter Plot
-        </mat-checkbox>
-        <mat-checkbox
-          color="primary"
-          [(ngModel)]="isDataExplorerLineGraphEnabled"
-          (ngModelChange)="dataExplorerToggleLineGraph()"
-          i18n
-        >
-          Line Graph
-        </mat-checkbox>
+<mat-tab-group>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
+    </ng-template>
+    <div class="data-explorer-authoring flex flex-col gap-2">
+      <div>
         <mat-checkbox
           color="primary"
-          [(ngModel)]="isDataExplorerBarGraphEnabled"
-          (ngModelChange)="dataExplorerToggleBarGraph()"
+          [(ngModel)]="componentContent.isDataExplorerEnabled"
+          (ngModelChange)="toggleDataExplorer()"
           i18n
         >
-          Bar Graph
+          Enable Data Explorer
         </mat-checkbox>
       </div>
-      @if (isDataExplorerScatterPlotEnabled) {
-        <div>
-          <mat-checkbox
-            color="primary"
-            [(ngModel)]="componentContent.isDataExplorerScatterPlotRegressionLineEnabled"
-            (ngModelChange)="componentChanged()"
-            i18n
-          >
-            Show Scatter Plot Regression Line
-          </mat-checkbox>
-        </div>
-      }
-      <div>
-        <mat-form-field class="number-input">
-          <mat-label i18n>Number of Series</mat-label>
-          <input
-            matInput
-            type="number"
-            min="1"
-            [(ngModel)]="componentContent.numDataExplorerSeries"
-            (ngModelChange)="numDataExplorerSeriesChanged()"
-          />
-        </mat-form-field>
-      </div>
-      <div>
-        <mat-form-field class="number-input">
-          <mat-label i18n>Number of Y Axes</mat-label>
-          <input
-            matInput
-            type="number"
-            min="1"
-            [(ngModel)]="componentContent.numDataExplorerYAxis"
-            (ngModelChange)="numDataExplorerYAxisChanged()"
-          />
-        </mat-form-field>
-      </div>
-      @if (componentContent.numDataExplorerYAxis > 1) {
+      @if (componentContent.isDataExplorerEnabled) {
         <div class="flex flex-col gap-2">
-          <span i18n>Choose the Y Axis for each Series</span>
-          @for (
-            s of [].constructor(componentContent.numDataExplorerSeries);
-            track s;
-            let seriesIndex = $index
-          ) {
+          <div class="flex flex-wrap gap-5">
+            <span i18n>Allowed Graph Types:</span>
+            <mat-checkbox
+              color="primary"
+              [(ngModel)]="isDataExplorerScatterPlotEnabled"
+              (ngModelChange)="dataExplorerToggleScatterPlot()"
+              i18n
+            >
+              Scatter Plot
+            </mat-checkbox>
+            <mat-checkbox
+              color="primary"
+              [(ngModel)]="isDataExplorerLineGraphEnabled"
+              (ngModelChange)="dataExplorerToggleLineGraph()"
+              i18n
+            >
+              Line Graph
+            </mat-checkbox>
+            <mat-checkbox
+              color="primary"
+              [(ngModel)]="isDataExplorerBarGraphEnabled"
+              (ngModelChange)="dataExplorerToggleBarGraph()"
+              i18n
+            >
+              Bar Graph
+            </mat-checkbox>
+          </div>
+          @if (isDataExplorerScatterPlotEnabled) {
             <div>
+              <mat-checkbox
+                color="primary"
+                [(ngModel)]="componentContent.isDataExplorerScatterPlotRegressionLineEnabled"
+                (ngModelChange)="componentChanged()"
+                i18n
+              >
+                Show Scatter Plot Regression Line
+              </mat-checkbox>
+            </div>
+          }
+          <div>
+            <mat-form-field class="number-input">
+              <mat-label i18n>Number of Series</mat-label>
+              <input
+                matInput
+                type="number"
+                min="1"
+                [(ngModel)]="componentContent.numDataExplorerSeries"
+                (ngModelChange)="numDataExplorerSeriesChanged()"
+              />
+            </mat-form-field>
+          </div>
+          <div>
+            <mat-form-field class="number-input">
+              <mat-label i18n>Number of Y Axes</mat-label>
+              <input
+                matInput
+                type="number"
+                min="1"
+                [(ngModel)]="componentContent.numDataExplorerYAxis"
+                (ngModelChange)="numDataExplorerYAxisChanged()"
+              />
+            </mat-form-field>
+          </div>
+          @if (componentContent.numDataExplorerYAxis > 1) {
+            <div class="flex flex-col gap-2">
+              <span i18n>Choose the Y Axis for each Series</span>
+              @for (
+                s of [].constructor(componentContent.numDataExplorerSeries);
+                track s;
+                let seriesIndex = $index
+              ) {
+                <div>
+                  <mat-form-field>
+                    <mat-label><span i18n>Series</span> {{ seriesIndex + 1 }}</mat-label>
+                    <mat-select
+                      [(ngModel)]="componentContent.dataExplorerSeriesParams[seriesIndex].yAxis"
+                      (ngModelChange)="componentChanged()"
+                    >
+                      @for (
+                        y of [].constructor(componentContent.numDataExplorerYAxis);
+                        track y;
+                        let yAxisIndex = $index
+                      ) {
+                        <mat-option [value]="yAxisIndex">
+                          <span i18n>Y Axis</span><span> {{ yAxisIndex + 1 }}</span>
+                        </mat-option>
+                      }
+                    </mat-select>
+                  </mat-form-field>
+                </div>
+              }
+            </div>
+          }
+          <div>
+            <mat-checkbox
+              color="primary"
+              [(ngModel)]="componentContent.isDataExplorerAxisLabelsEditable"
+              (ngModelChange)="componentChanged()"
+              i18n
+            >
+              Can Student Edit Axis Labels
+            </mat-checkbox>
+          </div>
+          <div class="gap-5">
+            <div class="fix-data-to-table-column-label flex justify-start items-center gap-2">
+              <span i18n>Fix Data to Table Column</span>
+              <mat-icon
+                matTooltip="You can author x or y data to always use a specific table column. The student will not be able to change the table column for that x or y data. If you want the student to be able to choose the table column, you can leave the select option blank for that x or y data."
+                matTooltipPosition="right"
+                i18n-matTooltip
+              >
+                help
+              </mat-icon>
+            </div>
+            <mat-form-field>
+              <mat-label i18n>X Data</mat-label>
+              <mat-select
+                [(ngModel)]="componentContent.dataExplorerDataToColumn['x']"
+                (ngModelChange)="componentChanged()"
+              >
+                <mat-option [value]="" i18n>(Allow student to select)</mat-option>
+                @for (columnName of columnNames; track columnName; let columnIndex = $index) {
+                  <mat-option [value]="columnIndex">
+                    @if (columnName === '') {
+                      (<span i18n>Table Column</span> {{ columnIndex + 1 }})
+                    }
+                    @if (columnName !== '') {
+                      {{ columnName }}
+                    }
+                  </mat-option>
+                }
+              </mat-select>
+            </mat-form-field>
+            @for (
+              y of [].constructor(componentContent.numDataExplorerSeries);
+              track y;
+              let dataExplorerSeriesIndex = $index
+            ) {
               <mat-form-field>
-                <mat-label><span i18n>Series</span> {{ seriesIndex + 1 }}</mat-label>
+                <mat-label i18n
+                  >Y Data
+                  {{
+                    componentContent.numDataExplorerSeries > 1 ? dataExplorerSeriesIndex + 1 : ''
+                  }}</mat-label
+                >
                 <mat-select
-                  [(ngModel)]="componentContent.dataExplorerSeriesParams[seriesIndex].yAxis"
+                  [(ngModel)]="
+                    componentContent.dataExplorerDataToColumn[
+                      'y' + (dataExplorerSeriesIndex > 0 ? dataExplorerSeriesIndex + 1 : '')
+                    ]
+                  "
                   (ngModelChange)="componentChanged()"
                 >
-                  @for (
-                    y of [].constructor(componentContent.numDataExplorerYAxis);
-                    track y;
-                    let yAxisIndex = $index
-                  ) {
-                    <mat-option [value]="yAxisIndex">
-                      <span i18n>Y Axis</span><span> {{ yAxisIndex + 1 }}</span>
+                  <mat-option [value]="" i18n>(Allow student to select)</mat-option>
+                  @for (columnName of columnNames; track columnName; let columnIndex = $index) {
+                    <mat-option [value]="columnIndex">
+                      @if (columnName === '') {
+                        (<span i18n>Table Column</span> {{ columnIndex + 1 }})
+                      }
+                      @if (columnName !== '') {
+                        {{ columnName }}
+                      }
                     </mat-option>
                   }
                 </mat-select>
               </mat-form-field>
-            </div>
-          }
+            }
+          </div>
+          <div class="gap-2">
+            <mat-form-field>
+              <mat-label i18n>Tooltip Header Column</mat-label>
+              <mat-select
+                [(ngModel)]="componentContent.dataExplorerTooltipHeaderColumn"
+                (ngModelChange)="componentChanged()"
+              >
+                <mat-option [value]="" i18n>(Default)</mat-option>
+                @for (columnName of columnNames; track columnName; let columnIndex = $index) {
+                  <mat-option [value]="columnIndex">
+                    @if (columnName === '') {
+                      (<span i18n>Table Column</span> {{ columnIndex + 1 }})
+                    }
+                    @if (columnName !== '') {
+                      {{ columnName }}
+                    }
+                  </mat-option>
+                }
+              </mat-select>
+            </mat-form-field>
+            <mat-icon
+              matTooltip="When the student hovers their mouse over a data point on a scatter plot or line graph, the tooltip will display the value from this column along with the x and y values. This can be left blank and the tooltip will still show the x and y values like normal."
+              matTooltipPosition="right"
+              i18n-matTooltip
+            >
+              help
+            </mat-icon>
+          </div>
         </div>
       }
+    </div>
+    <div class="flex justify-start items-center">
+      <button
+        mat-raised-button
+        color="primary"
+        class="import-table-button flex justify-center items-center"
+      >
+        <span i18n>Import Table</span>
+        <input
+          type="file"
+          accept=".csv"
+          class="import-table-input"
+          (change)="importTableFile($event)"
+        />
+      </button>
+      <mat-icon
+        matTooltip="Only .csv (comma separated values) files are allowed"
+        i18n-matTooltip
+        tabindex="0"
+        aria-role="button"
+      >
+        help
+      </mat-icon>
+      @if (isImportingTable) {
+        <mat-progress-spinner class="import-table-spinner" mode="indeterminate" [diameter]="20">
+        </mat-progress-spinner>
+      }
+      <div class="import-table-message">{{ importTableMessage }}</div>
+    </div>
+    @if (isNotebookEnabled()) {
       <div>
-        <mat-checkbox
-          color="primary"
-          [(ngModel)]="componentContent.isDataExplorerAxisLabelsEditable"
-          (ngModelChange)="componentChanged()"
-          i18n
-        >
-          Can Student Edit Axis Labels
-        </mat-checkbox>
-      </div>
-      <div class="gap-5">
-        <div class="fix-data-to-table-column-label flex justify-start items-center gap-2">
-          <span i18n>Fix Data to Table Column</span>
-          <mat-icon
-            matTooltip="You can author x or y data to always use a specific table column. The student will not be able to change the table column for that x or y data. If you want the student to be able to choose the table column, you can leave the select option blank for that x or y data."
-            matTooltipPosition="right"
-            i18n-matTooltip
-          >
-            help
-          </mat-icon>
-        </div>
-        <mat-form-field>
-          <mat-label i18n>X Data</mat-label>
-          <mat-select
-            [(ngModel)]="componentContent.dataExplorerDataToColumn['x']"
-            (ngModelChange)="componentChanged()"
-          >
-            <mat-option [value]="" i18n>(Allow student to select)</mat-option>
-            @for (columnName of columnNames; track columnName; let columnIndex = $index) {
-              <mat-option [value]="columnIndex">
-                @if (columnName === '') {
-                  (<span i18n>Table Column</span> {{ columnIndex + 1 }})
-                }
-                @if (columnName !== '') {
-                  {{ columnName }}
-                }
-              </mat-option>
-            }
-          </mat-select>
-        </mat-form-field>
-        @for (
-          y of [].constructor(componentContent.numDataExplorerSeries);
-          track y;
-          let dataExplorerSeriesIndex = $index
-        ) {
-          <mat-form-field>
-            <mat-label i18n
-              >Y Data
-              {{
-                componentContent.numDataExplorerSeries > 1 ? dataExplorerSeriesIndex + 1 : ''
-              }}</mat-label
-            >
-            <mat-select
-              [(ngModel)]="
-                componentContent.dataExplorerDataToColumn[
-                  'y' + (dataExplorerSeriesIndex > 0 ? dataExplorerSeriesIndex + 1 : '')
-                ]
-              "
-              (ngModelChange)="componentChanged()"
-            >
-              <mat-option [value]="" i18n>(Allow student to select)</mat-option>
-              @for (columnName of columnNames; track columnName; let columnIndex = $index) {
-                <mat-option [value]="columnIndex">
-                  @if (columnName === '') {
-                    (<span i18n>Table Column</span> {{ columnIndex + 1 }})
-                  }
-                  @if (columnName !== '') {
-                    {{ columnName }}
-                  }
-                </mat-option>
-              }
-            </mat-select>
-          </mat-form-field>
-        }
-      </div>
-      <div class="gap-2">
-        <mat-form-field>
-          <mat-label i18n>Tooltip Header Column</mat-label>
-          <mat-select
-            [(ngModel)]="componentContent.dataExplorerTooltipHeaderColumn"
-            (ngModelChange)="componentChanged()"
-          >
-            <mat-option [value]="" i18n>(Default)</mat-option>
-            @for (columnName of columnNames; track columnName; let columnIndex = $index) {
-              <mat-option [value]="columnIndex">
-                @if (columnName === '') {
-                  (<span i18n>Table Column</span> {{ columnIndex + 1 }})
-                }
-                @if (columnName !== '') {
-                  {{ columnName }}
-                }
-              </mat-option>
-            }
-          </mat-select>
-        </mat-form-field>
-        <mat-icon
-          matTooltip="When the student hovers their mouse over a data point on a scatter plot or line graph, the tooltip will display the value from this column along with the x and y values. This can be left blank and the tooltip will still show the x and y values like normal."
-          matTooltipPosition="right"
-          i18n-matTooltip
-        >
-          help
-        </mat-icon>
+        <edit-component-add-to-notebook-button [componentContent]="componentContent" />
       </div>
+    }
+    <edit-component-save-button [componentContent]="componentContent" />
+    <br />
+    <edit-component-submit-button [componentContent]="componentContent" />
+    <div>
+      <mat-checkbox
+        color="primary"
+        [(ngModel)]="componentContent.enableRowSelection"
+        (ngModelChange)="componentChanged()"
+        i18n
+      >
+        Enable Row Selection
+      </mat-checkbox>
+    </div>
+    @if (componentContent.showSubmitButton) {
+      <edit-component-max-submit [componentContent]="componentContent" />
+    }
+    <edit-component-default-feedback [componentContent]="componentContent" />
+    <div class="flex flex-col justify-start items-start">
+      <edit-component-max-score [componentContent]="componentContent" />
+      <edit-component-exclude-from-total-score [componentContent]="componentContent" />
+      <edit-component-width [componentContent]="componentContent" />
     </div>
-  }
-</div>
-<div class="flex justify-start items-center">
-  <button
-    mat-raised-button
-    color="primary"
-    class="import-table-button flex justify-center items-center"
-  >
-    <span i18n>Import Table</span>
-    <input
-      type="file"
-      accept=".csv"
-      class="import-table-input"
-      (change)="importTableFile($event)"
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>visibility</mat-icon>&nbsp;<span i18n>Visibility</span>
+    </ng-template>
+    <edit-component-constraints [componentContent]="component.content" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>join_inner</mat-icon>&nbsp;<span i18n>Connections</span>
+    </ng-template>
+    <edit-table-connected-components
+      [nodeId]="nodeId"
+      [componentId]="componentId"
+      [allowedConnectedComponentTypes]="allowedConnectedComponentTypes"
+      [componentContent]="componentContent"
+      [connectedComponents]="componentContent.connectedComponents"
+      (connectedComponentsChanged)="connectedComponentsChanged($event)"
     />
-  </button>
-  <mat-icon
-    matTooltip="Only .csv (comma separated values) files are allowed"
-    i18n-matTooltip
-    tabindex="0"
-    aria-role="button"
-  >
-    help
-  </mat-icon>
-  @if (isImportingTable) {
-    <mat-progress-spinner class="import-table-spinner" mode="indeterminate" [diameter]="20">
-    </mat-progress-spinner>
-  }
-  <div class="import-table-message">{{ importTableMessage }}</div>
-</div>
-@if (isNotebookEnabled()) {
-  <div>
-    <edit-component-add-to-notebook-button [componentContent]="componentContent" />
-  </div>
-}
-<edit-component-save-button [componentContent]="componentContent" />
-<br />
-<edit-component-submit-button [componentContent]="componentContent" />
-<div>
-  <mat-checkbox
-    color="primary"
-    [(ngModel)]="componentContent.enableRowSelection"
-    (ngModelChange)="componentChanged()"
-    i18n
-  >
-    Enable Row Selection
-  </mat-checkbox>
-</div>
-@if (componentContent.showSubmitButton) {
-  <edit-component-max-submit [componentContent]="componentContent" />
-}
-<edit-component-default-feedback [componentContent]="componentContent" />
-<div class="flex flex-col justify-start items-start">
-  <edit-component-max-score [componentContent]="componentContent" />
-  <edit-component-exclude-from-total-score [componentContent]="componentContent" />
-  <edit-component-width [componentContent]="componentContent" />
-  <edit-component-rubric [componentContent]="componentContent" />
-  <edit-component-tags [componentContent]="componentContent" />
-</div>
-<edit-table-connected-components
-  [nodeId]="nodeId"
-  [componentId]="componentId"
-  [allowedConnectedComponentTypes]="allowedConnectedComponentTypes"
-  [componentContent]="componentContent"
-  [connectedComponents]="componentContent.connectedComponents"
-  (connectedComponentsChanged)="connectedComponentsChanged($event)"
-/>
-<edit-component-constraints [componentContent]="component.content" />
-<edit-component-json [component]="component" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
+    </ng-template>
+    <edit-component-rubric [componentContent]="component.content" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label> <mat-icon>sell</mat-icon>&nbsp;<span i18n>Tags</span></ng-template>
+    <edit-component-tags [componentContent]="component.content" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label> <mat-icon>code</mat-icon>&nbsp;<span i18n>JSON</span></ng-template>
+    <edit-component-json [component]="component" />
+  </mat-tab>
+</mat-tab-group>
diff --git a/src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.ts b/src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.ts
index 301550db088..2ab247a8c7c 100644
--- a/src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.ts
+++ b/src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.ts
@@ -1,57 +1,29 @@
 import { Component } from '@angular/core';
-import { FormsModule } from '@angular/forms';
 import { MatButton } from '@angular/material/button';
-import { MatCheckbox } from '@angular/material/checkbox';
 import { MatFormFieldModule } from '@angular/material/form-field';
-import { MatIcon } from '@angular/material/icon';
 import { MatInput } from '@angular/material/input';
 import { MatProgressSpinner } from '@angular/material/progress-spinner';
 import { MatSelectModule } from '@angular/material/select';
 import { MatTooltip } from '@angular/material/tooltip';
 import { EditAdvancedComponentComponent } from '../../../../../app/authoring-tool/edit-advanced-component/edit-advanced-component.component';
-import { EditComponentDefaultFeedback } from '../../../../../app/authoring-tool/edit-advanced-component/edit-component-default-feedback/edit-component-default-feedback.component';
-import { EditComponentAddToNotebookButtonComponent } from '../../../../../app/authoring-tool/edit-component-add-to-notebook-button/edit-component-add-to-notebook-button.component';
-import { EditComponentConstraintsComponent } from '../../../../../app/authoring-tool/edit-component-constraints/edit-component-constraints.component';
-import { EditComponentExcludeFromTotalScoreComponent } from '../../../../../app/authoring-tool/edit-component-exclude-from-total-score/edit-component-exclude-from-total-score.component';
-import { EditComponentJsonComponent } from '../../../../../app/authoring-tool/edit-component-json/edit-component-json.component';
-import { EditComponentMaxScoreComponent } from '../../../../../app/authoring-tool/edit-component-max-score/edit-component-max-score.component';
-import { EditComponentMaxSubmitComponent } from '../../../../../app/authoring-tool/edit-component-max-submit/edit-component-max-submit.component';
-import { EditComponentRubricComponent } from '../../../../../app/authoring-tool/edit-component-rubric/edit-component-rubric.component';
-import { EditComponentSaveButtonComponent } from '../../../../../app/authoring-tool/edit-component-save-button/edit-component-save-button.component';
-import { EditComponentSubmitButtonComponent } from '../../../../../app/authoring-tool/edit-component-submit-button/edit-component-submit-button.component';
-import { EditComponentTagsComponent } from '../../../../../app/authoring-tool/edit-component-tags/edit-component-tags.component';
-import { EditComponentWidthComponent } from '../../../../../app/authoring-tool/edit-component-width/edit-component-width.component';
 import { CSVToArray } from '../../../common/array/array';
 import { EditTableConnectedComponentsComponent } from '../edit-table-connected-components/edit-table-connected-components.component';
 import { TableContent } from '../TableContent';
+import { EditComponentAdvancedSharedModule } from '../../../../../app/authoring-tool/edit-component-advanced/edit-component-advanced-shared.module';
 
 @Component({
-  templateUrl: 'edit-table-advanced.component.html',
-  styleUrl: 'edit-table-advanced.component.scss',
   imports: [
-    MatCheckbox,
-    FormsModule,
+    EditComponentAdvancedSharedModule,
+    EditTableConnectedComponentsComponent,
+    MatButton,
     MatFormFieldModule,
     MatInput,
-    MatSelectModule,
-    MatIcon,
-    MatTooltip,
-    MatButton,
     MatProgressSpinner,
-    EditComponentAddToNotebookButtonComponent,
-    EditComponentSaveButtonComponent,
-    EditComponentSubmitButtonComponent,
-    EditComponentMaxSubmitComponent,
-    EditComponentDefaultFeedback,
-    EditComponentMaxScoreComponent,
-    EditComponentExcludeFromTotalScoreComponent,
-    EditComponentWidthComponent,
-    EditComponentRubricComponent,
-    EditComponentTagsComponent,
-    EditTableConnectedComponentsComponent,
-    EditComponentConstraintsComponent,
-    EditComponentJsonComponent
-  ]
+    MatSelectModule,
+    MatTooltip
+  ],
+  styleUrl: 'edit-table-advanced.component.scss',
+  templateUrl: 'edit-table-advanced.component.html'
 })
 export class EditTableAdvancedComponent extends EditAdvancedComponentComponent {
   MAX_ALLOWED_CELLS_IN_IMPORT = 2000;

From 0f0da982a8a3d281edd0a205edf0c9474633b01d Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Thu, 2 Apr 2026 15:02:23 -0700
Subject: [PATCH 19/33] Organize Summary advanced component authoring using
 tabs

---
 .../edit-summary-advanced.component.ts        | 52 ++++++++++++-------
 .../student-summary-display.component.ts      |  2 +-
 2 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/src/assets/wise5/components/summary/edit-summary-advanced/edit-summary-advanced.component.ts b/src/assets/wise5/components/summary/edit-summary-advanced/edit-summary-advanced.component.ts
index c136475b698..efd5f701956 100644
--- a/src/assets/wise5/components/summary/edit-summary-advanced/edit-summary-advanced.component.ts
+++ b/src/assets/wise5/components/summary/edit-summary-advanced/edit-summary-advanced.component.ts
@@ -1,27 +1,41 @@
 import { Component } from '@angular/core';
 import { EditAdvancedComponentComponent } from '../../../../../app/authoring-tool/edit-advanced-component/edit-advanced-component.component';
-import { EditComponentWidthComponent } from '../../../../../app/authoring-tool/edit-component-width/edit-component-width.component';
-import { EditComponentRubricComponent } from '../../../../../app/authoring-tool/edit-component-rubric/edit-component-rubric.component';
-import { EditComponentTagsComponent } from '../../../../../app/authoring-tool/edit-component-tags/edit-component-tags.component';
-import { EditComponentConstraintsComponent } from '../../../../../app/authoring-tool/edit-component-constraints/edit-component-constraints.component';
-import { EditComponentJsonComponent } from '../../../../../app/authoring-tool/edit-component-json/edit-component-json.component';
+import { EditComponentAdvancedSharedModule } from '../../../../../app/authoring-tool/edit-component-advanced/edit-component-advanced-shared.module';
 
 @Component({
-  imports: [
-    EditComponentWidthComponent,
-    EditComponentRubricComponent,
-    EditComponentTagsComponent,
-    EditComponentConstraintsComponent,
-    EditComponentJsonComponent
-  ],
+  imports: [EditComponentAdvancedSharedModule],
   template: `
-    <div class="flex flex-col">
-      <edit-component-width [componentContent]="componentContent" />
-      <edit-component-rubric [componentContent]="componentContent" />
-      <edit-component-tags [componentContent]="componentContent" />
-      <edit-component-constraints [componentContent]="component.content" />
-      <edit-component-json [component]="component" />
-    </div>
+    <mat-tab-group>
+      <mat-tab>
+        <div class="flex flex-col">
+          <edit-component-width [componentContent]="componentContent" />
+        </div>
+      </mat-tab>
+      <mat-tab>
+        <ng-template mat-tab-label>
+          <mat-icon>visibility</mat-icon>&nbsp;<span i18n>Visibility</span>
+        </ng-template>
+        <edit-component-constraints [componentContent]="component.content" />
+      </mat-tab>
+      <mat-tab>
+        <ng-template mat-tab-label>
+          <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
+        </ng-template>
+        <edit-component-rubric [componentContent]="component.content" />
+      </mat-tab>
+      <mat-tab>
+        <ng-template mat-tab-label>
+          <mat-icon>sell</mat-icon>&nbsp;<span i18n>Tags</span></ng-template
+        >
+        <edit-component-tags [componentContent]="component.content" />
+      </mat-tab>
+      <mat-tab>
+        <ng-template mat-tab-label>
+          <mat-icon>code</mat-icon>&nbsp;<span i18n>JSON</span></ng-template
+        >
+        <edit-component-json [component]="component" />
+      </mat-tab>
+    </mat-tab-group>
   `
 })
 export class EditSummaryAdvancedComponent extends EditAdvancedComponentComponent {}
diff --git a/src/assets/wise5/directives/student-summary-display/student-summary-display.component.ts b/src/assets/wise5/directives/student-summary-display/student-summary-display.component.ts
index 42913b2a6b3..ece916056ff 100644
--- a/src/assets/wise5/directives/student-summary-display/student-summary-display.component.ts
+++ b/src/assets/wise5/directives/student-summary-display/student-summary-display.component.ts
@@ -50,7 +50,7 @@ export class StudentSummaryDisplay extends SummaryDisplayComponent {
   private initializeChangeListeners(): void {
     this.studentWorkSavedToServerSubscription = (
       this.dataService as StudentDataService
-    ).studentWorkSavedToServer$.subscribe((componentState) => {
+    ).studentWorkSavedToServer$?.subscribe((componentState) => {
       if (
         this.doRender &&
         componentState.nodeId === this.nodeId &&

From bb0185543f666525d62efec5743455a8e761d887 Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Thu, 2 Apr 2026 15:05:31 -0700
Subject: [PATCH 20/33] Organize ShowMyWork advanced component authoring using
 tabs

---
 .../edit-show-my-work-advanced.component.ts   | 33 ++++++++++++++++---
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/assets/wise5/components/showMyWork/edit-show-my-work-advanced/edit-show-my-work-advanced.component.ts b/src/assets/wise5/components/showMyWork/edit-show-my-work-advanced/edit-show-my-work-advanced.component.ts
index d1929ba4ca2..bba9ecefd43 100644
--- a/src/assets/wise5/components/showMyWork/edit-show-my-work-advanced/edit-show-my-work-advanced.component.ts
+++ b/src/assets/wise5/components/showMyWork/edit-show-my-work-advanced/edit-show-my-work-advanced.component.ts
@@ -1,13 +1,36 @@
 import { Component } from '@angular/core';
 import { EditAdvancedComponentComponent } from '../../../../../app/authoring-tool/edit-advanced-component/edit-advanced-component.component';
-import { EditComponentConstraintsComponent } from '../../../../../app/authoring-tool/edit-component-constraints/edit-component-constraints.component';
-import { EditComponentJsonComponent } from '../../../../../app/authoring-tool/edit-component-json/edit-component-json.component';
+import { EditComponentAdvancedSharedModule } from '../../../../../app/authoring-tool/edit-component-advanced/edit-component-advanced-shared.module';
 
 @Component({
-  imports: [EditComponentConstraintsComponent, EditComponentJsonComponent],
+  imports: [EditComponentAdvancedSharedModule],
   template: `
-    <edit-component-constraints [componentContent]="component.content" />
-    <edit-component-json [component]="component" />
+    <mat-tab-group>
+      <mat-tab>
+        <ng-template mat-tab-label>
+          <mat-icon>visibility</mat-icon>&nbsp;<span i18n>Visibility</span>
+        </ng-template>
+        <edit-component-constraints [componentContent]="component.content" />
+      </mat-tab>
+      <mat-tab>
+        <ng-template mat-tab-label>
+          <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
+        </ng-template>
+        <edit-component-rubric [componentContent]="component.content" />
+      </mat-tab>
+      <mat-tab>
+        <ng-template mat-tab-label>
+          <mat-icon>sell</mat-icon>&nbsp;<span i18n>Tags</span></ng-template
+        >
+        <edit-component-tags [componentContent]="component.content" />
+      </mat-tab>
+      <mat-tab>
+        <ng-template mat-tab-label>
+          <mat-icon>code</mat-icon>&nbsp;<span i18n>JSON</span></ng-template
+        >
+        <edit-component-json [component]="component" />
+      </mat-tab>
+    </mat-tab-group>
   `
 })
 export class EditShowMyWorkAdvancedComponent extends EditAdvancedComponentComponent {}

From cec40879398c0b51c20daa9b14038ca61085045f Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Thu, 2 Apr 2026 15:07:28 -0700
Subject: [PATCH 21/33] Organize ShowGroupWork advanced component authoring
 using tabs

---
 ...edit-show-group-work-advanced.component.ts | 33 ++++++++++++++++---
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/assets/wise5/components/showGroupWork/edit-show-group-work-advanced/edit-show-group-work-advanced.component.ts b/src/assets/wise5/components/showGroupWork/edit-show-group-work-advanced/edit-show-group-work-advanced.component.ts
index 1798a447abe..0b2e6a07fbf 100644
--- a/src/assets/wise5/components/showGroupWork/edit-show-group-work-advanced/edit-show-group-work-advanced.component.ts
+++ b/src/assets/wise5/components/showGroupWork/edit-show-group-work-advanced/edit-show-group-work-advanced.component.ts
@@ -1,13 +1,36 @@
 import { Component } from '@angular/core';
 import { EditAdvancedComponentComponent } from '../../../../../app/authoring-tool/edit-advanced-component/edit-advanced-component.component';
-import { EditComponentConstraintsComponent } from '../../../../../app/authoring-tool/edit-component-constraints/edit-component-constraints.component';
-import { EditComponentJsonComponent } from '../../../../../app/authoring-tool/edit-component-json/edit-component-json.component';
+import { EditComponentAdvancedSharedModule } from '../../../../../app/authoring-tool/edit-component-advanced/edit-component-advanced-shared.module';
 
 @Component({
-  imports: [EditComponentConstraintsComponent, EditComponentJsonComponent],
+  imports: [EditComponentAdvancedSharedModule],
   template: `
-    <edit-component-constraints [componentContent]="component.content" />
-    <edit-component-json [component]="component" />
+    <mat-tab-group>
+      <mat-tab>
+        <ng-template mat-tab-label>
+          <mat-icon>visibility</mat-icon>&nbsp;<span i18n>Visibility</span>
+        </ng-template>
+        <edit-component-constraints [componentContent]="component.content" />
+      </mat-tab>
+      <mat-tab>
+        <ng-template mat-tab-label>
+          <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
+        </ng-template>
+        <edit-component-rubric [componentContent]="component.content" />
+      </mat-tab>
+      <mat-tab>
+        <ng-template mat-tab-label>
+          <mat-icon>sell</mat-icon>&nbsp;<span i18n>Tags</span></ng-template
+        >
+        <edit-component-tags [componentContent]="component.content" />
+      </mat-tab>
+      <mat-tab>
+        <ng-template mat-tab-label>
+          <mat-icon>code</mat-icon>&nbsp;<span i18n>JSON</span></ng-template
+        >
+        <edit-component-json [component]="component" />
+      </mat-tab>
+    </mat-tab-group>
   `
 })
 export class EditShowGroupWorkAdvancedComponent extends EditAdvancedComponentComponent {}

From fc74f5f5fc2bcfad6e8bc73e1880a6faeb79a6cf Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Thu, 2 Apr 2026 15:15:58 -0700
Subject: [PATCH 22/33] Organize OutsideUrl advanced component authoring using
 tabs

---
 .../edit-outside-url-advanced.component.ts    | 52 ++++++++++++++-----
 1 file changed, 38 insertions(+), 14 deletions(-)

diff --git a/src/assets/wise5/components/outsideURL/edit-outside-url-advanced/edit-outside-url-advanced.component.ts b/src/assets/wise5/components/outsideURL/edit-outside-url-advanced/edit-outside-url-advanced.component.ts
index 597ae6a5490..a2c39add51e 100644
--- a/src/assets/wise5/components/outsideURL/edit-outside-url-advanced/edit-outside-url-advanced.component.ts
+++ b/src/assets/wise5/components/outsideURL/edit-outside-url-advanced/edit-outside-url-advanced.component.ts
@@ -1,20 +1,44 @@
 import { Component } from '@angular/core';
 import { EditAdvancedComponentComponent } from '../../../../../app/authoring-tool/edit-advanced-component/edit-advanced-component.component';
-import { EditComponentWidthComponent } from '../../../../../app/authoring-tool/edit-component-width/edit-component-width.component';
-import { EditComponentRubricComponent } from '../../../../../app/authoring-tool/edit-component-rubric/edit-component-rubric.component';
-import { EditComponentConstraintsComponent } from '../../../../../app/authoring-tool/edit-component-constraints/edit-component-constraints.component';
-import { EditComponentJsonComponent } from '../../../../../app/authoring-tool/edit-component-json/edit-component-json.component';
+import { EditComponentAdvancedSharedModule } from '../../../../../app/authoring-tool/edit-component-advanced/edit-component-advanced-shared.module';
 
 @Component({
-  imports: [
-    EditComponentWidthComponent,
-    EditComponentRubricComponent,
-    EditComponentConstraintsComponent,
-    EditComponentJsonComponent
-  ],
-  template: `<edit-component-width [componentContent]="componentContent" />
-    <edit-component-rubric [componentContent]="componentContent" />
-    <edit-component-constraints [componentContent]="component.content" />
-    <edit-component-json [component]="component" />`
+  imports: [EditComponentAdvancedSharedModule],
+  template: `
+    <mat-tab-group>
+      <mat-tab>
+        <ng-template mat-tab-label>
+          <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
+        </ng-template>
+        <div class="flex flex-col">
+          <edit-component-width [componentContent]="componentContent" />
+        </div>
+      </mat-tab>
+      <mat-tab>
+        <ng-template mat-tab-label>
+          <mat-icon>visibility</mat-icon>&nbsp;<span i18n>Visibility</span>
+        </ng-template>
+        <edit-component-constraints [componentContent]="component.content" />
+      </mat-tab>
+      <mat-tab>
+        <ng-template mat-tab-label>
+          <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
+        </ng-template>
+        <edit-component-rubric [componentContent]="component.content" />
+      </mat-tab>
+      <mat-tab>
+        <ng-template mat-tab-label>
+          <mat-icon>sell</mat-icon>&nbsp;<span i18n>Tags</span></ng-template
+        >
+        <edit-component-tags [componentContent]="component.content" />
+      </mat-tab>
+      <mat-tab>
+        <ng-template mat-tab-label>
+          <mat-icon>code</mat-icon>&nbsp;<span i18n>JSON</span></ng-template
+        >
+        <edit-component-json [component]="component" />
+      </mat-tab>
+    </mat-tab-group>
+  `
 })
 export class EditOutsideUrlAdvancedComponent extends EditAdvancedComponentComponent {}

From f82985cf71a870ef2bd8e89b08a3d2a0a1966040 Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Thu, 2 Apr 2026 15:16:07 -0700
Subject: [PATCH 23/33] Organize PeerChat advanced component authoring using
 tabs

---
 ...-peer-chat-advanced-component.component.ts | 33 ++++++++++++++++---
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/assets/wise5/components/peerChat/edit-peer-chat-advanced-component/edit-peer-chat-advanced-component.component.ts b/src/assets/wise5/components/peerChat/edit-peer-chat-advanced-component/edit-peer-chat-advanced-component.component.ts
index 4605a036289..65fd2c8a556 100644
--- a/src/assets/wise5/components/peerChat/edit-peer-chat-advanced-component/edit-peer-chat-advanced-component.component.ts
+++ b/src/assets/wise5/components/peerChat/edit-peer-chat-advanced-component/edit-peer-chat-advanced-component.component.ts
@@ -1,13 +1,36 @@
 import { Component } from '@angular/core';
 import { EditAdvancedComponentComponent } from '../../../../../app/authoring-tool/edit-advanced-component/edit-advanced-component.component';
-import { EditComponentConstraintsComponent } from '../../../../../app/authoring-tool/edit-component-constraints/edit-component-constraints.component';
-import { EditComponentJsonComponent } from '../../../../../app/authoring-tool/edit-component-json/edit-component-json.component';
+import { EditComponentAdvancedSharedModule } from '../../../../../app/authoring-tool/edit-component-advanced/edit-component-advanced-shared.module';
 
 @Component({
-  imports: [EditComponentConstraintsComponent, EditComponentJsonComponent],
+  imports: [EditComponentAdvancedSharedModule],
   template: `
-    <edit-component-constraints [componentContent]="component.content" />
-    <edit-component-json [component]="component" />
+    <mat-tab-group>
+      <mat-tab>
+        <ng-template mat-tab-label>
+          <mat-icon>visibility</mat-icon>&nbsp;<span i18n>Visibility</span>
+        </ng-template>
+        <edit-component-constraints [componentContent]="component.content" />
+      </mat-tab>
+      <mat-tab>
+        <ng-template mat-tab-label>
+          <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
+        </ng-template>
+        <edit-component-rubric [componentContent]="component.content" />
+      </mat-tab>
+      <mat-tab>
+        <ng-template mat-tab-label>
+          <mat-icon>sell</mat-icon>&nbsp;<span i18n>Tags</span></ng-template
+        >
+        <edit-component-tags [componentContent]="component.content" />
+      </mat-tab>
+      <mat-tab>
+        <ng-template mat-tab-label>
+          <mat-icon>code</mat-icon>&nbsp;<span i18n>JSON</span></ng-template
+        >
+        <edit-component-json [component]="component" />
+      </mat-tab>
+    </mat-tab-group>
   `
 })
 export class EditPeerChatAdvancedComponentComponent extends EditAdvancedComponentComponent {}

From 5fd54163638e20dc6aa65800485cfa4136326557 Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Thu, 2 Apr 2026 15:16:39 -0700
Subject: [PATCH 24/33] Organize Label advanced component authoring using tabs

---
 .../edit-label-advanced.component.html        | 86 ++++++++++++-------
 .../edit-label-advanced.component.ts          | 31 +------
 2 files changed, 60 insertions(+), 57 deletions(-)

diff --git a/src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.html b/src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.html
index 8e9c8ff7dbd..58ddbdab663 100644
--- a/src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.html
+++ b/src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.html
@@ -1,29 +1,57 @@
-@if (isNotebookEnabled()) {
-  <div>
-    <edit-component-add-to-notebook-button [componentContent]="componentContent" />
-  </div>
-}
-<edit-component-save-button [componentContent]="componentContent" />
-<br />
-<edit-component-submit-button [componentContent]="componentContent" />
-@if (componentContent.showSubmitButton) {
-  <edit-component-max-submit [componentContent]="componentContent" />
-}
-<edit-component-default-feedback [componentContent]="componentContent" />
-<div class="flex flex-col justify-start items-start">
-  <edit-component-max-score [componentContent]="componentContent" />
-  <edit-component-exclude-from-total-score [componentContent]="componentContent" />
-  <edit-component-width [componentContent]="componentContent" />
-  <edit-component-rubric [componentContent]="componentContent" />
-  <edit-component-tags [componentContent]="componentContent" />
-</div>
-<edit-label-connected-components
-  [nodeId]="nodeId"
-  [componentId]="componentId"
-  [allowedConnectedComponentTypes]="allowedConnectedComponentTypes"
-  [componentContent]="componentContent"
-  [connectedComponents]="componentContent.connectedComponents"
-  (connectedComponentsChanged)="connectedComponentsChanged($event)"
-/>
-<edit-component-constraints [componentContent]="component.content" />
-<edit-component-json [component]="component" />
+<mat-tab-group>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
+    </ng-template>
+    @if (isNotebookEnabled()) {
+      <div>
+        <edit-component-add-to-notebook-button [componentContent]="componentContent" />
+      </div>
+    }
+    <edit-component-save-button [componentContent]="componentContent" />
+    <br />
+    <edit-component-submit-button [componentContent]="componentContent" />
+    @if (componentContent.showSubmitButton) {
+      <edit-component-max-submit [componentContent]="componentContent" />
+    }
+    <edit-component-default-feedback [componentContent]="componentContent" />
+    <div class="flex flex-col justify-start items-start">
+      <edit-component-max-score [componentContent]="componentContent" />
+      <edit-component-exclude-from-total-score [componentContent]="componentContent" />
+      <edit-component-width [componentContent]="componentContent" />
+    </div>
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>visibility</mat-icon>&nbsp;<span i18n>Visibility</span>
+    </ng-template>
+    <edit-component-constraints [componentContent]="component.content" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>join_inner</mat-icon>&nbsp;<span i18n>Connections</span>
+    </ng-template>
+    <edit-label-connected-components
+      [nodeId]="nodeId"
+      [componentId]="componentId"
+      [allowedConnectedComponentTypes]="allowedConnectedComponentTypes"
+      [componentContent]="componentContent"
+      [connectedComponents]="componentContent.connectedComponents"
+      (connectedComponentsChanged)="connectedComponentsChanged($event)"
+    />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
+    </ng-template>
+    <edit-component-rubric [componentContent]="component.content" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label> <mat-icon>sell</mat-icon>&nbsp;<span i18n>Tags</span></ng-template>
+    <edit-component-tags [componentContent]="component.content" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label> <mat-icon>code</mat-icon>&nbsp;<span i18n>JSON</span></ng-template>
+    <edit-component-json [component]="component" />
+  </mat-tab>
+</mat-tab-group>
diff --git a/src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.ts b/src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.ts
index 6978eb7a21c..f601511fc7f 100644
--- a/src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.ts
+++ b/src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.ts
@@ -1,36 +1,11 @@
 import { Component } from '@angular/core';
 import { EditAdvancedComponentComponent } from '../../../../../app/authoring-tool/edit-advanced-component/edit-advanced-component.component';
-import { EditComponentAddToNotebookButtonComponent } from '../../../../../app/authoring-tool/edit-component-add-to-notebook-button/edit-component-add-to-notebook-button.component';
-import { EditComponentSaveButtonComponent } from '../../../../../app/authoring-tool/edit-component-save-button/edit-component-save-button.component';
-import { EditComponentSubmitButtonComponent } from '../../../../../app/authoring-tool/edit-component-submit-button/edit-component-submit-button.component';
-import { EditComponentMaxSubmitComponent } from '../../../../../app/authoring-tool/edit-component-max-submit/edit-component-max-submit.component';
-import { EditComponentDefaultFeedback } from '../../../../../app/authoring-tool/edit-advanced-component/edit-component-default-feedback/edit-component-default-feedback.component';
-import { EditComponentMaxScoreComponent } from '../../../../../app/authoring-tool/edit-component-max-score/edit-component-max-score.component';
-import { EditComponentExcludeFromTotalScoreComponent } from '../../../../../app/authoring-tool/edit-component-exclude-from-total-score/edit-component-exclude-from-total-score.component';
-import { EditComponentWidthComponent } from '../../../../../app/authoring-tool/edit-component-width/edit-component-width.component';
-import { EditComponentRubricComponent } from '../../../../../app/authoring-tool/edit-component-rubric/edit-component-rubric.component';
-import { EditComponentTagsComponent } from '../../../../../app/authoring-tool/edit-component-tags/edit-component-tags.component';
 import { EditLabelConnectedComponentsComponent } from '../edit-label-connected-components/edit-label-connected-components.component';
-import { EditComponentConstraintsComponent } from '../../../../../app/authoring-tool/edit-component-constraints/edit-component-constraints.component';
-import { EditComponentJsonComponent } from '../../../../../app/authoring-tool/edit-component-json/edit-component-json.component';
+import { EditComponentAdvancedSharedModule } from '../../../../../app/authoring-tool/edit-component-advanced/edit-component-advanced-shared.module';
 
 @Component({
-  templateUrl: 'edit-label-advanced.component.html',
-  imports: [
-    EditComponentAddToNotebookButtonComponent,
-    EditComponentSaveButtonComponent,
-    EditComponentSubmitButtonComponent,
-    EditComponentMaxSubmitComponent,
-    EditComponentDefaultFeedback,
-    EditComponentMaxScoreComponent,
-    EditComponentExcludeFromTotalScoreComponent,
-    EditComponentWidthComponent,
-    EditComponentRubricComponent,
-    EditComponentTagsComponent,
-    EditLabelConnectedComponentsComponent,
-    EditComponentConstraintsComponent,
-    EditComponentJsonComponent
-  ]
+  imports: [EditComponentAdvancedSharedModule, EditLabelConnectedComponentsComponent],
+  templateUrl: 'edit-label-advanced.component.html'
 })
 export class EditLabelAdvancedComponent extends EditAdvancedComponentComponent {
   allowedConnectedComponentTypes = [

From 5685dd6388b2462445542848f7480c2f7ce1c70c Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Thu, 2 Apr 2026 17:18:59 -0700
Subject: [PATCH 25/33] Got summary authoring working again.

---
 .../edit-summary-advanced/edit-summary-advanced.component.ts  | 3 +++
 .../summary/summary-student/summary-student.component.ts      | 4 ++--
 .../student-summary-display.component.ts                      | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/assets/wise5/components/summary/edit-summary-advanced/edit-summary-advanced.component.ts b/src/assets/wise5/components/summary/edit-summary-advanced/edit-summary-advanced.component.ts
index efd5f701956..64c283d65cd 100644
--- a/src/assets/wise5/components/summary/edit-summary-advanced/edit-summary-advanced.component.ts
+++ b/src/assets/wise5/components/summary/edit-summary-advanced/edit-summary-advanced.component.ts
@@ -7,6 +7,9 @@ import { EditComponentAdvancedSharedModule } from '../../../../../app/authoring-
   template: `
     <mat-tab-group>
       <mat-tab>
+        <ng-template mat-tab-label>
+          <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
+        </ng-template>
         <div class="flex flex-col">
           <edit-component-width [componentContent]="componentContent" />
         </div>
diff --git a/src/assets/wise5/components/summary/summary-student/summary-student.component.ts b/src/assets/wise5/components/summary/summary-student/summary-student.component.ts
index 4afe3db2405..f47c0877d90 100644
--- a/src/assets/wise5/components/summary/summary-student/summary-student.component.ts
+++ b/src/assets/wise5/components/summary/summary-student/summary-student.component.ts
@@ -72,11 +72,11 @@ export class SummaryStudent extends ComponentStudent {
     }
     this.isStudent = this.configService.isPreview() || this.configService.isStudentRun();
     if (this.isStudent) {
-      this.otherStepTitle = this.getOtherStepTitle();
       this.isShowDisplay = this.calculateIsShowDisplay();
     } else {
-      this.isShowDisplay = true;
+      this.isShowDisplay = !this.configService.isAuthoring();
     }
+    this.otherStepTitle = this.getOtherStepTitle();
     if (!this.isShowDisplay) {
       this.warningMessage = this.getWarningMessage();
     }
diff --git a/src/assets/wise5/directives/student-summary-display/student-summary-display.component.ts b/src/assets/wise5/directives/student-summary-display/student-summary-display.component.ts
index ece916056ff..42913b2a6b3 100644
--- a/src/assets/wise5/directives/student-summary-display/student-summary-display.component.ts
+++ b/src/assets/wise5/directives/student-summary-display/student-summary-display.component.ts
@@ -50,7 +50,7 @@ export class StudentSummaryDisplay extends SummaryDisplayComponent {
   private initializeChangeListeners(): void {
     this.studentWorkSavedToServerSubscription = (
       this.dataService as StudentDataService
-    ).studentWorkSavedToServer$?.subscribe((componentState) => {
+    ).studentWorkSavedToServer$.subscribe((componentState) => {
       if (
         this.doRender &&
         componentState.nodeId === this.nodeId &&

From eacb4c381bfd0884dca81e220ed674bcf49ceaf2 Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Thu, 2 Apr 2026 17:46:41 -0700
Subject: [PATCH 26/33] Disable mat tab animations

---
 .../edit-ai-chat-advanced.component.html      |   2 +-
 .../edit-animation-advanced.component.html    |   2 +-
 ...t-audio-oscillator-advanced.component.html |   2 +-
 .../edit-concept-map-advanced.component.html  |   2 +-
 ...it-dialog-guidance-advanced.component.html |   2 +-
 .../edit-discussion-advanced.component.html   |   2 +-
 .../edit-draw-advanced.component.html         |   2 +-
 .../edit-embedded-advanced.component.html     |   2 +-
 .../edit-graph-advanced.component.html        |   2 +-
 .../edit-html-advanced.component.html         |   2 +-
 .../edit-label-advanced.component.html        |   2 +-
 .../edit-match-advanced.component.html        |   2 +-
 ...it-multiple-choice-advanced.component.html |   2 +-
 ...edit-open-response-advanced.component.html |   2 +-
 .../edit-outside-url-advanced.component.ts    |   2 +-
 ...-peer-chat-advanced-component.component.ts |   2 +-
 ...edit-show-group-work-advanced.component.ts |   2 +-
 .../edit-show-my-work-advanced.component.ts   |   2 +-
 .../edit-summary-advanced.component.ts        |   2 +-
 .../edit-table-advanced.component.html        |   2 +-
 src/messages.xlf                              | 820 ++++++++++++++----
 21 files changed, 659 insertions(+), 201 deletions(-)

diff --git a/src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html b/src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html
index 0a4c2273468..62e706a37a9 100644
--- a/src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html
+++ b/src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group>
+<mat-tab-group animationDuration="0ms">
   <mat-tab>
     <ng-template mat-tab-label>
       <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
diff --git a/src/assets/wise5/components/animation/edit-animation-advanced/edit-animation-advanced.component.html b/src/assets/wise5/components/animation/edit-animation-advanced/edit-animation-advanced.component.html
index aece545b3e5..09ee41bb94d 100644
--- a/src/assets/wise5/components/animation/edit-animation-advanced/edit-animation-advanced.component.html
+++ b/src/assets/wise5/components/animation/edit-animation-advanced/edit-animation-advanced.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group>
+<mat-tab-group animationDuration="0ms">
   <mat-tab>
     <ng-template mat-tab-label>
       <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
diff --git a/src/assets/wise5/components/audioOscillator/edit-audio-oscillator-advanced/edit-audio-oscillator-advanced.component.html b/src/assets/wise5/components/audioOscillator/edit-audio-oscillator-advanced/edit-audio-oscillator-advanced.component.html
index aece545b3e5..09ee41bb94d 100644
--- a/src/assets/wise5/components/audioOscillator/edit-audio-oscillator-advanced/edit-audio-oscillator-advanced.component.html
+++ b/src/assets/wise5/components/audioOscillator/edit-audio-oscillator-advanced/edit-audio-oscillator-advanced.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group>
+<mat-tab-group animationDuration="0ms">
   <mat-tab>
     <ng-template mat-tab-label>
       <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
diff --git a/src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html b/src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html
index 384b2448dcd..0a71b783fb6 100644
--- a/src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html
+++ b/src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group>
+<mat-tab-group animationDuration="0ms">
   <mat-tab>
     <ng-template mat-tab-label>
       <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
diff --git a/src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-advanced/edit-dialog-guidance-advanced.component.html b/src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-advanced/edit-dialog-guidance-advanced.component.html
index 5d12b79a580..59aac53991a 100644
--- a/src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-advanced/edit-dialog-guidance-advanced.component.html
+++ b/src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-advanced/edit-dialog-guidance-advanced.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group>
+<mat-tab-group animationDuration="0ms">
   <mat-tab>
     <ng-template mat-tab-label>
       <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
diff --git a/src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html b/src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html
index fd19123d3b5..f7763164d97 100644
--- a/src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html
+++ b/src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group>
+<mat-tab-group animationDuration="0ms">
   <mat-tab>
     <ng-template mat-tab-label>
       <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
diff --git a/src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html b/src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html
index 31c5ca97a89..7d7b2d7e95a 100644
--- a/src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html
+++ b/src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group>
+<mat-tab-group animationDuration="0ms">
   <mat-tab>
     <ng-template mat-tab-label>
       <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
diff --git a/src/assets/wise5/components/embedded/edit-embedded-advanced/edit-embedded-advanced.component.html b/src/assets/wise5/components/embedded/edit-embedded-advanced/edit-embedded-advanced.component.html
index 559748e7f23..abee69d2e9b 100644
--- a/src/assets/wise5/components/embedded/edit-embedded-advanced/edit-embedded-advanced.component.html
+++ b/src/assets/wise5/components/embedded/edit-embedded-advanced/edit-embedded-advanced.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group>
+<mat-tab-group animationDuration="0ms">
   <mat-tab>
     <ng-template mat-tab-label>
       <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
diff --git a/src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html b/src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html
index 38008d62112..f0fb2c7b2f9 100644
--- a/src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html
+++ b/src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group>
+<mat-tab-group animationDuration="0ms">
   <mat-tab>
     <ng-template mat-tab-label>
       <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
diff --git a/src/assets/wise5/components/html/edit-html-advanced/edit-html-advanced.component.html b/src/assets/wise5/components/html/edit-html-advanced/edit-html-advanced.component.html
index 0667831856b..519ff543f29 100644
--- a/src/assets/wise5/components/html/edit-html-advanced/edit-html-advanced.component.html
+++ b/src/assets/wise5/components/html/edit-html-advanced/edit-html-advanced.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group>
+<mat-tab-group animationDuration="0ms">
   <mat-tab>
     <ng-template mat-tab-label>
       <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
diff --git a/src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.html b/src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.html
index 58ddbdab663..4bd42e8617b 100644
--- a/src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.html
+++ b/src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group>
+<mat-tab-group animationDuration="0ms">
   <mat-tab>
     <ng-template mat-tab-label>
       <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
diff --git a/src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html b/src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html
index 5692bae0935..4acc6d82c59 100644
--- a/src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html
+++ b/src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group>
+<mat-tab-group animationDuration="0ms">
   <mat-tab>
     <ng-template mat-tab-label>
       <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
diff --git a/src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.html b/src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.html
index d999ae30de8..260d2ab4c41 100644
--- a/src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.html
+++ b/src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group>
+<mat-tab-group animationDuration="0ms">
   <mat-tab>
     <ng-template mat-tab-label>
       <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
diff --git a/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html b/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html
index 2b0d27bb61d..2b95896e911 100644
--- a/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html
+++ b/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group>
+<mat-tab-group animationDuration="0ms">
   <mat-tab>
     <ng-template mat-tab-label>
       <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
diff --git a/src/assets/wise5/components/outsideURL/edit-outside-url-advanced/edit-outside-url-advanced.component.ts b/src/assets/wise5/components/outsideURL/edit-outside-url-advanced/edit-outside-url-advanced.component.ts
index a2c39add51e..444097753aa 100644
--- a/src/assets/wise5/components/outsideURL/edit-outside-url-advanced/edit-outside-url-advanced.component.ts
+++ b/src/assets/wise5/components/outsideURL/edit-outside-url-advanced/edit-outside-url-advanced.component.ts
@@ -5,7 +5,7 @@ import { EditComponentAdvancedSharedModule } from '../../../../../app/authoring-
 @Component({
   imports: [EditComponentAdvancedSharedModule],
   template: `
-    <mat-tab-group>
+    <mat-tab-group animationDuration="0ms">
       <mat-tab>
         <ng-template mat-tab-label>
           <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
diff --git a/src/assets/wise5/components/peerChat/edit-peer-chat-advanced-component/edit-peer-chat-advanced-component.component.ts b/src/assets/wise5/components/peerChat/edit-peer-chat-advanced-component/edit-peer-chat-advanced-component.component.ts
index 65fd2c8a556..75ece29b3fd 100644
--- a/src/assets/wise5/components/peerChat/edit-peer-chat-advanced-component/edit-peer-chat-advanced-component.component.ts
+++ b/src/assets/wise5/components/peerChat/edit-peer-chat-advanced-component/edit-peer-chat-advanced-component.component.ts
@@ -5,7 +5,7 @@ import { EditComponentAdvancedSharedModule } from '../../../../../app/authoring-
 @Component({
   imports: [EditComponentAdvancedSharedModule],
   template: `
-    <mat-tab-group>
+    <mat-tab-group animationDuration="0ms">
       <mat-tab>
         <ng-template mat-tab-label>
           <mat-icon>visibility</mat-icon>&nbsp;<span i18n>Visibility</span>
diff --git a/src/assets/wise5/components/showGroupWork/edit-show-group-work-advanced/edit-show-group-work-advanced.component.ts b/src/assets/wise5/components/showGroupWork/edit-show-group-work-advanced/edit-show-group-work-advanced.component.ts
index 0b2e6a07fbf..d528208ce93 100644
--- a/src/assets/wise5/components/showGroupWork/edit-show-group-work-advanced/edit-show-group-work-advanced.component.ts
+++ b/src/assets/wise5/components/showGroupWork/edit-show-group-work-advanced/edit-show-group-work-advanced.component.ts
@@ -5,7 +5,7 @@ import { EditComponentAdvancedSharedModule } from '../../../../../app/authoring-
 @Component({
   imports: [EditComponentAdvancedSharedModule],
   template: `
-    <mat-tab-group>
+    <mat-tab-group animationDuration="0ms">
       <mat-tab>
         <ng-template mat-tab-label>
           <mat-icon>visibility</mat-icon>&nbsp;<span i18n>Visibility</span>
diff --git a/src/assets/wise5/components/showMyWork/edit-show-my-work-advanced/edit-show-my-work-advanced.component.ts b/src/assets/wise5/components/showMyWork/edit-show-my-work-advanced/edit-show-my-work-advanced.component.ts
index bba9ecefd43..aa44e84e8b5 100644
--- a/src/assets/wise5/components/showMyWork/edit-show-my-work-advanced/edit-show-my-work-advanced.component.ts
+++ b/src/assets/wise5/components/showMyWork/edit-show-my-work-advanced/edit-show-my-work-advanced.component.ts
@@ -5,7 +5,7 @@ import { EditComponentAdvancedSharedModule } from '../../../../../app/authoring-
 @Component({
   imports: [EditComponentAdvancedSharedModule],
   template: `
-    <mat-tab-group>
+    <mat-tab-group animationDuration="0ms">
       <mat-tab>
         <ng-template mat-tab-label>
           <mat-icon>visibility</mat-icon>&nbsp;<span i18n>Visibility</span>
diff --git a/src/assets/wise5/components/summary/edit-summary-advanced/edit-summary-advanced.component.ts b/src/assets/wise5/components/summary/edit-summary-advanced/edit-summary-advanced.component.ts
index 64c283d65cd..34af9d251d1 100644
--- a/src/assets/wise5/components/summary/edit-summary-advanced/edit-summary-advanced.component.ts
+++ b/src/assets/wise5/components/summary/edit-summary-advanced/edit-summary-advanced.component.ts
@@ -5,7 +5,7 @@ import { EditComponentAdvancedSharedModule } from '../../../../../app/authoring-
 @Component({
   imports: [EditComponentAdvancedSharedModule],
   template: `
-    <mat-tab-group>
+    <mat-tab-group animationDuration="0ms">
       <mat-tab>
         <ng-template mat-tab-label>
           <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
diff --git a/src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html b/src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html
index 58444eab3ed..3cd7a8ec440 100644
--- a/src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html
+++ b/src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group>
+<mat-tab-group animationDuration="0ms">
   <mat-tab>
     <ng-template mat-tab-label>
       <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
diff --git a/src/messages.xlf b/src/messages.xlf
index 8117d633672..07b0ba79ab1 100644
--- a/src/messages.xlf
+++ b/src/messages.xlf
@@ -625,7 +625,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
-          <context context-type="linenumber">144,146</context>
+          <context context-type="linenumber">149,151</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html</context>
@@ -680,7 +680,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
-          <context context-type="linenumber">154,157</context>
+          <context context-type="linenumber">159,162</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html</context>
@@ -755,7 +755,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
-          <context context-type="linenumber">166,168</context>
+          <context context-type="linenumber">171,173</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.html</context>
@@ -767,11 +767,11 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html</context>
-          <context context-type="linenumber">123,125</context>
+          <context context-type="linenumber">128,129</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html</context>
-          <context context-type="linenumber">174,176</context>
+          <context context-type="linenumber">179,180</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html</context>
@@ -828,20 +828,12 @@
           <context context-type="linenumber">16,19</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="8360107325291301836" datatype="html">
-        <source>Advanced Settings</source>
+      <trans-unit id="5222210534332546893" datatype="html">
+        <source>Advanced Activity Settings</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.html</context>
           <context context-type="linenumber">1,5</context>
         </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/authoringTool/authoring-tool.component.ts</context>
-          <context context-type="linenumber">105</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/authoringTool/components/shared/authoring-tool-bar/authoring-tool-bar.component.ts</context>
-          <context context-type="linenumber">71</context>
-        </context-group>
       </trans-unit>
       <trans-unit id="5547981558491672240" datatype="html">
         <source> Close </source>
@@ -911,6 +903,86 @@
           <context context-type="sourcefile">src/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.html</context>
           <context context-type="linenumber">44,47</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html</context>
+          <context context-type="linenumber">47,49</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/animation/edit-animation-advanced/edit-animation-advanced.component.html</context>
+          <context context-type="linenumber">48,50</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/audioOscillator/edit-audio-oscillator-advanced/edit-audio-oscillator-advanced.component.html</context>
+          <context context-type="linenumber">48,50</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
+          <context context-type="linenumber">241,243</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-advanced/edit-dialog-guidance-advanced.component.html</context>
+          <context context-type="linenumber">40,42</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html</context>
+          <context context-type="linenumber">42,44</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html</context>
+          <context context-type="linenumber">54,56</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/embedded/edit-embedded-advanced/edit-embedded-advanced.component.html</context>
+          <context context-type="linenumber">61,63</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html</context>
+          <context context-type="linenumber">238,240</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/html/edit-html-advanced/edit-html-advanced.component.html</context>
+          <context context-type="linenumber">21,23</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.html</context>
+          <context context-type="linenumber">54,56</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html</context>
+          <context context-type="linenumber">70,72</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.html</context>
+          <context context-type="linenumber">59,61</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
+          <context context-type="linenumber">608,610</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/outsideURL/edit-outside-url-advanced/edit-outside-url-advanced.component.ts</context>
+          <context context-type="linenumber">37,39</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/peerChat/edit-peer-chat-advanced-component/edit-peer-chat-advanced-component.component.ts</context>
+          <context context-type="linenumber">29,31</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/showGroupWork/edit-show-group-work-advanced/edit-show-group-work-advanced.component.ts</context>
+          <context context-type="linenumber">29,31</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/showMyWork/edit-show-my-work-advanced/edit-show-my-work-advanced.component.ts</context>
+          <context context-type="linenumber">29,31</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/summary/edit-summary-advanced/edit-summary-advanced.component.ts</context>
+          <context context-type="linenumber">37,39</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
+          <context context-type="linenumber">304,306</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="2543636733220429928" datatype="html">
         <source>Show JSON</source>
@@ -1008,6 +1080,86 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
           <context context-type="sourcefile">src/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.html</context>
           <context context-type="linenumber">28,31</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html</context>
+          <context context-type="linenumber">38,40</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/animation/edit-animation-advanced/edit-animation-advanced.component.html</context>
+          <context context-type="linenumber">39,41</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/audioOscillator/edit-audio-oscillator-advanced/edit-audio-oscillator-advanced.component.html</context>
+          <context context-type="linenumber">39,41</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
+          <context context-type="linenumber">232,234</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-advanced/edit-dialog-guidance-advanced.component.html</context>
+          <context context-type="linenumber">31,33</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html</context>
+          <context context-type="linenumber">33,35</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html</context>
+          <context context-type="linenumber">45,47</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/embedded/edit-embedded-advanced/edit-embedded-advanced.component.html</context>
+          <context context-type="linenumber">52,54</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html</context>
+          <context context-type="linenumber">229,231</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/html/edit-html-advanced/edit-html-advanced.component.html</context>
+          <context context-type="linenumber">16,18</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.html</context>
+          <context context-type="linenumber">45,47</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html</context>
+          <context context-type="linenumber">61,63</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.html</context>
+          <context context-type="linenumber">50,52</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
+          <context context-type="linenumber">599,601</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/outsideURL/edit-outside-url-advanced/edit-outside-url-advanced.component.ts</context>
+          <context context-type="linenumber">25,27</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/peerChat/edit-peer-chat-advanced-component/edit-peer-chat-advanced-component.component.ts</context>
+          <context context-type="linenumber">17,19</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/showGroupWork/edit-show-group-work-advanced/edit-show-group-work-advanced.component.ts</context>
+          <context context-type="linenumber">17,19</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/showMyWork/edit-show-my-work-advanced/edit-show-my-work-advanced.component.ts</context>
+          <context context-type="linenumber">17,19</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/summary/edit-summary-advanced/edit-summary-advanced.component.ts</context>
+          <context context-type="linenumber">25,27</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
+          <context context-type="linenumber">295,297</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/themes/default/themeComponents/helpIcon/help-icon.component.ts</context>
           <context context-type="linenumber">35</context>
@@ -1040,6 +1192,82 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
           <context context-type="sourcefile">src/app/authoring-tool/edit-component-tags/edit-component-tags.component.html</context>
           <context context-type="linenumber">2,6</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html</context>
+          <context context-type="linenumber">43,44</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/animation/edit-animation-advanced/edit-animation-advanced.component.html</context>
+          <context context-type="linenumber">44,45</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/audioOscillator/edit-audio-oscillator-advanced/edit-audio-oscillator-advanced.component.html</context>
+          <context context-type="linenumber">44,45</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
+          <context context-type="linenumber">237,238</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-advanced/edit-dialog-guidance-advanced.component.html</context>
+          <context context-type="linenumber">36,37</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html</context>
+          <context context-type="linenumber">38,39</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html</context>
+          <context context-type="linenumber">50,51</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/embedded/edit-embedded-advanced/edit-embedded-advanced.component.html</context>
+          <context context-type="linenumber">57,58</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html</context>
+          <context context-type="linenumber">234,235</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.html</context>
+          <context context-type="linenumber">50,51</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html</context>
+          <context context-type="linenumber">66,67</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.html</context>
+          <context context-type="linenumber">55,56</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
+          <context context-type="linenumber">604,605</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/outsideURL/edit-outside-url-advanced/edit-outside-url-advanced.component.ts</context>
+          <context context-type="linenumber">31,33</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/peerChat/edit-peer-chat-advanced-component/edit-peer-chat-advanced-component.component.ts</context>
+          <context context-type="linenumber">23,25</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/showGroupWork/edit-show-group-work-advanced/edit-show-group-work-advanced.component.ts</context>
+          <context context-type="linenumber">23,25</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/showMyWork/edit-show-my-work-advanced/edit-show-my-work-advanced.component.ts</context>
+          <context context-type="linenumber">23,25</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/summary/edit-summary-advanced/edit-summary-advanced.component.ts</context>
+          <context context-type="linenumber">31,33</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
+          <context context-type="linenumber">300,301</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="6486069346793029625" datatype="html">
         <source>Add Tag</source>
@@ -1691,11 +1919,11 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">39,41</context>
+          <context context-type="linenumber">65,66</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">497,498</context>
+          <context context-type="linenumber">524,525</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/vle/node/node.component.html</context>
@@ -1757,7 +1985,7 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">478,479</context>
+          <context context-type="linenumber">505,506</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html</context>
@@ -1772,7 +2000,7 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">488,492</context>
+          <context context-type="linenumber">515,518</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/showGroupWork/show-group-work-authoring/show-group-work-authoring.component.html</context>
@@ -1811,7 +2039,7 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">466,467</context>
+          <context context-type="linenumber">493,494</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html</context>
@@ -1845,11 +2073,11 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">40,42</context>
+          <context context-type="linenumber">66,67</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">498,501</context>
+          <context context-type="linenumber">525,527</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/vle/node/node.component.html</context>
@@ -2732,7 +2960,7 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">105,108</context>
+          <context context-type="linenumber">132,135</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8352660755693654653" datatype="html">
@@ -9217,11 +9445,11 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html</context>
-          <context context-type="linenumber">114,115</context>
+          <context context-type="linenumber">119,120</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html</context>
-          <context context-type="linenumber">165,166</context>
+          <context context-type="linenumber">170,171</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html</context>
@@ -10700,6 +10928,17 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
           <context context-type="linenumber">2,7</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="8360107325291301836" datatype="html">
+        <source>Advanced Settings</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/authoringTool/authoring-tool.component.ts</context>
+          <context context-type="linenumber">105</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/authoringTool/components/shared/authoring-tool-bar/authoring-tool-bar.component.ts</context>
+          <context context-type="linenumber">71</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="1422076554976852397" datatype="html">
         <source>Unit List</source>
         <context-group purpose="location">
@@ -11167,15 +11406,15 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
-          <context context-type="linenumber">66,67</context>
+          <context context-type="linenumber">71,72</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
-          <context context-type="linenumber">86,87</context>
+          <context context-type="linenumber">91,92</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
-          <context context-type="linenumber">99,100</context>
+          <context context-type="linenumber">104,105</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7765979807116943270" datatype="html">
@@ -13769,7 +14008,7 @@ The branches will be removed but the steps will remain in the unit.</source>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
-          <context context-type="linenumber">83,84</context>
+          <context context-type="linenumber">88,89</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7084378498770243742" datatype="html">
@@ -16312,33 +16551,246 @@ Are you sure you want to proceed?</source>
           <context context-type="linenumber">114</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="1141886420788473147" datatype="html">
-        <source>Model</source>
+      <trans-unit id="6439365426343089851" datatype="html">
+        <source>General</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html</context>
-          <context context-type="linenumber">2,3</context>
+          <context context-type="linenumber">4,7</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="555720515547706264" datatype="html">
-        <source>Students watch an animation.</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/animation/AnimationInfo.ts</context>
-          <context context-type="linenumber">4</context>
+          <context context-type="sourcefile">src/assets/wise5/components/animation/edit-animation-advanced/edit-animation-advanced.component.html</context>
+          <context context-type="linenumber">4,6</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="7885570895165894241" datatype="html">
-        <source>Animation</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/animation/AnimationInfo.ts</context>
-          <context context-type="linenumber">5</context>
+          <context context-type="sourcefile">src/assets/wise5/components/audioOscillator/edit-audio-oscillator-advanced/edit-audio-oscillator-advanced.component.html</context>
+          <context context-type="linenumber">4,6</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/animation/AnimationInfo.ts</context>
-          <context context-type="linenumber">8</context>
+          <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
+          <context context-type="linenumber">4,7</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/animation/animationService.ts</context>
-          <context context-type="linenumber">9</context>
+          <context context-type="sourcefile">src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-advanced/edit-dialog-guidance-advanced.component.html</context>
+          <context context-type="linenumber">4,6</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html</context>
+          <context context-type="linenumber">4,7</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html</context>
+          <context context-type="linenumber">4,8</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/embedded/edit-embedded-advanced/edit-embedded-advanced.component.html</context>
+          <context context-type="linenumber">4,7</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html</context>
+          <context context-type="linenumber">4,7</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/html/edit-html-advanced/edit-html-advanced.component.html</context>
+          <context context-type="linenumber">4,6</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.html</context>
+          <context context-type="linenumber">4,8</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html</context>
+          <context context-type="linenumber">4,8</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.html</context>
+          <context context-type="linenumber">4,7</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
+          <context context-type="linenumber">4,7</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/outsideURL/edit-outside-url-advanced/edit-outside-url-advanced.component.ts</context>
+          <context context-type="linenumber">11,14</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/summary/edit-summary-advanced/edit-summary-advanced.component.ts</context>
+          <context context-type="linenumber">11,14</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
+          <context context-type="linenumber">4,6</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1141886420788473147" datatype="html">
+        <source>Model</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html</context>
+          <context context-type="linenumber">7,8</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8271357500216966879" datatype="html">
+        <source>Visibility</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html</context>
+          <context context-type="linenumber">19,21</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/animation/edit-animation-advanced/edit-animation-advanced.component.html</context>
+          <context context-type="linenumber">20,22</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/audioOscillator/edit-audio-oscillator-advanced/edit-audio-oscillator-advanced.component.html</context>
+          <context context-type="linenumber">20,22</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
+          <context context-type="linenumber">213,215</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-advanced/edit-dialog-guidance-advanced.component.html</context>
+          <context context-type="linenumber">12,14</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html</context>
+          <context context-type="linenumber">14,16</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html</context>
+          <context context-type="linenumber">26,28</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/embedded/edit-embedded-advanced/edit-embedded-advanced.component.html</context>
+          <context context-type="linenumber">33,35</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html</context>
+          <context context-type="linenumber">210,212</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/html/edit-html-advanced/edit-html-advanced.component.html</context>
+          <context context-type="linenumber">10,12</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.html</context>
+          <context context-type="linenumber">26,28</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html</context>
+          <context context-type="linenumber">42,44</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.html</context>
+          <context context-type="linenumber">31,33</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
+          <context context-type="linenumber">580,582</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/outsideURL/edit-outside-url-advanced/edit-outside-url-advanced.component.ts</context>
+          <context context-type="linenumber">19,21</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/peerChat/edit-peer-chat-advanced-component/edit-peer-chat-advanced-component.component.ts</context>
+          <context context-type="linenumber">11,13</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/showGroupWork/edit-show-group-work-advanced/edit-show-group-work-advanced.component.ts</context>
+          <context context-type="linenumber">11,13</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/showMyWork/edit-show-my-work-advanced/edit-show-my-work-advanced.component.ts</context>
+          <context context-type="linenumber">11,13</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/summary/edit-summary-advanced/edit-summary-advanced.component.ts</context>
+          <context context-type="linenumber">19,21</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
+          <context context-type="linenumber">276,278</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2557623954339695776" datatype="html">
+        <source>Connections</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html</context>
+          <context context-type="linenumber">25,28</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/animation/edit-animation-advanced/edit-animation-advanced.component.html</context>
+          <context context-type="linenumber">26,29</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/audioOscillator/edit-audio-oscillator-advanced/edit-audio-oscillator-advanced.component.html</context>
+          <context context-type="linenumber">26,29</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
+          <context context-type="linenumber">219,222</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-advanced/edit-dialog-guidance-advanced.component.html</context>
+          <context context-type="linenumber">18,21</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html</context>
+          <context context-type="linenumber">20,23</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html</context>
+          <context context-type="linenumber">32,35</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/embedded/edit-embedded-advanced/edit-embedded-advanced.component.html</context>
+          <context context-type="linenumber">39,42</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html</context>
+          <context context-type="linenumber">216,219</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.html</context>
+          <context context-type="linenumber">32,35</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html</context>
+          <context context-type="linenumber">48,51</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.html</context>
+          <context context-type="linenumber">37,40</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
+          <context context-type="linenumber">586,589</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
+          <context context-type="linenumber">282,285</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="555720515547706264" datatype="html">
+        <source>Students watch an animation.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/animation/AnimationInfo.ts</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7885570895165894241" datatype="html">
+        <source>Animation</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/animation/AnimationInfo.ts</context>
+          <context context-type="linenumber">5</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/animation/AnimationInfo.ts</context>
+          <context context-type="linenumber">8</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/animation/animationService.ts</context>
+          <context context-type="linenumber">9</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3262484830112117000" datatype="html">
@@ -16448,11 +16900,11 @@ Are you sure you want to proceed?</source>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html</context>
-          <context context-type="linenumber">105,106</context>
+          <context context-type="linenumber">110,111</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html</context>
-          <context context-type="linenumber">156,157</context>
+          <context context-type="linenumber">161,162</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/table/table-authoring/table-authoring.component.html</context>
@@ -17817,95 +18269,95 @@ Are you ready to receive feedback on this answer?</source>
         <source> Show Auto Score </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
-          <context context-type="linenumber">9,14</context>
+          <context context-type="linenumber">14,18</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7204440653533209919" datatype="html">
         <source> Show Auto Feedback </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
-          <context context-type="linenumber">19,22</context>
+          <context context-type="linenumber">24,27</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4645345687322304891" datatype="html">
         <source>Rules</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
-          <context context-type="linenumber">23,24</context>
+          <context context-type="linenumber">28,29</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5108291808218367313" datatype="html">
         <source><x id="START_TAG_MAT_ICON" ctype="x-mat_icon" equiv-text="&lt;mat-icon&gt;"/>add<x id="CLOSE_TAG_MAT_ICON" ctype="x-mat_icon" equiv-text="&lt;/mat-icon&gt;"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
-          <context context-type="linenumber">25,27</context>
+          <context context-type="linenumber">30,32</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">291,293</context>
+          <context context-type="linenumber">318,319</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8185078869695276161" datatype="html">
         <source>Rule Name</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
-          <context context-type="linenumber">31,32</context>
+          <context context-type="linenumber">36,37</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3730039082945415558" datatype="html">
         <source>Rule Type</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
-          <context context-type="linenumber">36,37</context>
+          <context context-type="linenumber">41,42</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8169176486137628315" datatype="html">
         <source>should contain</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
-          <context context-type="linenumber">38,39</context>
+          <context context-type="linenumber">43,44</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3277724871797964976" datatype="html">
         <source>should not contain</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
-          <context context-type="linenumber">39,42</context>
+          <context context-type="linenumber">44,47</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6832879550227262389" datatype="html">
         <source>Comparison</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
-          <context context-type="linenumber">43,44</context>
+          <context context-type="linenumber">48,49</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6550339439511070147" datatype="html">
         <source>exactly</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
-          <context context-type="linenumber">45,46</context>
+          <context context-type="linenumber">50,51</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6183016012908695689" datatype="html">
         <source>more than</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
-          <context context-type="linenumber">46,47</context>
+          <context context-type="linenumber">51,52</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8014012170270529279" datatype="html">
         <source>less than</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
-          <context context-type="linenumber">47,50</context>
+          <context context-type="linenumber">52,55</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8177873832400820695" datatype="html">
         <source>Count</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
-          <context context-type="linenumber">51,54</context>
+          <context context-type="linenumber">56,59</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/directives/summary-display/summary-display.component.ts</context>
@@ -17916,53 +18368,53 @@ Are you ready to receive feedback on this answer?</source>
         <source>Node</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
-          <context context-type="linenumber">63,64</context>
+          <context context-type="linenumber">68,69</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
-          <context context-type="linenumber">96,97</context>
+          <context context-type="linenumber">101,102</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4643424617552820254" datatype="html">
         <source>Link Connection</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
-          <context context-type="linenumber">75,76</context>
+          <context context-type="linenumber">80,81</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7907945348249932591" datatype="html">
         <source>with any or no link</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
-          <context context-type="linenumber">77,78</context>
+          <context context-type="linenumber">82,83</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1161611634034772834" datatype="html">
         <source>with specific link</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
-          <context context-type="linenumber">78,81</context>
+          <context context-type="linenumber">83,86</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3207050836358092212" datatype="html">
         <source>to</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
-          <context context-type="linenumber">94,96</context>
+          <context context-type="linenumber">99,101</context>
         </context-group>
       </trans-unit>
       <trans-unit id="9059370898508409354" datatype="html">
         <source> Add Category (Optional) </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
-          <context context-type="linenumber">112,115</context>
+          <context context-type="linenumber">117,120</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5265520188056210631" datatype="html">
         <source>Category Name</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
-          <context context-type="linenumber">118,121</context>
+          <context context-type="linenumber">123,126</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/graph/graph-authoring/graph-authoring.component.html</context>
@@ -17973,35 +18425,35 @@ Are you ready to receive feedback on this answer?</source>
         <source>Delete Catagory</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
-          <context context-type="linenumber">129,132</context>
+          <context context-type="linenumber">134,136</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5014211148978183528" datatype="html">
         <source><x id="START_TAG_MAT_ICON" ctype="x-mat_icon" equiv-text="&lt;mat-icon&gt;"/>arrow_upward<x id="CLOSE_TAG_MAT_ICON" ctype="x-mat_icon" equiv-text="&lt;/mat-icon&gt;"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
-          <context context-type="linenumber">148,150</context>
+          <context context-type="linenumber">153,154</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3933631340363368115" datatype="html">
         <source><x id="START_TAG_MAT_ICON" ctype="x-mat_icon" equiv-text="&lt;mat-icon&gt;"/>arrow_downward<x id="CLOSE_TAG_MAT_ICON" ctype="x-mat_icon" equiv-text="&lt;/mat-icon&gt;"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
-          <context context-type="linenumber">159,161</context>
+          <context context-type="linenumber">164,165</context>
         </context-group>
       </trans-unit>
       <trans-unit id="697516526173606785" datatype="html">
         <source><x id="START_TAG_MAT_ICON" ctype="x-mat_icon" equiv-text="&lt;mat-icon&gt;"/>delete<x id="CLOSE_TAG_MAT_ICON" ctype="x-mat_icon" equiv-text="&lt;/mat-icon&gt;"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
-          <context context-type="linenumber">170,172</context>
+          <context context-type="linenumber">175,176</context>
         </context-group>
       </trans-unit>
       <trans-unit id="500264980333816901" datatype="html">
         <source>Custom Rule Evaluator</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
-          <context context-type="linenumber">177,180</context>
+          <context context-type="linenumber">182,185</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1619150342877037073" datatype="html">
@@ -18010,7 +18462,7 @@ Are you ready to receive feedback on this answer?</source>
 Rule Name: <x id="PH" equiv-text="ruleName"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.ts</context>
-          <context context-type="linenumber">72</context>
+          <context context-type="linenumber">66</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5561671044584768513" datatype="html">
@@ -18020,7 +18472,7 @@ Rule Name: <x id="PH" equiv-text="ruleName"/>
 Category Name: <x id="PH_1" equiv-text="categoryName"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.ts</context>
-          <context context-type="linenumber">94</context>
+          <context context-type="linenumber">88</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6591302615932523578" datatype="html">
@@ -19239,7 +19691,7 @@ Category Name: <x id="PH_1" equiv-text="categoryName"/></source>
         <source>Model Parameters</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/embedded/edit-embedded-advanced/edit-embedded-advanced.component.html</context>
-          <context context-type="linenumber">5,8</context>
+          <context context-type="linenumber">10,12</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2523845313743263564" datatype="html">
@@ -19325,98 +19777,98 @@ Category Name: <x id="PH_1" equiv-text="categoryName"/></source>
         <source>Subtitle</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html</context>
-          <context context-type="linenumber">5,8</context>
+          <context context-type="linenumber">10,12</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6038090354944913407" datatype="html">
         <source> Show Mouse X Plot Line </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html</context>
-          <context context-type="linenumber">17,20</context>
+          <context context-type="linenumber">22,25</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7511254113975885497" datatype="html">
         <source> Highlight X Range From Zero </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html</context>
-          <context context-type="linenumber">28,33</context>
+          <context context-type="linenumber">33,37</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2374606233482948612" datatype="html">
         <source> Show Mouse Y Plot Line </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html</context>
-          <context context-type="linenumber">38,43</context>
+          <context context-type="linenumber">43,47</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4914369430419603773" datatype="html">
         <source> Save Mouse Over Points </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html</context>
-          <context context-type="linenumber">48,53</context>
+          <context context-type="linenumber">53,57</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2109638896440504960" datatype="html">
         <source> Hide Trial Select </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html</context>
-          <context context-type="linenumber">58,63</context>
+          <context context-type="linenumber">63,67</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2854843866190535864" datatype="html">
         <source> Use Custom Legend </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html</context>
-          <context context-type="linenumber">68,71</context>
+          <context context-type="linenumber">73,76</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1068887658267080826" datatype="html">
         <source>Custom Legend</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html</context>
-          <context context-type="linenumber">75,77</context>
+          <context context-type="linenumber">80,82</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1641317975197485744" datatype="html">
         <source>X Axis Plot Line</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html</context>
-          <context context-type="linenumber">82,86</context>
+          <context context-type="linenumber">87,90</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4237918213546843069" datatype="html">
         <source>Add X Axis Plot Line</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html</context>
-          <context context-type="linenumber">87,91</context>
+          <context context-type="linenumber">92,95</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1981747122879457636" datatype="html">
         <source>X Value</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html</context>
-          <context context-type="linenumber">110,111</context>
+          <context context-type="linenumber">115,116</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1311123949267647741" datatype="html">
         <source>Y Axis Plot Line</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html</context>
-          <context context-type="linenumber">133,137</context>
+          <context context-type="linenumber">138,141</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8612283902503651053" datatype="html">
         <source>Add Y Axis Plot Line</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html</context>
-          <context context-type="linenumber">138,142</context>
+          <context context-type="linenumber">143,146</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1916263168413560281" datatype="html">
         <source>Y Value</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html</context>
-          <context context-type="linenumber">161,162</context>
+          <context context-type="linenumber">166,167</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2284734213284090218" datatype="html">
@@ -19667,7 +20119,7 @@ Category Name: <x id="PH_1" equiv-text="categoryName"/></source>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
-          <context context-type="linenumber">98,99</context>
+          <context context-type="linenumber">103,104</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3209999096046346298" datatype="html">
@@ -19748,7 +20200,7 @@ Category Name: <x id="PH_1" equiv-text="categoryName"/></source>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
-          <context context-type="linenumber">87,89</context>
+          <context context-type="linenumber">92,94</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5289698469514143994" datatype="html">
@@ -20480,12 +20932,11 @@ Category Name: <x id="PH_1" equiv-text="categoryName"/></source>
           <context context-type="linenumber">35</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="1333234691426606537" datatype="html">
-        <source> Student Can Create Choices
-</source>
+      <trans-unit id="7986847885560446361" datatype="html">
+        <source> Student Can Create Choices </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html</context>
-          <context context-type="linenumber">8,13</context>
+          <context context-type="linenumber">13,17</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2424938650602658133" datatype="html">
@@ -20818,11 +21269,11 @@ Warning: This will delete all existing choices and buckets in this activity.</so
         <source> Show Feedback </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.html</context>
-          <context context-type="linenumber">8,11</context>
+          <context context-type="linenumber">13,16</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">63,67</context>
+          <context context-type="linenumber">89,92</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3824537844289284943" datatype="html">
@@ -20969,215 +21420,222 @@ Warning: This will delete all existing choices in this activity.</source>
         <source>Starter Sentence</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">4,8</context>
+          <context context-type="linenumber">9,11</context>
         </context-group>
       </trans-unit>
       <trans-unit id="220156928567517440" datatype="html">
         <source> Allow students to record audio response </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">16,22</context>
+          <context context-type="linenumber">21,26</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3484984238852181071" datatype="html">
+        <source>AI</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
+          <context context-type="linenumber">43,47</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1759795162772199785" datatype="html">
         <source> Enable AI Model </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">27,31</context>
+          <context context-type="linenumber">53,56</context>
         </context-group>
       </trans-unit>
       <trans-unit id="9153897398545804453" datatype="html">
         <source>Score On</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">34,36</context>
+          <context context-type="linenumber">60,62</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1230154438678955604" datatype="html">
         <source>Change</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">41,46</context>
+          <context context-type="linenumber">67,70</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7401107549258505528" datatype="html">
         <source> Show Score </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">53,58</context>
+          <context context-type="linenumber">79,83</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6706329976663713413" datatype="html">
         <source> Enable Feedback Rules </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">73,75</context>
+          <context context-type="linenumber">99,101</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5056621402071854825" datatype="html">
         <source>Scoring Rule</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">84,87</context>
+          <context context-type="linenumber">111,114</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2840439048375115947" datatype="html">
         <source>Add Scoring Rule</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">89,92</context>
+          <context context-type="linenumber">116,119</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1749702431264125217" datatype="html">
         <source>Feedback Text</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">117,119</context>
+          <context context-type="linenumber">144,146</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6318060955337736972" datatype="html">
         <source>Move Scoring Rule Up</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">128,131</context>
+          <context context-type="linenumber">155,157</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8741073904951621119" datatype="html">
         <source>Move Scoring Rule Down</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">139,142</context>
+          <context context-type="linenumber">166,168</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8481143767365565734" datatype="html">
         <source>Delete Scoring Rule</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">149,152</context>
+          <context context-type="linenumber">176,178</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4753983371217895606" datatype="html">
         <source> Enable Multiple Attempt Feedback </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">169,172</context>
+          <context context-type="linenumber">196,199</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6924674031457346140" datatype="html">
         <source>Multiple Attempt Scoring Rules</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">174,177</context>
+          <context context-type="linenumber">201,204</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2707777420645958826" datatype="html">
         <source>Add Multiple Attempt Scoring Rule</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">179,182</context>
+          <context context-type="linenumber">206,209</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2885623017281914681" datatype="html">
         <source>Previous Score</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">195,198</context>
+          <context context-type="linenumber">222,225</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">304,307</context>
+          <context context-type="linenumber">331,334</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2466216299740593982" datatype="html">
         <source>Current Score</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">204,207</context>
+          <context context-type="linenumber">231,234</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">314,317</context>
+          <context context-type="linenumber">341,344</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8219288603984689566" datatype="html">
         <source>Feedback to Student</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">215,217</context>
+          <context context-type="linenumber">242,244</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">402,404</context>
+          <context context-type="linenumber">429,431</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1237543279965214424" datatype="html">
         <source>Move Multiple Attempt Scoring Rule Up</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">231,234</context>
+          <context context-type="linenumber">258,260</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5646689888494364443" datatype="html">
         <source>Move Multiple Attempt Scoring Rule Down</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">247,250</context>
+          <context context-type="linenumber">274,276</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8247485612014750779" datatype="html">
         <source>Delet Multiple Attempt Scoring</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">257,260</context>
+          <context context-type="linenumber">284,286</context>
         </context-group>
       </trans-unit>
       <trans-unit id="681347196878226021" datatype="html">
         <source> Enable Notifications </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">277,280</context>
+          <context context-type="linenumber">304,307</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5851560788527570644" datatype="html">
         <source>Notifications</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">282,285</context>
+          <context context-type="linenumber">309,312</context>
         </context-group>
       </trans-unit>
       <trans-unit id="370200567263525921" datatype="html">
         <source>Move Notification Up</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">335,337</context>
+          <context context-type="linenumber">362,364</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2769177863929534863" datatype="html">
         <source>Move Notification Down</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">351,353</context>
+          <context context-type="linenumber">378,380</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1807548935384776633" datatype="html">
         <source>Delete Notification</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">361,363</context>
+          <context context-type="linenumber">388,390</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6336206965755061198" datatype="html">
         <source> Enable Ambient Display Dismiss Mode </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">376,378</context>
+          <context context-type="linenumber">403,405</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4441143426637747672" datatype="html">
         <source>Dismiss Code</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">380,383</context>
+          <context context-type="linenumber">407,410</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/vle/dismiss-ambient-notification-dialog/dismiss-ambient-notification-dialog.component.html</context>
@@ -21188,70 +21646,70 @@ Warning: This will delete all existing choices in this activity.</source>
         <source> Notify Student </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">396,398</context>
+          <context context-type="linenumber">423,425</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6137238378032253613" datatype="html">
         <source> Notify Teacher </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">416,418</context>
+          <context context-type="linenumber">443,445</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6470995886890122968" datatype="html">
         <source>Feedback to Teacher</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">422,424</context>
+          <context context-type="linenumber">449,451</context>
         </context-group>
       </trans-unit>
       <trans-unit id="853281253580647095" datatype="html">
         <source> Use Custom Completion Criteria </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">441,443</context>
+          <context context-type="linenumber">468,470</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6321190757824576813" datatype="html">
         <source>Custom Completion Criteria</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">445,448</context>
+          <context context-type="linenumber">472,475</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3954026354727494376" datatype="html">
         <source>Add Completion Criteria</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">450,453</context>
+          <context context-type="linenumber">477,480</context>
         </context-group>
       </trans-unit>
       <trans-unit id="376261460573165321" datatype="html">
         <source>Move Completion Criteria Up</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">508,511</context>
+          <context context-type="linenumber">537,539</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2584224885214103035" datatype="html">
         <source>Move Completion Criteria Down</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">519,522</context>
+          <context context-type="linenumber">550,552</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4117701430807776885" datatype="html">
         <source>Delete Completion Criteria</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">529,532</context>
+          <context context-type="linenumber">560,562</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8705933649296793690" datatype="html">
         <source>Default feedback</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts</context>
-          <context context-type="linenumber">48</context>
+          <context context-type="linenumber">40</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2839735751687486837" datatype="html">
@@ -21262,7 +21720,7 @@ Score: <x id="PH" equiv-text="score"/>
 Feedback Text: <x id="PH_1" equiv-text="feedbackText"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts</context>
-          <context context-type="linenumber">125</context>
+          <context context-type="linenumber">117</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1461861786609911168" datatype="html">
@@ -21275,28 +21733,28 @@ Current Score: <x id="PH_1" equiv-text="currentScore"/>
 Feedback Text: <x id="PH_2" equiv-text="feedbackText"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts</context>
-          <context context-type="linenumber">164</context>
+          <context context-type="linenumber">156</context>
         </context-group>
       </trans-unit>
       <trans-unit id="846244999760672149" datatype="html">
         <source>you got a score of</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts</context>
-          <context context-type="linenumber">194</context>
+          <context context-type="linenumber">186</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7599226289089492371" datatype="html">
         <source>Please talk to your teacher</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts</context>
-          <context context-type="linenumber">196</context>
+          <context context-type="linenumber">188</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5580639382077453513" datatype="html">
         <source>got a score of</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts</context>
-          <context context-type="linenumber">198</context>
+          <context context-type="linenumber">190</context>
         </context-group>
       </trans-unit>
       <trans-unit id="867656616658826137" datatype="html">
@@ -21307,21 +21765,21 @@ Previous Score: <x id="PH" equiv-text="previousScore"/>
 Current Score: <x id="PH_1" equiv-text="currentScore"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts</context>
-          <context context-type="linenumber">212</context>
+          <context context-type="linenumber">204</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3689003016353565518" datatype="html">
         <source>Are you sure you want to delete the custom completion criteria?</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts</context>
-          <context context-type="linenumber">246</context>
+          <context context-type="linenumber">238</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2986030604058491184" datatype="html">
         <source>Are you sure you want to delete this completion criteria?</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts</context>
-          <context context-type="linenumber">278</context>
+          <context context-type="linenumber">270</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2481731999593972877" datatype="html">
@@ -22014,91 +22472,91 @@ If this problem continues, let your teacher know and move on to the next activit
         <source> Enable Data Explorer </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
-          <context context-type="linenumber">9,12</context>
+          <context context-type="linenumber">14,17</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4173311596714384928" datatype="html">
         <source>Allowed Graph Types:</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
-          <context context-type="linenumber">15,18</context>
+          <context context-type="linenumber">20,23</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7616972858721568695" datatype="html">
         <source> Scatter Plot </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
-          <context context-type="linenumber">22,25</context>
+          <context context-type="linenumber">27,30</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7157349609585445725" datatype="html">
         <source> Line Graph </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
-          <context context-type="linenumber">30,33</context>
+          <context context-type="linenumber">35,38</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3855767997754076890" datatype="html">
         <source> Bar Graph </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
-          <context context-type="linenumber">38,41</context>
+          <context context-type="linenumber">43,46</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4020076158139443273" datatype="html">
         <source> Show Scatter Plot Regression Line </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
-          <context context-type="linenumber">49,54</context>
+          <context context-type="linenumber">54,57</context>
         </context-group>
       </trans-unit>
       <trans-unit id="545032190934312859" datatype="html">
         <source>Number of Series</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
-          <context context-type="linenumber">55,58</context>
+          <context context-type="linenumber">60,63</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6782739524699579798" datatype="html">
         <source>Number of Y Axes</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
-          <context context-type="linenumber">67,70</context>
+          <context context-type="linenumber">72,75</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1137431228467559488" datatype="html">
         <source>Choose the Y Axis for each Series</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
-          <context context-type="linenumber">79,81</context>
+          <context context-type="linenumber">84,86</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8872044219673964063" datatype="html">
         <source> Can Student Edit Axis Labels </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
-          <context context-type="linenumber">114,118</context>
+          <context context-type="linenumber">119,122</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3713391988569817922" datatype="html">
         <source>Fix Data to Table Column</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
-          <context context-type="linenumber">119,121</context>
+          <context context-type="linenumber">124,126</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4903641308316968050" datatype="html">
         <source>You can author x or y data to always use a specific table column. The student will not be able to change the table column for that x or y data. If you want the student to be able to choose the table column, you can leave the select option blank for that x or y data.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
-          <context context-type="linenumber">121,124</context>
+          <context context-type="linenumber">126,128</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4924717968662921227" datatype="html">
         <source>X Data</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
-          <context context-type="linenumber">129,131</context>
+          <context context-type="linenumber">134,136</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/table/table-show-work/table-show-work.component.html</context>
@@ -22113,35 +22571,35 @@ If this problem continues, let your teacher know and move on to the next activit
         <source>(Allow student to select)</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
-          <context context-type="linenumber">134,135</context>
+          <context context-type="linenumber">139,140</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
-          <context context-type="linenumber">167,168</context>
+          <context context-type="linenumber">172,173</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7307452398282895526" datatype="html">
         <source>Table Column</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
-          <context context-type="linenumber">138,140</context>
+          <context context-type="linenumber">143,145</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
-          <context context-type="linenumber">171,173</context>
+          <context context-type="linenumber">176,178</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
-          <context context-type="linenumber">193,195</context>
+          <context context-type="linenumber">198,200</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4008480597051306996" datatype="html">
         <source>Y Data <x id="INTERPOLATION" equiv-text="{{
-                componentContent.numDataExplorerSeries &gt; 1 ? dataExplorerSeriesIndex + 1 : &apos;&apos;
-              }}"/></source>
+                    componentContent.numDataExplorerSeries &gt; 1 ? dataExplorerSeriesIndex + 1 : &apos;&apos;
+                  }}"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
-          <context context-type="linenumber">155,158</context>
+          <context context-type="linenumber">160,163</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/table/table-show-work/table-show-work.component.html</context>
@@ -22156,70 +22614,70 @@ If this problem continues, let your teacher know and move on to the next activit
         <source>Tooltip Header Column</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
-          <context context-type="linenumber">184,186</context>
+          <context context-type="linenumber">189,191</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3881979289060192401" datatype="html">
         <source>(Default)</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
-          <context context-type="linenumber">189,190</context>
+          <context context-type="linenumber">194,195</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6831283049838928246" datatype="html">
         <source>When the student hovers their mouse over a data point on a scatter plot or line graph, the tooltip will display the value from this column along with the x and y values. This can be left blank and the tooltip will still show the x and y values like normal.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
-          <context context-type="linenumber">203,206</context>
+          <context context-type="linenumber">208,211</context>
         </context-group>
       </trans-unit>
       <trans-unit id="422640406252615282" datatype="html">
         <source>Import Table</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
-          <context context-type="linenumber">219,223</context>
+          <context context-type="linenumber">224,228</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2086728176415459180" datatype="html">
         <source>Only .csv (comma separated values) files are allowed</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
-          <context context-type="linenumber">228,233</context>
+          <context context-type="linenumber">233,237</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7356324061229396264" datatype="html">
         <source> Enable Row Selection </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
-          <context context-type="linenumber">256,260</context>
+          <context context-type="linenumber">261,264</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3802284852279199102" datatype="html">
         <source>Are you sure you want to overwrite the existing table?</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.ts</context>
-          <context context-type="linenumber">221</context>
+          <context context-type="linenumber">193</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5497998297263821629" datatype="html">
         <source>Importing table...</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.ts</context>
-          <context context-type="linenumber">223</context>
+          <context context-type="linenumber">195</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4805591784714355993" datatype="html">
         <source>Error: The table contains more than <x id="PH" equiv-text="this.MAX_ALLOWED_CELLS_IN_IMPORT"/> cells</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.ts</context>
-          <context context-type="linenumber">231</context>
+          <context context-type="linenumber">203</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8522934403801176161" datatype="html">
         <source>Successfully imported table</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.ts</context>
-          <context context-type="linenumber">235</context>
+          <context context-type="linenumber">207</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3206542606001340679" datatype="html">

From 6ee2e528431c54c6a563667288bd97314419f3e1 Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Tue, 7 Apr 2026 13:14:42 -0700
Subject: [PATCH 27/33] Component rubric authoring: remove button to toggle
 tinymce, and show it immediately when the user opens the tab

---
 .../edit-component-rubric.component.html      |  21 --
 .../edit-component-rubric.component.ts        |  22 +-
 .../edit-ai-chat-advanced.component.html      |   5 +-
 .../edit-animation-advanced.component.html    |   5 +-
 ...t-audio-oscillator-advanced.component.html |   5 +-
 .../edit-concept-map-advanced.component.html  |   5 +-
 ...it-dialog-guidance-advanced.component.html |   5 +-
 .../edit-discussion-advanced.component.html   |   5 +-
 .../edit-draw-advanced.component.html         |   5 +-
 .../edit-embedded-advanced.component.html     |   5 +-
 .../edit-graph-advanced.component.html        |   5 +-
 .../edit-html-advanced.component.html         |   2 +-
 .../edit-label-advanced.component.html        |   5 +-
 .../edit-match-advanced.component.html        |   5 +-
 ...it-multiple-choice-advanced.component.html |   5 +-
 ...edit-open-response-advanced.component.html |   5 +-
 .../edit-outside-url-advanced.component.ts    |   5 +-
 ...-peer-chat-advanced-component.component.ts |   5 +-
 ...edit-show-group-work-advanced.component.ts |   5 +-
 .../edit-show-my-work-advanced.component.ts   |   5 +-
 .../edit-summary-advanced.component.ts        |   5 +-
 .../edit-table-advanced.component.html        |   5 +-
 src/messages.xlf                              | 269 +++++++++---------
 23 files changed, 212 insertions(+), 197 deletions(-)
 delete mode 100644 src/app/authoring-tool/edit-component-rubric/edit-component-rubric.component.html

diff --git a/src/app/authoring-tool/edit-component-rubric/edit-component-rubric.component.html b/src/app/authoring-tool/edit-component-rubric/edit-component-rubric.component.html
deleted file mode 100644
index 3a2b3769604..00000000000
--- a/src/app/authoring-tool/edit-component-rubric/edit-component-rubric.component.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<div class="flex flex-row justify-start items-center gap-2">
-  <mat-label class="node__label--vertical-alignment" i18n>Rubric</mat-label>
-  <button
-    mat-raised-button
-    color="primary"
-    class="topButton enable-in-translation"
-    (click)="showRubricAuthoring = !showRubricAuthoring"
-    matTooltip="Edit activity rubric"
-    i18n-matTooltip
-    matTooltipPosition="above"
-  >
-    <mat-icon>message</mat-icon>
-  </button>
-</div>
-@if (showRubricAuthoring) {
-  <translatable-rich-text-editor
-    [content]="componentContent"
-    key="rubric"
-    (defaultLanguageTextChanged)="save()"
-  />
-}
diff --git a/src/app/authoring-tool/edit-component-rubric/edit-component-rubric.component.ts b/src/app/authoring-tool/edit-component-rubric/edit-component-rubric.component.ts
index a2b667fb10c..12c0bafd13e 100644
--- a/src/app/authoring-tool/edit-component-rubric/edit-component-rubric.component.ts
+++ b/src/app/authoring-tool/edit-component-rubric/edit-component-rubric.component.ts
@@ -1,28 +1,18 @@
 import { Component, Input } from '@angular/core';
 import { TeacherProjectService } from '../../../assets/wise5/services/teacherProjectService';
-import { MatButtonModule } from '@angular/material/button';
-import { MatIconModule } from '@angular/material/icon';
 import { TranslatableRichTextEditorComponent } from '../../../assets/wise5/authoringTool/components/translatable-rich-text-editor/translatable-rich-text-editor.component';
-import { MatTooltipModule } from '@angular/material/tooltip';
-import { MatFormFieldModule } from '@angular/material/form-field';
 
 @Component({
-  imports: [
-    MatButtonModule,
-    MatFormFieldModule,
-    MatIconModule,
-    MatTooltipModule,
-    TranslatableRichTextEditorComponent
-  ],
+  imports: [TranslatableRichTextEditorComponent],
   selector: 'edit-component-rubric',
-  styles: [
-    'label { margin-right: 10px; } div { margin-bottom: 10px; } .mat-icon { margin: 0px; } '
-  ],
-  templateUrl: 'edit-component-rubric.component.html'
+  template: `<translatable-rich-text-editor
+    [content]="componentContent"
+    key="rubric"
+    (defaultLanguageTextChanged)="save()"
+  />`
 })
 export class EditComponentRubricComponent {
   @Input() componentContent: any;
-  protected showRubricAuthoring: boolean;
 
   constructor(private projectService: TeacherProjectService) {}
 
diff --git a/src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html b/src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html
index 62e706a37a9..399858b50d8 100644
--- a/src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html
+++ b/src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html
@@ -37,7 +37,10 @@
     <ng-template mat-tab-label>
       <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
     </ng-template>
-    <edit-component-rubric [componentContent]="componentContent" />
+    <ng-template matTabContent>
+      <!-- lazy load needed for tinymce to work -->
+      <edit-component-rubric [componentContent]="component.content" />
+    </ng-template>
   </mat-tab>
   <mat-tab>
     <ng-template mat-tab-label> <mat-icon>sell</mat-icon>&nbsp;<span i18n>Tags</span></ng-template>
diff --git a/src/assets/wise5/components/animation/edit-animation-advanced/edit-animation-advanced.component.html b/src/assets/wise5/components/animation/edit-animation-advanced/edit-animation-advanced.component.html
index 09ee41bb94d..4be790f82ad 100644
--- a/src/assets/wise5/components/animation/edit-animation-advanced/edit-animation-advanced.component.html
+++ b/src/assets/wise5/components/animation/edit-animation-advanced/edit-animation-advanced.component.html
@@ -38,7 +38,10 @@
     <ng-template mat-tab-label>
       <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
     </ng-template>
-    <edit-component-rubric [componentContent]="component.content" />
+    <ng-template matTabContent>
+      <!-- lazy load needed for tinymce to work -->
+      <edit-component-rubric [componentContent]="component.content" />
+    </ng-template>
   </mat-tab>
   <mat-tab>
     <ng-template mat-tab-label> <mat-icon>sell</mat-icon>&nbsp;<span i18n>Tags</span></ng-template>
diff --git a/src/assets/wise5/components/audioOscillator/edit-audio-oscillator-advanced/edit-audio-oscillator-advanced.component.html b/src/assets/wise5/components/audioOscillator/edit-audio-oscillator-advanced/edit-audio-oscillator-advanced.component.html
index 09ee41bb94d..4be790f82ad 100644
--- a/src/assets/wise5/components/audioOscillator/edit-audio-oscillator-advanced/edit-audio-oscillator-advanced.component.html
+++ b/src/assets/wise5/components/audioOscillator/edit-audio-oscillator-advanced/edit-audio-oscillator-advanced.component.html
@@ -38,7 +38,10 @@
     <ng-template mat-tab-label>
       <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
     </ng-template>
-    <edit-component-rubric [componentContent]="component.content" />
+    <ng-template matTabContent>
+      <!-- lazy load needed for tinymce to work -->
+      <edit-component-rubric [componentContent]="component.content" />
+    </ng-template>
   </mat-tab>
   <mat-tab>
     <ng-template mat-tab-label> <mat-icon>sell</mat-icon>&nbsp;<span i18n>Tags</span></ng-template>
diff --git a/src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html b/src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html
index 0a71b783fb6..d5d2274902e 100644
--- a/src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html
+++ b/src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html
@@ -231,7 +231,10 @@
     <ng-template mat-tab-label>
       <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
     </ng-template>
-    <edit-component-rubric [componentContent]="component.content" />
+    <ng-template matTabContent>
+      <!-- lazy load needed for tinymce to work -->
+      <edit-component-rubric [componentContent]="component.content" />
+    </ng-template>
   </mat-tab>
   <mat-tab>
     <ng-template mat-tab-label> <mat-icon>sell</mat-icon>&nbsp;<span i18n>Tags</span></ng-template>
diff --git a/src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-advanced/edit-dialog-guidance-advanced.component.html b/src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-advanced/edit-dialog-guidance-advanced.component.html
index 59aac53991a..e96b0219fad 100644
--- a/src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-advanced/edit-dialog-guidance-advanced.component.html
+++ b/src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-advanced/edit-dialog-guidance-advanced.component.html
@@ -30,7 +30,10 @@
     <ng-template mat-tab-label>
       <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
     </ng-template>
-    <edit-component-rubric [componentContent]="componentContent" />
+    <ng-template matTabContent>
+      <!-- lazy load needed for tinymce to work -->
+      <edit-component-rubric [componentContent]="component.content" />
+    </ng-template>
   </mat-tab>
   <mat-tab>
     <ng-template mat-tab-label> <mat-icon>sell</mat-icon>&nbsp;<span i18n>Tags</span></ng-template>
diff --git a/src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html b/src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html
index f7763164d97..e0bee2f0b60 100644
--- a/src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html
+++ b/src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html
@@ -32,7 +32,10 @@
     <ng-template mat-tab-label>
       <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
     </ng-template>
-    <edit-component-rubric [componentContent]="componentContent" />
+    <ng-template matTabContent>
+      <!-- lazy load needed for tinymce to work -->
+      <edit-component-rubric [componentContent]="component.content" />
+    </ng-template>
   </mat-tab>
   <mat-tab>
     <ng-template mat-tab-label> <mat-icon>sell</mat-icon>&nbsp;<span i18n>Tags</span></ng-template>
diff --git a/src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html b/src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html
index 7d7b2d7e95a..ab665d7e449 100644
--- a/src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html
+++ b/src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html
@@ -44,7 +44,10 @@
     <ng-template mat-tab-label>
       <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
     </ng-template>
-    <edit-component-rubric [componentContent]="component.content" />
+    <ng-template matTabContent>
+      <!-- lazy load needed for tinymce to work -->
+      <edit-component-rubric [componentContent]="component.content" />
+    </ng-template>
   </mat-tab>
   <mat-tab>
     <ng-template mat-tab-label> <mat-icon>sell</mat-icon>&nbsp;<span i18n>Tags</span></ng-template>
diff --git a/src/assets/wise5/components/embedded/edit-embedded-advanced/edit-embedded-advanced.component.html b/src/assets/wise5/components/embedded/edit-embedded-advanced/edit-embedded-advanced.component.html
index abee69d2e9b..aeee8abd7d6 100644
--- a/src/assets/wise5/components/embedded/edit-embedded-advanced/edit-embedded-advanced.component.html
+++ b/src/assets/wise5/components/embedded/edit-embedded-advanced/edit-embedded-advanced.component.html
@@ -51,7 +51,10 @@
     <ng-template mat-tab-label>
       <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
     </ng-template>
-    <edit-component-rubric [componentContent]="component.content" />
+    <ng-template matTabContent>
+      <!-- lazy load needed for tinymce to work -->
+      <edit-component-rubric [componentContent]="component.content" />
+    </ng-template>
   </mat-tab>
   <mat-tab>
     <ng-template mat-tab-label> <mat-icon>sell</mat-icon>&nbsp;<span i18n>Tags</span></ng-template>
diff --git a/src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html b/src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html
index f0fb2c7b2f9..273380c5da7 100644
--- a/src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html
+++ b/src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html
@@ -228,7 +228,10 @@
     <ng-template mat-tab-label>
       <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
     </ng-template>
-    <edit-component-rubric [componentContent]="component.content" />
+    <ng-template matTabContent>
+      <!-- lazy load needed for tinymce to work -->
+      <edit-component-rubric [componentContent]="component.content" />
+    </ng-template>
   </mat-tab>
   <mat-tab>
     <ng-template mat-tab-label> <mat-icon>sell</mat-icon>&nbsp;<span i18n>Tags</span></ng-template>
diff --git a/src/assets/wise5/components/html/edit-html-advanced/edit-html-advanced.component.html b/src/assets/wise5/components/html/edit-html-advanced/edit-html-advanced.component.html
index 519ff543f29..b5cf23c6f3d 100644
--- a/src/assets/wise5/components/html/edit-html-advanced/edit-html-advanced.component.html
+++ b/src/assets/wise5/components/html/edit-html-advanced/edit-html-advanced.component.html
@@ -15,7 +15,7 @@
     <ng-template mat-tab-label>
       <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
     </ng-template>
-    <edit-component-rubric [componentContent]="componentContent" />
+    <edit-component-rubric [componentContent]="component.content" />
   </mat-tab>
   <mat-tab>
     <ng-template mat-tab-label> <mat-icon>code</mat-icon>&nbsp;<span i18n>JSON</span></ng-template>
diff --git a/src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.html b/src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.html
index 4bd42e8617b..d4eab62f1d9 100644
--- a/src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.html
+++ b/src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.html
@@ -44,7 +44,10 @@
     <ng-template mat-tab-label>
       <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
     </ng-template>
-    <edit-component-rubric [componentContent]="component.content" />
+    <ng-template matTabContent>
+      <!-- lazy load needed for tinymce to work -->
+      <edit-component-rubric [componentContent]="component.content" />
+    </ng-template>
   </mat-tab>
   <mat-tab>
     <ng-template mat-tab-label> <mat-icon>sell</mat-icon>&nbsp;<span i18n>Tags</span></ng-template>
diff --git a/src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html b/src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html
index 4acc6d82c59..78472f3e50b 100644
--- a/src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html
+++ b/src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html
@@ -60,7 +60,10 @@
     <ng-template mat-tab-label>
       <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
     </ng-template>
-    <edit-component-rubric [componentContent]="componentContent" />
+    <ng-template matTabContent>
+      <!-- lazy load needed for tinymce to work -->
+      <edit-component-rubric [componentContent]="component.content" />
+    </ng-template>
   </mat-tab>
   <mat-tab>
     <ng-template mat-tab-label> <mat-icon>sell</mat-icon>&nbsp;<span i18n>Tags</span></ng-template>
diff --git a/src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.html b/src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.html
index 260d2ab4c41..6513bd93169 100644
--- a/src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.html
+++ b/src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.html
@@ -49,7 +49,10 @@
     <ng-template mat-tab-label>
       <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
     </ng-template>
-    <edit-component-rubric [componentContent]="componentContent" />
+    <ng-template matTabContent>
+      <!-- lazy load needed for tinymce to work -->
+      <edit-component-rubric [componentContent]="component.content" />
+    </ng-template>
   </mat-tab>
   <mat-tab>
     <ng-template mat-tab-label> <mat-icon>sell</mat-icon>&nbsp;<span i18n>Tags</span></ng-template>
diff --git a/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html b/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html
index 2b95896e911..3803b988bc5 100644
--- a/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html
+++ b/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html
@@ -598,7 +598,10 @@
     <ng-template mat-tab-label>
       <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
     </ng-template>
-    <edit-component-rubric [componentContent]="component.content" />
+    <ng-template matTabContent>
+      <!-- lazy load needed for tinymce to work -->
+      <edit-component-rubric [componentContent]="component.content" />
+    </ng-template>
   </mat-tab>
   <mat-tab>
     <ng-template mat-tab-label> <mat-icon>sell</mat-icon>&nbsp;<span i18n>Tags</span></ng-template>
diff --git a/src/assets/wise5/components/outsideURL/edit-outside-url-advanced/edit-outside-url-advanced.component.ts b/src/assets/wise5/components/outsideURL/edit-outside-url-advanced/edit-outside-url-advanced.component.ts
index 444097753aa..19d8be86a89 100644
--- a/src/assets/wise5/components/outsideURL/edit-outside-url-advanced/edit-outside-url-advanced.component.ts
+++ b/src/assets/wise5/components/outsideURL/edit-outside-url-advanced/edit-outside-url-advanced.component.ts
@@ -24,7 +24,10 @@ import { EditComponentAdvancedSharedModule } from '../../../../../app/authoring-
         <ng-template mat-tab-label>
           <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
         </ng-template>
-        <edit-component-rubric [componentContent]="component.content" />
+        <ng-template matTabContent>
+          <!-- lazy load needed for tinymce to work -->
+          <edit-component-rubric [componentContent]="component.content" />
+        </ng-template>
       </mat-tab>
       <mat-tab>
         <ng-template mat-tab-label>
diff --git a/src/assets/wise5/components/peerChat/edit-peer-chat-advanced-component/edit-peer-chat-advanced-component.component.ts b/src/assets/wise5/components/peerChat/edit-peer-chat-advanced-component/edit-peer-chat-advanced-component.component.ts
index 75ece29b3fd..5f78895ca40 100644
--- a/src/assets/wise5/components/peerChat/edit-peer-chat-advanced-component/edit-peer-chat-advanced-component.component.ts
+++ b/src/assets/wise5/components/peerChat/edit-peer-chat-advanced-component/edit-peer-chat-advanced-component.component.ts
@@ -16,7 +16,10 @@ import { EditComponentAdvancedSharedModule } from '../../../../../app/authoring-
         <ng-template mat-tab-label>
           <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
         </ng-template>
-        <edit-component-rubric [componentContent]="component.content" />
+        <ng-template matTabContent>
+          <!-- lazy load needed for tinymce to work -->
+          <edit-component-rubric [componentContent]="component.content" />
+        </ng-template>
       </mat-tab>
       <mat-tab>
         <ng-template mat-tab-label>
diff --git a/src/assets/wise5/components/showGroupWork/edit-show-group-work-advanced/edit-show-group-work-advanced.component.ts b/src/assets/wise5/components/showGroupWork/edit-show-group-work-advanced/edit-show-group-work-advanced.component.ts
index d528208ce93..63f671e2a7a 100644
--- a/src/assets/wise5/components/showGroupWork/edit-show-group-work-advanced/edit-show-group-work-advanced.component.ts
+++ b/src/assets/wise5/components/showGroupWork/edit-show-group-work-advanced/edit-show-group-work-advanced.component.ts
@@ -16,7 +16,10 @@ import { EditComponentAdvancedSharedModule } from '../../../../../app/authoring-
         <ng-template mat-tab-label>
           <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
         </ng-template>
-        <edit-component-rubric [componentContent]="component.content" />
+        <ng-template matTabContent>
+          <!-- lazy load needed for tinymce to work -->
+          <edit-component-rubric [componentContent]="component.content" />
+        </ng-template>
       </mat-tab>
       <mat-tab>
         <ng-template mat-tab-label>
diff --git a/src/assets/wise5/components/showMyWork/edit-show-my-work-advanced/edit-show-my-work-advanced.component.ts b/src/assets/wise5/components/showMyWork/edit-show-my-work-advanced/edit-show-my-work-advanced.component.ts
index aa44e84e8b5..9f80260dac7 100644
--- a/src/assets/wise5/components/showMyWork/edit-show-my-work-advanced/edit-show-my-work-advanced.component.ts
+++ b/src/assets/wise5/components/showMyWork/edit-show-my-work-advanced/edit-show-my-work-advanced.component.ts
@@ -16,7 +16,10 @@ import { EditComponentAdvancedSharedModule } from '../../../../../app/authoring-
         <ng-template mat-tab-label>
           <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
         </ng-template>
-        <edit-component-rubric [componentContent]="component.content" />
+        <ng-template matTabContent>
+          <!-- lazy load needed for tinymce to work -->
+          <edit-component-rubric [componentContent]="component.content" />
+        </ng-template>
       </mat-tab>
       <mat-tab>
         <ng-template mat-tab-label>
diff --git a/src/assets/wise5/components/summary/edit-summary-advanced/edit-summary-advanced.component.ts b/src/assets/wise5/components/summary/edit-summary-advanced/edit-summary-advanced.component.ts
index 34af9d251d1..493ed3ea030 100644
--- a/src/assets/wise5/components/summary/edit-summary-advanced/edit-summary-advanced.component.ts
+++ b/src/assets/wise5/components/summary/edit-summary-advanced/edit-summary-advanced.component.ts
@@ -24,7 +24,10 @@ import { EditComponentAdvancedSharedModule } from '../../../../../app/authoring-
         <ng-template mat-tab-label>
           <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
         </ng-template>
-        <edit-component-rubric [componentContent]="component.content" />
+        <ng-template matTabContent>
+          <!-- lazy load needed for tinymce to work -->
+          <edit-component-rubric [componentContent]="component.content" />
+        </ng-template>
       </mat-tab>
       <mat-tab>
         <ng-template mat-tab-label>
diff --git a/src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html b/src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html
index 3cd7a8ec440..ae0e16aa0ef 100644
--- a/src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html
+++ b/src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html
@@ -294,7 +294,10 @@
     <ng-template mat-tab-label>
       <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
     </ng-template>
-    <edit-component-rubric [componentContent]="component.content" />
+    <ng-template matTabContent>
+      <!-- lazy load needed for tinymce to work -->
+      <edit-component-rubric [componentContent]="component.content" />
+    </ng-template>
   </mat-tab>
   <mat-tab>
     <ng-template mat-tab-label> <mat-icon>sell</mat-icon>&nbsp;<span i18n>Tags</span></ng-template>
diff --git a/src/messages.xlf b/src/messages.xlf
index 07b0ba79ab1..42df54a60a0 100644
--- a/src/messages.xlf
+++ b/src/messages.xlf
@@ -905,39 +905,39 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html</context>
-          <context context-type="linenumber">47,49</context>
+          <context context-type="linenumber">50,52</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/animation/edit-animation-advanced/edit-animation-advanced.component.html</context>
-          <context context-type="linenumber">48,50</context>
+          <context context-type="linenumber">51,53</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/audioOscillator/edit-audio-oscillator-advanced/edit-audio-oscillator-advanced.component.html</context>
-          <context context-type="linenumber">48,50</context>
+          <context context-type="linenumber">51,53</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
-          <context context-type="linenumber">241,243</context>
+          <context context-type="linenumber">244,246</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-advanced/edit-dialog-guidance-advanced.component.html</context>
-          <context context-type="linenumber">40,42</context>
+          <context context-type="linenumber">43,45</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html</context>
-          <context context-type="linenumber">42,44</context>
+          <context context-type="linenumber">45,47</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html</context>
-          <context context-type="linenumber">54,56</context>
+          <context context-type="linenumber">57,59</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/embedded/edit-embedded-advanced/edit-embedded-advanced.component.html</context>
-          <context context-type="linenumber">61,63</context>
+          <context context-type="linenumber">64,66</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html</context>
-          <context context-type="linenumber">238,240</context>
+          <context context-type="linenumber">241,243</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/html/edit-html-advanced/edit-html-advanced.component.html</context>
@@ -945,43 +945,43 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.html</context>
-          <context context-type="linenumber">54,56</context>
+          <context context-type="linenumber">57,59</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html</context>
-          <context context-type="linenumber">70,72</context>
+          <context context-type="linenumber">73,75</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.html</context>
-          <context context-type="linenumber">59,61</context>
+          <context context-type="linenumber">62,64</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">608,610</context>
+          <context context-type="linenumber">611,613</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/outsideURL/edit-outside-url-advanced/edit-outside-url-advanced.component.ts</context>
-          <context context-type="linenumber">37,39</context>
+          <context context-type="linenumber">40,42</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/peerChat/edit-peer-chat-advanced-component/edit-peer-chat-advanced-component.component.ts</context>
-          <context context-type="linenumber">29,31</context>
+          <context context-type="linenumber">32,34</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/showGroupWork/edit-show-group-work-advanced/edit-show-group-work-advanced.component.ts</context>
-          <context context-type="linenumber">29,31</context>
+          <context context-type="linenumber">32,34</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/showMyWork/edit-show-my-work-advanced/edit-show-my-work-advanced.component.ts</context>
-          <context context-type="linenumber">29,31</context>
+          <context context-type="linenumber">32,34</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/summary/edit-summary-advanced/edit-summary-advanced.component.ts</context>
-          <context context-type="linenumber">37,39</context>
+          <context context-type="linenumber">40,42</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
-          <context context-type="linenumber">304,306</context>
+          <context context-type="linenumber">307,309</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2543636733220429928" datatype="html">
@@ -1070,108 +1070,6 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
           <context context-type="linenumber">15,17</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="8129802372590365244" datatype="html">
-        <source>Rubric</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/authoring-tool/edit-component-rubric/edit-component-rubric.component.html</context>
-          <context context-type="linenumber">2,6</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.html</context>
-          <context context-type="linenumber">28,31</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html</context>
-          <context context-type="linenumber">38,40</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/animation/edit-animation-advanced/edit-animation-advanced.component.html</context>
-          <context context-type="linenumber">39,41</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/audioOscillator/edit-audio-oscillator-advanced/edit-audio-oscillator-advanced.component.html</context>
-          <context context-type="linenumber">39,41</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
-          <context context-type="linenumber">232,234</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-advanced/edit-dialog-guidance-advanced.component.html</context>
-          <context context-type="linenumber">31,33</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html</context>
-          <context context-type="linenumber">33,35</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html</context>
-          <context context-type="linenumber">45,47</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/embedded/edit-embedded-advanced/edit-embedded-advanced.component.html</context>
-          <context context-type="linenumber">52,54</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html</context>
-          <context context-type="linenumber">229,231</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/html/edit-html-advanced/edit-html-advanced.component.html</context>
-          <context context-type="linenumber">16,18</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.html</context>
-          <context context-type="linenumber">45,47</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html</context>
-          <context context-type="linenumber">61,63</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.html</context>
-          <context context-type="linenumber">50,52</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">599,601</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/outsideURL/edit-outside-url-advanced/edit-outside-url-advanced.component.ts</context>
-          <context context-type="linenumber">25,27</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/peerChat/edit-peer-chat-advanced-component/edit-peer-chat-advanced-component.component.ts</context>
-          <context context-type="linenumber">17,19</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/showGroupWork/edit-show-group-work-advanced/edit-show-group-work-advanced.component.ts</context>
-          <context context-type="linenumber">17,19</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/showMyWork/edit-show-my-work-advanced/edit-show-my-work-advanced.component.ts</context>
-          <context context-type="linenumber">17,19</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/summary/edit-summary-advanced/edit-summary-advanced.component.ts</context>
-          <context context-type="linenumber">25,27</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
-          <context context-type="linenumber">295,297</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/themes/default/themeComponents/helpIcon/help-icon.component.ts</context>
-          <context context-type="linenumber">35</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="8741193813895692751" datatype="html">
-        <source>Edit activity rubric</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/authoring-tool/edit-component-rubric/edit-component-rubric.component.html</context>
-          <context context-type="linenumber">8,12</context>
-        </context-group>
-      </trans-unit>
       <trans-unit id="5694406324105859820" datatype="html">
         <source>Show Save Button</source>
         <context-group purpose="location">
@@ -1194,79 +1092,79 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html</context>
-          <context context-type="linenumber">43,44</context>
+          <context context-type="linenumber">46,47</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/animation/edit-animation-advanced/edit-animation-advanced.component.html</context>
-          <context context-type="linenumber">44,45</context>
+          <context context-type="linenumber">47,48</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/audioOscillator/edit-audio-oscillator-advanced/edit-audio-oscillator-advanced.component.html</context>
-          <context context-type="linenumber">44,45</context>
+          <context context-type="linenumber">47,48</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
-          <context context-type="linenumber">237,238</context>
+          <context context-type="linenumber">240,241</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-advanced/edit-dialog-guidance-advanced.component.html</context>
-          <context context-type="linenumber">36,37</context>
+          <context context-type="linenumber">39,40</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html</context>
-          <context context-type="linenumber">38,39</context>
+          <context context-type="linenumber">41,42</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html</context>
-          <context context-type="linenumber">50,51</context>
+          <context context-type="linenumber">53,54</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/embedded/edit-embedded-advanced/edit-embedded-advanced.component.html</context>
-          <context context-type="linenumber">57,58</context>
+          <context context-type="linenumber">60,61</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html</context>
-          <context context-type="linenumber">234,235</context>
+          <context context-type="linenumber">237,238</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.html</context>
-          <context context-type="linenumber">50,51</context>
+          <context context-type="linenumber">53,54</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html</context>
-          <context context-type="linenumber">66,67</context>
+          <context context-type="linenumber">69,70</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.html</context>
-          <context context-type="linenumber">55,56</context>
+          <context context-type="linenumber">58,59</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">604,605</context>
+          <context context-type="linenumber">607,608</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/outsideURL/edit-outside-url-advanced/edit-outside-url-advanced.component.ts</context>
-          <context context-type="linenumber">31,33</context>
+          <context context-type="linenumber">34,36</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/peerChat/edit-peer-chat-advanced-component/edit-peer-chat-advanced-component.component.ts</context>
-          <context context-type="linenumber">23,25</context>
+          <context context-type="linenumber">26,28</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/showGroupWork/edit-show-group-work-advanced/edit-show-group-work-advanced.component.ts</context>
-          <context context-type="linenumber">23,25</context>
+          <context context-type="linenumber">26,28</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/showMyWork/edit-show-my-work-advanced/edit-show-my-work-advanced.component.ts</context>
-          <context context-type="linenumber">23,25</context>
+          <context context-type="linenumber">26,28</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/summary/edit-summary-advanced/edit-summary-advanced.component.ts</context>
-          <context context-type="linenumber">31,33</context>
+          <context context-type="linenumber">34,36</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
-          <context context-type="linenumber">300,301</context>
+          <context context-type="linenumber">303,304</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6486069346793029625" datatype="html">
@@ -10858,6 +10756,97 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
           <context context-type="linenumber">23,27</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="8129802372590365244" datatype="html">
+        <source>Rubric</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.html</context>
+          <context context-type="linenumber">28,31</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html</context>
+          <context context-type="linenumber">38,41</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/animation/edit-animation-advanced/edit-animation-advanced.component.html</context>
+          <context context-type="linenumber">39,42</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/audioOscillator/edit-audio-oscillator-advanced/edit-audio-oscillator-advanced.component.html</context>
+          <context context-type="linenumber">39,42</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
+          <context context-type="linenumber">232,235</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-advanced/edit-dialog-guidance-advanced.component.html</context>
+          <context context-type="linenumber">31,34</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html</context>
+          <context context-type="linenumber">33,36</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html</context>
+          <context context-type="linenumber">45,48</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/embedded/edit-embedded-advanced/edit-embedded-advanced.component.html</context>
+          <context context-type="linenumber">52,55</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html</context>
+          <context context-type="linenumber">229,232</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/html/edit-html-advanced/edit-html-advanced.component.html</context>
+          <context context-type="linenumber">16,18</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.html</context>
+          <context context-type="linenumber">45,48</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html</context>
+          <context context-type="linenumber">61,64</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.html</context>
+          <context context-type="linenumber">50,53</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
+          <context context-type="linenumber">599,602</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/outsideURL/edit-outside-url-advanced/edit-outside-url-advanced.component.ts</context>
+          <context context-type="linenumber">25,28</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/peerChat/edit-peer-chat-advanced-component/edit-peer-chat-advanced-component.component.ts</context>
+          <context context-type="linenumber">17,20</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/showGroupWork/edit-show-group-work-advanced/edit-show-group-work-advanced.component.ts</context>
+          <context context-type="linenumber">17,20</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/showMyWork/edit-show-my-work-advanced/edit-show-my-work-advanced.component.ts</context>
+          <context context-type="linenumber">17,20</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/summary/edit-summary-advanced/edit-summary-advanced.component.ts</context>
+          <context context-type="linenumber">25,28</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
+          <context context-type="linenumber">295,298</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/themes/default/themeComponents/helpIcon/help-icon.component.ts</context>
+          <context context-type="linenumber">35</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="1354846446306331186" datatype="html">
         <source>Milestones</source>
         <context-group purpose="location">

From 94ec8b303172d4e4cce598f765397498c6891b8d Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Wed, 8 Apr 2026 18:53:20 -0700
Subject: [PATCH 28/33] Show visibility icon if component has constraints.
 Click on it to open advanced authoring with constraint tab opened.

---
 .../edit-advanced-component.component.ts      |  12 ++
 .../edit-component-advanced.component.spec.ts |   9 +-
 .../edit-component-advanced.component.ts      |  18 ++-
 ...dit-component-advanced-button.component.ts |   2 +-
 .../visibility-constraint-icon.component.ts   |  36 +++++
 .../node-authoring.component.html             |   3 +
 .../node-authoring.component.ts               |   8 +-
 .../edit-ai-chat-advanced.component.html      |   2 +-
 .../edit-animation-advanced.component.html    |   2 +-
 ...t-audio-oscillator-advanced.component.html |   2 +-
 .../edit-concept-map-advanced.component.html  |   2 +-
 ...it-dialog-guidance-advanced.component.html |   2 +-
 .../edit-discussion-advanced.component.html   |   2 +-
 .../edit-draw-advanced.component.html         |   2 +-
 .../edit-embedded-advanced.component.html     |   2 +-
 .../edit-graph-advanced.component.html        |   2 +-
 .../edit-html-advanced.component.html         |   2 +-
 .../edit-label-advanced.component.html        |   2 +-
 .../edit-match-advanced.component.html        |   2 +-
 ...it-multiple-choice-advanced.component.html |   2 +-
 ...edit-open-response-advanced.component.html |  66 +++++-----
 .../edit-outside-url-advanced.component.ts    |   2 +-
 ...-peer-chat-advanced-component.component.ts |   2 +-
 ...edit-show-group-work-advanced.component.ts |   2 +-
 .../edit-show-my-work-advanced.component.ts   |   2 +-
 .../edit-summary-advanced.component.ts        |   2 +-
 .../edit-table-advanced.component.html        |   2 +-
 src/messages.xlf                              | 123 +++++++++---------
 28 files changed, 193 insertions(+), 122 deletions(-)
 create mode 100644 src/assets/wise5/authoringTool/components/visibility-constraint-icon/visibility-constraint-icon.component.ts

diff --git a/src/app/authoring-tool/edit-advanced-component/edit-advanced-component.component.ts b/src/app/authoring-tool/edit-advanced-component/edit-advanced-component.component.ts
index 94a3858b113..58824235d2a 100644
--- a/src/app/authoring-tool/edit-advanced-component/edit-advanced-component.component.ts
+++ b/src/app/authoring-tool/edit-advanced-component/edit-advanced-component.component.ts
@@ -10,8 +10,11 @@ import { moveObjectDown, moveObjectUp } from '../../../assets/wise5/common/array
 export abstract class EditAdvancedComponentComponent {
   component: Component;
   componentContent: ComponentContent;
+  protected selectedTabIndex: number = 0;
+
   @Input() componentId: string;
   @Input() nodeId: string;
+  @Input() tab: string = 'general';
 
   constructor(
     protected nodeService: TeacherNodeService,
@@ -23,6 +26,15 @@ export abstract class EditAdvancedComponentComponent {
     this.componentContent = this.teacherProjectService.getComponent(this.nodeId, this.componentId);
     this.component = new Component(this.componentContent, this.nodeId);
     this.teacherProjectService.uiChanged();
+
+    switch (this.tab) {
+      case 'visibility':
+        this.selectedTabIndex = 1;
+        break;
+      default:
+        this.selectedTabIndex = 0;
+        break;
+    }
   }
 
   setShowSubmitButtonValue(show: boolean = false): void {
diff --git a/src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.spec.ts b/src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.spec.ts
index 88fbe826309..a364f114868 100644
--- a/src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.spec.ts
+++ b/src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.spec.ts
@@ -19,9 +19,12 @@ describe('EditComponentAdvancedComponent', () => {
         {
           provide: MAT_DIALOG_DATA,
           useValue: {
-            content: { type: 'ShowMyWork' },
-            id: 'component1',
-            nodeId: 'node1'
+            component: {
+              content: { type: 'ShowMyWork' },
+              id: 'component1',
+              nodeId: 'node1'
+            },
+            tab: 'general'
           }
         },
         {
diff --git a/src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.ts b/src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.ts
index 92d606db2b1..a3d74c363cb 100644
--- a/src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.ts
+++ b/src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.ts
@@ -26,18 +26,22 @@ export class EditComponentAdvancedComponent {
   private componentRef: ComponentRef<WISEComponent>;
   constructor(
     private applicationRef: ApplicationRef,
-    @Inject(MAT_DIALOG_DATA) protected component: WISEComponent,
+    @Inject(MAT_DIALOG_DATA) protected data: { component: WISEComponent; tab?: string },
     private injector: EnvironmentInjector
   ) {}
 
   ngAfterViewInit(): void {
-    this.componentRef = createComponent(components[this.component.content.type].authoringAdvanced, {
-      hostElement: this.componentElementRef.nativeElement,
-      environmentInjector: this.injector
-    });
+    this.componentRef = createComponent(
+      components[this.data.component.content.type].authoringAdvanced,
+      {
+        hostElement: this.componentElementRef.nativeElement,
+        environmentInjector: this.injector
+      }
+    );
     Object.assign(this.componentRef.instance, {
-      nodeId: this.component.nodeId,
-      componentId: this.component.id
+      nodeId: this.data.component.nodeId,
+      componentId: this.data.component.id,
+      tab: this.data.tab
     });
     this.applicationRef.attachView(this.componentRef.hostView);
   }
diff --git a/src/assets/wise5/authoringTool/components/edit-component-advanced-button/edit-component-advanced-button.component.ts b/src/assets/wise5/authoringTool/components/edit-component-advanced-button/edit-component-advanced-button.component.ts
index ccb8afb1798..7ebf4b27ef2 100644
--- a/src/assets/wise5/authoringTool/components/edit-component-advanced-button/edit-component-advanced-button.component.ts
+++ b/src/assets/wise5/authoringTool/components/edit-component-advanced-button/edit-component-advanced-button.component.ts
@@ -20,7 +20,7 @@ export class EditComponentAdvancedButtonComponent {
 
   protected showComponentAdvancedAuthoring(): void {
     this.dialog.open(EditComponentAdvancedComponent, {
-      data: new WiseComponent(this.componentContent, this.nodeId),
+      data: { component: new WiseComponent(this.componentContent, this.nodeId), tab: 'general' },
       width: '80%'
     });
   }
diff --git a/src/assets/wise5/authoringTool/components/visibility-constraint-icon/visibility-constraint-icon.component.ts b/src/assets/wise5/authoringTool/components/visibility-constraint-icon/visibility-constraint-icon.component.ts
new file mode 100644
index 00000000000..02ecec71c9e
--- /dev/null
+++ b/src/assets/wise5/authoringTool/components/visibility-constraint-icon/visibility-constraint-icon.component.ts
@@ -0,0 +1,36 @@
+import { Component, inject, Input } from '@angular/core';
+import { MatButtonModule } from '@angular/material/button';
+import { MatDialog } from '@angular/material/dialog';
+import { MatIconModule } from '@angular/material/icon';
+import { MatTooltipModule } from '@angular/material/tooltip';
+import { EditComponentAdvancedComponent } from '../../../../../app/authoring-tool/edit-component-advanced/edit-component-advanced.component';
+import { Component as WiseComponent } from '../../../common/Component';
+import { ComponentContent } from '../../../common/ComponentContent';
+
+@Component({
+  imports: [MatButtonModule, MatIconModule, MatTooltipModule],
+  selector: 'visibility-constraint-icon',
+  template: `<button
+    mat-icon-button
+    (click)="openVisibilityConstraintAuthoring()"
+    [matTooltip]="tooltip"
+    matTooltipPosition="above"
+  >
+    <mat-icon>visibility_off</mat-icon>
+  </button>`
+})
+export class VisibilityConstraintIconComponent {
+  private dialog = inject(MatDialog);
+
+  @Input() componentContent: ComponentContent;
+  @Input() nodeId: string;
+
+  protected tooltip = $localize`This activity is displayed to the student when certain conditions are met. Click to view and edit the conditions.`;
+
+  protected openVisibilityConstraintAuthoring(): void {
+    this.dialog.open(EditComponentAdvancedComponent, {
+      data: { component: new WiseComponent(this.componentContent, this.nodeId), tab: 'visibility' },
+      width: '80%'
+    });
+  }
+}
diff --git a/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html b/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html
index cc525e6d327..16c656231ce 100644
--- a/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html
+++ b/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html
@@ -49,6 +49,9 @@
               <span class="heavy">{{ i + 1 }}. {{ getComponentTypeLabel(component.type) }}</span>
             </div>
             <toggle-component-tag [component]="component" />
+            @if (hasVisibilityConstraint(component)) {
+              <visibility-constraint-icon [componentContent]="component" [nodeId]="nodeId" />
+            }
             <span class="flex grow"></span>
             <div class="text flex justify-end items-center">
               @if (component.id === editingComponentId) {
diff --git a/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts b/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts
index ddd6902a24b..21972068b6e 100644
--- a/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts
+++ b/src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts
@@ -27,6 +27,7 @@ import { ComponentAuthoringComponent } from '../../components/component-authorin
 import { RouterModule } from '@angular/router';
 import { EditComponentAdvancedButtonComponent } from '../../components/edit-component-advanced-button/edit-component-advanced-button.component';
 import { ToggleComponentTagComponent } from '../../components/toggle-component-tag/toggle-component-tag.component';
+import { VisibilityConstraintIconComponent } from '../../components/visibility-constraint-icon/visibility-constraint-icon.component';
 
 @Component({
   imports: [
@@ -47,7 +48,8 @@ import { ToggleComponentTagComponent } from '../../components/toggle-component-t
     MatTooltipModule,
     RouterModule,
     TeacherNodeIconComponent,
-    ToggleComponentTagComponent
+    ToggleComponentTagComponent,
+    VisibilityConstraintIconComponent
   ],
   styleUrl: './node-authoring.component.scss',
   templateUrl: './node-authoring.component.html'
@@ -227,6 +229,10 @@ export class NodeAuthoringComponent implements OnInit {
     return this.componentTypeService.getComponentTypeLabel(componentType);
   }
 
+  protected hasVisibilityConstraint(component: ComponentContent): boolean {
+    return component.constraints?.length > 0;
+  }
+
   private setShowSaveButtonForAllComponents(node: Node, showSaveButton: boolean): void {
     node.components
       .filter((component) =>
diff --git a/src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html b/src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html
index 399858b50d8..af402027901 100644
--- a/src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html
+++ b/src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group animationDuration="0ms">
+<mat-tab-group animationDuration="0ms" [selectedIndex]="selectedTabIndex">
   <mat-tab>
     <ng-template mat-tab-label>
       <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
diff --git a/src/assets/wise5/components/animation/edit-animation-advanced/edit-animation-advanced.component.html b/src/assets/wise5/components/animation/edit-animation-advanced/edit-animation-advanced.component.html
index 4be790f82ad..6a62f5b32d5 100644
--- a/src/assets/wise5/components/animation/edit-animation-advanced/edit-animation-advanced.component.html
+++ b/src/assets/wise5/components/animation/edit-animation-advanced/edit-animation-advanced.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group animationDuration="0ms">
+<mat-tab-group animationDuration="0ms" [selectedIndex]="selectedTabIndex">
   <mat-tab>
     <ng-template mat-tab-label>
       <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
diff --git a/src/assets/wise5/components/audioOscillator/edit-audio-oscillator-advanced/edit-audio-oscillator-advanced.component.html b/src/assets/wise5/components/audioOscillator/edit-audio-oscillator-advanced/edit-audio-oscillator-advanced.component.html
index 4be790f82ad..6a62f5b32d5 100644
--- a/src/assets/wise5/components/audioOscillator/edit-audio-oscillator-advanced/edit-audio-oscillator-advanced.component.html
+++ b/src/assets/wise5/components/audioOscillator/edit-audio-oscillator-advanced/edit-audio-oscillator-advanced.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group animationDuration="0ms">
+<mat-tab-group animationDuration="0ms" [selectedIndex]="selectedTabIndex">
   <mat-tab>
     <ng-template mat-tab-label>
       <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
diff --git a/src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html b/src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html
index d5d2274902e..75bce96a1d7 100644
--- a/src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html
+++ b/src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group animationDuration="0ms">
+<mat-tab-group animationDuration="0ms" [selectedIndex]="selectedTabIndex">
   <mat-tab>
     <ng-template mat-tab-label>
       <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
diff --git a/src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-advanced/edit-dialog-guidance-advanced.component.html b/src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-advanced/edit-dialog-guidance-advanced.component.html
index e96b0219fad..e8fc30f81da 100644
--- a/src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-advanced/edit-dialog-guidance-advanced.component.html
+++ b/src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-advanced/edit-dialog-guidance-advanced.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group animationDuration="0ms">
+<mat-tab-group animationDuration="0ms" [selectedIndex]="selectedTabIndex">
   <mat-tab>
     <ng-template mat-tab-label>
       <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
diff --git a/src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html b/src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html
index e0bee2f0b60..596f1aec514 100644
--- a/src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html
+++ b/src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group animationDuration="0ms">
+<mat-tab-group animationDuration="0ms" [selectedIndex]="selectedTabIndex">
   <mat-tab>
     <ng-template mat-tab-label>
       <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
diff --git a/src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html b/src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html
index ab665d7e449..e06a5a28b96 100644
--- a/src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html
+++ b/src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group animationDuration="0ms">
+<mat-tab-group animationDuration="0ms" [selectedIndex]="selectedTabIndex">
   <mat-tab>
     <ng-template mat-tab-label>
       <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
diff --git a/src/assets/wise5/components/embedded/edit-embedded-advanced/edit-embedded-advanced.component.html b/src/assets/wise5/components/embedded/edit-embedded-advanced/edit-embedded-advanced.component.html
index aeee8abd7d6..1732659b66a 100644
--- a/src/assets/wise5/components/embedded/edit-embedded-advanced/edit-embedded-advanced.component.html
+++ b/src/assets/wise5/components/embedded/edit-embedded-advanced/edit-embedded-advanced.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group animationDuration="0ms">
+<mat-tab-group animationDuration="0ms" [selectedIndex]="selectedTabIndex">
   <mat-tab>
     <ng-template mat-tab-label>
       <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
diff --git a/src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html b/src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html
index 273380c5da7..0e5e95e4f02 100644
--- a/src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html
+++ b/src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group animationDuration="0ms">
+<mat-tab-group animationDuration="0ms" [selectedIndex]="selectedTabIndex">
   <mat-tab>
     <ng-template mat-tab-label>
       <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
diff --git a/src/assets/wise5/components/html/edit-html-advanced/edit-html-advanced.component.html b/src/assets/wise5/components/html/edit-html-advanced/edit-html-advanced.component.html
index b5cf23c6f3d..c7569c53368 100644
--- a/src/assets/wise5/components/html/edit-html-advanced/edit-html-advanced.component.html
+++ b/src/assets/wise5/components/html/edit-html-advanced/edit-html-advanced.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group animationDuration="0ms">
+<mat-tab-group animationDuration="0ms" [selectedIndex]="selectedTabIndex">
   <mat-tab>
     <ng-template mat-tab-label>
       <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
diff --git a/src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.html b/src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.html
index d4eab62f1d9..d5ad19fffac 100644
--- a/src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.html
+++ b/src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group animationDuration="0ms">
+<mat-tab-group animationDuration="0ms" [selectedIndex]="selectedTabIndex">
   <mat-tab>
     <ng-template mat-tab-label>
       <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
diff --git a/src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html b/src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html
index 78472f3e50b..c58f0874c7d 100644
--- a/src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html
+++ b/src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group animationDuration="0ms">
+<mat-tab-group animationDuration="0ms" [selectedIndex]="selectedTabIndex">
   <mat-tab>
     <ng-template mat-tab-label>
       <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
diff --git a/src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.html b/src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.html
index 6513bd93169..255ea291d67 100644
--- a/src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.html
+++ b/src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group animationDuration="0ms">
+<mat-tab-group animationDuration="0ms" [selectedIndex]="selectedTabIndex">
   <mat-tab>
     <ng-template mat-tab-label>
       <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
diff --git a/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html b/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html
index 3803b988bc5..5bbddbff026 100644
--- a/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html
+++ b/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group animationDuration="0ms">
+<mat-tab-group animationDuration="0ms" [selectedIndex]="selectedTabIndex">
   <mat-tab>
     <ng-template mat-tab-label>
       <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
@@ -38,6 +38,38 @@
       <edit-component-width [componentContent]="component.content" />
     </div>
   </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>visibility</mat-icon>&nbsp;<span i18n>Visibility</span>
+    </ng-template>
+    <edit-component-constraints [componentContent]="component.content" />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>join_inner</mat-icon>&nbsp;<span i18n>Connections</span>
+    </ng-template>
+    <edit-connected-components
+      [nodeId]="component.nodeId"
+      [componentId]="component.id"
+      [allowedConnectedComponentTypes]="allowedConnectedComponentTypes"
+      [componentContent]="component.content"
+      [connectedComponents]="component.content.connectedComponents"
+      (connectedComponentsChanged)="connectedComponentsChanged($event)"
+    />
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
+    </ng-template>
+    <ng-template matTabContent>
+      <!-- lazy load needed for tinymce to work -->
+      <edit-component-rubric [componentContent]="component.content" />
+    </ng-template>
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label> <mat-icon>sell</mat-icon>&nbsp;<span i18n>Tags</span></ng-template>
+    <edit-component-tags [componentContent]="component.content" />
+  </mat-tab>
   <mat-tab>
     <ng-template mat-tab-label>
       <mat-icon>auto_awesome</mat-icon>&nbsp;<span i18n>AI</span>
@@ -575,38 +607,6 @@
       </div>
     }
   </mat-tab>
-  <mat-tab>
-    <ng-template mat-tab-label>
-      <mat-icon>visibility</mat-icon>&nbsp;<span i18n>Visibility</span>
-    </ng-template>
-    <edit-component-constraints [componentContent]="component.content" />
-  </mat-tab>
-  <mat-tab>
-    <ng-template mat-tab-label>
-      <mat-icon>join_inner</mat-icon>&nbsp;<span i18n>Connections</span>
-    </ng-template>
-    <edit-connected-components
-      [nodeId]="component.nodeId"
-      [componentId]="component.id"
-      [allowedConnectedComponentTypes]="allowedConnectedComponentTypes"
-      [componentContent]="component.content"
-      [connectedComponents]="component.content.connectedComponents"
-      (connectedComponentsChanged)="connectedComponentsChanged($event)"
-    />
-  </mat-tab>
-  <mat-tab>
-    <ng-template mat-tab-label>
-      <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
-    </ng-template>
-    <ng-template matTabContent>
-      <!-- lazy load needed for tinymce to work -->
-      <edit-component-rubric [componentContent]="component.content" />
-    </ng-template>
-  </mat-tab>
-  <mat-tab>
-    <ng-template mat-tab-label> <mat-icon>sell</mat-icon>&nbsp;<span i18n>Tags</span></ng-template>
-    <edit-component-tags [componentContent]="component.content" />
-  </mat-tab>
   <mat-tab>
     <ng-template mat-tab-label> <mat-icon>code</mat-icon>&nbsp;<span i18n>JSON</span></ng-template>
     <edit-component-json [component]="component" />
diff --git a/src/assets/wise5/components/outsideURL/edit-outside-url-advanced/edit-outside-url-advanced.component.ts b/src/assets/wise5/components/outsideURL/edit-outside-url-advanced/edit-outside-url-advanced.component.ts
index 19d8be86a89..e1fa8e2e4f4 100644
--- a/src/assets/wise5/components/outsideURL/edit-outside-url-advanced/edit-outside-url-advanced.component.ts
+++ b/src/assets/wise5/components/outsideURL/edit-outside-url-advanced/edit-outside-url-advanced.component.ts
@@ -5,7 +5,7 @@ import { EditComponentAdvancedSharedModule } from '../../../../../app/authoring-
 @Component({
   imports: [EditComponentAdvancedSharedModule],
   template: `
-    <mat-tab-group animationDuration="0ms">
+    <mat-tab-group animationDuration="0ms" [selectedIndex]="selectedTabIndex">
       <mat-tab>
         <ng-template mat-tab-label>
           <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
diff --git a/src/assets/wise5/components/peerChat/edit-peer-chat-advanced-component/edit-peer-chat-advanced-component.component.ts b/src/assets/wise5/components/peerChat/edit-peer-chat-advanced-component/edit-peer-chat-advanced-component.component.ts
index 5f78895ca40..2eb41fb7b8d 100644
--- a/src/assets/wise5/components/peerChat/edit-peer-chat-advanced-component/edit-peer-chat-advanced-component.component.ts
+++ b/src/assets/wise5/components/peerChat/edit-peer-chat-advanced-component/edit-peer-chat-advanced-component.component.ts
@@ -5,7 +5,7 @@ import { EditComponentAdvancedSharedModule } from '../../../../../app/authoring-
 @Component({
   imports: [EditComponentAdvancedSharedModule],
   template: `
-    <mat-tab-group animationDuration="0ms">
+    <mat-tab-group animationDuration="0ms" [selectedIndex]="selectedTabIndex">
       <mat-tab>
         <ng-template mat-tab-label>
           <mat-icon>visibility</mat-icon>&nbsp;<span i18n>Visibility</span>
diff --git a/src/assets/wise5/components/showGroupWork/edit-show-group-work-advanced/edit-show-group-work-advanced.component.ts b/src/assets/wise5/components/showGroupWork/edit-show-group-work-advanced/edit-show-group-work-advanced.component.ts
index 63f671e2a7a..7d9b36e4469 100644
--- a/src/assets/wise5/components/showGroupWork/edit-show-group-work-advanced/edit-show-group-work-advanced.component.ts
+++ b/src/assets/wise5/components/showGroupWork/edit-show-group-work-advanced/edit-show-group-work-advanced.component.ts
@@ -5,7 +5,7 @@ import { EditComponentAdvancedSharedModule } from '../../../../../app/authoring-
 @Component({
   imports: [EditComponentAdvancedSharedModule],
   template: `
-    <mat-tab-group animationDuration="0ms">
+    <mat-tab-group animationDuration="0ms" [selectedIndex]="selectedTabIndex">
       <mat-tab>
         <ng-template mat-tab-label>
           <mat-icon>visibility</mat-icon>&nbsp;<span i18n>Visibility</span>
diff --git a/src/assets/wise5/components/showMyWork/edit-show-my-work-advanced/edit-show-my-work-advanced.component.ts b/src/assets/wise5/components/showMyWork/edit-show-my-work-advanced/edit-show-my-work-advanced.component.ts
index 9f80260dac7..6cb939fad14 100644
--- a/src/assets/wise5/components/showMyWork/edit-show-my-work-advanced/edit-show-my-work-advanced.component.ts
+++ b/src/assets/wise5/components/showMyWork/edit-show-my-work-advanced/edit-show-my-work-advanced.component.ts
@@ -5,7 +5,7 @@ import { EditComponentAdvancedSharedModule } from '../../../../../app/authoring-
 @Component({
   imports: [EditComponentAdvancedSharedModule],
   template: `
-    <mat-tab-group animationDuration="0ms">
+    <mat-tab-group animationDuration="0ms" [selectedIndex]="selectedTabIndex">
       <mat-tab>
         <ng-template mat-tab-label>
           <mat-icon>visibility</mat-icon>&nbsp;<span i18n>Visibility</span>
diff --git a/src/assets/wise5/components/summary/edit-summary-advanced/edit-summary-advanced.component.ts b/src/assets/wise5/components/summary/edit-summary-advanced/edit-summary-advanced.component.ts
index 493ed3ea030..651f185ed43 100644
--- a/src/assets/wise5/components/summary/edit-summary-advanced/edit-summary-advanced.component.ts
+++ b/src/assets/wise5/components/summary/edit-summary-advanced/edit-summary-advanced.component.ts
@@ -5,7 +5,7 @@ import { EditComponentAdvancedSharedModule } from '../../../../../app/authoring-
 @Component({
   imports: [EditComponentAdvancedSharedModule],
   template: `
-    <mat-tab-group animationDuration="0ms">
+    <mat-tab-group animationDuration="0ms" [selectedIndex]="selectedTabIndex">
       <mat-tab>
         <ng-template mat-tab-label>
           <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
diff --git a/src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html b/src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html
index ae0e16aa0ef..083778cbebf 100644
--- a/src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html
+++ b/src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group animationDuration="0ms">
+<mat-tab-group animationDuration="0ms" [selectedIndex]="selectedTabIndex">
   <mat-tab>
     <ng-template mat-tab-label>
       <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
diff --git a/src/messages.xlf b/src/messages.xlf
index 8cd9601e363..0f9c08dfdc4 100644
--- a/src/messages.xlf
+++ b/src/messages.xlf
@@ -1140,7 +1140,7 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">607,608</context>
+          <context context-type="linenumber">70,71</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/outsideURL/edit-outside-url-advanced/edit-outside-url-advanced.component.ts</context>
@@ -1388,7 +1388,7 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html</context>
-          <context context-type="linenumber">90,92</context>
+          <context context-type="linenumber">93,95</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html</context>
@@ -1419,7 +1419,7 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html</context>
-          <context context-type="linenumber">101,104</context>
+          <context context-type="linenumber">104,107</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html</context>
@@ -1817,11 +1817,11 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">65,66</context>
+          <context context-type="linenumber">97,98</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">524,525</context>
+          <context context-type="linenumber">556,557</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/vle/node/node.component.html</context>
@@ -1883,7 +1883,7 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">505,506</context>
+          <context context-type="linenumber">537,538</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html</context>
@@ -1898,7 +1898,7 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">515,518</context>
+          <context context-type="linenumber">547,550</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/showGroupWork/show-group-work-authoring/show-group-work-authoring.component.html</context>
@@ -1937,7 +1937,7 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">493,494</context>
+          <context context-type="linenumber">525,526</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html</context>
@@ -1971,11 +1971,11 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">66,67</context>
+          <context context-type="linenumber">98,99</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">525,527</context>
+          <context context-type="linenumber">557,559</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/vle/node/node.component.html</context>
@@ -2858,7 +2858,7 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">132,135</context>
+          <context context-type="linenumber">164,167</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8352660755693654653" datatype="html">
@@ -10527,7 +10527,7 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html</context>
-          <context context-type="linenumber">66,68</context>
+          <context context-type="linenumber">69,71</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4365227337792214829" datatype="html">
@@ -10816,7 +10816,7 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">599,602</context>
+          <context context-type="linenumber">62,65</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/outsideURL/edit-outside-url-advanced/edit-outside-url-advanced.component.ts</context>
@@ -11303,6 +11303,13 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
           <context context-type="linenumber">50,52</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="2170693430286604200" datatype="html">
+        <source>This activity is displayed to the student when certain conditions are met. Click to view and edit the conditions.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/authoringTool/components/visibility-constraint-icon/visibility-constraint-icon.component.ts</context>
+          <context context-type="linenumber">28</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="1318680729593701201" datatype="html">
         <source>Also currently editing this unit: <x id="PH" equiv-text="otherAuthors.join(
               &apos;, &apos;
@@ -12935,7 +12942,7 @@ The branches will be removed but the steps will remain in the unit.</source>
 <x id="PH" equiv-text="componentNumber"/>. <x id="PH_1" equiv-text="component.type"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts</context>
-          <context context-type="linenumber">168</context>
+          <context context-type="linenumber">170</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8956408262591847852" datatype="html">
@@ -16674,7 +16681,7 @@ Are you sure you want to proceed?</source>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">580,582</context>
+          <context context-type="linenumber">43,45</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/outsideURL/edit-outside-url-advanced/edit-outside-url-advanced.component.ts</context>
@@ -16753,7 +16760,7 @@ Are you sure you want to proceed?</source>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">586,589</context>
+          <context context-type="linenumber">49,52</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
@@ -18283,7 +18290,7 @@ Are you ready to receive feedback on this answer?</source>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">318,319</context>
+          <context context-type="linenumber">350,351</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8185078869695276161" datatype="html">
@@ -21262,7 +21269,7 @@ Warning: This will delete all existing choices and buckets in this activity.</so
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">89,92</context>
+          <context context-type="linenumber">121,124</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3824537844289284943" datatype="html">
@@ -21423,208 +21430,208 @@ Warning: This will delete all existing choices in this activity.</source>
         <source>AI</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">43,47</context>
+          <context context-type="linenumber">75,79</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1759795162772199785" datatype="html">
         <source> Enable AI Model </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">53,56</context>
+          <context context-type="linenumber">85,88</context>
         </context-group>
       </trans-unit>
       <trans-unit id="9153897398545804453" datatype="html">
         <source>Score On</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">60,62</context>
+          <context context-type="linenumber">92,94</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1230154438678955604" datatype="html">
         <source>Change</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">67,70</context>
+          <context context-type="linenumber">99,102</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7401107549258505528" datatype="html">
         <source> Show Score </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">79,83</context>
+          <context context-type="linenumber">111,115</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6706329976663713413" datatype="html">
         <source> Enable Feedback Rules </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">99,101</context>
+          <context context-type="linenumber">131,133</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5056621402071854825" datatype="html">
         <source>Scoring Rule</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">111,114</context>
+          <context context-type="linenumber">143,146</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2840439048375115947" datatype="html">
         <source>Add Scoring Rule</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">116,119</context>
+          <context context-type="linenumber">148,151</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1749702431264125217" datatype="html">
         <source>Feedback Text</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">144,146</context>
+          <context context-type="linenumber">176,178</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6318060955337736972" datatype="html">
         <source>Move Scoring Rule Up</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">155,157</context>
+          <context context-type="linenumber">187,189</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8741073904951621119" datatype="html">
         <source>Move Scoring Rule Down</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">166,168</context>
+          <context context-type="linenumber">198,200</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8481143767365565734" datatype="html">
         <source>Delete Scoring Rule</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">176,178</context>
+          <context context-type="linenumber">208,210</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4753983371217895606" datatype="html">
         <source> Enable Multiple Attempt Feedback </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">196,199</context>
+          <context context-type="linenumber">228,231</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6924674031457346140" datatype="html">
         <source>Multiple Attempt Scoring Rules</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">201,204</context>
+          <context context-type="linenumber">233,236</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2707777420645958826" datatype="html">
         <source>Add Multiple Attempt Scoring Rule</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">206,209</context>
+          <context context-type="linenumber">238,241</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2885623017281914681" datatype="html">
         <source>Previous Score</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">222,225</context>
+          <context context-type="linenumber">254,257</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">331,334</context>
+          <context context-type="linenumber">363,366</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2466216299740593982" datatype="html">
         <source>Current Score</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">231,234</context>
+          <context context-type="linenumber">263,266</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">341,344</context>
+          <context context-type="linenumber">373,376</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8219288603984689566" datatype="html">
         <source>Feedback to Student</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">242,244</context>
+          <context context-type="linenumber">274,276</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">429,431</context>
+          <context context-type="linenumber">461,463</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1237543279965214424" datatype="html">
         <source>Move Multiple Attempt Scoring Rule Up</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">258,260</context>
+          <context context-type="linenumber">290,292</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5646689888494364443" datatype="html">
         <source>Move Multiple Attempt Scoring Rule Down</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">274,276</context>
+          <context context-type="linenumber">306,308</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8247485612014750779" datatype="html">
         <source>Delet Multiple Attempt Scoring</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">284,286</context>
+          <context context-type="linenumber">316,318</context>
         </context-group>
       </trans-unit>
       <trans-unit id="681347196878226021" datatype="html">
         <source> Enable Notifications </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">304,307</context>
+          <context context-type="linenumber">336,339</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5851560788527570644" datatype="html">
         <source>Notifications</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">309,312</context>
+          <context context-type="linenumber">341,344</context>
         </context-group>
       </trans-unit>
       <trans-unit id="370200567263525921" datatype="html">
         <source>Move Notification Up</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">362,364</context>
+          <context context-type="linenumber">394,396</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2769177863929534863" datatype="html">
         <source>Move Notification Down</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">378,380</context>
+          <context context-type="linenumber">410,412</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1807548935384776633" datatype="html">
         <source>Delete Notification</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">388,390</context>
+          <context context-type="linenumber">420,422</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6336206965755061198" datatype="html">
         <source> Enable Ambient Display Dismiss Mode </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">403,405</context>
+          <context context-type="linenumber">435,437</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4441143426637747672" datatype="html">
         <source>Dismiss Code</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">407,410</context>
+          <context context-type="linenumber">439,442</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/vle/dismiss-ambient-notification-dialog/dismiss-ambient-notification-dialog.component.html</context>
@@ -21635,63 +21642,63 @@ Warning: This will delete all existing choices in this activity.</source>
         <source> Notify Student </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">423,425</context>
+          <context context-type="linenumber">455,457</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6137238378032253613" datatype="html">
         <source> Notify Teacher </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">443,445</context>
+          <context context-type="linenumber">475,477</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6470995886890122968" datatype="html">
         <source>Feedback to Teacher</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">449,451</context>
+          <context context-type="linenumber">481,483</context>
         </context-group>
       </trans-unit>
       <trans-unit id="853281253580647095" datatype="html">
         <source> Use Custom Completion Criteria </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">468,470</context>
+          <context context-type="linenumber">500,502</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6321190757824576813" datatype="html">
         <source>Custom Completion Criteria</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">472,475</context>
+          <context context-type="linenumber">504,507</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3954026354727494376" datatype="html">
         <source>Add Completion Criteria</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">477,480</context>
+          <context context-type="linenumber">509,512</context>
         </context-group>
       </trans-unit>
       <trans-unit id="376261460573165321" datatype="html">
         <source>Move Completion Criteria Up</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">537,539</context>
+          <context context-type="linenumber">569,571</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2584224885214103035" datatype="html">
         <source>Move Completion Criteria Down</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">550,552</context>
+          <context context-type="linenumber">582,584</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4117701430807776885" datatype="html">
         <source>Delete Completion Criteria</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">560,562</context>
+          <context context-type="linenumber">592,594</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8705933649296793690" datatype="html">

From 1b7770ee26a544b736df708f8ff184618537f7ab Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Thu, 9 Apr 2026 13:31:35 -0700
Subject: [PATCH 29/33] Edit component JSON: remove toggle and show textarea
 when tab is opened.

---
 .../edit-component-json.component.html        |  45 ++--
 .../edit-component-json.component.ts          |  63 +----
 src/messages.xlf                              | 223 ++++++++----------
 3 files changed, 128 insertions(+), 203 deletions(-)

diff --git a/src/app/authoring-tool/edit-component-json/edit-component-json.component.html b/src/app/authoring-tool/edit-component-json/edit-component-json.component.html
index 399fcc224d0..9a8ab1006a3 100644
--- a/src/app/authoring-tool/edit-component-json/edit-component-json.component.html
+++ b/src/app/authoring-tool/edit-component-json/edit-component-json.component.html
@@ -1,28 +1,19 @@
-<div class="flex flex-row justify-start items-center gap-2">
-  <mat-label class="node__label--vertical-alignment" i18n>JSON</mat-label>
-  <button
-    mat-raised-button
-    color="primary"
-    class="topButton"
-    (click)="toggleJSONView()"
-    matTooltip="Show JSON"
-    i18n-matTooltip
-    matTooltipPosition="above"
-  >
-    <mat-icon>code</mat-icon>
-  </button>
-</div>
-@if (showJSONAuthoring) {
-  <div class="flex flex-col gap-2">
-    <span i18n style="color: red">Close the JSON view to save the changes</span>
-    <mat-form-field class="w-full">
-      <mat-label i18n>Edit Activity JSON</mat-label>
-      <textarea
-        matInput
-        cdkTextareaAutosize
-        [(ngModel)]="componentContentJSONString"
-        (ngModelChange)="jsonChanged.next($event)"
-      ></textarea>
-    </mat-form-field>
+<div class="pt-4">
+  <div class="mb-2">
+    <mat-icon color="warn" class="align-bottom">warning</mat-icon>
+    <span i18n class="warn">
+      Editing the JSON directly is generally not recommended, as errors can break the unit. If you
+      need assistance, please contact WISE staff.
+    </span>
   </div>
-}
+  <mat-form-field class="w-full" appearance="outline" style="margin-top: 10px">
+    <mat-label i18n>Edit Activity JSON</mat-label>
+    <textarea
+      class="mat-body-2"
+      matInput
+      cdkTextareaAutosize
+      [(ngModel)]="componentContentJSONString"
+      (ngModelChange)="jsonChanged.next($event)"
+    ></textarea>
+  </mat-form-field>
+</div>
diff --git a/src/app/authoring-tool/edit-component-json/edit-component-json.component.ts b/src/app/authoring-tool/edit-component-json/edit-component-json.component.ts
index 91af05c6b8e..cb629d507b5 100644
--- a/src/app/authoring-tool/edit-component-json/edit-component-json.component.ts
+++ b/src/app/authoring-tool/edit-component-json/edit-component-json.component.ts
@@ -23,16 +23,14 @@ import { MatButtonModule } from '@angular/material/button';
     MatTooltipModule
   ],
   selector: 'edit-component-json',
-  styles: ['div { margin-top: 10px; margin-bottom: 10px; } .mat-icon { margin: 0px; }'],
+  styles: ['.mat-icon { margin: 0px; }'],
   templateUrl: 'edit-component-json.component.html'
 })
 export class EditComponentJsonComponent {
   @Input() component: WISEComponent;
   protected componentContentJSONString: string;
   protected jsonChanged: Subject<string> = new Subject<string>();
-  protected showJSONAuthoring: boolean = false;
   private subscriptions: Subscription = new Subscription();
-  private validComponentContentJSONString: string;
 
   constructor(
     private notificationService: NotificationService,
@@ -40,20 +38,11 @@ export class EditComponentJsonComponent {
   ) {}
 
   ngOnInit(): void {
-    this.setComponentContentJsonString();
-    this.subscriptions.add(
-      this.jsonChanged.pipe(debounceTime(1000), distinctUntilChanged()).subscribe(() => {
-        if (this.isJSONValid()) {
-          this.rememberRecentValidJSON();
-          this.notificationService.showJSONValidMessage();
-        } else {
-          this.notificationService.showJSONInvalidMessage();
-        }
-      })
-    );
+    this.componentContentJSONString = JSON.stringify(this.component.content, null, 4);
     this.subscriptions.add(
-      this.projectService.nodeChanged$.subscribe(() => {
-        this.setComponentContentJsonString();
+      this.jsonChanged.pipe(debounceTime(1000), distinctUntilChanged()).subscribe((newText) => {
+        this.componentContentJSONString = newText;
+        this.saveChanges();
       })
     );
   }
@@ -62,55 +51,15 @@ export class EditComponentJsonComponent {
     this.subscriptions.unsubscribe();
   }
 
-  private setComponentContentJsonString(): void {
-    this.componentContentJSONString = JSON.stringify(this.component.content, null, 4);
-  }
-
-  protected toggleJSONView(): void {
-    if (this.showJSONAuthoring) {
-      if (this.isJSONValid()) {
-        this.saveChanges();
-        this.showJSONAuthoring = false;
-      } else {
-        const doRollback = confirm(
-          $localize`The JSON is invalid. Invalid JSON will not be saved.\nClick "OK" to revert back to the last valid JSON.\nClick "Cancel" to keep the invalid JSON open so you can fix it.`
-        );
-        if (doRollback) {
-          this.rollbackToRecentValidJSON();
-          this.saveChanges();
-        }
-      }
-    } else {
-      this.showJSONAuthoring = true;
-      this.rememberRecentValidJSON();
-    }
-  }
-
-  private isJSONValid(): boolean {
-    try {
-      JSON.parse(this.componentContentJSONString);
-      return true;
-    } catch (e) {
-      return false;
-    }
-  }
-
   private saveChanges(): void {
     try {
       this.projectService
         .getNode(this.component.nodeId)
         .replaceComponent(this.component.id, JSON.parse(this.componentContentJSONString));
       this.projectService.componentChanged();
+      this.notificationService.showJSONValidMessage();
     } catch (e) {
       this.notificationService.showJSONInvalidMessage();
     }
   }
-
-  private rememberRecentValidJSON(): void {
-    this.validComponentContentJSONString = this.componentContentJSONString;
-  }
-
-  private rollbackToRecentValidJSON(): void {
-    this.componentContentJSONString = this.validComponentContentJSONString;
-  }
 }
diff --git a/src/messages.xlf b/src/messages.xlf
index 0f9c08dfdc4..978d7ae9f02 100644
--- a/src/messages.xlf
+++ b/src/messages.xlf
@@ -893,133 +893,22 @@
           <context context-type="linenumber">16,19</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="2742664813202759813" datatype="html">
-        <source>JSON</source>
+      <trans-unit id="8577046754106915585" datatype="html">
+        <source> Editing the JSON directly is generally not recommended, as errors can break the unit. If you need assistance, please contact WISE staff. </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/authoring-tool/edit-component-json/edit-component-json.component.html</context>
-          <context context-type="linenumber">2,6</context>
+          <context context-type="linenumber">5,9</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.html</context>
-          <context context-type="linenumber">44,47</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html</context>
-          <context context-type="linenumber">50,52</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/animation/edit-animation-advanced/edit-animation-advanced.component.html</context>
-          <context context-type="linenumber">51,53</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/audioOscillator/edit-audio-oscillator-advanced/edit-audio-oscillator-advanced.component.html</context>
-          <context context-type="linenumber">51,53</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
-          <context context-type="linenumber">244,246</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-advanced/edit-dialog-guidance-advanced.component.html</context>
-          <context context-type="linenumber">43,45</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html</context>
-          <context context-type="linenumber">45,47</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html</context>
-          <context context-type="linenumber">57,59</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/embedded/edit-embedded-advanced/edit-embedded-advanced.component.html</context>
-          <context context-type="linenumber">64,66</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html</context>
-          <context context-type="linenumber">241,243</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/html/edit-html-advanced/edit-html-advanced.component.html</context>
-          <context context-type="linenumber">21,23</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.html</context>
-          <context context-type="linenumber">57,59</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html</context>
-          <context context-type="linenumber">73,75</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.html</context>
-          <context context-type="linenumber">62,64</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">611,613</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/outsideURL/edit-outside-url-advanced/edit-outside-url-advanced.component.ts</context>
-          <context context-type="linenumber">40,42</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/peerChat/edit-peer-chat-advanced-component/edit-peer-chat-advanced-component.component.ts</context>
-          <context context-type="linenumber">32,34</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/showGroupWork/edit-show-group-work-advanced/edit-show-group-work-advanced.component.ts</context>
-          <context context-type="linenumber">32,34</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/showMyWork/edit-show-my-work-advanced/edit-show-my-work-advanced.component.ts</context>
-          <context context-type="linenumber">32,34</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/summary/edit-summary-advanced/edit-summary-advanced.component.ts</context>
-          <context context-type="linenumber">40,42</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
-          <context context-type="linenumber">307,309</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="2543636733220429928" datatype="html">
-        <source>Show JSON</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/authoring-tool/edit-component-json/edit-component-json.component.html</context>
-          <context context-type="linenumber">8,12</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/authoringTool/node/advanced/node-advanced-authoring/node-advanced-authoring.component.html</context>
-          <context context-type="linenumber">60,64</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="1918155515588550927" datatype="html">
-        <source>Close the JSON view to save the changes</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/authoring-tool/edit-component-json/edit-component-json.component.html</context>
-          <context context-type="linenumber">17,19</context>
+          <context context-type="linenumber">49,53</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8880132687084463323" datatype="html">
         <source>Edit Activity JSON</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/authoring-tool/edit-component-json/edit-component-json.component.html</context>
-          <context context-type="linenumber">19,23</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="19198353055300541" datatype="html">
-        <source>The JSON is invalid. Invalid JSON will not be saved.
-Click &quot;OK&quot; to revert back to the last valid JSON.
-Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/authoring-tool/edit-component-json/edit-component-json.component.ts</context>
-          <context context-type="linenumber">76</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.ts</context>
-          <context context-type="linenumber">67</context>
+          <context context-type="linenumber">10,14</context>
         </context-group>
       </trans-unit>
       <trans-unit id="269492429034038872" datatype="html">
@@ -10866,11 +10755,91 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
           <context context-type="linenumber">62</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="8577046754106915585" datatype="html">
-        <source> Editing the JSON directly is generally not recommended, as errors can break the unit. If you need assistance, please contact WISE staff. </source>
+      <trans-unit id="2742664813202759813" datatype="html">
+        <source>JSON</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.html</context>
-          <context context-type="linenumber">49,53</context>
+          <context context-type="linenumber">44,47</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html</context>
+          <context context-type="linenumber">50,52</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/animation/edit-animation-advanced/edit-animation-advanced.component.html</context>
+          <context context-type="linenumber">51,53</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/audioOscillator/edit-audio-oscillator-advanced/edit-audio-oscillator-advanced.component.html</context>
+          <context context-type="linenumber">51,53</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.html</context>
+          <context context-type="linenumber">244,246</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/dialogGuidance/edit-dialog-guidance-advanced/edit-dialog-guidance-advanced.component.html</context>
+          <context context-type="linenumber">43,45</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html</context>
+          <context context-type="linenumber">45,47</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html</context>
+          <context context-type="linenumber">57,59</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/embedded/edit-embedded-advanced/edit-embedded-advanced.component.html</context>
+          <context context-type="linenumber">64,66</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html</context>
+          <context context-type="linenumber">241,243</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/html/edit-html-advanced/edit-html-advanced.component.html</context>
+          <context context-type="linenumber">21,23</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.html</context>
+          <context context-type="linenumber">57,59</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html</context>
+          <context context-type="linenumber">73,75</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.html</context>
+          <context context-type="linenumber">62,64</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
+          <context context-type="linenumber">611,613</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/outsideURL/edit-outside-url-advanced/edit-outside-url-advanced.component.ts</context>
+          <context context-type="linenumber">40,42</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/peerChat/edit-peer-chat-advanced-component/edit-peer-chat-advanced-component.component.ts</context>
+          <context context-type="linenumber">32,34</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/showGroupWork/edit-show-group-work-advanced/edit-show-group-work-advanced.component.ts</context>
+          <context context-type="linenumber">32,34</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/showMyWork/edit-show-my-work-advanced/edit-show-my-work-advanced.component.ts</context>
+          <context context-type="linenumber">32,34</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/summary/edit-summary-advanced/edit-summary-advanced.component.ts</context>
+          <context context-type="linenumber">40,42</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html</context>
+          <context context-type="linenumber">307,309</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2475616145493399595" datatype="html">
@@ -10884,6 +10853,15 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
           <context context-type="linenumber">65,69</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="19198353055300541" datatype="html">
+        <source>The JSON is invalid. Invalid JSON will not be saved.
+Click &quot;OK&quot; to revert back to the last valid JSON.
+Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.ts</context>
+          <context context-type="linenumber">67</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="82388219829106287" datatype="html">
         <source>Unit Home</source>
         <context-group purpose="location">
@@ -12683,6 +12661,13 @@ The branches will be removed but the steps will remain in the unit.</source>
           <context context-type="linenumber">49,53</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="2543636733220429928" datatype="html">
+        <source>Show JSON</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/authoringTool/node/advanced/node-advanced-authoring/node-advanced-authoring.component.html</context>
+          <context context-type="linenumber">60,64</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="3361600127930482405" datatype="html">
         <source>Paths</source>
         <context-group purpose="location">

From b9341eec27fbd40e3a84ecddac2e663bdc3bbe20 Mon Sep 17 00:00:00 2001
From: Jonathan Lim-Breitbart <breity10@gmail.com>
Date: Fri, 10 Apr 2026 14:56:03 -0700
Subject: [PATCH 30/33] Make advanced editing tabs header sticky and update
 styles

---
 .../edit-component-advanced.component.html    | 22 +++++++++--------
 .../edit-component-advanced.component.ts      | 24 +++++++++++++++++--
 2 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.html b/src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.html
index 0f6f23ab223..79e1be3824d 100644
--- a/src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.html
+++ b/src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.html
@@ -1,11 +1,13 @@
-<h2 mat-dialog-title i18n>Advanced Activity Settings</h2>
-<mat-divider />
-<div mat-dialog-content>
-  <div #component></div>
+<div class="edit-component-advanced">
+  <h2 mat-dialog-title i18n>Advanced Activity Settings</h2>
+  <mat-divider />
+  <div mat-dialog-content>
+    <div #component></div>
+  </div>
+  <mat-divider />
+  <mat-dialog-actions align="end">
+    <button class="enable-in-translation" mat-button mat-dialog-close cdkFocusRegionstart i18n>
+      Close
+    </button>
+  </mat-dialog-actions>
 </div>
-<mat-divider />
-<mat-dialog-actions align="end">
-  <button class="enable-in-translation" mat-button mat-dialog-close cdkFocusRegionstart i18n>
-    Close
-  </button>
-</mat-dialog-actions>
diff --git a/src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.ts b/src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.ts
index a3d74c363cb..febba44f6fe 100644
--- a/src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.ts
+++ b/src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.ts
@@ -6,7 +6,8 @@ import {
   ElementRef,
   EnvironmentInjector,
   Inject,
-  ViewChild
+  ViewChild,
+  ViewEncapsulation
 } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
 import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
@@ -15,9 +16,28 @@ import { Component as WISEComponent } from '../../../assets/wise5/common/Compone
 import { components } from '../../../assets/wise5/components/Components';
 
 @Component({
+  encapsulation: ViewEncapsulation.None,
   imports: [MatDivider, MatDialogModule, MatButtonModule],
   styles: [
-    '.mat-divider { margin: 0 -16px; } .mat-mdc-dialog-content { padding-top: 10px !important; padding-bottom: 10px !important; }'
+    `
+      .edit-component-advanced {
+        --mat-tab-divider-color: var(--mat-divider-color);
+        --mat-tab-divider-height: 1px;
+        .mat-divider {
+          margin: 0 -16px;
+        }
+        .mat-mdc-tab-body-content {
+          padding: 16px 0;
+        }
+        .mat-mdc-tab-header {
+          position: sticky;
+          top: 0;
+          z-index: 2;
+          background-color: white;
+          margin: 0 -16px;
+        }
+      }
+    `
   ],
   templateUrl: './edit-component-advanced.component.html'
 })

From 852f33c8c74db05bdcab0dbc52f207ec12f5ea56 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Fri, 10 Apr 2026 22:01:15 +0000
Subject: [PATCH 31/33] Updated messages

---
 src/messages.xlf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/messages.xlf b/src/messages.xlf
index 978d7ae9f02..00f6a480f73 100644
--- a/src/messages.xlf
+++ b/src/messages.xlf
@@ -832,14 +832,14 @@
         <source>Advanced Activity Settings</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.html</context>
-          <context context-type="linenumber">1,5</context>
+          <context context-type="linenumber">2,5</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5547981558491672240" datatype="html">
         <source> Close </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.html</context>
-          <context context-type="linenumber">9,12</context>
+          <context context-type="linenumber">10,14</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html</context>

From af36c365ac4a0275a6bc2844ca81a338b11191e8 Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Fri, 10 Apr 2026 16:12:26 -0700
Subject: [PATCH 32/33] feat(AI Summary): Allow author to edit system prompt
 (#2300)

---
 .../edit-advanced-component.component.ts      |  19 ++-
 .../edit-component-advanced-shared.module.ts  |   3 +
 .../edit-component-advanced.component.spec.ts |   4 +
 ...nt-summarizer-system-prompt.component.html |   0
 ...nent-summarizer-system-prompt.component.ts |  21 +++
 src/assets/wise5/common/ComponentContent.ts   |   3 +
 .../edit-ai-chat-advanced.component.spec.ts   |  11 +-
 ...dit-concept-map-advanced.component.spec.ts |   1 +
 .../discussion/discussionService.ts           |   9 ++
 .../edit-discussion-advanced.component.html   |   8 +
 .../edit-graph-advanced.component.spec.ts     |   1 +
 ...edit-open-response-advanced.component.html |   4 +
 ...t-open-response-advanced.component.spec.ts |   1 +
 .../openResponse/openResponseService.ts       |   9 ++
 ...-chat-advanced-component.component.spec.ts |   9 +-
 .../edit-table-advanced.component.spec.ts     |   1 +
 .../ai-summary/ai-summary.component.ts        |  18 ++-
 .../discussion-ai-summary.component.ts        |  15 +-
 ...open-response-ai-summary.component.spec.ts |   9 +-
 .../open-response-ai-summary.component.ts     |  15 +-
 src/messages.xlf                              | 139 ++++++++++--------
 21 files changed, 218 insertions(+), 82 deletions(-)
 create mode 100644 src/app/authoring-tool/edit-component-summarizer-system-prompt/edit-component-summarizer-system-prompt.component.html
 create mode 100644 src/app/authoring-tool/edit-component-summarizer-system-prompt/edit-component-summarizer-system-prompt.component.ts

diff --git a/src/app/authoring-tool/edit-advanced-component/edit-advanced-component.component.ts b/src/app/authoring-tool/edit-advanced-component/edit-advanced-component.component.ts
index 58824235d2a..ed94b95e9df 100644
--- a/src/app/authoring-tool/edit-advanced-component/edit-advanced-component.component.ts
+++ b/src/app/authoring-tool/edit-advanced-component/edit-advanced-component.component.ts
@@ -1,13 +1,15 @@
-import { Directive, Input } from '@angular/core';
+import { Directive, inject, Input } from '@angular/core';
 import { ComponentContent } from '../../../assets/wise5/common/ComponentContent';
 import { Component } from '../../../assets/wise5/common/Component';
 import { NotebookService } from '../../../assets/wise5/services/notebookService';
 import { TeacherProjectService } from '../../../assets/wise5/services/teacherProjectService';
 import { TeacherNodeService } from '../../../assets/wise5/services/teacherNodeService';
 import { moveObjectDown, moveObjectUp } from '../../../assets/wise5/common/array/array';
+import { ComponentServiceLookupService } from '../../../assets/wise5/services/componentServiceLookupService';
 
 @Directive()
 export abstract class EditAdvancedComponentComponent {
+  protected aiEnabled: boolean;
   component: Component;
   componentContent: ComponentContent;
   protected selectedTabIndex: number = 0;
@@ -16,6 +18,8 @@ export abstract class EditAdvancedComponentComponent {
   @Input() nodeId: string;
   @Input() tab: string = 'general';
 
+  private componentServiceLookupService = inject(ComponentServiceLookupService);
+
   constructor(
     protected nodeService: TeacherNodeService,
     protected notebookService: NotebookService,
@@ -25,6 +29,19 @@ export abstract class EditAdvancedComponentComponent {
   ngOnInit(): void {
     this.componentContent = this.teacherProjectService.getComponent(this.nodeId, this.componentId);
     this.component = new Component(this.componentContent, this.nodeId);
+    this.aiEnabled = this.teacherProjectService.getProject().ai?.enabled;
+    if (this.aiEnabled && ['Discussion', 'OpenResponse'].includes(this.component.content.type)) {
+      if (this.component.content.ai == null) {
+        const componentService = this.componentServiceLookupService.getService(
+          this.component.content.type
+        );
+        this.component.content.ai = {
+          teacherSummarySystemPrompt: componentService.getDefaultTeacherSummarySystemPrompt(
+            this.component.content.prompt
+          )
+        };
+      }
+    }
     this.teacherProjectService.uiChanged();
 
     switch (this.tab) {
diff --git a/src/app/authoring-tool/edit-component-advanced/edit-component-advanced-shared.module.ts b/src/app/authoring-tool/edit-component-advanced/edit-component-advanced-shared.module.ts
index d0e6ffee11e..7782418c9f2 100644
--- a/src/app/authoring-tool/edit-component-advanced/edit-component-advanced-shared.module.ts
+++ b/src/app/authoring-tool/edit-component-advanced/edit-component-advanced-shared.module.ts
@@ -16,6 +16,7 @@ import { MatCheckboxModule } from '@angular/material/checkbox';
 import { FormsModule } from '@angular/forms';
 import { EditComponentAddToNotebookButtonComponent } from '../edit-component-add-to-notebook-button/edit-component-add-to-notebook-button.component';
 import { EditConnectedComponentsComponent } from '../edit-connected-components/edit-connected-components.component';
+import { EditComponentSummarizerSystemPromptComponent } from '../edit-component-summarizer-system-prompt/edit-component-summarizer-system-prompt.component';
 
 @NgModule({
   imports: [
@@ -29,6 +30,7 @@ import { EditConnectedComponentsComponent } from '../edit-connected-components/e
     EditComponentExcludeFromTotalScoreComponent,
     EditComponentWidthComponent,
     EditComponentRubricComponent,
+    EditComponentSummarizerSystemPromptComponent,
     EditComponentTagsComponent,
     EditComponentConstraintsComponent,
     EditComponentJsonComponent,
@@ -48,6 +50,7 @@ import { EditConnectedComponentsComponent } from '../edit-connected-components/e
     EditComponentExcludeFromTotalScoreComponent,
     EditComponentWidthComponent,
     EditComponentRubricComponent,
+    EditComponentSummarizerSystemPromptComponent,
     EditComponentTagsComponent,
     EditComponentConstraintsComponent,
     EditComponentJsonComponent,
diff --git a/src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.spec.ts b/src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.spec.ts
index a364f114868..2166cae3fe7 100644
--- a/src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.spec.ts
+++ b/src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.spec.ts
@@ -8,6 +8,7 @@ import { NotificationService } from '../../../assets/wise5/services/notification
 import { TeacherNodeService } from '../../../assets/wise5/services/teacherNodeService';
 import { TeacherProjectService } from '../../../assets/wise5/services/teacherProjectService';
 import { EditComponentAdvancedComponent } from './edit-component-advanced.component';
+import { ComponentServiceLookupService } from '../../../assets/wise5/services/componentServiceLookupService';
 
 let component: EditComponentAdvancedComponent;
 let fixture: ComponentFixture<EditComponentAdvancedComponent>;
@@ -34,6 +35,7 @@ describe('EditComponentAdvancedComponent', () => {
           }
         },
         MockProviders(
+          ComponentServiceLookupService,
           TeacherNodeService,
           NotebookService,
           NotificationService,
@@ -47,6 +49,8 @@ describe('EditComponentAdvancedComponent', () => {
     spyOn(TestBed.inject(TeacherProjectService), 'getComponent').and.returnValue({
       type: 'ShowMyWork'
     } as ComponentContent);
+    spyOn(TestBed.inject(TeacherProjectService), 'getProject').and.returnValue({});
+
     fixture.detectChanges();
   });
 
diff --git a/src/app/authoring-tool/edit-component-summarizer-system-prompt/edit-component-summarizer-system-prompt.component.html b/src/app/authoring-tool/edit-component-summarizer-system-prompt/edit-component-summarizer-system-prompt.component.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/app/authoring-tool/edit-component-summarizer-system-prompt/edit-component-summarizer-system-prompt.component.ts b/src/app/authoring-tool/edit-component-summarizer-system-prompt/edit-component-summarizer-system-prompt.component.ts
new file mode 100644
index 00000000000..43c02268678
--- /dev/null
+++ b/src/app/authoring-tool/edit-component-summarizer-system-prompt/edit-component-summarizer-system-prompt.component.ts
@@ -0,0 +1,21 @@
+import { Component } from '@angular/core';
+import { EditComponentFieldComponent } from '../edit-component-field.component';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { FormsModule } from '@angular/forms';
+import { MatInputModule } from '@angular/material/input';
+import { CdkTextareaAutosize } from '@angular/cdk/text-field';
+
+@Component({
+  imports: [CdkTextareaAutosize, FormsModule, MatFormFieldModule, MatInputModule],
+  selector: 'edit-component-summarizer-system-prompt',
+  template: `<mat-form-field class="w-full">
+    <mat-label i18n>Teacher Summary System Prompt</mat-label>
+    <textarea
+      matInput
+      cdkTextareaAutosize
+      [(ngModel)]="componentContent.ai.teacherSummarySystemPrompt"
+      (ngModelChange)="inputChanged.next($event)"
+    ></textarea>
+  </mat-form-field> `
+})
+export class EditComponentSummarizerSystemPromptComponent extends EditComponentFieldComponent {}
diff --git a/src/assets/wise5/common/ComponentContent.ts b/src/assets/wise5/common/ComponentContent.ts
index 6273bb3663e..ea9795e1a05 100644
--- a/src/assets/wise5/common/ComponentContent.ts
+++ b/src/assets/wise5/common/ComponentContent.ts
@@ -4,6 +4,9 @@ import { DynamicPrompt } from '../directives/dynamic-prompt/DynamicPrompt';
 
 export interface ComponentContent {
   id: string;
+  ai?: {
+    teacherSummarySystemPrompt?: string;
+  };
   anonymizeResponses?: boolean;
   connectedComponents?: any[];
   constraints?: any[];
diff --git a/src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.spec.ts b/src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.spec.ts
index aa84662ac04..3fb55dd1c6c 100644
--- a/src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.spec.ts
+++ b/src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.spec.ts
@@ -7,6 +7,7 @@ import { NotebookService } from '../../../services/notebookService';
 import { EditConnectedComponentsComponent } from '../../../../../app/authoring-tool/edit-connected-components/edit-connected-components.component';
 import { EditComponentJsonComponent } from '../../../../../app/authoring-tool/edit-component-json/edit-component-json.component';
 import { EditComponentWidthComponent } from '../../../../../app/authoring-tool/edit-component-width/edit-component-width.component';
+import { ComponentServiceLookupService } from '../../../services/componentServiceLookupService';
 
 describe('EditAiChatAdvancedComponent', () => {
   let component: EditAiChatAdvancedComponent;
@@ -22,7 +23,14 @@ describe('EditAiChatAdvancedComponent', () => {
           EditConnectedComponentsComponent
         )
       ],
-      providers: [MockProviders(NotebookService, TeacherNodeService, TeacherProjectService)]
+      providers: [
+        MockProviders(
+          ComponentServiceLookupService,
+          NotebookService,
+          TeacherNodeService,
+          TeacherProjectService
+        )
+      ]
     });
     fixture = TestBed.createComponent(EditAiChatAdvancedComponent);
     component = fixture.componentInstance;
@@ -31,6 +39,7 @@ describe('EditAiChatAdvancedComponent', () => {
       id: 'component1',
       type: 'aiChat'
     });
+    spyOn(TestBed.inject(TeacherProjectService), 'getProject').and.returnValue({});
     fixture.detectChanges();
   });
 
diff --git a/src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.spec.ts b/src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.spec.ts
index 9b0a0c940c4..adc1646b8cd 100644
--- a/src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.spec.ts
+++ b/src/assets/wise5/components/conceptMap/edit-concept-map-advanced/edit-concept-map-advanced.component.spec.ts
@@ -26,6 +26,7 @@ describe('EditConceptMapAdvancedComponent', () => {
     spyOn(TestBed.inject(TeacherProjectService), 'getComponent').and.returnValue({
       rules: []
     } as ConceptMapContent);
+    spyOn(TestBed.inject(TeacherProjectService), 'getProject').and.returnValue({});
     spyOn(TestBed.inject(NotebookService), 'isNotebookEnabled').and.returnValue(true);
     fixture = TestBed.createComponent(EditConceptMapAdvancedComponent);
     component = fixture.componentInstance;
diff --git a/src/assets/wise5/components/discussion/discussionService.ts b/src/assets/wise5/components/discussion/discussionService.ts
index a4691ac14d0..2a7ed4abfae 100644
--- a/src/assets/wise5/components/discussion/discussionService.ts
+++ b/src/assets/wise5/components/discussion/discussionService.ts
@@ -27,6 +27,9 @@ export class DiscussionService extends ComponentService {
     component.isStudentAttachmentEnabled = true;
     component.gateClassmateResponses = true;
     component.anonymizeResponses = false;
+    component.ai = {
+      teacherSummarySystemPrompt: this.getDefaultTeacherSummarySystemPrompt()
+    };
     return component;
   }
 
@@ -335,4 +338,10 @@ export class DiscussionService extends ComponentService {
       col2: evenResponses.reverse()
     };
   }
+
+  getDefaultTeacherSummarySystemPrompt(): string {
+    return `You are a teacher who is summarizing students' discussion threads, which include posts and replies to the following question: "$QUESTION$".
+    Each thread is in the format: $RESPONSE_FORMAT$.
+    In the same language as the question, provide a summary of the threads in 100 words or less.`;
+  }
 }
diff --git a/src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html b/src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html
index 596f1aec514..2999a2aadbd 100644
--- a/src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html
+++ b/src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html
@@ -9,6 +9,14 @@
       <edit-component-width [componentContent]="componentContent" />
     </div>
   </mat-tab>
+  @if (aiEnabled) {
+    <mat-tab>
+      <ng-template mat-tab-label>
+        <mat-icon>auto_awesome</mat-icon>&nbsp;<span i18n>AI</span>
+      </ng-template>
+      <edit-component-summarizer-system-prompt [componentContent]="component.content" />
+    </mat-tab>
+  }
   <mat-tab>
     <ng-template mat-tab-label>
       <mat-icon>visibility</mat-icon>&nbsp;<span i18n>Visibility</span>
diff --git a/src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.spec.ts b/src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.spec.ts
index 194ad8826b9..824fe1d9320 100644
--- a/src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.spec.ts
+++ b/src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.spec.ts
@@ -30,6 +30,7 @@ describe('EditGraphAdvancedComponent', () => {
       xAxis: {},
       yAxis: {}
     } as GraphContent);
+    spyOn(TestBed.inject(TeacherProjectService), 'getProject').and.returnValue({});
     spyOn(projectService, 'getLocale').and.returnValue(new ProjectLocale({ default: 'en-US' }));
     spyOn(projectService, 'isDefaultLocale').and.returnValue(true);
     spyOn(TestBed.inject(NotebookService), 'isNotebookEnabled').and.returnValue(true);
diff --git a/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html b/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html
index 5bbddbff026..9f821e5c9a6 100644
--- a/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html
+++ b/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html
@@ -74,6 +74,10 @@
     <ng-template mat-tab-label>
       <mat-icon>auto_awesome</mat-icon>&nbsp;<span i18n>AI</span>
     </ng-template>
+    @if (aiEnabled) {
+      <!-- currently C-Rater can be used without the global AI being turned on, due to legacy reasons. -->
+      <edit-component-summarizer-system-prompt [componentContent]="component.content" />
+    }
     <div>
       <mat-checkbox
         color="primary"
diff --git a/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.spec.ts b/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.spec.ts
index 26aece523b2..56d9419fc11 100644
--- a/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.spec.ts
+++ b/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.spec.ts
@@ -31,6 +31,7 @@ describe('EditOpenResponseAdvancedComponent', () => {
   beforeEach(() => {
     const projectService = TestBed.inject(TeacherProjectService);
     spyOn(projectService, 'getComponent').and.returnValue({} as ComponentContent);
+    spyOn(TestBed.inject(TeacherProjectService), 'getProject').and.returnValue({});
     spyOn(TestBed.inject(NotebookService), 'isNotebookEnabled').and.returnValue(true);
     spyOn(projectService, 'getFlattenedProjectAsNodeIds').and.returnValue([
       'node1',
diff --git a/src/assets/wise5/components/openResponse/openResponseService.ts b/src/assets/wise5/components/openResponse/openResponseService.ts
index f44f0a37ca9..7c576e391c6 100644
--- a/src/assets/wise5/components/openResponse/openResponseService.ts
+++ b/src/assets/wise5/components/openResponse/openResponseService.ts
@@ -19,6 +19,9 @@ export class OpenResponseService extends ComponentService {
     component.type = 'OpenResponse';
     component.starterSentence = null;
     component.isStudentAttachmentEnabled = false;
+    component.ai = {
+      teacherSummarySystemPrompt: this.getDefaultTeacherSummarySystemPrompt()
+    };
     return component;
   }
 
@@ -127,4 +130,10 @@ export class OpenResponseService extends ComponentService {
     }
     return false;
   }
+
+  getDefaultTeacherSummarySystemPrompt(): string {
+    return `You are a teacher who is summarizing student responses to the following question: "$QUESTION$".
+    Each student response is in the format: $RESPONSE_FORMAT$.
+    In the same language as the question, provide a summary of the responses in 100 words or less.`;
+  }
 }
diff --git a/src/assets/wise5/components/peerChat/edit-peer-chat-advanced-component/edit-peer-chat-advanced-component.component.spec.ts b/src/assets/wise5/components/peerChat/edit-peer-chat-advanced-component/edit-peer-chat-advanced-component.component.spec.ts
index bf3016c1d53..5094c9969ac 100644
--- a/src/assets/wise5/components/peerChat/edit-peer-chat-advanced-component/edit-peer-chat-advanced-component.component.spec.ts
+++ b/src/assets/wise5/components/peerChat/edit-peer-chat-advanced-component/edit-peer-chat-advanced-component.component.spec.ts
@@ -7,6 +7,7 @@ import { TeacherProjectService } from '../../../services/teacherProjectService';
 import { PeerChatContent } from '../PeerChatContent';
 import { EditPeerChatAdvancedComponentComponent } from './edit-peer-chat-advanced-component.component';
 import { EditComponentJsonComponent } from '../../../../../app/authoring-tool/edit-component-json/edit-component-json.component';
+import { ComponentServiceLookupService } from '../../../services/componentServiceLookupService';
 
 describe('EditPeerChatAdvancedComponentComponent', () => {
   let component: EditPeerChatAdvancedComponentComponent;
@@ -16,7 +17,12 @@ describe('EditPeerChatAdvancedComponentComponent', () => {
     await TestBed.configureTestingModule({
       imports: [EditPeerChatAdvancedComponentComponent, MockComponent(EditComponentJsonComponent)],
       providers: [
-        MockProviders(TeacherNodeService, TeacherProjectService, NotebookService),
+        MockProviders(
+          ComponentServiceLookupService,
+          TeacherNodeService,
+          TeacherProjectService,
+          NotebookService
+        ),
         provideHttpClient(withInterceptorsFromDi())
       ]
     }).compileComponents();
@@ -26,6 +32,7 @@ describe('EditPeerChatAdvancedComponentComponent', () => {
     spyOn(TestBed.inject(TeacherProjectService), 'getComponent').and.returnValue(
       {} as PeerChatContent
     );
+    spyOn(TestBed.inject(TeacherProjectService), 'getProject').and.returnValue({});
     fixture = TestBed.createComponent(EditPeerChatAdvancedComponentComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
diff --git a/src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.spec.ts b/src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.spec.ts
index 4f653192c81..a45e0627cc0 100644
--- a/src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.spec.ts
+++ b/src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.spec.ts
@@ -30,6 +30,7 @@ describe('EditTableAdvancedComponent', () => {
 
   beforeEach(() => {
     spyOn(TestBed.inject(TeacherProjectService), 'getComponent').and.returnValue(createComponent());
+    spyOn(TestBed.inject(TeacherProjectService), 'getProject').and.returnValue({});
     spyOn(TestBed.inject(NotebookService), 'isNotebookEnabled').and.returnValue(true);
     spyOn(TestBed.inject(TeacherProjectService), 'getFlattenedProjectAsNodeIds').and.returnValue([
       'node1',
diff --git a/src/assets/wise5/directives/teacher-summary-display/ai-summary/ai-summary.component.ts b/src/assets/wise5/directives/teacher-summary-display/ai-summary/ai-summary.component.ts
index 12916ebcf82..666cd099779 100644
--- a/src/assets/wise5/directives/teacher-summary-display/ai-summary/ai-summary.component.ts
+++ b/src/assets/wise5/directives/teacher-summary-display/ai-summary/ai-summary.component.ts
@@ -10,6 +10,7 @@ import { DatePipe } from '@angular/common';
 import { TeacherProjectService } from '../../../services/teacherProjectService';
 import { ChatService } from '../../../../../app/services/chat/chat.service';
 import { OpenAiChatService } from '../../../../../app/services/chat/openAiChat.service';
+import { ComponentContent } from '../../../common/ComponentContent';
 
 /**
  * Abstract base class for components that use an LLM to summarize student responses.
@@ -25,6 +26,7 @@ export abstract class AiSummaryComponent {
   @Input() periodId: number;
 
   private chatService: ChatService = inject(OpenAiChatService);
+  private component: ComponentContent;
   protected dataService: TeacherDataService = inject(TeacherDataService);
   protected datePipe: DatePipe = inject(DatePipe);
   private localStorageService: LocalStorageService = inject(LocalStorageService);
@@ -38,6 +40,7 @@ export abstract class AiSummaryComponent {
   protected summaryDate: Date;
 
   ngOnInit(): void {
+    this.component = this.projectService.getComponent(this.nodeId, this.componentId);
     this.latestComponentStates = this.getLatestComponentStates();
     this.hasStudentResponses = this.latestComponentStates.length > 0;
     if (this.hasStudentResponses) {
@@ -64,9 +67,8 @@ export abstract class AiSummaryComponent {
 
   protected async generateSummary(): Promise<void> {
     this.generatingSummary = true;
-    const prompt = this.projectService.getComponent(this.nodeId, this.componentId).prompt;
     this.summary = await this.chatService.sendMessage([
-      new ChatMessage('system', this.getSystemPrompt(prompt), this.nodeId),
+      new ChatMessage('system', this.getSystemPrompt(this.component.prompt), this.nodeId),
       new ChatMessage('user', this.getStudentResponses(), this.nodeId)
     ]);
     this.localStorageService.setItem(this.getSummaryKey(), this.summary);
@@ -79,7 +81,17 @@ export abstract class AiSummaryComponent {
 
   protected abstract getStudentResponses(): string;
 
-  protected abstract getSystemPrompt(prompt: string): string;
+  protected getSystemPrompt(prompt: string): string {
+    const systemPrompt =
+      this.component.ai?.teacherSummarySystemPrompt ?? this.getDefaultSystemPrompt();
+    return systemPrompt
+      .replace('$QUESTION$', prompt)
+      .replace('$RESPONSE_FORMAT$', this.getResponseFormat());
+  }
+
+  protected abstract getResponseFormat(): string;
+
+  protected abstract getDefaultSystemPrompt(): string;
 
   private getSummaryKey(): string {
     return `component-summary-${this.periodId}-${this.nodeId}-${this.componentId}`;
diff --git a/src/assets/wise5/directives/teacher-summary-display/discussion-ai-summary/discussion-ai-summary.component.ts b/src/assets/wise5/directives/teacher-summary-display/discussion-ai-summary/discussion-ai-summary.component.ts
index c3727aef2f2..14ce5adb2f7 100644
--- a/src/assets/wise5/directives/teacher-summary-display/discussion-ai-summary/discussion-ai-summary.component.ts
+++ b/src/assets/wise5/directives/teacher-summary-display/discussion-ai-summary/discussion-ai-summary.component.ts
@@ -1,11 +1,12 @@
 import { DatePipe } from '@angular/common';
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
 import { MatButton } from '@angular/material/button';
 import { MatIcon } from '@angular/material/icon';
 import { MatProgressSpinner } from '@angular/material/progress-spinner';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { MarkdownComponent } from 'ngx-markdown';
 import { AiSummaryComponent } from '../ai-summary/ai-summary.component';
+import { DiscussionService } from '../../../components/discussion/discussionService';
 
 interface Thread {
   id: number;
@@ -23,10 +24,14 @@ interface Thread {
   templateUrl: '../ai-summary/ai-summary.component.html'
 })
 export class DiscussionAiSummaryComponent extends AiSummaryComponent {
-  protected getSystemPrompt(prompt: string): string {
-    return `You are a teacher who is summarizing students' discussion threads, which include posts and replies to the following question: "${prompt}".
-      Each thread is in the format: <thread><post>Post</post><replies><reply>Reply 1</reply><reply>Reply 2</reply></replies></thread>.
-      In the same language as the question, provide a summary of the threads in 100 words or less.`;
+  private discussionService = inject(DiscussionService);
+
+  protected getDefaultSystemPrompt(): string {
+    return this.discussionService.getDefaultTeacherSummarySystemPrompt();
+  }
+
+  protected getResponseFormat(): string {
+    return '<thread><post>Post</post><replies><reply>Reply 1</reply><reply>Reply 2</reply></replies></thread>';
   }
 
   protected getStudentResponses(): string {
diff --git a/src/assets/wise5/directives/teacher-summary-display/open-response-ai-summary/open-response-ai-summary.component.spec.ts b/src/assets/wise5/directives/teacher-summary-display/open-response-ai-summary/open-response-ai-summary.component.spec.ts
index 7bbffdebf0d..d905d404af8 100644
--- a/src/assets/wise5/directives/teacher-summary-display/open-response-ai-summary/open-response-ai-summary.component.spec.ts
+++ b/src/assets/wise5/directives/teacher-summary-display/open-response-ai-summary/open-response-ai-summary.component.spec.ts
@@ -15,6 +15,7 @@ import { MarkdownComponent, MarkdownService } from 'ngx-markdown';
 import { TeacherProjectService } from '../../../services/teacherProjectService';
 import { ChatService } from '../../../../../app/services/chat/chat.service';
 import { OpenAiChatService } from '../../../../../app/services/chat/openAiChat.service';
+import { OpenResponseService } from '../../../components/openResponse/openResponseService';
 
 describe('OpenResponseAiSummaryComponent', () => {
   let component: OpenResponseAiSummaryComponent;
@@ -38,6 +39,7 @@ describe('OpenResponseAiSummaryComponent', () => {
           LocalStorageService,
           MarkdownService,
           OpenAiChatService,
+          OpenResponseService,
           TeacherProjectService,
           SummaryService,
           TeacherDataService
@@ -53,7 +55,10 @@ describe('OpenResponseAiSummaryComponent', () => {
     spyOn(projectService, 'getComponent').and.returnValue({
       id: 'component1',
       type: 'OpenResponse',
-      prompt: 'What is your opinion on climate change?'
+      prompt: 'What is your opinion on climate change?',
+      ai: {
+        teacherSummarySystemPrompt: 'You are a teacher summarizing student responses.'
+      }
     } as any);
 
     fixture = TestBed.createComponent(OpenResponseAiSummaryComponent);
@@ -172,7 +177,7 @@ describe('OpenResponseAiSummaryComponent', () => {
       await component['generateSummary']();
       const messages = sendMessageSpy.calls.mostRecent().args[0];
       expect(messages[0].role).toBe('system');
-      expect(messages[0].content).toContain('What is your opinion on climate change?');
+      expect(messages[0].content).toContain('You are a teacher summarizing student responses.');
     });
 
     it('should call chatService with student responses', async () => {
diff --git a/src/assets/wise5/directives/teacher-summary-display/open-response-ai-summary/open-response-ai-summary.component.ts b/src/assets/wise5/directives/teacher-summary-display/open-response-ai-summary/open-response-ai-summary.component.ts
index 6953cf4b80e..4758e457c57 100644
--- a/src/assets/wise5/directives/teacher-summary-display/open-response-ai-summary/open-response-ai-summary.component.ts
+++ b/src/assets/wise5/directives/teacher-summary-display/open-response-ai-summary/open-response-ai-summary.component.ts
@@ -1,11 +1,12 @@
 import { DatePipe } from '@angular/common';
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
 import { MatButton } from '@angular/material/button';
 import { MatIcon } from '@angular/material/icon';
 import { MatProgressSpinner } from '@angular/material/progress-spinner';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { MarkdownComponent } from 'ngx-markdown';
 import { AiSummaryComponent } from '../ai-summary/ai-summary.component';
+import { OpenResponseService } from '../../../components/openResponse/openResponseService';
 
 /**
  * Uses an LLM to summarize students' responses to open response questions.
@@ -17,10 +18,14 @@ import { AiSummaryComponent } from '../ai-summary/ai-summary.component';
   templateUrl: '../ai-summary/ai-summary.component.html'
 })
 export class OpenResponseAiSummaryComponent extends AiSummaryComponent {
-  protected getSystemPrompt(prompt: string): string {
-    return `You are a teacher who is summarizing student responses to the following question: "${prompt}".
-      Each student response is in the format: <response>Response</response>.
-      In the same language as the question, provide a summary of the responses in 100 words or less.`;
+  private openResponseService = inject(OpenResponseService);
+
+  protected getDefaultSystemPrompt(): string {
+    return this.openResponseService.getDefaultTeacherSummarySystemPrompt();
+  }
+
+  protected getResponseFormat(): string {
+    return '<response>Response</response>';
   }
 
   protected getStudentResponses(): string {
diff --git a/src/messages.xlf b/src/messages.xlf
index 00f6a480f73..affac40c824 100644
--- a/src/messages.xlf
+++ b/src/messages.xlf
@@ -973,6 +973,13 @@
           <context context-type="linenumber">15,18</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="8815129696139137937" datatype="html">
+        <source>Teacher Summary System Prompt</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/authoring-tool/edit-component-summarizer-system-prompt/edit-component-summarizer-system-prompt.component.ts</context>
+          <context context-type="linenumber">12,16</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="7886570921510760899" datatype="html">
         <source>Tags</source>
         <context-group purpose="location">
@@ -1001,7 +1008,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html</context>
-          <context context-type="linenumber">41,42</context>
+          <context context-type="linenumber">49,50</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html</context>
@@ -1706,11 +1713,11 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">97,98</context>
+          <context context-type="linenumber">101,102</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">556,557</context>
+          <context context-type="linenumber">560,561</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/vle/node/node.component.html</context>
@@ -1772,7 +1779,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">537,538</context>
+          <context context-type="linenumber">541,542</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html</context>
@@ -1787,7 +1794,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">547,550</context>
+          <context context-type="linenumber">551,554</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/showGroupWork/show-group-work-authoring/show-group-work-authoring.component.html</context>
@@ -1826,7 +1833,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">525,526</context>
+          <context context-type="linenumber">529,530</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html</context>
@@ -1860,11 +1867,11 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">98,99</context>
+          <context context-type="linenumber">102,103</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">557,559</context>
+          <context context-type="linenumber">561,563</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/vle/node/node.component.html</context>
@@ -2747,7 +2754,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">164,167</context>
+          <context context-type="linenumber">168,171</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8352660755693654653" datatype="html">
@@ -10673,7 +10680,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html</context>
-          <context context-type="linenumber">33,36</context>
+          <context context-type="linenumber">41,44</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html</context>
@@ -10783,7 +10790,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html</context>
-          <context context-type="linenumber">45,47</context>
+          <context context-type="linenumber">53,55</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html</context>
@@ -10815,7 +10822,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">611,613</context>
+          <context context-type="linenumber">615,617</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/outsideURL/edit-outside-url-advanced/edit-outside-url-advanced.component.ts</context>
@@ -16634,7 +16641,7 @@ Are you sure you want to proceed?</source>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html</context>
-          <context context-type="linenumber">14,16</context>
+          <context context-type="linenumber">22,24</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html</context>
@@ -16717,7 +16724,7 @@ Are you sure you want to proceed?</source>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html</context>
-          <context context-type="linenumber">20,23</context>
+          <context context-type="linenumber">28,31</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html</context>
@@ -18275,7 +18282,7 @@ Are you ready to receive feedback on this answer?</source>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">350,351</context>
+          <context context-type="linenumber">354,355</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8185078869695276161" datatype="html">
@@ -19386,6 +19393,17 @@ Category Name: <x id="PH_1" equiv-text="categoryName"/></source>
           <context context-type="linenumber">232</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="3484984238852181071" datatype="html">
+        <source>AI</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html</context>
+          <context context-type="linenumber">15,17</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
+          <context context-type="linenumber">75,78</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="831017338718169987" datatype="html">
         <source>Students draw on a canvas using a variety of tools.</source>
         <context-group purpose="location">
@@ -21254,7 +21272,7 @@ Warning: This will delete all existing choices and buckets in this activity.</so
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">121,124</context>
+          <context context-type="linenumber">125,128</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3824537844289284943" datatype="html">
@@ -21411,212 +21429,205 @@ Warning: This will delete all existing choices in this activity.</source>
           <context context-type="linenumber">21,26</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="3484984238852181071" datatype="html">
-        <source>AI</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">75,79</context>
-        </context-group>
-      </trans-unit>
       <trans-unit id="1759795162772199785" datatype="html">
         <source> Enable AI Model </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">85,88</context>
+          <context context-type="linenumber">89,92</context>
         </context-group>
       </trans-unit>
       <trans-unit id="9153897398545804453" datatype="html">
         <source>Score On</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">92,94</context>
+          <context context-type="linenumber">96,98</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1230154438678955604" datatype="html">
         <source>Change</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">99,102</context>
+          <context context-type="linenumber">103,106</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7401107549258505528" datatype="html">
         <source> Show Score </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">111,115</context>
+          <context context-type="linenumber">115,119</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6706329976663713413" datatype="html">
         <source> Enable Feedback Rules </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">131,133</context>
+          <context context-type="linenumber">135,137</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5056621402071854825" datatype="html">
         <source>Scoring Rule</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">143,146</context>
+          <context context-type="linenumber">147,150</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2840439048375115947" datatype="html">
         <source>Add Scoring Rule</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">148,151</context>
+          <context context-type="linenumber">152,155</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1749702431264125217" datatype="html">
         <source>Feedback Text</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">176,178</context>
+          <context context-type="linenumber">180,182</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6318060955337736972" datatype="html">
         <source>Move Scoring Rule Up</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">187,189</context>
+          <context context-type="linenumber">191,193</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8741073904951621119" datatype="html">
         <source>Move Scoring Rule Down</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">198,200</context>
+          <context context-type="linenumber">202,204</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8481143767365565734" datatype="html">
         <source>Delete Scoring Rule</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">208,210</context>
+          <context context-type="linenumber">212,214</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4753983371217895606" datatype="html">
         <source> Enable Multiple Attempt Feedback </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">228,231</context>
+          <context context-type="linenumber">232,235</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6924674031457346140" datatype="html">
         <source>Multiple Attempt Scoring Rules</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">233,236</context>
+          <context context-type="linenumber">237,240</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2707777420645958826" datatype="html">
         <source>Add Multiple Attempt Scoring Rule</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">238,241</context>
+          <context context-type="linenumber">242,245</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2885623017281914681" datatype="html">
         <source>Previous Score</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">254,257</context>
+          <context context-type="linenumber">258,261</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">363,366</context>
+          <context context-type="linenumber">367,370</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2466216299740593982" datatype="html">
         <source>Current Score</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">263,266</context>
+          <context context-type="linenumber">267,270</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">373,376</context>
+          <context context-type="linenumber">377,380</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8219288603984689566" datatype="html">
         <source>Feedback to Student</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">274,276</context>
+          <context context-type="linenumber">278,280</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">461,463</context>
+          <context context-type="linenumber">465,467</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1237543279965214424" datatype="html">
         <source>Move Multiple Attempt Scoring Rule Up</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">290,292</context>
+          <context context-type="linenumber">294,296</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5646689888494364443" datatype="html">
         <source>Move Multiple Attempt Scoring Rule Down</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">306,308</context>
+          <context context-type="linenumber">310,312</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8247485612014750779" datatype="html">
         <source>Delet Multiple Attempt Scoring</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">316,318</context>
+          <context context-type="linenumber">320,322</context>
         </context-group>
       </trans-unit>
       <trans-unit id="681347196878226021" datatype="html">
         <source> Enable Notifications </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">336,339</context>
+          <context context-type="linenumber">340,343</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5851560788527570644" datatype="html">
         <source>Notifications</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">341,344</context>
+          <context context-type="linenumber">345,348</context>
         </context-group>
       </trans-unit>
       <trans-unit id="370200567263525921" datatype="html">
         <source>Move Notification Up</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">394,396</context>
+          <context context-type="linenumber">398,400</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2769177863929534863" datatype="html">
         <source>Move Notification Down</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">410,412</context>
+          <context context-type="linenumber">414,416</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1807548935384776633" datatype="html">
         <source>Delete Notification</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">420,422</context>
+          <context context-type="linenumber">424,426</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6336206965755061198" datatype="html">
         <source> Enable Ambient Display Dismiss Mode </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">435,437</context>
+          <context context-type="linenumber">439,441</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4441143426637747672" datatype="html">
         <source>Dismiss Code</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">439,442</context>
+          <context context-type="linenumber">443,446</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/vle/dismiss-ambient-notification-dialog/dismiss-ambient-notification-dialog.component.html</context>
@@ -21627,63 +21638,63 @@ Warning: This will delete all existing choices in this activity.</source>
         <source> Notify Student </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">455,457</context>
+          <context context-type="linenumber">459,461</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6137238378032253613" datatype="html">
         <source> Notify Teacher </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">475,477</context>
+          <context context-type="linenumber">479,481</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6470995886890122968" datatype="html">
         <source>Feedback to Teacher</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">481,483</context>
+          <context context-type="linenumber">485,487</context>
         </context-group>
       </trans-unit>
       <trans-unit id="853281253580647095" datatype="html">
         <source> Use Custom Completion Criteria </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">500,502</context>
+          <context context-type="linenumber">504,506</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6321190757824576813" datatype="html">
         <source>Custom Completion Criteria</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">504,507</context>
+          <context context-type="linenumber">508,511</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3954026354727494376" datatype="html">
         <source>Add Completion Criteria</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">509,512</context>
+          <context context-type="linenumber">513,516</context>
         </context-group>
       </trans-unit>
       <trans-unit id="376261460573165321" datatype="html">
         <source>Move Completion Criteria Up</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">569,571</context>
+          <context context-type="linenumber">573,575</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2584224885214103035" datatype="html">
         <source>Move Completion Criteria Down</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">582,584</context>
+          <context context-type="linenumber">586,588</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4117701430807776885" datatype="html">
         <source>Delete Completion Criteria</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">592,594</context>
+          <context context-type="linenumber">596,598</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8705933649296793690" datatype="html">
@@ -23085,14 +23096,14 @@ If this problem continues, let your teacher know and move on to the next activit
         <source>Summary generated <x id="PH" equiv-text="this.datePipe.transform(this.summaryDate, &apos;short&apos;)"/> from <x id="PH_1" equiv-text="this.latestComponentStates.length"/> responses</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/directives/teacher-summary-display/ai-summary/ai-summary.component.ts</context>
-          <context context-type="linenumber">93</context>
+          <context context-type="linenumber">105</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2424618748979671937" datatype="html">
         <source>Summary generated <x id="PH" equiv-text="this.datePipe.transform(this.summaryDate, &apos;short&apos;)"/> from <x id="PH_1" equiv-text="this.latestComponentStates.length"/> posts and comments</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/directives/teacher-summary-display/discussion-ai-summary/discussion-ai-summary.component.ts</context>
-          <context context-type="linenumber">55</context>
+          <context context-type="linenumber">60</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6958186570862992763" datatype="html">

From 2ef900fb5ec8365327fefb773fe918f032b6b0d4 Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Fri, 10 Apr 2026 16:52:49 -0700
Subject: [PATCH 33/33] Move AI tab between connection and rubric tabs.

---
 .../edit-discussion-advanced.component.html   |  16 +--
 ...edit-open-response-advanced.component.html |  26 ++---
 src/messages.xlf                              | 110 +++++++++---------
 3 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html b/src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html
index 2999a2aadbd..bda549c17f3 100644
--- a/src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html
+++ b/src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html
@@ -9,14 +9,6 @@
       <edit-component-width [componentContent]="componentContent" />
     </div>
   </mat-tab>
-  @if (aiEnabled) {
-    <mat-tab>
-      <ng-template mat-tab-label>
-        <mat-icon>auto_awesome</mat-icon>&nbsp;<span i18n>AI</span>
-      </ng-template>
-      <edit-component-summarizer-system-prompt [componentContent]="component.content" />
-    </mat-tab>
-  }
   <mat-tab>
     <ng-template mat-tab-label>
       <mat-icon>visibility</mat-icon>&nbsp;<span i18n>Visibility</span>
@@ -36,6 +28,14 @@
       (connectedComponentsChanged)="connectedComponentsChanged($event)"
     />
   </mat-tab>
+  @if (aiEnabled) {
+    <mat-tab>
+      <ng-template mat-tab-label>
+        <mat-icon>auto_awesome</mat-icon>&nbsp;<span i18n>AI</span>
+      </ng-template>
+      <edit-component-summarizer-system-prompt [componentContent]="component.content" />
+    </mat-tab>
+  }
   <mat-tab>
     <ng-template mat-tab-label>
       <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
diff --git a/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html b/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html
index 9f821e5c9a6..8187ba507db 100644
--- a/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html
+++ b/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html
@@ -57,19 +57,6 @@
       (connectedComponentsChanged)="connectedComponentsChanged($event)"
     />
   </mat-tab>
-  <mat-tab>
-    <ng-template mat-tab-label>
-      <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
-    </ng-template>
-    <ng-template matTabContent>
-      <!-- lazy load needed for tinymce to work -->
-      <edit-component-rubric [componentContent]="component.content" />
-    </ng-template>
-  </mat-tab>
-  <mat-tab>
-    <ng-template mat-tab-label> <mat-icon>sell</mat-icon>&nbsp;<span i18n>Tags</span></ng-template>
-    <edit-component-tags [componentContent]="component.content" />
-  </mat-tab>
   <mat-tab>
     <ng-template mat-tab-label>
       <mat-icon>auto_awesome</mat-icon>&nbsp;<span i18n>AI</span>
@@ -611,6 +598,19 @@
       </div>
     }
   </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>message</mat-icon>&nbsp;<span i18n>Rubric</span>
+    </ng-template>
+    <ng-template matTabContent>
+      <!-- lazy load needed for tinymce to work -->
+      <edit-component-rubric [componentContent]="component.content" />
+    </ng-template>
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label> <mat-icon>sell</mat-icon>&nbsp;<span i18n>Tags</span></ng-template>
+    <edit-component-tags [componentContent]="component.content" />
+  </mat-tab>
   <mat-tab>
     <ng-template mat-tab-label> <mat-icon>code</mat-icon>&nbsp;<span i18n>JSON</span></ng-template>
     <edit-component-json [component]="component" />
diff --git a/src/messages.xlf b/src/messages.xlf
index affac40c824..a2ad89311e1 100644
--- a/src/messages.xlf
+++ b/src/messages.xlf
@@ -1036,7 +1036,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">70,71</context>
+          <context context-type="linenumber">611,612</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/outsideURL/edit-outside-url-advanced/edit-outside-url-advanced.component.ts</context>
@@ -1713,11 +1713,11 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">101,102</context>
+          <context context-type="linenumber">88,89</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">560,561</context>
+          <context context-type="linenumber">547,548</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/vle/node/node.component.html</context>
@@ -1779,7 +1779,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">541,542</context>
+          <context context-type="linenumber">528,529</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html</context>
@@ -1794,7 +1794,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">551,554</context>
+          <context context-type="linenumber">538,541</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/showGroupWork/show-group-work-authoring/show-group-work-authoring.component.html</context>
@@ -1833,7 +1833,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">529,530</context>
+          <context context-type="linenumber">516,517</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/summary/summary-authoring/summary-authoring.component.html</context>
@@ -1867,11 +1867,11 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">102,103</context>
+          <context context-type="linenumber">89,90</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">561,563</context>
+          <context context-type="linenumber">548,550</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/vle/node/node.component.html</context>
@@ -2754,7 +2754,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">168,171</context>
+          <context context-type="linenumber">155,158</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8352660755693654653" datatype="html">
@@ -10712,7 +10712,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">62,65</context>
+          <context context-type="linenumber">603,606</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/outsideURL/edit-outside-url-advanced/edit-outside-url-advanced.component.ts</context>
@@ -16641,7 +16641,7 @@ Are you sure you want to proceed?</source>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html</context>
-          <context context-type="linenumber">22,24</context>
+          <context context-type="linenumber">14,16</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html</context>
@@ -16724,7 +16724,7 @@ Are you sure you want to proceed?</source>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html</context>
-          <context context-type="linenumber">28,31</context>
+          <context context-type="linenumber">20,23</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html</context>
@@ -18282,7 +18282,7 @@ Are you ready to receive feedback on this answer?</source>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">354,355</context>
+          <context context-type="linenumber">341,342</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8185078869695276161" datatype="html">
@@ -19397,11 +19397,11 @@ Category Name: <x id="PH_1" equiv-text="categoryName"/></source>
         <source>AI</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/discussion/edit-discussion-advanced/edit-discussion-advanced.component.html</context>
-          <context context-type="linenumber">15,17</context>
+          <context context-type="linenumber">34,36</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">75,78</context>
+          <context context-type="linenumber">62,65</context>
         </context-group>
       </trans-unit>
       <trans-unit id="831017338718169987" datatype="html">
@@ -21272,7 +21272,7 @@ Warning: This will delete all existing choices and buckets in this activity.</so
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">125,128</context>
+          <context context-type="linenumber">112,115</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3824537844289284943" datatype="html">
@@ -21433,201 +21433,201 @@ Warning: This will delete all existing choices in this activity.</source>
         <source> Enable AI Model </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">89,92</context>
+          <context context-type="linenumber">76,79</context>
         </context-group>
       </trans-unit>
       <trans-unit id="9153897398545804453" datatype="html">
         <source>Score On</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">96,98</context>
+          <context context-type="linenumber">83,85</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1230154438678955604" datatype="html">
         <source>Change</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">103,106</context>
+          <context context-type="linenumber">90,93</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7401107549258505528" datatype="html">
         <source> Show Score </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">115,119</context>
+          <context context-type="linenumber">102,106</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6706329976663713413" datatype="html">
         <source> Enable Feedback Rules </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">135,137</context>
+          <context context-type="linenumber">122,124</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5056621402071854825" datatype="html">
         <source>Scoring Rule</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">147,150</context>
+          <context context-type="linenumber">134,137</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2840439048375115947" datatype="html">
         <source>Add Scoring Rule</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">152,155</context>
+          <context context-type="linenumber">139,142</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1749702431264125217" datatype="html">
         <source>Feedback Text</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">180,182</context>
+          <context context-type="linenumber">167,169</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6318060955337736972" datatype="html">
         <source>Move Scoring Rule Up</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">191,193</context>
+          <context context-type="linenumber">178,180</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8741073904951621119" datatype="html">
         <source>Move Scoring Rule Down</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">202,204</context>
+          <context context-type="linenumber">189,191</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8481143767365565734" datatype="html">
         <source>Delete Scoring Rule</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">212,214</context>
+          <context context-type="linenumber">199,201</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4753983371217895606" datatype="html">
         <source> Enable Multiple Attempt Feedback </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">232,235</context>
+          <context context-type="linenumber">219,222</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6924674031457346140" datatype="html">
         <source>Multiple Attempt Scoring Rules</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">237,240</context>
+          <context context-type="linenumber">224,227</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2707777420645958826" datatype="html">
         <source>Add Multiple Attempt Scoring Rule</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">242,245</context>
+          <context context-type="linenumber">229,232</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2885623017281914681" datatype="html">
         <source>Previous Score</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">258,261</context>
+          <context context-type="linenumber">245,248</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">367,370</context>
+          <context context-type="linenumber">354,357</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2466216299740593982" datatype="html">
         <source>Current Score</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">267,270</context>
+          <context context-type="linenumber">254,257</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">377,380</context>
+          <context context-type="linenumber">364,367</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8219288603984689566" datatype="html">
         <source>Feedback to Student</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">278,280</context>
+          <context context-type="linenumber">265,267</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">465,467</context>
+          <context context-type="linenumber">452,454</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1237543279965214424" datatype="html">
         <source>Move Multiple Attempt Scoring Rule Up</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">294,296</context>
+          <context context-type="linenumber">281,283</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5646689888494364443" datatype="html">
         <source>Move Multiple Attempt Scoring Rule Down</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">310,312</context>
+          <context context-type="linenumber">297,299</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8247485612014750779" datatype="html">
         <source>Delet Multiple Attempt Scoring</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">320,322</context>
+          <context context-type="linenumber">307,309</context>
         </context-group>
       </trans-unit>
       <trans-unit id="681347196878226021" datatype="html">
         <source> Enable Notifications </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">340,343</context>
+          <context context-type="linenumber">327,330</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5851560788527570644" datatype="html">
         <source>Notifications</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">345,348</context>
+          <context context-type="linenumber">332,335</context>
         </context-group>
       </trans-unit>
       <trans-unit id="370200567263525921" datatype="html">
         <source>Move Notification Up</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">398,400</context>
+          <context context-type="linenumber">385,387</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2769177863929534863" datatype="html">
         <source>Move Notification Down</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">414,416</context>
+          <context context-type="linenumber">401,403</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1807548935384776633" datatype="html">
         <source>Delete Notification</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">424,426</context>
+          <context context-type="linenumber">411,413</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6336206965755061198" datatype="html">
         <source> Enable Ambient Display Dismiss Mode </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">439,441</context>
+          <context context-type="linenumber">426,428</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4441143426637747672" datatype="html">
         <source>Dismiss Code</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">443,446</context>
+          <context context-type="linenumber">430,433</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/vle/dismiss-ambient-notification-dialog/dismiss-ambient-notification-dialog.component.html</context>
@@ -21638,63 +21638,63 @@ Warning: This will delete all existing choices in this activity.</source>
         <source> Notify Student </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">459,461</context>
+          <context context-type="linenumber">446,448</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6137238378032253613" datatype="html">
         <source> Notify Teacher </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">479,481</context>
+          <context context-type="linenumber">466,468</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6470995886890122968" datatype="html">
         <source>Feedback to Teacher</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">485,487</context>
+          <context context-type="linenumber">472,474</context>
         </context-group>
       </trans-unit>
       <trans-unit id="853281253580647095" datatype="html">
         <source> Use Custom Completion Criteria </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">504,506</context>
+          <context context-type="linenumber">491,493</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6321190757824576813" datatype="html">
         <source>Custom Completion Criteria</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">508,511</context>
+          <context context-type="linenumber">495,498</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3954026354727494376" datatype="html">
         <source>Add Completion Criteria</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">513,516</context>
+          <context context-type="linenumber">500,503</context>
         </context-group>
       </trans-unit>
       <trans-unit id="376261460573165321" datatype="html">
         <source>Move Completion Criteria Up</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">573,575</context>
+          <context context-type="linenumber">560,562</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2584224885214103035" datatype="html">
         <source>Move Completion Criteria Down</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">586,588</context>
+          <context context-type="linenumber">573,575</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4117701430807776885" datatype="html">
         <source>Delete Completion Criteria</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.html</context>
-          <context context-type="linenumber">596,598</context>
+          <context context-type="linenumber">583,585</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8705933649296793690" datatype="html">