From 2ec11c8ffdaae126498c4f0d9de6fefa301b02d6 Mon Sep 17 00:00:00 2001 From: Evgeny Stepanovych Date: Mon, 6 Jan 2025 11:57:35 -0500 Subject: [PATCH] NAS-133384: Use red color for destructive actions (#11280) --- src/app/interfaces/dialog.interface.ts | 2 +- .../components/slide-in/slide-in.component.spec.ts | 11 ++--------- .../components/slide-in/slide-in.component.ts | 2 +- .../app-delete-dialog.component.html | 2 +- .../docker-image-delete-dialog.component.html | 2 +- .../cloud-credentials-card.component.ts | 1 + .../ssh-connection-card.component.ts | 1 + .../ssh-keypair-card/ssh-keypair-card.component.ts | 1 + .../acme-dns-authenticator-list.component.ts | 1 + .../certificate-authority-list.component.spec.ts | 1 + .../certificate-authority-list.component.ts | 1 + .../certificate-list.component.spec.ts | 2 +- .../certificate-list/certificate-list.component.ts | 2 +- .../csr-list/csr-list.component.spec.ts | 2 +- .../certificates-dash/csr-list/csr-list.component.ts | 2 +- .../delete-group-dialog.component.html | 2 +- .../privilege-list/privilege-list.component.ts | 1 + .../user-api-keys/user-api-keys.component.spec.ts | 2 +- .../users/user-api-keys/user-api-keys.component.ts | 2 +- .../delete-user-dialog.component.html | 2 +- .../cloud-backup-card.component.spec.ts | 2 ++ .../cloud-backup-card/cloud-backup-card.component.ts | 2 ++ .../cloud-backup-snapshots.component.ts | 1 + .../cloud-backup-list.component.spec.ts | 2 ++ .../cloud-backup-list/cloud-backup-list.component.ts | 2 ++ .../cloudsync-list/cloudsync-list.component.spec.ts | 2 ++ .../cloudsync-list/cloudsync-list.component.ts | 2 ++ .../cloudsync-task-card.component.spec.ts | 2 ++ .../cloudsync-task-card.component.ts | 2 ++ .../replication-list.component.spec.ts | 2 ++ .../replication-list/replication-list.component.ts | 2 ++ .../replication-task-card.component.spec.ts | 2 ++ .../replication-task-card.component.ts | 2 ++ .../rsync-task-card/rsync-task-card.component.spec.ts | 2 ++ .../rsync-task-card/rsync-task-card.component.ts | 2 ++ .../rsync-task-list/rsync-task-list.component.ts | 1 + .../scrub-task/scrub-list/scrub-list.component.ts | 1 + .../scrub-task-card/scrub-task-card.component.spec.ts | 2 ++ .../scrub-task-card/scrub-task-card.component.ts | 2 ++ .../smart-task-card/smart-task-card.component.spec.ts | 2 ++ .../smart-task-card/smart-task-card.component.ts | 2 ++ .../smart-task-list/smart-task-list.component.spec.ts | 2 ++ .../smart-task-list/smart-task-list.component.ts | 2 ++ .../snapshot-task-card.component.spec.ts | 2 ++ .../snapshot-task-card.component.ts | 2 ++ .../snapshot-task-list.component.spec.ts | 2 ++ .../snapshot-task-list.component.ts | 2 ++ .../vmware-snapshot-list.component.ts | 2 ++ .../dataset-quotas-list.component.ts | 1 + .../delete-dataset-dialog.component.html | 3 +-- .../delete-dataset-dialog.component.scss | 4 ---- .../delete-dataset-dialog.component.ts | 1 + .../snapshot-batch-delete-dialog.component.html | 2 +- .../snapshot-details-row.component.ts | 1 + .../static-route-delete-dialog.component.html | 2 +- .../reporting-exporters-list.component.ts | 1 + .../shares-dashboard/nfs-card/nfs-card.component.ts | 2 ++ .../shares-dashboard/smb-card/smb-card.component.ts | 2 ++ .../authorized-access-list.component.ts | 1 + .../delete-extent-dialog.component.html | 2 +- .../initiator-list/initiator-list.component.ts | 1 + .../iscsi/portal/portal-list/portal-list.component.ts | 1 + .../delete-target-dialog.component.html | 2 +- .../pages/sharing/nfs/nfs-list/nfs-list.component.ts | 1 + .../pages/sharing/smb/smb-list/smb-list.component.ts | 1 + .../export-disconnect-modal.component.html | 2 +- .../cron-delete-dialog.component.html | 2 +- .../init-shutdown-card.component.ts | 1 + .../tunable-list/tunable-list.component.spec.ts | 1 + .../sysctl/tunable-list/tunable-list.component.ts | 1 + .../boot-pool-delete-dialog.component.html | 2 +- .../components/jbof-list/jbof-list.component.spec.ts | 2 +- .../components/jbof-list/jbof-list.component.ts | 2 +- .../manage-configuration-menu.component.html | 2 +- .../manage-configuration-menu.component.ts | 3 ++- .../ntp-server-card/ntp-server-card.component.ts | 1 + .../upload-config-dialog.component.html | 2 +- .../device-delete-modal.component.html | 2 +- .../delete-vm-dialog/delete-vm-dialog.component.html | 2 +- 79 files changed, 107 insertions(+), 41 deletions(-) diff --git a/src/app/interfaces/dialog.interface.ts b/src/app/interfaces/dialog.interface.ts index 373f827a70e..4a6df028a1f 100644 --- a/src/app/interfaces/dialog.interface.ts +++ b/src/app/interfaces/dialog.interface.ts @@ -7,7 +7,7 @@ export interface ConfirmOptions { cancelText?: string; disableClose?: boolean; confirmationCheckboxText?: string; - buttonColor?: 'primary' | 'red'; + buttonColor?: 'primary' | 'warn'; } export interface ConfirmOptionsWithSecondaryCheckbox extends ConfirmOptions { diff --git a/src/app/modules/slide-ins/components/slide-in/slide-in.component.spec.ts b/src/app/modules/slide-ins/components/slide-in/slide-in.component.spec.ts index a2a759dfb56..2168c61efd5 100644 --- a/src/app/modules/slide-ins/components/slide-in/slide-in.component.spec.ts +++ b/src/app/modules/slide-ins/components/slide-in/slide-in.component.spec.ts @@ -215,7 +215,7 @@ describe('SlideInComponent', () => { message: 'You have unsaved changes. Are you sure you want to close?', cancelText: 'No', buttonText: 'Yes', - buttonColor: 'red', + buttonColor: 'warn', hideCheckbox: true, }); discardPeriodicTasks(); @@ -236,14 +236,7 @@ describe('SlideInComponent', () => { const backdrop = spectator.query('.ix-slide-in2-background')!; backdrop.dispatchEvent(new Event('click')); - expect(spectator.inject(DialogService).confirm).not.toHaveBeenCalledWith({ - title: 'Unsaved Changes', - message: 'You have unsaved changes. Are you sure you want to close?', - cancelText: 'No', - buttonText: 'Yes', - buttonColor: 'red', - hideCheckbox: true, - }); + expect(spectator.inject(DialogService).confirm).not.toHaveBeenCalled(); discardPeriodicTasks(); })); }); diff --git a/src/app/modules/slide-ins/components/slide-in/slide-in.component.ts b/src/app/modules/slide-ins/components/slide-in/slide-in.component.ts index e38e0478f57..b4c33b041ac 100644 --- a/src/app/modules/slide-ins/components/slide-in/slide-in.component.ts +++ b/src/app/modules/slide-ins/components/slide-in/slide-in.component.ts @@ -218,7 +218,7 @@ export class SlideInComponent implements OnInit, OnDestroy { message: this.translate.instant('You have unsaved changes. Are you sure you want to close?'), cancelText: this.translate.instant('No'), buttonText: this.translate.instant('Yes'), - buttonColor: 'red', + buttonColor: 'warn', hideCheckbox: true, }); } diff --git a/src/app/pages/apps/components/app-delete-dialog/app-delete-dialog.component.html b/src/app/pages/apps/components/app-delete-dialog/app-delete-dialog.component.html index 738d3f52f18..5d90b1fc015 100644 --- a/src/app/pages/apps/components/app-delete-dialog/app-delete-dialog.component.html +++ b/src/app/pages/apps/components/app-delete-dialog/app-delete-dialog.component.html @@ -33,7 +33,7 @@

diff --git a/src/app/pages/system/general-settings/manage-configuration-menu/manage-configuration-menu.component.ts b/src/app/pages/system/general-settings/manage-configuration-menu/manage-configuration-menu.component.ts index bf92c7cf639..7f2817061b9 100644 --- a/src/app/pages/system/general-settings/manage-configuration-menu/manage-configuration-menu.component.ts +++ b/src/app/pages/system/general-settings/manage-configuration-menu/manage-configuration-menu.component.ts @@ -62,11 +62,12 @@ export class ManageConfigurationMenuComponent { this.matDialog.open(UploadConfigDialogComponent); } - onResetDefaults(): void { + onResetToDefaults(): void { this.dialogService.confirm({ title: helptext.reset_config_form.title, message: helptext.reset_config_form.message, buttonText: helptext.reset_config_form.button_text, + buttonColor: 'warn', }) .pipe( filter(Boolean), diff --git a/src/app/pages/system/general-settings/ntp-server/ntp-server-card/ntp-server-card.component.ts b/src/app/pages/system/general-settings/ntp-server/ntp-server-card/ntp-server-card.component.ts index 95c47693199..a198dbf601a 100644 --- a/src/app/pages/system/general-settings/ntp-server/ntp-server-card/ntp-server-card.component.ts +++ b/src/app/pages/system/general-settings/ntp-server/ntp-server-card/ntp-server-card.component.ts @@ -131,6 +131,7 @@ export class NtpServerCardComponent implements OnInit { { address: server.address }, ), buttonText: this.translate.instant('Delete'), + buttonColor: 'warn', }).pipe( filter(Boolean), switchMap(() => this.api.call('system.ntpserver.delete', [server.id])), diff --git a/src/app/pages/system/general-settings/upload-config-dialog/upload-config-dialog.component.html b/src/app/pages/system/general-settings/upload-config-dialog/upload-config-dialog.component.html index 650626a823e..3c8496c1a62 100644 --- a/src/app/pages/system/general-settings/upload-config-dialog/upload-config-dialog.component.html +++ b/src/app/pages/system/general-settings/upload-config-dialog/upload-config-dialog.component.html @@ -15,7 +15,7 @@

{{ 'Upload Config' | translate }}

*ixRequiresRoles="requiredRoles" mat-button type="submit" - color="primary" + color="warn" ixTest="upload" [disabled]="form.invalid" > diff --git a/src/app/pages/vm/devices/device-list/device-delete-modal/device-delete-modal.component.html b/src/app/pages/vm/devices/device-list/device-delete-modal/device-delete-modal.component.html index b3254db7379..1f93ed37d89 100644 --- a/src/app/pages/vm/devices/device-list/device-delete-modal/device-delete-modal.component.html +++ b/src/app/pages/vm/devices/device-list/device-delete-modal/device-delete-modal.component.html @@ -51,7 +51,7 @@

{{ 'Delete' | translate }}

*ixRequiresRoles="requiredRoles" type="submit" mat-button - color="primary" + color="warn" ixTest="delete-device" [disabled]="form.invalid" > diff --git a/src/app/pages/vm/vm-list/delete-vm-dialog/delete-vm-dialog.component.html b/src/app/pages/vm/vm-list/delete-vm-dialog/delete-vm-dialog.component.html index 15efed6bb8d..c5c4a21d86b 100644 --- a/src/app/pages/vm/vm-list/delete-vm-dialog/delete-vm-dialog.component.html +++ b/src/app/pages/vm/vm-list/delete-vm-dialog/delete-vm-dialog.component.html @@ -30,7 +30,7 @@

{{ 'Delete Virtual Machine' | translate }}