Loading spinner should show until all protected features have loaded

cisagov · Sep 20, 2023 · 638bfcc · 638bfcc
1 parent 210ffe7
commit 638bfcc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CSETWebNg/src/app/dialogs/enable-protected/enable-protected.component.html b/CSETWebNg/src/app/dialogs/enable-protected/enable-protected.component.html
@@ -38,7 +38,7 @@
       </tr>
     </table>
 
-    <div *ngIf="!modulesList || modulesList.length === 0">
+    <div *ngIf="!modulesList || modulesList.length === 0 || !cisaWorkflowStatusLoaded">
       <div class="spinner-container" style="margin: 2em auto">
         <div style="max-width: 50px; max-height: 50px;"></div>
       </div>

diff --git a/CSETWebNg/src/app/dialogs/enable-protected/enable-protected.component.ts b/CSETWebNg/src/app/dialogs/enable-protected/enable-protected.component.ts
@@ -39,6 +39,7 @@ export class EnableProtectedComponent implements OnInit {
   message: any;
   enableFeatureButtonClick: boolean = false;
   cisaWorkflowEnabled: boolean = false;
+  cisaWorkflowStatusLoaded: boolean = false;
 
   constructor(private dialog: MatDialogRef<EnableProtectedComponent>,
     private featureSvc: EnableFeatureService,
@@ -54,6 +55,7 @@ export class EnableProtectedComponent implements OnInit {
 
     this.configSvc.getCisaAssessorWorkflow().subscribe((cisaWorkflowEnabled: boolean) => {
       this.cisaWorkflowEnabled = cisaWorkflowEnabled;
+      this.cisaWorkflowStatusLoaded = true;
     });
   }