NAS-132334: PR update

.vscode/settings.json

@@ -1,10 +1,6 @@
 {
-    "vsicons.presets.angular": true,
     "typescript.updateImportsOnFileMove.enabled": "always",
     "typescript.preferences.importModuleSpecifier": "non-relative",
-    "eslint.options": {
-        "extensions": [".ts", ".html"]
-    },
     "eslint.validate": [
         "typescript",
         "html"

eslint/eslint-ts-rules-extra.mjs

@@ -113,6 +113,10 @@ export const extraRules = {
         "importNames": ["NgIf"],
         "message": "Use built-in control flow syntax instead"
       },
+      {
+        "name": "@angular/core",
+        "importNames": ["CUSTOM_ELEMENTS_SCHEMA"],
+      },
       {
         "name": "@angular/common",
         "importNames": ["CommonModule"],

src/app/enums/cloudsync-transfer-setting.enum.ts

@@ -0,0 +1,13 @@
+import { marker as T } from '@biesbjerg/ngx-translate-extract-marker';
+
+export enum CloudsyncTransferSetting {
+  Default = 'DEFAULT',
+  Performance = 'PERFORMANCE',
+  FastStorage = 'FAST_STORAGE',
+}
+
+export const cloudsyncTransferSettingLabels = new Map<CloudsyncTransferSetting, string>([
+  [CloudsyncTransferSetting.Default, T('Default')],
+  [CloudsyncTransferSetting.Performance, T('Performance')],
+  [CloudsyncTransferSetting.FastStorage, T('Fast Storage')],
+]);

src/app/enums/virtualization.enum.ts

@@ -15,7 +15,7 @@ export enum VirtualizationStatus {
   Stopped = 'STOPPED',
 }
 
-export const virtualizationStatusMap = new Map<VirtualizationStatus, string>([
+export const virtualizationStatusLabels = new Map<VirtualizationStatus, string>([
   [VirtualizationStatus.Running, T('Running')],
   [VirtualizationStatus.Stopped, T('Stopped')],
 ]);

src/app/interfaces/api/api-call-directory.interface.ts

@@ -1,4 +1,5 @@
 import { AlertPolicy } from 'app/enums/alert-policy.enum';
+import { CloudsyncTransferSetting } from 'app/enums/cloudsync-transfer-setting.enum';
 import { DatasetRecordSize, DatasetType } from 'app/enums/dataset.enum';
 import { DeviceType } from 'app/enums/device-type.enum';
 import { DockerConfig, DockerStatusData } from 'app/enums/docker-config.interface';
@@ -36,12 +37,7 @@ import { AuditConfig, AuditEntry, AuditQueryParams } from 'app/interfaces/audit/
 import { AuthSession } from 'app/interfaces/auth-session.interface';
 import { LoginExOtpTokenQuery, LoginExQuery, LoginExResponse } from 'app/interfaces/auth.interface';
 import { AvailableApp } from 'app/interfaces/available-app.interface';
-import {
-  Bootenv,
-  CreateBootenvParams,
-  SetBootenvAttributeParams,
-  UpdateBootenvParams,
-} from 'app/interfaces/bootenv.interface';
+import { BootenvCloneParams, BootEnvironment, BootenvKeepParams } from 'app/interfaces/boot-environment.interface';
 import {
   CatalogConfig, CatalogApp,
   CatalogUpdate, GetItemDetailsParams,
@@ -349,12 +345,12 @@ export interface ApiCallDirectory {
   'boot.get_state': { params: void; response: PoolInstance };
   'boot.set_scrub_interval': { params: [number]; response: number };
 
-  // Bootenv
-  'bootenv.activate': { params: [string]; response: boolean };
-  'bootenv.create': { params: CreateBootenvParams; response: string };
-  'bootenv.query': { params: QueryParams<Bootenv>; response: Bootenv[] };
-  'bootenv.set_attribute': { params: SetBootenvAttributeParams; response: boolean };
-  'bootenv.update': { params: UpdateBootenvParams; response: string };
+  // Boot Environment
+  'boot.environment.query': { params: QueryParams<BootEnvironment>; response: BootEnvironment[] };
+  'boot.environment.activate': { params: [{ id: string }]; response: unknown };
+  'boot.environment.destroy': { params: [{ id: string }]; response: unknown };
+  'boot.environment.clone': { params: BootenvCloneParams; response: unknown };
+  'boot.environment.keep': { params: BootenvKeepParams; response: unknown };
 
   // Catalog
   'catalog.get_app_details': { params: [name: string, params: GetItemDetailsParams]; response: CatalogApp };
@@ -384,6 +380,7 @@ export interface ApiCallDirectory {
   'cloud_backup.delete': { params: [id: number]; response: boolean };
   'cloud_backup.list_snapshots': { params: [id: number]; response: CloudBackupSnapshot[] };
   'cloud_backup.list_snapshot_directory': { params: CloudBackupSnapshotDirectoryParams; response: CloudBackupSnapshotDirectoryListing[] };
+  'cloud_backup.transfer_setting_choices': { params: void; response: CloudsyncTransferSetting[] };
   'cloud_backup.query': { params: [id?: QueryParams<CloudBackup>]; response: CloudBackup[] };
   'cloud_backup.update': { params: [id: number, update: CloudBackupUpdate]; response: CloudBackup };
 

src/app/interfaces/api/api-event-directory.interface.ts

@@ -2,6 +2,7 @@ import { DockerStatusData } from 'app/enums/docker-config.interface';
 import { FailoverStatus } from 'app/enums/failover-status.enum';
 import { Alert } from 'app/interfaces/alert.interface';
 import { App, AppStats } from 'app/interfaces/app.interface';
+import { BootEnvironment } from 'app/interfaces/boot-environment.interface';
 import { ContainerImage } from 'app/interfaces/container-image.interface';
 import { DirectoryServicesState } from 'app/interfaces/directory-services-state.interface';
 import { Disk } from 'app/interfaces/disk.interface';
@@ -43,4 +44,5 @@ export interface ApiEventDirectory {
   'vm.query': { response: VirtualMachine };
   'zfs.pool.scan': { response: PoolScan };
   'zfs.snapshot.query': { response: ZfsSnapshot };
+  'boot.environment.query': { response: BootEnvironment };
 }

src/app/interfaces/boot-environment.interface.ts

@@ -0,0 +1,59 @@
+import { ApiTimestamp } from 'app/interfaces/api-date.interface';
+
+export interface BootEnvironment {
+  /**
+   * The name of the boot environment.
+   */
+  id: string;
+
+  /**
+   * The name of the dataset representing the boot environment.
+   */
+  dataset: string;
+
+  /**
+   * If `true`, represents the `currently` running boot environment.
+   */
+  active: boolean;
+
+  /**
+   * If `true`, represents the boot environment that will become the running boot environment at `next boot`.
+   */
+  activated: boolean;
+
+  /**
+   * Represents when the boot environment was created.
+   */
+  created: ApiTimestamp;
+
+  /**
+   * An integer representing the number of bytes used by the boot environment.
+   */
+  used_bytes: number;
+
+  /**
+   * A human-readable string representing the total number of space used by the boot environment.
+   */
+  used: string;
+
+  /**
+   * When set to `false`, will be automatically deleted during an upgrade procedure
+   * if there isn’t enough room on the boot drive to apply said update.
+   */
+  keep: boolean;
+
+  /**
+   * If `true` indicates whether the boot environment may be `activated`.
+   */
+  can_activate: boolean;
+}
+
+export type BootenvCloneParams = [{
+  id: string;
+  target: string;
+}];
+
+export type BootenvKeepParams = [{
+  id: string;
+  value: boolean;
+}];

src/app/interfaces/cloud-backup.interface.ts

@@ -1,7 +1,8 @@
 import { marker as T } from '@biesbjerg/ngx-translate-extract-marker';
+import { CloudsyncTransferSetting } from 'app/enums/cloudsync-transfer-setting.enum';
 import { ApiTimestamp } from 'app/interfaces/api-date.interface';
 import { Job } from 'app/interfaces/job.interface';
-import { BwLimit, BwLimitUpdate, CloudCredential } from './cloud-sync-task.interface';
+import { CloudCredential } from './cloud-sync-task.interface';
 import { Schedule } from './schedule.interface';
 
 export interface CloudBackup {
@@ -15,20 +16,18 @@ export interface CloudBackup {
   snapshot: boolean;
   include: string[];
   exclude: string[];
-  transfers: number | null;
   args: string;
   enabled: boolean;
   password: string;
   credentials: CloudCredential;
   job: Job | null;
   locked: boolean;
   keep_last?: number;
-  bwlimit?: BwLimit[];
+  transfer_setting: CloudsyncTransferSetting;
 }
 
-export interface CloudBackupUpdate extends Omit<CloudBackup, 'id' | 'job' | 'locked' | 'bwlimit' | 'credentials'> {
+export interface CloudBackupUpdate extends Omit<CloudBackup, 'id' | 'job' | 'locked' | 'credentials'> {
   credentials: number;
-  bwlimit: BwLimitUpdate[];
 }
 
 export interface CloudBackupSnapshot {

src/app/modules/alerts/store/alert.effects.ts

@@ -35,7 +35,7 @@ export class AlertEffects {
   loadAlerts$ = createEffect(() => this.actions$.pipe(
     ofType(adminUiInitialized, alertIndicatorPressed, alertReceivedWhenPanelIsOpen),
     switchMap(() => {
-      return this.ws.call('alert.list').pipe(
+      return this.api.call('alert.list').pipe(
         map((alerts) => alertsLoaded({ alerts })),
         catchError((error) => {
           console.error(error);
@@ -51,7 +51,7 @@ export class AlertEffects {
   subscribeToUpdates$ = createEffect(() => this.actions$.pipe(
     ofType(adminUiInitialized),
     switchMap(() => {
-      return this.ws.subscribe('alert.list').pipe(
+      return this.api.subscribe('alert.list').pipe(
         switchMap((event) => {
           return this.store$.select(selectIsAlertPanelOpen).pipe(
             switchMap((isAlertsPanelOpen) => {
@@ -80,7 +80,7 @@ export class AlertEffects {
   dismissAlert$ = createEffect(() => this.actions$.pipe(
     ofType(dismissAlertPressed),
     mergeMap(({ id }) => {
-      return this.ws.call('alert.dismiss', [id]).pipe(
+      return this.api.call('alert.dismiss', [id]).pipe(
         catchError((error) => {
           this.errorHandler.showErrorModal(error);
           this.store$.dispatch(alertChanged({ alert: { id, dismissed: false } as Alert }));
@@ -93,7 +93,7 @@ export class AlertEffects {
   reopenAlert$ = createEffect(() => this.actions$.pipe(
     ofType(reopenAlertPressed),
     mergeMap(({ id }) => {
-      return this.ws.call('alert.restore', [id]).pipe(
+      return this.api.call('alert.restore', [id]).pipe(
         catchError((error) => {
           this.errorHandler.showErrorModal(error);
           this.store$.dispatch(alertChanged({ alert: { id, dismissed: true } as Alert }));
@@ -107,7 +107,7 @@ export class AlertEffects {
     ofType(dismissAllAlertsPressed),
     withLatestFrom(this.store$.select(selectUnreadAlerts).pipe(pairwise())),
     mergeMap(([, [unreadAlerts]]) => {
-      const requests = unreadAlerts.map((alert) => this.ws.call('alert.dismiss', [alert.id]));
+      const requests = unreadAlerts.map((alert) => this.api.call('alert.dismiss', [alert.id]));
       return forkJoin(requests).pipe(
         catchError((error) => {
           this.errorHandler.showErrorModal(error);
@@ -123,7 +123,7 @@ export class AlertEffects {
     ofType(reopenAllAlertsPressed),
     withLatestFrom(this.store$.select(selectDismissedAlerts).pipe(pairwise())),
     mergeMap(([, [dismissedAlerts]]) => {
-      const requests = dismissedAlerts.map((alert) => this.ws.call('alert.restore', [alert.id]));
+      const requests = dismissedAlerts.map((alert) => this.api.call('alert.restore', [alert.id]));
       return forkJoin(requests).pipe(
         catchError((error) => {
           this.errorHandler.showErrorModal(error);
@@ -136,7 +136,7 @@ export class AlertEffects {
 
   constructor(
     private actions$: Actions,
-    private ws: ApiService,
+    private api: ApiService,
     private store$: Store<AlertSlice>,
     private translate: TranslateService,
     private errorHandler: ErrorHandlerService,

src/app/modules/buttons/export-button/export-button.component.ts

@@ -57,7 +57,7 @@ export class ExportButtonComponent<T, M extends ApiJobMethod> {
   protected readonly isHaLicensed = toSignal(this.store$.select(selectIsHaLicensed));
 
   constructor(
-    private ws: ApiService,
+    private api: ApiService,
     private cdr: ChangeDetectorRef,
     private errorHandler: ErrorHandlerService,
     private dialogService: DialogService,
@@ -67,7 +67,7 @@ export class ExportButtonComponent<T, M extends ApiJobMethod> {
 
   onExport(): void {
     this.isLoading = true;
-    this.ws.job(this.jobMethod, this.getExportParams(
+    this.api.job(this.jobMethod, this.getExportParams(
       this.getQueryFilters(this.searchQuery),
       this.getQueryOptions(this.sorting),
     )).pipe(
@@ -89,7 +89,7 @@ export class ExportButtonComponent<T, M extends ApiJobMethod> {
           customArguments.report_name = url;
         }
 
-        return this.ws.call('core.download', [downloadMethod, [customArguments], url]);
+        return this.api.call('core.download', [downloadMethod, [customArguments], url]);
       }),
       switchMap(([, url]) => this.download.downloadUrl(url, `${this.filename}.${this.fileType}`, this.fileMimeType)),
       catchError((error) => {

src/app/modules/buttons/mobile-back-button/mobile-back-button.component.ts

@@ -1,7 +1,6 @@
 import {
   Component, output, ChangeDetectionStrategy,
 } from '@angular/core';
-import { MatButton } from '@angular/material/button';
 import { TranslateModule } from '@ngx-translate/core';
 import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component';
 import { TestDirective } from 'app/modules/test-id/test.directive';
@@ -10,7 +9,6 @@ import { TestDirective } from 'app/modules/test-id/test.directive';
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
   imports: [
-    MatButton,
     IxIconComponent,
     TranslateModule,
     TestDirective,

src/app/modules/dialog/components/confirm-dialog/confirm-dialog.component.ts

@@ -1,4 +1,3 @@
-import { CdkScrollable } from '@angular/cdk/scrolling';
 import {
   ChangeDetectionStrategy,
   Component, Inject,
@@ -22,7 +21,6 @@ import { TestDirective } from 'app/modules/test-id/test.directive';
   standalone: true,
   imports: [
     MatDialogTitle,
-    CdkScrollable,
     MatDialogContent,
     MatCheckbox,
     ReactiveFormsModule,