Merge branch 'develop' into node-authoring-ui-changes-toggle-edit-pre…

…view-component

src/app/teacher/classroom-monitor.module.ts

@@ -6,8 +6,6 @@ import { ComponentNewWorkBadgeComponent } from '../classroom-monitor/component-n
 import { ComponentSelectComponent } from '../classroom-monitor/component-select/component-select.component';
 import { StepInfoComponent } from '../classroom-monitor/step-info/step-info.component';
 import { PeerGroupGradingModule } from './peer-group-grading.module';
-import { SelectPeriodModule } from './select-period.module';
-import { ComponentGradingModule } from './component-grading.module';
 import { TeacherSummaryDisplay } from '../../assets/wise5/directives/teacher-summary-display/teacher-summary-display.component';
 import { HighchartsChartModule } from 'highcharts-angular';
 import { StudentTeacherCommonModule } from '../student-teacher-common.module';
@@ -37,6 +35,8 @@ import { RouterModule } from '@angular/router';
 import { SaveIndicatorComponent } from '../../assets/wise5/common/save-indicator/save-indicator.component';
 import { PreviewComponentComponent } from '../../assets/wise5/authoringTool/components/preview-component/preview-component.component';
 import { StepToolsComponent } from '../../assets/wise5/common/stepTools/step-tools.component';
+import { ComponentGradingComponent } from '../../assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading.component';
+import { SelectPeriodComponent } from '../../assets/wise5/classroomMonitor/classroomMonitorComponents/select-period/select-period.component';
 
 @NgModule({
   declarations: [
@@ -61,7 +61,7 @@ import { StepToolsComponent } from '../../assets/wise5/common/stepTools/step-too
     ViewComponentRevisionsComponent
   ],
   imports: [
-    ComponentGradingModule,
+    ComponentGradingComponent,
     ComponentNewWorkBadgeComponent,
     ComponentSelectComponent,
     ComponentStudentModule,
@@ -76,7 +76,7 @@ import { StepToolsComponent } from '../../assets/wise5/common/stepTools/step-too
     ProjectProgressComponent,
     RouterModule,
     SaveIndicatorComponent,
-    SelectPeriodModule,
+    SelectPeriodComponent,
     StepInfoComponent,
     StepToolsComponent,
     StudentTeacherCommonModule

src/app/teacher/grading-common.module.ts

@@ -8,29 +8,29 @@ import { WorkgroupComponentGradingComponent } from '../../assets/wise5/classroom
 import { WorkgroupNodeStatusComponent } from '../classroom-monitor/workgroup-node-status/workgroup-node-status.component';
 import { WorkgroupSelectAutocompleteComponent } from '../classroom-monitor/workgroup-select/workgroup-select-autocomplete/workgroup-select-autocomplete.component';
 import { StudentTeacherCommonModule } from '../student-teacher-common.module';
-import { ComponentGradingModule } from './component-grading.module';
 import { StatusIconComponent } from '../classroom-monitor/status-icon/status-icon.component';
 import { NavItemProgressComponent } from '../classroom-monitor/nav-item-progress/nav-item-progress.component';
+import { ComponentGradingComponent } from '../../assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading.component';
+import { ComponentStateInfoComponent } from '../../assets/wise5/common/component-state-info/component-state-info.component';
 
 @NgModule({
   imports: [
-    ComponentGradingModule,
+    ComponentGradingComponent,
+    ComponentStateInfoComponent,
     EditComponentAnnotationsComponent,
     IntersectionObserverModule,
     NavItemProgressComponent,
     StatusIconComponent,
     StudentTeacherCommonModule,
     WorkgroupInfoComponent,
+    WorkgroupComponentGradingComponent,
     WorkgroupNodeScoreComponent,
     WorkgroupNodeStatusComponent
   ],
-  declarations: [
-    WorkgroupComponentGradingComponent,
-    WorkgroupItemComponent,
-    WorkgroupSelectAutocompleteComponent
-  ],
+  declarations: [WorkgroupItemComponent, WorkgroupSelectAutocompleteComponent],
   exports: [
-    ComponentGradingModule,
+    ComponentGradingComponent,
+    ComponentStateInfoComponent,
     EditComponentAnnotationsComponent,
     IntersectionObserverModule,
     NavItemProgressComponent,

src/app/teacher/milestone/milestone.module.ts

@@ -8,15 +8,15 @@ import { MilestoneWorkgroupItemComponent } from '../../../assets/wise5/classroom
 import { MilestonesComponent } from '../../classroom-monitor/milestones/milestones.component';
 import { StudentTeacherCommonModule } from '../../student-teacher-common.module';
 import { GradingCommonModule } from '../grading-common.module';
-import { SelectPeriodModule } from '../select-period.module';
 import { MilestoneReportDataComponent } from './milestone-report-data/milestone-report-data.component';
 import { MilestoneReportGraphComponent } from './milestone-report-graph/milestone-report-graph.component';
+import { SelectPeriodComponent } from '../../../assets/wise5/classroomMonitor/classroomMonitorComponents/select-period/select-period.component';
 
 @NgModule({
   imports: [
     GradingCommonModule,
     HighchartsChartModule,
-    SelectPeriodModule,
+    SelectPeriodComponent,
     StudentTeacherCommonModule
   ],
   declarations: [

src/app/teacher/peer-group-grading.module.ts

@@ -7,7 +7,7 @@ import { PeerGroupPeriodComponent } from '../../assets/wise5/classroomMonitor/cl
 import { PeerGroupUnassignedWorkgroupsComponent } from '../../assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-unassigned-workgroups/peer-group-unassigned-workgroups.component';
 import { PeerGroupWorkgroupComponent } from '../../assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-workgroup/peer-group-workgroup.component';
 import { StudentTeacherCommonModule } from '../student-teacher-common.module';
-import { SelectPeriodModule } from './select-period.module';
+import { SelectPeriodComponent } from '../../assets/wise5/classroomMonitor/classroomMonitorComponents/select-period/select-period.component';
 
 @NgModule({
   declarations: [
@@ -19,7 +19,7 @@ import { SelectPeriodModule } from './select-period.module';
     PeerGroupUnassignedWorkgroupsComponent,
     PeerGroupWorkgroupComponent
   ],
-  imports: [StudentTeacherCommonModule, SelectPeriodModule],
+  imports: [StudentTeacherCommonModule, SelectPeriodComponent],
   exports: [
     PeerGroupAssignedWorkgroupsComponent,
     PeerGroupDialogComponent,

src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading.component.ts

@@ -10,9 +10,46 @@ import {
 } from '@angular/core';
 import { components } from '../../components/Components';
 import { TeacherProjectService } from '../../services/teacherProjectService';
+import { AiChatGradingModule } from '../../components/aiChat/ai-chat-grading/ai-chat-grading.module';
+import { AnimationGradingModule } from '../../components/animation/animation-grading/animation-grading.module';
+import { AudioOscillatorGradingModule } from '../../components/audioOscillator/audio-oscillator-grading/audio-oscillator-grading.module';
+import { ConceptMapGradingModule } from '../../components/conceptMap/concept-map-grading/concept-map-grading.module';
+import { DialogGuidanceGradingModule } from '../../components/dialogGuidance/dialog-guidance-grading/dialog-guidance-grading.module';
+import { DiscussionGradingModule } from '../../components/discussion/discussion-grading/discussion-grading.module';
+import { DrawGradingModule } from '../../components/draw/draw-grading/draw-grading.module';
+import { EmbeddedGradingModule } from '../../components/embedded/embedded-grading/embedded-grading.module';
+import { GraphGradingModule } from '../../components/graph/graph-grading/graph-grading.module';
+import { LabelGradingModule } from '../../components/label/label-grading/label-grading.module';
+import { MatchGradingModule } from '../../components/match/match-grading/match-grading.module';
+import { OpenResponseGradingModule } from '../../components/openResponse/open-response-grading/open-response-grading.module';
+import { PeerChatGradingModule } from '../../components/peerChat/peer-chat-grading/peer-chat-grading.module';
+import { ShowGroupWorkGradingModule } from '../../components/showGroupWork/show-group-work-grading/show-group-work-grading.module';
+import { TableGradingModule } from '../../components/table/table-grading/table-grading.module';
+import { ShowMyWorkGradingModule } from '../../components/showMyWork/show-my-work-grading/show-my-work-grading.module';
+import { MultipleChoiceGradingComponent } from '../../components/multipleChoice/multiple-choice-grading/multiple-choice-grading.component';
 
 @Component({
+  imports: [
+    AiChatGradingModule,
+    AnimationGradingModule,
+    AudioOscillatorGradingModule,
+    ConceptMapGradingModule,
+    DialogGuidanceGradingModule,
+    DiscussionGradingModule,
+    DrawGradingModule,
+    EmbeddedGradingModule,
+    GraphGradingModule,
+    LabelGradingModule,
+    MatchGradingModule,
+    MultipleChoiceGradingComponent,
+    OpenResponseGradingModule,
+    PeerChatGradingModule,
+    ShowGroupWorkGradingModule,
+    ShowMyWorkGradingModule,
+    TableGradingModule
+  ],
   selector: 'component-grading-component',
+  standalone: true,
   template: '<div #component></div>'
 })
 export class ComponentGradingComponent {

src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details-dialog/milestone-details-dialog.component.spec.ts

@@ -26,11 +26,7 @@ describe('MilestoneDetailsDialogComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [
-        MilestoneDetailsComponent,
-        MilestoneDetailsDialogComponent,
-        SelectPeriodComponent
-      ],
+      declarations: [MilestoneDetailsComponent, MilestoneDetailsDialogComponent],
       imports: [
         ClassroomMonitorTestingModule,
         MatDialogModule,
@@ -40,7 +36,8 @@ describe('MilestoneDetailsDialogComponent', () => {
         MatProgressBarModule,
         MatSelectModule,
         MatTooltipModule,
-        NavItemProgressComponent
+        NavItemProgressComponent,
+        SelectPeriodComponent
       ],
       providers: [
         {

src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details/milestone-details.component.html

@@ -1,7 +1,7 @@
 <div class="milestone-details">
   <section class="milestone-details__section mat-elevation-z1">
     <div fxLayout="row" fxLayoutAlign="start center">
-      <select-period></select-period>
+      <select-period />
       <span fxFlex></span>
       <div fxLayout="row" fxLayoutAlign="start center">
         <nav-item-progress

src/assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-workgroup-item/milestone-workgroup-item.component.html

@@ -80,7 +80,7 @@ <h3 class="accent-1 gray-lightest-bg component__header">
             [componentId]="firstComponentId"
             [workgroupId]="workgroupId"
             [nodeId]="firstNodeId"
-          ></workgroup-component-grading>
+          />
         </div>
       </div>
       <div
@@ -102,7 +102,7 @@ <h3 class="accent-1 gray-lightest-bg component__header">
             [componentId]="lastComponentId"
             [workgroupId]="workgroupId"
             [nodeId]="lastNodeId"
-          ></workgroup-component-grading>
+          />
         </div>
       </div>
     </div>

src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/workgroup-item/workgroup-item.component.html

@@ -54,7 +54,7 @@ <h3 class="accent-1 gray-lightest-bg component__header">
               [componentId]="component.id"
               [workgroupId]="workgroupId"
               [nodeId]="nodeId"
-            ></workgroup-component-grading>
+            />
           </div>
         </div>
       </ng-container>

src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-dialog/peer-group-dialog.component.html

@@ -1,7 +1,13 @@
-<h2 mat-dialog-title class="mat-dialog-title--icons" fxLayout="row wrap" fxLayoutAlign="start center" fxLayoutGap="8px">
+<h2
+  mat-dialog-title
+  class="mat-dialog-title--icons"
+  fxLayout="row wrap"
+  fxLayoutAlign="start center"
+  fxLayoutGap="8px"
+>
   <span i18n>Groupings for {{ peerGroupingName }}</span>
   <span fxFlex fxHide.xs></span>
-  <select-period></select-period>
+  <select-period />
 </h2>
 <mat-dialog-content class="dialog-content-scroll">
   <p class="info" i18n>Tip: Drag students to change groups for this peer grouping.</p>

src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-dialog/peer-group-dialog.component.spec.ts

@@ -1,4 +1,3 @@
-import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatDialogModule, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { MatSelectModule } from '@angular/material/select';
@@ -22,24 +21,26 @@ describe('PeerGroupDialogComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-    declarations: [PeerGroupDialogComponent, SelectPeriodComponent],
-    schemas: [NO_ERRORS_SCHEMA],
-    imports: [BrowserAnimationsModule,
+      declarations: [PeerGroupDialogComponent],
+      schemas: [NO_ERRORS_SCHEMA],
+      imports: [
+        BrowserAnimationsModule,
         CommonModule,
         MatDialogModule,
         MatSelectModule,
-        StudentTeacherCommonServicesModule],
-    providers: [
+        SelectPeriodComponent,
+        StudentTeacherCommonServicesModule
+      ],
+      providers: [
         ClassroomStatusService,
         { provide: MAT_DIALOG_DATA, useValue: {} },
         TeacherDataService,
         TeacherProjectService,
         TeacherWebSocketService,
         WorkgroupService,
-        provideHttpClient(withInterceptorsFromDi()),
-        provideHttpClientTesting()
-    ]
-}).compileComponents();
+        provideHttpClient(withInterceptorsFromDi())
+      ]
+    }).compileComponents();
   });
 
   beforeEach(() => {

src/assets/wise5/classroomMonitor/classroomMonitorComponents/peer-group/peer-group-period/peer-group-period.component.spec.ts

@@ -47,15 +47,15 @@ describe('PeerGroupPeriodComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-    declarations: [
+      declarations: [
         PeerGroupAssignedWorkgroupsComponent,
         PeerGroupPeriodComponent,
         PeerGroupGroupingComponent,
         PeerGroupUnassignedWorkgroupsComponent,
-        PeerGroupWorkgroupComponent,
-        SelectPeriodComponent
-    ],
-    imports: [BrowserAnimationsModule,
+        PeerGroupWorkgroupComponent
+      ],
+      imports: [
+        BrowserAnimationsModule,
         CommonModule,
         DragDropModule,
         FlexLayoutModule,
@@ -65,8 +65,10 @@ describe('PeerGroupPeriodComponent', () => {
         MatFormFieldModule,
         MatIconModule,
         MatSelectModule,
-        ReactiveFormsModule],
-    providers: [
+        ReactiveFormsModule,
+        SelectPeriodComponent
+      ],
+      providers: [
         AchievementService,
         AnnotationService,
         ConfigService,
@@ -84,8 +86,8 @@ describe('PeerGroupPeriodComponent', () => {
         WorkgroupService,
         provideHttpClient(withInterceptorsFromDi()),
         provideHttpClientTesting()
-    ]
-}).compileComponents();
+      ]
+    }).compileComponents();
   });
 
   beforeEach(() => {