NAS-131666 / 24.10.0 / Add support for Stopping state (by undsoft) (#…

…10836) * NAS-131666: Add support for Stopping state --------- Co-authored-by: Evgeny Stepanovych <[email protected]>
truenas · Oct 9, 2024 · d752456 · d752456
1 parent b566fdf
commit d752456
Show file tree

Hide file tree

Showing 92 changed files with 95 additions and 107 deletions.
diff --git a/src/app/enums/catalog-app-state.enum.ts b/src/app/enums/catalog-app-state.enum.ts
@@ -3,11 +3,13 @@ export enum CatalogAppState {
   Deploying = 'DEPLOYING',
   Stopped = 'STOPPED',
   Crashed = 'CRASHED',
+  Stopping = 'STOPPING',
 }
 
 export const appStateIcons = new Map<CatalogAppState, string>([
   [CatalogAppState.Running, 'mdi-check-circle'],
   [CatalogAppState.Deploying, 'mdi-progress-wrench'],
+  [CatalogAppState.Stopping, 'mdi-progress-wrench'],
   [CatalogAppState.Stopped, 'mdi-stop-circle'],
   [CatalogAppState.Crashed, 'mdi-alert-circle'],
 ]);
diff --git a/src/app/pages/apps/components/installed-apps/installed-apps.component.ts b/src/app/pages/apps/components/installed-apps/installed-apps.component.ts
@@ -19,7 +19,7 @@ import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
 import { Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
 import {
-  combineLatest, filter, finalize,
+  combineLatest, filter,
   Observable,
 } from 'rxjs';
 import { CatalogAppState } from 'app/enums/catalog-app-state.enum';
@@ -324,10 +324,8 @@ export class InstalledAppsComponent implements OnInit, AfterViewInit {
   }
 
   stop(name: string): void {
-    this.loader.open(this.translate.instant('Stopping "{app}"', { app: name }));
     this.appService.stopApplication(name)
       .pipe(
-        finalize(() => this.loader.close()),
         this.errorHandler.catchError(),
         untilDestroyed(this),
       )

diff --git a/src/app/pages/apps/enum/app-status.enum.ts b/src/app/pages/apps/enum/app-status.enum.ts
@@ -6,6 +6,7 @@ export enum AppStatus {
   Deploying = 'DEPLOYING',
   Stopped = 'STOPPED',
   Stopping = 'STOPPING',
+  Crashed = 'CRASHED',
 }
 
 export const appStatusIcons = new Map<AppStatus, string>([
@@ -14,6 +15,7 @@ export const appStatusIcons = new Map<AppStatus, string>([
   [AppStatus.Deploying, 'mdi-progress-wrench'],
   [AppStatus.Stopping, 'mdi-progress-wrench'],
   [AppStatus.Stopped, 'mdi-stop-circle'],
+  [AppStatus.Crashed, 'mdi-stop-circle'],
 ]);
 
 export const appStatusLabels = new Map<AppStatus, string>([
@@ -22,4 +24,5 @@ export const appStatusLabels = new Map<AppStatus, string>([
   [AppStatus.Deploying, T('Deploying')],
   [AppStatus.Stopped, T('Stopped')],
   [AppStatus.Stopping, T('Stopping')],
+  [AppStatus.Crashed, T('Crashed')],
 ]);
diff --git a/src/app/pages/apps/utils/get-app-status.ts b/src/app/pages/apps/utils/get-app-status.ts
@@ -1,24 +1,9 @@
-import { CatalogAppState } from 'app/enums/catalog-app-state.enum';
 import { App, AppStartQueryParams } from 'app/interfaces/app.interface';
 import { Job } from 'app/interfaces/job.interface';
 import { AppStatus } from 'app/pages/apps/enum/app-status.enum';
 
 export function getAppStatus(app: App, _?: Job<void, AppStartQueryParams>): AppStatus {
   if (!app) return null;
 
-  let status: AppStatus;
-
-  switch (app.state) {
-    case CatalogAppState.Running:
-      status = AppStatus.Running;
-      break;
-    case CatalogAppState.Deploying:
-      status = AppStatus.Deploying;
-      break;
-    case CatalogAppState.Stopped:
-      status = AppStatus.Stopped;
-      break;
-  }
-
-  return status;
+  return app.state as unknown as AppStatus;
 }
diff --git a/src/assets/i18n/af.json b/src/assets/i18n/af.json
@@ -978,6 +978,7 @@
   "Copy to Clipboard": "",
   "Cores": "",
   "Country": "",
+  "Crashed": "",
   "Create": "",
   "Create ACME Certificate": "",
   "Create ACME DNS-Authenticator": "",
@@ -4085,7 +4086,6 @@
   "Stop {vmName}?": "",
   "Stopped": "",
   "Stopping": "",
-  "Stopping \"{app}\"": "",
   "Stopping Apps Service": "",
   "Stopping {rowName}": "",
   "Stops the rollback when the safety  check finds any related clone snapshots that are newer than the  rollback snapshot.": "",

diff --git a/src/assets/i18n/ar.json b/src/assets/i18n/ar.json
@@ -978,6 +978,7 @@
   "Copy to Clipboard": "",
   "Cores": "",
   "Country": "",
+  "Crashed": "",
   "Create": "",
   "Create ACME Certificate": "",
   "Create ACME DNS-Authenticator": "",
@@ -4085,7 +4086,6 @@
   "Stop {vmName}?": "",
   "Stopped": "",
   "Stopping": "",
-  "Stopping \"{app}\"": "",
   "Stopping Apps Service": "",
   "Stopping {rowName}": "",
   "Stops the rollback when the safety  check finds any related clone snapshots that are newer than the  rollback snapshot.": "",

diff --git a/src/assets/i18n/ast.json b/src/assets/i18n/ast.json
@@ -978,6 +978,7 @@
   "Copy to Clipboard": "",
   "Cores": "",
   "Country": "",
+  "Crashed": "",
   "Create": "",
   "Create ACME Certificate": "",
   "Create ACME DNS-Authenticator": "",
@@ -4085,7 +4086,6 @@
   "Stop {vmName}?": "",
   "Stopped": "",
   "Stopping": "",
-  "Stopping \"{app}\"": "",
   "Stopping Apps Service": "",
   "Stopping {rowName}": "",
   "Stops the rollback when the safety  check finds any related clone snapshots that are newer than the  rollback snapshot.": "",

diff --git a/src/assets/i18n/az.json b/src/assets/i18n/az.json
@@ -978,6 +978,7 @@
   "Copy to Clipboard": "",
   "Cores": "",
   "Country": "",
+  "Crashed": "",
   "Create": "",
   "Create ACME Certificate": "",
   "Create ACME DNS-Authenticator": "",
@@ -4085,7 +4086,6 @@
   "Stop {vmName}?": "",
   "Stopped": "",
   "Stopping": "",
-  "Stopping \"{app}\"": "",
   "Stopping Apps Service": "",
   "Stopping {rowName}": "",
   "Stops the rollback when the safety  check finds any related clone snapshots that are newer than the  rollback snapshot.": "",

diff --git a/src/assets/i18n/be.json b/src/assets/i18n/be.json
@@ -978,6 +978,7 @@
   "Copy to Clipboard": "",
   "Cores": "",
   "Country": "",
+  "Crashed": "",
   "Create": "",
   "Create ACME Certificate": "",
   "Create ACME DNS-Authenticator": "",
@@ -4085,7 +4086,6 @@
   "Stop {vmName}?": "",
   "Stopped": "",
   "Stopping": "",
-  "Stopping \"{app}\"": "",
   "Stopping Apps Service": "",
   "Stopping {rowName}": "",
   "Stops the rollback when the safety  check finds any related clone snapshots that are newer than the  rollback snapshot.": "",

diff --git a/src/assets/i18n/bg.json b/src/assets/i18n/bg.json
@@ -978,6 +978,7 @@
   "Copy to Clipboard": "",
   "Cores": "",
   "Country": "",
+  "Crashed": "",
   "Create": "",
   "Create ACME Certificate": "",
   "Create ACME DNS-Authenticator": "",
@@ -4085,7 +4086,6 @@
   "Stop {vmName}?": "",
   "Stopped": "",
   "Stopping": "",
-  "Stopping \"{app}\"": "",
   "Stopping Apps Service": "",
   "Stopping {rowName}": "",
   "Stops the rollback when the safety  check finds any related clone snapshots that are newer than the  rollback snapshot.": "",

diff --git a/src/assets/i18n/bn.json b/src/assets/i18n/bn.json
@@ -978,6 +978,7 @@
   "Copy to Clipboard": "",
   "Cores": "",
   "Country": "",
+  "Crashed": "",
   "Create": "",
   "Create ACME Certificate": "",
   "Create ACME DNS-Authenticator": "",
@@ -4085,7 +4086,6 @@
   "Stop {vmName}?": "",
   "Stopped": "",
   "Stopping": "",
-  "Stopping \"{app}\"": "",
   "Stopping Apps Service": "",
   "Stopping {rowName}": "",
   "Stops the rollback when the safety  check finds any related clone snapshots that are newer than the  rollback snapshot.": "",

diff --git a/src/assets/i18n/br.json b/src/assets/i18n/br.json
@@ -978,6 +978,7 @@
   "Copy to Clipboard": "",
   "Cores": "",
   "Country": "",
+  "Crashed": "",
   "Create": "",
   "Create ACME Certificate": "",
   "Create ACME DNS-Authenticator": "",
@@ -4085,7 +4086,6 @@
   "Stop {vmName}?": "",
   "Stopped": "",
   "Stopping": "",
-  "Stopping \"{app}\"": "",
   "Stopping Apps Service": "",
   "Stopping {rowName}": "",
   "Stops the rollback when the safety  check finds any related clone snapshots that are newer than the  rollback snapshot.": "",

diff --git a/src/assets/i18n/bs.json b/src/assets/i18n/bs.json
@@ -978,6 +978,7 @@
   "Copy to Clipboard": "",
   "Cores": "",
   "Country": "",
+  "Crashed": "",
   "Create": "",
   "Create ACME Certificate": "",
   "Create ACME DNS-Authenticator": "",
@@ -4085,7 +4086,6 @@
   "Stop {vmName}?": "",
   "Stopped": "",
   "Stopping": "",
-  "Stopping \"{app}\"": "",
   "Stopping Apps Service": "",
   "Stopping {rowName}": "",
   "Stops the rollback when the safety  check finds any related clone snapshots that are newer than the  rollback snapshot.": "",

diff --git a/src/assets/i18n/ca.json b/src/assets/i18n/ca.json
@@ -978,6 +978,7 @@
   "Copy to Clipboard": "",
   "Cores": "",
   "Country": "",
+  "Crashed": "",
   "Create": "",
   "Create ACME Certificate": "",
   "Create ACME DNS-Authenticator": "",
@@ -4085,7 +4086,6 @@
   "Stop {vmName}?": "",
   "Stopped": "",
   "Stopping": "",
-  "Stopping \"{app}\"": "",
   "Stopping Apps Service": "",
   "Stopping {rowName}": "",
   "Stops the rollback when the safety  check finds any related clone snapshots that are newer than the  rollback snapshot.": "",

diff --git a/src/assets/i18n/cs.json b/src/assets/i18n/cs.json
@@ -918,6 +918,7 @@
   "Copy and Paste": "",
   "Copy to Clipboard": "",
   "Cores": "",
+  "Crashed": "",
   "Create": "",
   "Create ACME Certificate": "",
   "Create ACME DNS-Authenticator": "",
@@ -3706,7 +3707,6 @@
   "Stop {vmName}?": "",
   "Stopped": "",
   "Stopping": "",
-  "Stopping \"{app}\"": "",
   "Stopping Apps Service": "",
   "Stopping {rowName}": "",
   "Stops the rollback when the safety  check finds any related clone snapshots that are newer than the  rollback snapshot.": "",

diff --git a/src/assets/i18n/cy.json b/src/assets/i18n/cy.json
@@ -978,6 +978,7 @@
   "Copy to Clipboard": "",
   "Cores": "",
   "Country": "",
+  "Crashed": "",
   "Create": "",
   "Create ACME Certificate": "",
   "Create ACME DNS-Authenticator": "",
@@ -4085,7 +4086,6 @@
   "Stop {vmName}?": "",
   "Stopped": "",
   "Stopping": "",
-  "Stopping \"{app}\"": "",
   "Stopping Apps Service": "",
   "Stopping {rowName}": "",
   "Stops the rollback when the safety  check finds any related clone snapshots that are newer than the  rollback snapshot.": "",

diff --git a/src/assets/i18n/da.json b/src/assets/i18n/da.json
@@ -978,6 +978,7 @@
   "Copy to Clipboard": "",
   "Cores": "",
   "Country": "",
+  "Crashed": "",
   "Create": "",
   "Create ACME Certificate": "",
   "Create ACME DNS-Authenticator": "",
@@ -4085,7 +4086,6 @@
   "Stop {vmName}?": "",
   "Stopped": "",
   "Stopping": "",
-  "Stopping \"{app}\"": "",
   "Stopping Apps Service": "",
   "Stopping {rowName}": "",
   "Stops the rollback when the safety  check finds any related clone snapshots that are newer than the  rollback snapshot.": "",

diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
@@ -700,6 +700,7 @@
   "Copies": "",
   "Copy Json": "",
   "Copy to Clipboard": "",
+  "Crashed": "",
   "Create ACME DNS-Authenticator": "",
   "Create Alert": "",
   "Create Backup Credential": "",
@@ -2900,7 +2901,6 @@
   "Stop {vmName}?": "",
   "Stopped": "",
   "Stopping": "",
-  "Stopping \"{app}\"": "",
   "Stopping Apps Service": "",
   "Stopping {rowName}": "",
   "Stops the rollback when the safety  check finds any related clone snapshots that are newer than the  rollback snapshot.": "",

diff --git a/src/assets/i18n/dsb.json b/src/assets/i18n/dsb.json
@@ -978,6 +978,7 @@
   "Copy to Clipboard": "",
   "Cores": "",
   "Country": "",
+  "Crashed": "",
   "Create": "",
   "Create ACME Certificate": "",
   "Create ACME DNS-Authenticator": "",
@@ -4085,7 +4086,6 @@
   "Stop {vmName}?": "",
   "Stopped": "",
   "Stopping": "",
-  "Stopping \"{app}\"": "",
   "Stopping Apps Service": "",
   "Stopping {rowName}": "",
   "Stops the rollback when the safety  check finds any related clone snapshots that are newer than the  rollback snapshot.": "",

diff --git a/src/assets/i18n/el.json b/src/assets/i18n/el.json
@@ -978,6 +978,7 @@
   "Copy to Clipboard": "",
   "Cores": "",
   "Country": "",
+  "Crashed": "",
   "Create": "",
   "Create ACME Certificate": "",
   "Create ACME DNS-Authenticator": "",
@@ -4085,7 +4086,6 @@
   "Stop {vmName}?": "",
   "Stopped": "",
   "Stopping": "",
-  "Stopping \"{app}\"": "",
   "Stopping Apps Service": "",
   "Stopping {rowName}": "",
   "Stops the rollback when the safety  check finds any related clone snapshots that are newer than the  rollback snapshot.": "",

diff --git a/src/assets/i18n/en-au.json b/src/assets/i18n/en-au.json
@@ -978,6 +978,7 @@
   "Copy to Clipboard": "",
   "Cores": "",
   "Country": "",
+  "Crashed": "",
   "Create": "",
   "Create ACME Certificate": "",
   "Create ACME DNS-Authenticator": "",
@@ -4085,7 +4086,6 @@
   "Stop {vmName}?": "",
   "Stopped": "",
   "Stopping": "",
-  "Stopping \"{app}\"": "",
   "Stopping Apps Service": "",
   "Stopping {rowName}": "",
   "Stops the rollback when the safety  check finds any related clone snapshots that are newer than the  rollback snapshot.": "",

diff --git a/src/assets/i18n/en-gb.json b/src/assets/i18n/en-gb.json
@@ -978,6 +978,7 @@
   "Copy to Clipboard": "",
   "Cores": "",
   "Country": "",
+  "Crashed": "",
   "Create": "",
   "Create ACME Certificate": "",
   "Create ACME DNS-Authenticator": "",
@@ -4085,7 +4086,6 @@
   "Stop {vmName}?": "",
   "Stopped": "",
   "Stopping": "",
-  "Stopping \"{app}\"": "",
   "Stopping Apps Service": "",
   "Stopping {rowName}": "",
   "Stops the rollback when the safety  check finds any related clone snapshots that are newer than the  rollback snapshot.": "",

diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
@@ -978,6 +978,7 @@
   "Copy to Clipboard": "",
   "Cores": "",
   "Country": "",
+  "Crashed": "",
   "Create": "",
   "Create ACME Certificate": "",
   "Create ACME DNS-Authenticator": "",
@@ -4085,7 +4086,6 @@
   "Stop {vmName}?": "",
   "Stopped": "",
   "Stopping": "",
-  "Stopping \"{app}\"": "",
   "Stopping Apps Service": "",
   "Stopping {rowName}": "",
   "Stops the rollback when the safety  check finds any related clone snapshots that are newer than the  rollback snapshot.": "",