From 6866d6a3fe72a62b5239267d2efa42729c9aa4a4 Mon Sep 17 00:00:00 2001 From: Naman Munet Date: Mon, 10 Feb 2025 09:04:19 +0530 Subject: [PATCH] mgr/dashboard: remaning critical-confirmation-modal to delete-confirmation-modal and keeping default demetion impact as medium Fixes: https://tracker.ceph.com/issues/69628 Signed-off-by: Naman Munet --- .../iscsi-target-list.component.ts | 4 +-- .../pool-list/pool-list.component.ts | 6 ++-- .../nvmeof-initiators-list.component.ts | 4 +-- .../nvmeof-listeners-list.component.ts | 4 +-- .../nvmeof-namespaces-list.component.ts | 4 +-- .../nvmeof-subsystems.component.ts | 4 +-- .../ceph/block/rbd-list/rbd-list.component.ts | 10 +++---- .../rbd-namespace-list.component.ts | 4 +-- .../rbd-snapshot-list.component.ts | 6 ++-- .../rbd-trash-list.component.ts | 4 +-- .../cephfs-clients.component.ts | 4 +-- .../cephfs-directories.component.ts | 6 ++-- .../cephfs-list/cephfs-list.component.spec.ts | 4 +-- .../cephfs-list/cephfs-list.component.ts | 6 ++-- .../cephfs-snapshotschedule-list.component.ts | 8 ++--- .../cephfs-subvolume-group.component.ts | 6 ++-- .../cephfs-subvolume-list.component.ts | 6 ++-- ...phfs-subvolume-snapshots-list.component.ts | 6 ++-- .../configuration-form.component.ts | 4 +-- .../app/ceph/cluster/hosts/hosts.component.ts | 6 ++-- .../multi-cluster-list.component.ts | 4 +-- .../osd/osd-list/osd-list.component.spec.ts | 4 +-- .../osd/osd-list/osd-list.component.ts | 6 ++-- .../silence-list.component.spec.ts | 4 +-- .../silence-list/silence-list.component.ts | 4 +-- .../cluster/services/services.component.ts | 6 ++-- .../upgrade-progress.component.ts | 4 +-- .../ceph/nfs/nfs-list/nfs-list.component.ts | 6 ++-- .../pool-form/pool-form.component.spec.ts | 6 ++-- .../pool/pool-form/pool-form.component.ts | 4 +-- .../pool-list/pool-list.component.spec.ts | 4 +-- .../pool/pool-list/pool-list.component.ts | 6 ++-- .../rgw-bucket-list.component.ts | 6 ++-- .../rgw-multisite-details.component.ts | 4 +-- ...multisite-sync-policy-details.component.ts | 6 ++-- .../rgw-multisite-sync-policy.component.ts | 4 +-- .../rgw-storage-class-list.component.ts | 4 +-- .../rgw-user-accounts.component.ts | 4 +-- .../rgw-user-list/rgw-user-list.component.ts | 6 ++-- .../smb-cluster-list.component.ts | 4 +-- .../auth/role-list/role-list.component.ts | 4 +-- .../auth/user-list/user-list.component.ts | 6 ++-- .../shared/components/components.module.ts | 4 +-- .../delete-confirmation-modal.component.html} | 11 +++---- .../delete-confirmation-modal.component.scss} | 0 ...lete-confirmation-modal.component.spec.ts} | 30 ++++++++++--------- .../delete-confirmation-modal.component.ts} | 14 ++++----- .../crud-table/crud-table.component.ts | 4 +-- ... delete-confirmation-modal-impact.enum.ts} | 2 +- 49 files changed, 139 insertions(+), 138 deletions(-) rename src/pybind/mgr/dashboard/frontend/src/app/shared/components/{critical-confirmation-modal/critical-confirmation-modal.component.html => delete-confirmation-modal/delete-confirmation-modal.component.html} (92%) rename src/pybind/mgr/dashboard/frontend/src/app/shared/components/{critical-confirmation-modal/critical-confirmation-modal.component.scss => delete-confirmation-modal/delete-confirmation-modal.component.scss} (100%) rename src/pybind/mgr/dashboard/frontend/src/app/shared/components/{critical-confirmation-modal/critical-confirmation-modal.component.spec.ts => delete-confirmation-modal/delete-confirmation-modal.component.spec.ts} (89%) rename src/pybind/mgr/dashboard/frontend/src/app/shared/components/{critical-confirmation-modal/critical-confirmation-modal.component.ts => delete-confirmation-modal/delete-confirmation-modal.component.ts} (87%) rename src/pybind/mgr/dashboard/frontend/src/app/shared/enum/{critical-confirmation-modal-impact.enum.ts => delete-confirmation-modal-impact.enum.ts} (85%) diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-list/iscsi-target-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-list/iscsi-target-list.component.ts index 60b9869f2c3..520b50af510 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-list/iscsi-target-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-list/iscsi-target-list.component.ts @@ -6,7 +6,7 @@ import { Subscription } from 'rxjs'; import { IscsiService } from '~/app/shared/api/iscsi.service'; import { ListWithDetails } from '~/app/shared/classes/list-with-details.class'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; import { TableComponent } from '~/app/shared/datatable/table/table.component'; import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; @@ -223,7 +223,7 @@ export class IscsiTargetListComponent extends ListWithDetails implements OnInit, deleteIscsiTargetModal() { const target_iqn = this.selection.first().target_iqn; - this.modalRef = this.modalService.show(CriticalConfirmationModalComponent, { + this.modalRef = this.modalService.show(DeleteConfirmationModalComponent, { itemDescription: $localize`iSCSI target`, itemNames: [target_iqn], submitActionObservable: () => diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-list/pool-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-list/pool-list.component.ts index ef075f0f4b6..0b1d6700f8e 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-list/pool-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-list/pool-list.component.ts @@ -5,7 +5,7 @@ import { Observable, Subscriber, Subscription } from 'rxjs'; import { RbdMirroringService } from '~/app/shared/api/rbd-mirroring.service'; import { TableStatusViewCache } from '~/app/shared/classes/table-status-view-cache'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { URLVerbs } from '~/app/shared/constants/app.constants'; import { Icons } from '~/app/shared/enum/icons.enum'; import { CdTableAction } from '~/app/shared/models/cd-table-action'; @@ -16,7 +16,7 @@ import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; import { PoolEditPeerModalComponent } from '../pool-edit-peer-modal/pool-edit-peer-modal.component'; import { ModalCdsService } from '~/app/shared/services/modal-cds.service'; -import { DeletionImpact } from '~/app/shared/enum/critical-confirmation-modal-impact.enum'; +import { DeletionImpact } from '~/app/shared/enum/delete-confirmation-modal-impact.enum'; const BASE_URL = '/block/mirroring'; @Component({ @@ -147,7 +147,7 @@ export class PoolListComponent implements OnInit, OnDestroy { const poolName = this.selection.first().name; const peerUUID = this.getPeerUUID(); - this.modalService.show(CriticalConfirmationModalComponent, { + this.modalService.show(DeleteConfirmationModalComponent, { impact: DeletionImpact.high, itemDescription: $localize`mirror peer`, itemNames: [`${poolName} (${peerUUID})`], diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-initiators-list/nvmeof-initiators-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-initiators-list/nvmeof-initiators-list.component.ts index a5575a9c926..f8deaff3eeb 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-initiators-list/nvmeof-initiators-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-initiators-list/nvmeof-initiators-list.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit, TemplateRef, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; import { NvmeofService } from '~/app/shared/api/nvmeof.service'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { ActionLabelsI18n, URLVerbs } from '~/app/shared/constants/app.constants'; import { Icons } from '~/app/shared/enum/icons.enum'; import { CdTableAction } from '~/app/shared/models/cd-table-action'; @@ -106,7 +106,7 @@ export class NvmeofInitiatorsListComponent implements OnInit { hostNQNs.splice(allowAllHostIndex, 1); itemNames = [...hostNQNs, $localize`Allow any host(*)`]; } - this.modalService.show(CriticalConfirmationModalComponent, { + this.modalService.show(DeleteConfirmationModalComponent, { itemDescription: 'Initiator', itemNames, actionDescription: 'remove', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-listeners-list/nvmeof-listeners-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-listeners-list/nvmeof-listeners-list.component.ts index b49adda7c1b..5190b902276 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-listeners-list/nvmeof-listeners-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-listeners-list/nvmeof-listeners-list.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { NvmeofService } from '~/app/shared/api/nvmeof.service'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { ActionLabelsI18n, URLVerbs } from '~/app/shared/constants/app.constants'; import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; import { Icons } from '~/app/shared/enum/icons.enum'; @@ -99,7 +99,7 @@ export class NvmeofListenersListComponent implements OnInit { deleteListenerModal() { const listener = this.selection.first(); - this.modalService.show(CriticalConfirmationModalComponent, { + this.modalService.show(DeleteConfirmationModalComponent, { itemDescription: 'Listener', actionDescription: 'delete', itemNames: [`listener ${listener.host_name} (${listener.traddr}:${listener.trsvcid})`], diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-namespaces-list/nvmeof-namespaces-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-namespaces-list/nvmeof-namespaces-list.component.ts index 8f8f6eb8d05..0caa018c8bf 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-namespaces-list/nvmeof-namespaces-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-namespaces-list/nvmeof-namespaces-list.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { NvmeofService } from '~/app/shared/api/nvmeof.service'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { ActionLabelsI18n, URLVerbs } from '~/app/shared/constants/app.constants'; import { Icons } from '~/app/shared/enum/icons.enum'; import { CdTableAction } from '~/app/shared/models/cd-table-action'; @@ -170,7 +170,7 @@ export class NvmeofNamespacesListComponent implements OnInit { deleteNamespaceModal() { const namespace = this.selection.first(); - this.modalService.show(CriticalConfirmationModalComponent, { + this.modalService.show(DeleteConfirmationModalComponent, { itemDescription: 'Namespace', itemNames: [namespace.nsid], actionDescription: 'delete', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-subsystems/nvmeof-subsystems.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-subsystems/nvmeof-subsystems.component.ts index 269e427be50..7d712ba2d5c 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-subsystems/nvmeof-subsystems.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-subsystems/nvmeof-subsystems.component.ts @@ -9,7 +9,7 @@ import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; import { ListWithDetails } from '~/app/shared/classes/list-with-details.class'; import { CdTableAction } from '~/app/shared/models/cd-table-action'; import { Icons } from '~/app/shared/enum/icons.enum'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { FinishedTask } from '~/app/shared/models/finished-task'; import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; import { NvmeofService } from '~/app/shared/api/nvmeof.service'; @@ -111,7 +111,7 @@ export class NvmeofSubsystemsComponent extends ListWithDetails implements OnInit deleteSubsystemModal() { const subsystem = this.selection.first(); - this.modalService.show(CriticalConfirmationModalComponent, { + this.modalService.show(DeleteConfirmationModalComponent, { itemDescription: 'Subsystem', itemNames: [subsystem.nqn], actionDescription: 'delete', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-list/rbd-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-list/rbd-list.component.ts index 9e5c4fc9e3f..d079113a0e2 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-list/rbd-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-list/rbd-list.component.ts @@ -7,7 +7,7 @@ import { RbdService } from '~/app/shared/api/rbd.service'; import { ListWithDetails } from '~/app/shared/classes/list-with-details.class'; import { TableStatus } from '~/app/shared/classes/table-status'; import { ConfirmationModalComponent } from '~/app/shared/components/confirmation-modal/confirmation-modal.component'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; import { TableComponent } from '~/app/shared/datatable/table/table.component'; import { Icons } from '~/app/shared/enum/icons.enum'; @@ -32,7 +32,7 @@ import { RbdTrashMoveModalComponent } from '../rbd-trash-move-modal/rbd-trash-mo import { RBDImageFormat, RbdModel } from './rbd-model'; import { ModalCdsService } from '~/app/shared/services/modal-cds.service'; import { RBDActionHelpers } from '../rbd-contants'; -import { DeletionImpact } from '~/app/shared/enum/critical-confirmation-modal-impact.enum'; +import { DeletionImpact } from '~/app/shared/enum/delete-confirmation-modal-impact.enum'; const BASE_URL = 'block/rbd'; @Component({ @@ -426,7 +426,7 @@ export class RbdListComponent extends ListWithDetails implements OnInit { const imageName = this.selection.first().name; const imageSpec = new ImageSpec(poolName, namespace, imageName); - this.cdsModalService.show(CriticalConfirmationModalComponent, { + this.cdsModalService.show(DeleteConfirmationModalComponent, { impact: DeletionImpact.high, itemDescription: 'RBD', itemNames: [imageSpec.imageName], @@ -451,7 +451,7 @@ export class RbdListComponent extends ListWithDetails implements OnInit { const imageName = this.selection.first().name; const imageSpec = new ImageSpec(poolName, namespace, imageName); - this.cdsModalService.show(CriticalConfirmationModalComponent, { + this.cdsModalService.show(DeleteConfirmationModalComponent, { itemDescription: 'RBD', itemNames: [imageSpec], actionDescription: 'resync', @@ -533,7 +533,7 @@ export class RbdListComponent extends ListWithDetails implements OnInit { this.selection.first().name ); - this.cdsModalService.show(CriticalConfirmationModalComponent, { + this.cdsModalService.show(DeleteConfirmationModalComponent, { actionDescription: 'remove scheduling on', itemDescription: $localize`image`, itemNames: [`${imageName}`], diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-namespace-list/rbd-namespace-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-namespace-list/rbd-namespace-list.component.ts index da099cb1233..297f8e2ea83 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-namespace-list/rbd-namespace-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-namespace-list/rbd-namespace-list.component.ts @@ -5,7 +5,7 @@ import { forkJoin, Observable } from 'rxjs'; import { PoolService } from '~/app/shared/api/pool.service'; import { RbdService } from '~/app/shared/api/rbd.service'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; import { Icons } from '~/app/shared/enum/icons.enum'; import { NotificationType } from '~/app/shared/enum/notification-type.enum'; @@ -123,7 +123,7 @@ export class RbdNamespaceListComponent implements OnInit { deleteModal() { const pool = this.selection.first().pool; const namespace = this.selection.first().namespace; - const modalRef = this.cdsModalService.show(CriticalConfirmationModalComponent, { + const modalRef = this.cdsModalService.show(DeleteConfirmationModalComponent, { itemDescription: 'Namespace', itemNames: [`${pool}/${namespace}`], submitAction: () => diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.ts index ac20dc76fa3..144d008867a 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.ts @@ -15,7 +15,7 @@ import { of } from 'rxjs'; import { RbdService } from '~/app/shared/api/rbd.service'; import { CdHelperClass } from '~/app/shared/classes/cd-helper.class'; import { ConfirmationModalComponent } from '~/app/shared/components/confirmation-modal/confirmation-modal.component'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; import { CdTableAction } from '~/app/shared/models/cd-table-action'; @@ -37,7 +37,7 @@ import { RbdSnapshotFormModalComponent } from '../rbd-snapshot-form/rbd-snapshot import { RbdSnapshotActionsModel } from './rbd-snapshot-actions.model'; import { RbdSnapshotModel } from './rbd-snapshot.model'; import { ModalCdsService } from '~/app/shared/services/modal-cds.service'; -import { DeletionImpact } from '~/app/shared/enum/critical-confirmation-modal-impact.enum'; +import { DeletionImpact } from '~/app/shared/enum/delete-confirmation-modal-impact.enum'; @Component({ selector: 'cd-rbd-snapshot-list', @@ -325,7 +325,7 @@ export class RbdSnapshotListComponent implements OnInit, OnChanges { deleteSnapshotModal() { const snapshotName = this.selection.selected[0].name; - this.modalRef = this.cdsModalService.show(CriticalConfirmationModalComponent, { + this.modalRef = this.cdsModalService.show(DeleteConfirmationModalComponent, { impact: DeletionImpact.high, itemDescription: $localize`RBD snapshot`, itemNames: [snapshotName], diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-list/rbd-trash-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-list/rbd-trash-list.component.ts index c5fc2e7d662..a79a8dad030 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-list/rbd-trash-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-list/rbd-trash-list.component.ts @@ -6,7 +6,7 @@ import moment from 'moment'; import { RbdService } from '~/app/shared/api/rbd.service'; import { TableStatusViewCache } from '~/app/shared/classes/table-status-view-cache'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; import { TableComponent } from '~/app/shared/datatable/table/table.component'; import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; @@ -204,7 +204,7 @@ export class RbdTrashListComponent implements OnInit { const isExpired = moment().isAfter(expiresAt); const imageIdSpec = new ImageSpec(poolName, namespace, imageId); - this.modalRef = this.modalService.show(CriticalConfirmationModalComponent, { + this.modalRef = this.modalService.show(DeleteConfirmationModalComponent, { itemDescription: 'RBD', itemNames: [imageIdSpec], bodyTemplate: this.deleteTpl, diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-clients/cephfs-clients.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-clients/cephfs-clients.component.ts index 538f265776b..897b490c77b 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-clients/cephfs-clients.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-clients/cephfs-clients.component.ts @@ -5,7 +5,7 @@ import { BaseModal } from 'carbon-components-angular'; import { CephfsService } from '~/app/shared/api/cephfs.service'; import { TableStatusViewCache } from '~/app/shared/classes/table-status-view-cache'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; import { Icons } from '~/app/shared/enum/icons.enum'; import { NotificationType } from '~/app/shared/enum/notification-type.enum'; @@ -94,7 +94,7 @@ export class CephfsClientsComponent extends BaseModal implements OnInit { evictClientModal() { const clientId = this.selection.first().id; - this.modalRef = this.modalService.show(CriticalConfirmationModalComponent, { + this.modalRef = this.modalService.show(DeleteConfirmationModalComponent, { itemDescription: 'client', itemNames: [clientId], actionDescription: 'evict', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-directories/cephfs-directories.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-directories/cephfs-directories.component.ts index f51290e31ec..9da8f63e8e8 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-directories/cephfs-directories.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-directories/cephfs-directories.component.ts @@ -8,11 +8,11 @@ import moment from 'moment'; import { CephfsService } from '~/app/shared/api/cephfs.service'; import { ConfirmationModalComponent } from '~/app/shared/components/confirmation-modal/confirmation-modal.component'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { FormModalComponent } from '~/app/shared/components/form-modal/form-modal.component'; import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; -import { DeletionImpact } from '~/app/shared/enum/critical-confirmation-modal-impact.enum'; +import { DeletionImpact } from '~/app/shared/enum/delete-confirmation-modal-impact.enum'; import { Icons } from '~/app/shared/enum/icons.enum'; import { NotificationType } from '~/app/shared/enum/notification-type.enum'; import { CdValidators } from '~/app/shared/forms/cd-validators'; @@ -682,7 +682,7 @@ export class CephfsDirectoriesComponent implements OnInit, OnChanges { } deleteSnapshotModal() { - this.modalService.show(CriticalConfirmationModalComponent, { + this.modalService.show(DeleteConfirmationModalComponent, { impact: DeletionImpact.high, itemDescription: $localize`CephFs Snapshot`, itemNames: this.snapshot.selection.selected.map((snapshot: CephfsSnapshot) => snapshot.name), diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-list/cephfs-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-list/cephfs-list.component.spec.ts index 48bca420132..85be92fa74a 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-list/cephfs-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-list/cephfs-list.component.spec.ts @@ -9,7 +9,7 @@ import { ToastrModule } from 'ngx-toastr'; import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; import { SharedModule } from '~/app/shared/shared.module'; import { configureTestBed } from '~/testing/unit-test-helper'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { CephfsVolumeFormComponent } from '../cephfs-form/cephfs-form.component'; import { ModalService } from '~/app/shared/services/modal.service'; import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; @@ -61,7 +61,7 @@ describe('CephfsListComponent', () => { const callDeletion = () => { component.removeVolumeModal(); expect(modalRef).toBeTruthy(); - const deletion: CriticalConfirmationModalComponent = modalRef && modalRef.componentInstance; + const deletion: DeleteConfirmationModalComponent = modalRef && modalRef.componentInstance; deletion.submitActionObservable(); }; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-list/cephfs-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-list/cephfs-list.component.ts index cda087b0a33..383cd0ece4d 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-list/cephfs-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-list/cephfs-list.component.ts @@ -10,7 +10,7 @@ import { ListWithDetails } from '~/app/shared/classes/list-with-details.class'; import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; import { Icons } from '~/app/shared/enum/icons.enum'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { CdTableAction } from '~/app/shared/models/cd-table-action'; import { CdTableColumn } from '~/app/shared/models/cd-table-column'; import { CdTableFetchDataContext } from '~/app/shared/models/cd-table-fetch-data-context'; @@ -26,7 +26,7 @@ import { map, switchMap } from 'rxjs/operators'; import { HealthService } from '~/app/shared/api/health.service'; import { CephfsAuthModalComponent } from '~/app/ceph/cephfs/cephfs-auth-modal/cephfs-auth-modal.component'; import { ModalCdsService } from '~/app/shared/services/modal-cds.service'; -import { DeletionImpact } from '~/app/shared/enum/critical-confirmation-modal-impact.enum'; +import { DeletionImpact } from '~/app/shared/enum/delete-confirmation-modal-impact.enum'; const BASE_URL = 'cephfs/fs'; @@ -173,7 +173,7 @@ export class CephfsListComponent extends ListWithDetails implements OnInit { removeVolumeModal() { const volName = this.selection.first().mdsmap['fs_name']; - this.cdsModalService.show(CriticalConfirmationModalComponent, { + this.cdsModalService.show(DeleteConfirmationModalComponent, { impact: DeletionImpact.high, itemDescription: 'File System', itemNames: [volName], diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-snapshotschedule-list/cephfs-snapshotschedule-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-snapshotschedule-list/cephfs-snapshotschedule-list.component.ts index b61b9574a1b..09b74b51d7b 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-snapshotschedule-list/cephfs-snapshotschedule-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-snapshotschedule-list/cephfs-snapshotschedule-list.component.ts @@ -27,7 +27,7 @@ import { BlockUI, NgBlockUI } from 'ng-block-ui'; import { NotificationType } from '~/app/shared/enum/notification-type.enum'; import { ActionLabelsI18n, URLVerbs } from '~/app/shared/constants/app.constants'; import { CephfsSnapshotscheduleFormComponent } from '../cephfs-snapshotschedule-form/cephfs-snapshotschedule-form.component'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; import { FinishedTask } from '~/app/shared/models/finished-task'; import { ModalCdsService } from '~/app/shared/services/modal-cds.service'; @@ -245,7 +245,7 @@ export class CephfsSnapshotscheduleListComponent deactivateSnapshotSchedule() { const { path, start, fs, schedule, subvol, group } = this.selection.first(); - this.modalRef = this.modalService.show(CriticalConfirmationModalComponent, { + this.modalRef = this.modalService.show(DeleteConfirmationModalComponent, { itemDescription: $localize`snapshot schedule`, actionDescription: this.actionLabels.DEACTIVATE, submitActionObservable: () => @@ -268,7 +268,7 @@ export class CephfsSnapshotscheduleListComponent activateSnapshotSchedule() { const { path, start, fs, schedule, subvol, group } = this.selection.first(); - this.modalRef = this.modalService.show(CriticalConfirmationModalComponent, { + this.modalRef = this.modalService.show(DeleteConfirmationModalComponent, { itemDescription: $localize`snapshot schedule`, actionDescription: this.actionLabels.ACTIVATE, submitActionObservable: () => @@ -300,7 +300,7 @@ export class CephfsSnapshotscheduleListComponent }) ?.join('|'); - this.modalRef = this.modalService.show(CriticalConfirmationModalComponent, { + this.modalRef = this.modalService.show(DeleteConfirmationModalComponent, { itemDescription: $localize`snapshot schedule`, submitActionObservable: () => this.taskWrapper.wrapTaskAroundCall({ diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-subvolume-group/cephfs-subvolume-group.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-subvolume-group/cephfs-subvolume-group.component.ts index 167ea4b8c5c..9d68fd5c006 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-subvolume-group/cephfs-subvolume-group.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-subvolume-group/cephfs-subvolume-group.component.ts @@ -13,14 +13,14 @@ import { CephfsSubvolumegroupFormComponent } from '../cephfs-subvolumegroup-form import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; import { Permissions } from '~/app/shared/models/permissions'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { FinishedTask } from '~/app/shared/models/finished-task'; import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; import { CephfsSubvolumeGroup } from '~/app/shared/models/cephfs-subvolume-group.model'; import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import _ from 'lodash'; import { ModalCdsService } from '~/app/shared/services/modal-cds.service'; -import { DeletionImpact } from '~/app/shared/enum/critical-confirmation-modal-impact.enum'; +import { DeletionImpact } from '~/app/shared/enum/delete-confirmation-modal-impact.enum'; @Component({ selector: 'cd-cephfs-subvolume-group', @@ -175,7 +175,7 @@ export class CephfsSubvolumeGroupComponent implements OnInit, OnChanges { removeSubVolumeModal() { const name = this.selection.first().name; - this.cdsModalService.show(CriticalConfirmationModalComponent, { + this.cdsModalService.show(DeleteConfirmationModalComponent, { impact: DeletionImpact.high, itemDescription: 'subvolume group', itemNames: [name], diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-subvolume-list/cephfs-subvolume-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-subvolume-list/cephfs-subvolume-list.component.ts index 013288fc36b..eb048cb5b23 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-subvolume-list/cephfs-subvolume-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-subvolume-list/cephfs-subvolume-list.component.ts @@ -27,7 +27,7 @@ import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { FormControl } from '@angular/forms'; import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; import { CdForm } from '~/app/shared/forms/cd-form'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { CephfsSubvolumeGroupService } from '~/app/shared/api/cephfs-subvolume-group.service'; import { CephfsSubvolumeGroup } from '~/app/shared/models/cephfs-subvolume-group.model'; import { CephfsMountDetailsComponent } from '../cephfs-mount-details/cephfs-mount-details.component'; @@ -35,7 +35,7 @@ import { HealthService } from '~/app/shared/api/health.service'; import _ from 'lodash'; import { ModalCdsService } from '~/app/shared/services/modal-cds.service'; import { DEFAULT_SUBVOLUME_GROUP } from '~/app/shared/constants/cephfs.constant'; -import { DeletionImpact } from '~/app/shared/enum/critical-confirmation-modal-impact.enum'; +import { DeletionImpact } from '~/app/shared/enum/delete-confirmation-modal-impact.enum'; @Component({ selector: 'cd-cephfs-subvolume-list', @@ -246,7 +246,7 @@ export class CephfsSubvolumeListComponent extends CdForm implements OnInit, OnCh }); this.errorMessage = ''; this.selectedName = this.selection.first().name; - this.modalService.show(CriticalConfirmationModalComponent, { + this.modalService.show(DeleteConfirmationModalComponent, { impact: DeletionImpact.high, actionDescription: 'remove', itemNames: [this.selectedName], diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-subvolume-snapshots-list/cephfs-subvolume-snapshots-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-subvolume-snapshots-list/cephfs-subvolume-snapshots-list.component.ts index 770fbf2fe52..eabcee6b2ed 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-subvolume-snapshots-list/cephfs-subvolume-snapshots-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-subvolume-snapshots-list/cephfs-subvolume-snapshots-list.component.ts @@ -16,7 +16,7 @@ import { Permissions } from '~/app/shared/models/permissions'; import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; import { CdDatePipe } from '~/app/shared/pipes/cd-date.pipe'; import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { FinishedTask } from '~/app/shared/models/finished-task'; import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; import { FormModalComponent } from '~/app/shared/components/form-modal/form-modal.component'; @@ -27,7 +27,7 @@ import { Validators } from '@angular/forms'; import { CdValidators } from '~/app/shared/forms/cd-validators'; import { ModalCdsService } from '~/app/shared/services/modal-cds.service'; import { DEFAULT_SUBVOLUME_GROUP } from '~/app/shared/constants/cephfs.constant'; -import { DeletionImpact } from '~/app/shared/enum/critical-confirmation-modal-impact.enum'; +import { DeletionImpact } from '~/app/shared/enum/delete-confirmation-modal-impact.enum'; @Component({ selector: 'cd-cephfs-subvolume-snapshots-list', @@ -228,7 +228,7 @@ export class CephfsSubvolumeSnapshotsListComponent implements OnInit, OnChanges const subVolumeName = this.activeSubVolumeName; const subVolumeGroupName = this.activeGroupName; const fsName = this.fsName; - this.modalRef = this.modalService.show(CriticalConfirmationModalComponent, { + this.modalRef = this.modalService.show(DeleteConfirmationModalComponent, { impact: DeletionImpact.high, actionDescription: 'remove', itemNames: [snapshotName], diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.ts index 118cb18430a..7d44deaba8d 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.ts @@ -13,7 +13,7 @@ import { CdForm } from '~/app/shared/forms/cd-form'; import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; import { NotificationService } from '~/app/shared/services/notification.service'; import { ConfigFormCreateRequestModel } from './configuration-form-create-request.model'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { ModalCdsService } from '~/app/shared/services/modal-cds.service'; const RGW = 'rgw'; @@ -158,7 +158,7 @@ export class ConfigurationFormComponent extends CdForm implements OnInit { } openCriticalConfirmModal() { - this.modalService.show(CriticalConfirmationModalComponent, { + this.modalService.show(DeleteConfirmationModalComponent, { buttonText: $localize`Force Edit`, actionDescription: $localize`force edit`, itemDescription: $localize`configuration`, diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.ts index 702c90e3c5c..7a3bbf079d8 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.ts @@ -10,7 +10,7 @@ import { HostService } from '~/app/shared/api/host.service'; import { OrchestratorService } from '~/app/shared/api/orchestrator.service'; import { ListWithDetails } from '~/app/shared/classes/list-with-details.class'; import { ConfirmationModalComponent } from '~/app/shared/components/confirmation-modal/confirmation-modal.component'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { FormModalComponent } from '~/app/shared/components/form-modal/form-modal.component'; import { SelectMessages } from '~/app/shared/components/select/select-messages.model'; import { ActionLabelsI18n, URLVerbs } from '~/app/shared/constants/app.constants'; @@ -34,7 +34,7 @@ import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; import { URLBuilderService } from '~/app/shared/services/url-builder.service'; import { HostFormComponent } from './host-form/host-form.component'; import { ModalCdsService } from '~/app/shared/services/modal-cds.service'; -import { DeletionImpact } from '~/app/shared/enum/critical-confirmation-modal-impact.enum'; +import { DeletionImpact } from '~/app/shared/enum/delete-confirmation-modal-impact.enum'; const BASE_URL = 'hosts'; @@ -470,7 +470,7 @@ export class HostsComponent extends ListWithDetails implements OnDestroy, OnInit deleteAction() { const hostname = this.selection.first().hostname; - this.modalRef = this.cdsModalService.show(CriticalConfirmationModalComponent, { + this.modalRef = this.cdsModalService.show(DeleteConfirmationModalComponent, { impact: DeletionImpact.high, itemDescription: 'Host', itemNames: [hostname], diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/multi-cluster/multi-cluster-list/multi-cluster-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/multi-cluster/multi-cluster-list/multi-cluster-list.component.ts index cfdc2e1720e..ab03649e637 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/multi-cluster/multi-cluster-list/multi-cluster-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/multi-cluster/multi-cluster-list/multi-cluster-list.component.ts @@ -11,7 +11,7 @@ import { MultiClusterFormComponent } from '../multi-cluster-form/multi-cluster-f import { TableComponent } from '~/app/shared/datatable/table/table.component'; import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; import { Permissions } from '~/app/shared/models/permissions'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { NotificationService } from '~/app/shared/services/notification.service'; import { NotificationType } from '~/app/shared/enum/notification-type.enum'; import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; @@ -230,7 +230,7 @@ export class MultiClusterListComponent extends ListWithDetails implements OnInit openDeleteClusterModal() { const cluster = this.selection.first(); - this.modalRef = this.cdsModalService.show(CriticalConfirmationModalComponent, { + this.modalRef = this.cdsModalService.show(DeleteConfirmationModalComponent, { infoMessage: $localize`Please note that the data for the disconnected cluster will be visible for a duration of ~ 5 minutes. After this period, it will be automatically removed.`, actionDescription: $localize`Disconnect`, itemDescription: $localize`Cluster`, diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.spec.ts index 85ea9240414..f43c5108ce7 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.spec.ts @@ -16,7 +16,7 @@ import { CoreModule } from '~/app/core/core.module'; import { OrchestratorService } from '~/app/shared/api/orchestrator.service'; import { OsdService } from '~/app/shared/api/osd.service'; import { ConfirmationModalComponent } from '~/app/shared/components/confirmation-modal/confirmation-modal.component'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { FormModalComponent } from '~/app/shared/components/form-modal/form-modal.component'; import { TableActionsComponent } from '~/app/shared/datatable/table-actions/table-actions.component'; import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; @@ -501,7 +501,7 @@ describe('OsdListComponent', () => { }); it.skip('opens all critical confirmation modals', () => { - const modalClass = CriticalConfirmationModalComponent; + const modalClass = DeleteConfirmationModalComponent; mockSafeToDestroy(); expectOpensModal('Mark Lost', modalClass); expectOpensModal('Purge', modalClass); diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.ts index 19e3a6d2aba..670163dd909 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.ts @@ -11,7 +11,7 @@ import { OrchestratorService } from '~/app/shared/api/orchestrator.service'; import { OsdService } from '~/app/shared/api/osd.service'; import { ListWithDetails } from '~/app/shared/classes/list-with-details.class'; import { ConfirmationModalComponent } from '~/app/shared/components/confirmation-modal/confirmation-modal.component'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { FormModalComponent } from '~/app/shared/components/form-modal/form-modal.component'; import { ActionLabelsI18n, URLVerbs } from '~/app/shared/constants/app.constants'; import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; @@ -41,7 +41,7 @@ import { OsdScrubModalComponent } from '../osd-scrub-modal/osd-scrub-modal.compo import { ModalCdsService } from '~/app/shared/services/modal-cds.service'; import { CdTableFetchDataContext } from '~/app/shared/models/cd-table-fetch-data-context'; import { Osd } from '~/app/shared/models/osd.model'; -import { DeletionImpact } from '~/app/shared/enum/critical-confirmation-modal-impact.enum'; +import { DeletionImpact } from '~/app/shared/enum/delete-confirmation-modal-impact.enum'; const BASE_URL = 'osd'; @@ -583,7 +583,7 @@ export class OsdListComponent extends ListWithDetails implements OnInit { ): void { check(this.getSelectedOsdIds()).subscribe((result) => { const osdIds = this.getSelectedOsdIds(); - this.cdsModalService.show(CriticalConfirmationModalComponent, { + this.cdsModalService.show(DeleteConfirmationModalComponent, { impact: DeletionImpact.high, itemNames: osdIds, actionDescription: actionDescription, diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-list/silence-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-list/silence-list.component.spec.ts index 47793509747..7fdf0d37b53 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-list/silence-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-list/silence-list.component.spec.ts @@ -8,7 +8,7 @@ import { ToastrModule } from 'ngx-toastr'; import { of } from 'rxjs'; import { PrometheusService } from '~/app/shared/api/prometheus.service'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { TableActionsComponent } from '~/app/shared/datatable/table-actions/table-actions.component'; import { NotificationType } from '~/app/shared/enum/notification-type.enum'; import { Permission } from '~/app/shared/models/permissions'; @@ -143,7 +143,7 @@ describe('SilenceListComponent', () => { const expireSilence = () => { component.expireSilence(); - const deletion: CriticalConfirmationModalComponent = component.modalRef.componentInstance; + const deletion: DeleteConfirmationModalComponent = component.modalRef.componentInstance; // deletion.modalRef = new BsModalRef(); deletion.ngOnInit(); deletion.callSubmitAction(); diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-list/silence-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-list/silence-list.component.ts index 7098e002797..d83b49223b5 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-list/silence-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-list/silence-list.component.ts @@ -6,7 +6,7 @@ import { Observable, Subscriber } from 'rxjs'; import { PrometheusListHelper } from '~/app/shared/helpers/prometheus-list-helper'; import { SilenceFormComponent } from '~/app/ceph/cluster/prometheus/silence-form/silence-form.component'; import { PrometheusService } from '~/app/shared/api/prometheus.service'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { ActionLabelsI18n, SucceededActionLabelsI18n } from '~/app/shared/constants/app.constants'; import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; import { Icons } from '~/app/shared/enum/icons.enum'; @@ -195,7 +195,7 @@ export class SilenceListComponent extends PrometheusListHelper { const id = this.selection.first().id; const i18nSilence = $localize`Silence`; const applicationName = 'Prometheus'; - this.modalRef = this.modalService.show(CriticalConfirmationModalComponent, { + this.modalRef = this.modalService.show(DeleteConfirmationModalComponent, { itemDescription: i18nSilence, itemNames: [id], actionDescription: this.actionLabels.EXPIRE, diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/services.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/services.component.ts index 000cda887ef..e8202b7633c 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/services.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/services.component.ts @@ -7,7 +7,7 @@ import { delay } from 'rxjs/operators'; import { CephServiceService } from '~/app/shared/api/ceph-service.service'; import { OrchestratorService } from '~/app/shared/api/orchestrator.service'; import { ListWithDetails } from '~/app/shared/classes/list-with-details.class'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { ActionLabelsI18n, URLVerbs } from '~/app/shared/constants/app.constants'; import { TableComponent } from '~/app/shared/datatable/table/table.component'; import { Icons } from '~/app/shared/enum/icons.enum'; @@ -30,7 +30,6 @@ import { ServiceFormComponent } from './service-form/service-form.component'; import { SettingsService } from '~/app/shared/api/settings.service'; import { ModalCdsService } from '~/app/shared/services/modal-cds.service'; import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; -import { DeletionImpact } from '~/app/shared/enum/critical-confirmation-modal-impact.enum'; const BASE_URL = 'services'; @@ -276,8 +275,7 @@ export class ServicesComponent extends ListWithDetails implements OnChanges, OnI deleteAction() { const service = this.selection.first(); - this.cdsModalService.show(CriticalConfirmationModalComponent, { - impact: DeletionImpact.high, + this.cdsModalService.show(DeleteConfirmationModalComponent, { itemDescription: $localize`Service`, itemNames: [service.service_name], actionDescription: 'delete', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/upgrade/upgrade-progress/upgrade-progress.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/upgrade/upgrade-progress/upgrade-progress.component.ts index a04b4577365..8a119a4c466 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/upgrade/upgrade-progress/upgrade-progress.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/upgrade/upgrade-progress/upgrade-progress.component.ts @@ -4,7 +4,7 @@ import { Observable, ReplaySubject, Subscription } from 'rxjs'; import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { Icons } from '~/app/shared/enum/icons.enum'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { ModalCdsService } from '~/app/shared/services/modal-cds.service'; import { Permission } from '~/app/shared/models/permissions'; import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; @@ -109,7 +109,7 @@ export class UpgradeProgressComponent implements OnInit, OnDestroy { stopUpgradeModal() { // pause the upgrade meanwhile we get stop confirmation from user this.pauseUpgrade(); - this.modalRef = this.modalService.show(CriticalConfirmationModalComponent, { + this.modalRef = this.modalService.show(DeleteConfirmationModalComponent, { itemDescription: 'Upgrade', actionDescription: 'stop', submitAction: () => this.stopUpgrade(), diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-list/nfs-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-list/nfs-list.component.ts index d6dc5007e21..53b764be0b6 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-list/nfs-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-list/nfs-list.component.ts @@ -7,7 +7,7 @@ import { Subscription } from 'rxjs'; import { NfsService } from '~/app/shared/api/nfs.service'; import { ListWithDetails } from '~/app/shared/classes/list-with-details.class'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; import { TableComponent } from '~/app/shared/datatable/table/table.component'; import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; @@ -25,7 +25,7 @@ import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; import { getFsalFromRoute, getPathfromFsal } from '../utils'; import { SUPPORTED_FSAL } from '../models/nfs.fsal'; import { ModalCdsService } from '~/app/shared/services/modal-cds.service'; -import { DeletionImpact } from '~/app/shared/enum/critical-confirmation-modal-impact.enum'; +import { DeletionImpact } from '~/app/shared/enum/delete-confirmation-modal-impact.enum'; export enum RgwExportType { BUCKET = 'bucket', @@ -212,7 +212,7 @@ export class NfsListComponent extends ListWithDetails implements OnInit, OnDestr const cluster_id = this.selection.first().cluster_id; const export_id = this.selection.first().export_id; - this.modalRef = this.modalService.show(CriticalConfirmationModalComponent, { + this.modalRef = this.modalService.show(DeleteConfirmationModalComponent, { impact: DeletionImpact.high, itemDescription: $localize`NFS export`, itemNames: [`${cluster_id}:${export_id}`], diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.spec.ts index d831c59ca2f..9c2bb5ed5d9 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.spec.ts @@ -21,7 +21,7 @@ import { ErrorComponent } from '~/app/core/error/error.component'; import { CrushRuleService } from '~/app/shared/api/crush-rule.service'; import { ErasureCodeProfileService } from '~/app/shared/api/erasure-code-profile.service'; import { PoolService } from '~/app/shared/api/pool.service'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { SelectBadgesComponent } from '~/app/shared/components/select-badges/select-badges.component'; import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; import { ErasureCodeProfile } from '~/app/shared/models/erasure-code-profile'; @@ -795,7 +795,7 @@ describe('PoolFormComponent', () => { describe('crush rule deletion', () => { let taskWrapper: TaskWrapperService; - let deletion: CriticalConfirmationModalComponent; + let deletion: DeleteConfirmationModalComponent; let deleteSpy: jasmine.Spy; let modalSpy: jasmine.Spy; @@ -946,7 +946,7 @@ describe('PoolFormComponent', () => { describe('ecp deletion', () => { let taskWrapper: TaskWrapperService; - let deletion: CriticalConfirmationModalComponent; + let deletion: DeleteConfirmationModalComponent; let deleteSpy: jasmine.Spy; let modalSpy: jasmine.Spy; let modal: NgbModalRef; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.ts index 692229c66bd..b7cda346e98 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.ts @@ -11,7 +11,7 @@ import { CrushRuleService } from '~/app/shared/api/crush-rule.service'; import { ErasureCodeProfileService } from '~/app/shared/api/erasure-code-profile.service'; import { PoolService } from '~/app/shared/api/pool.service'; import { CrushNodeSelectionClass } from '~/app/shared/classes/crush.node.selection.class'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { SelectOption } from '~/app/shared/components/select/select-option.model'; import { ActionLabelsI18n, URLVerbs } from '~/app/shared/constants/app.constants'; import { Icons } from '~/app/shared/enum/icons.enum'; @@ -687,7 +687,7 @@ export class PoolFormComponent extends CdForm implements OnInit { return; } const name = value[nameAttribute]; - this.modalService.show(CriticalConfirmationModalComponent, { + this.modalService.show(DeleteConfirmationModalComponent, { itemDescription, itemNames: [name], submitActionObservable: () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.spec.ts index 98a0e474500..690aa74784d 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.spec.ts @@ -13,7 +13,7 @@ import { PgCategoryService } from '~/app/ceph/shared/pg-category.service'; import { ConfigurationService } from '~/app/shared/api/configuration.service'; import { ErasureCodeProfileService } from '~/app/shared/api/erasure-code-profile.service'; import { PoolService } from '~/app/shared/api/pool.service'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { ErasureCodeProfile } from '~/app/shared/models/erasure-code-profile'; import { ExecutingTask } from '~/app/shared/models/executing-task'; import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; @@ -152,7 +152,7 @@ describe('PoolListComponent', () => { const callDeletion = () => { component.deletePoolModal(); expect(modalRef).toBeTruthy(); - const deletion: CriticalConfirmationModalComponent = modalRef && modalRef.componentInstance; + const deletion: DeleteConfirmationModalComponent = modalRef && modalRef.componentInstance; deletion.submitActionObservable(); }; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.ts index dddfbdd6385..6342897a767 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.ts @@ -9,7 +9,7 @@ import { ErasureCodeProfileService } from '~/app/shared/api/erasure-code-profile import { PoolService } from '~/app/shared/api/pool.service'; import { ListWithDetails } from '~/app/shared/classes/list-with-details.class'; import { TableStatusViewCache } from '~/app/shared/classes/table-status-view-cache'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { ActionLabelsI18n, URLVerbs } from '~/app/shared/constants/app.constants'; import { TableComponent } from '~/app/shared/datatable/table/table.component'; import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; @@ -30,7 +30,7 @@ import { URLBuilderService } from '~/app/shared/services/url-builder.service'; import { Pool } from '../pool'; import { PoolStat, PoolStats } from '../pool-stat'; import { ModalCdsService } from '~/app/shared/services/modal-cds.service'; -import { DeletionImpact } from '~/app/shared/enum/critical-confirmation-modal-impact.enum'; +import { DeletionImpact } from '~/app/shared/enum/delete-confirmation-modal-impact.enum'; const BASE_URL = 'pool'; @@ -224,7 +224,7 @@ export class PoolListComponent extends ListWithDetails implements OnInit { deletePoolModal() { const name = this.selection.first().pool_name; - this.modalService.show(CriticalConfirmationModalComponent, { + this.modalService.show(DeleteConfirmationModalComponent, { impact: DeletionImpact.high, itemDescription: 'Pool', itemNames: [name], diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-list/rgw-bucket-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-list/rgw-bucket-list.component.ts index b2fa1b4a5e5..347ed374582 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-list/rgw-bucket-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-list/rgw-bucket-list.component.ts @@ -6,7 +6,7 @@ import { switchMap } from 'rxjs/operators'; import { RgwBucketService } from '~/app/shared/api/rgw-bucket.service'; import { ListWithDetails } from '~/app/shared/classes/list-with-details.class'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; import { TableComponent } from '~/app/shared/datatable/table/table.component'; import { Icons } from '~/app/shared/enum/icons.enum'; @@ -23,7 +23,7 @@ import { ModalCdsService } from '~/app/shared/services/modal-cds.service'; import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; import { URLBuilderService } from '~/app/shared/services/url-builder.service'; import { Bucket } from '../models/rgw-bucket'; -import { DeletionImpact } from '~/app/shared/enum/critical-confirmation-modal-impact.enum'; +import { DeletionImpact } from '~/app/shared/enum/delete-confirmation-modal-impact.enum'; const BASE_URL = 'rgw/bucket'; @@ -154,7 +154,7 @@ export class RgwBucketListComponent extends ListWithDetails implements OnInit, O deleteAction() { const itemNames = this.selection.selected.map((bucket: any) => bucket['bid']); - this.modalService.show(CriticalConfirmationModalComponent, { + this.modalService.show(DeleteConfirmationModalComponent, { itemDescription: $localize`bucket`, impact: DeletionImpact.high, itemNames: itemNames, diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-details/rgw-multisite-details.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-details/rgw-multisite-details.component.ts index 546b32b250c..c213ae26a59 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-details/rgw-multisite-details.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-details/rgw-multisite-details.component.ts @@ -15,7 +15,7 @@ import { forkJoin, Subscription, timer as observableTimer } from 'rxjs'; import { RgwRealmService } from '~/app/shared/api/rgw-realm.service'; import { RgwZoneService } from '~/app/shared/api/rgw-zone.service'; import { RgwZonegroupService } from '~/app/shared/api/rgw-zonegroup.service'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { ActionLabelsI18n, TimerServiceInterval } from '~/app/shared/constants/app.constants'; import { Icons } from '~/app/shared/enum/icons.enum'; import { NotificationType } from '~/app/shared/enum/notification-type.enum'; @@ -581,7 +581,7 @@ export class RgwMultisiteDetailsComponent implements OnDestroy, OnInit { delete(node: Node) { if (node?.data?.type === 'realm') { - const modalRef = this.cdsModalService.show(CriticalConfirmationModalComponent, { + const modalRef = this.cdsModalService.show(DeleteConfirmationModalComponent, { itemDescription: $localize`${node?.data?.type} ${node?.data?.name}`, itemNames: [`${node?.data?.name}`], submitAction: () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-sync-policy-details/rgw-multisite-sync-policy-details.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-sync-policy-details/rgw-multisite-sync-policy-details.component.ts index f6135515aa3..0f2175b0bcf 100755 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-sync-policy-details/rgw-multisite-sync-policy-details.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-sync-policy-details/rgw-multisite-sync-policy-details.component.ts @@ -8,7 +8,7 @@ import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; import { Permission } from '~/app/shared/models/permissions'; import { ModalService } from '~/app/shared/services/modal.service'; import { RgwMultisiteService } from '~/app/shared/api/rgw-multisite.service'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { FinishedTask } from '~/app/shared/models/finished-task'; import { Observable, Subscriber, forkJoin as observableForkJoin } from 'rxjs'; import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; @@ -244,7 +244,7 @@ export class RgwMultisiteSyncPolicyDetailsComponent implements OnChanges { selection = this.dirFlowSelection; } const flowIds = selection.selected.map((flow: any) => flow.id); - this.cdsModalService.show(CriticalConfirmationModalComponent, { + this.cdsModalService.show(DeleteConfirmationModalComponent, { itemDescription: selection.hasSingleSelection ? $localize`Flow` : $localize`Flows`, itemNames: flowIds, bodyTemplate: this.deleteTpl, @@ -309,7 +309,7 @@ export class RgwMultisiteSyncPolicyDetailsComponent implements OnChanges { deletePipe() { this.resourceType = MultisiteResourceType.pipe; const pipeIds = this.pipeSelection.selected.map((pipe: any) => pipe.id); - this.cdsModalService.show(CriticalConfirmationModalComponent, { + this.cdsModalService.show(DeleteConfirmationModalComponent, { itemDescription: this.pipeSelection.hasSingleSelection ? $localize`Pipe` : $localize`Pipes`, itemNames: pipeIds, bodyTemplate: this.deleteTpl, diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-sync-policy/rgw-multisite-sync-policy.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-sync-policy/rgw-multisite-sync-policy.component.ts index 03228856125..80c6b033de7 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-sync-policy/rgw-multisite-sync-policy.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-sync-policy/rgw-multisite-sync-policy.component.ts @@ -5,7 +5,7 @@ import { forkJoin as observableForkJoin, Observable, Subscriber } from 'rxjs'; import { RgwDaemonService } from '~/app/shared/api/rgw-daemon.service'; import { RgwMultisiteService } from '~/app/shared/api/rgw-multisite.service'; import { ListWithDetails } from '~/app/shared/classes/list-with-details.class'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { ActionLabelsI18n, URLVerbs } from '~/app/shared/constants/app.constants'; import { TableComponent } from '~/app/shared/datatable/table/table.component'; import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; @@ -174,7 +174,7 @@ export class RgwMultisiteSyncPolicyComponent extends ListWithDetails implements deleteAction() { const groupNames = this.selection.selected.map((policy: any) => policy.groupName); - this.modalService.show(CriticalConfirmationModalComponent, { + this.modalService.show(DeleteConfirmationModalComponent, { itemDescription: this.selection.hasSingleSelection ? $localize`Policy Group` : $localize`Policy Groups`, diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-storage-class-list/rgw-storage-class-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-storage-class-list/rgw-storage-class-list.component.ts index 16afef45d36..1f6fddf032d 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-storage-class-list/rgw-storage-class-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-storage-class-list/rgw-storage-class-list.component.ts @@ -15,8 +15,8 @@ import { import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; import { FinishedTask } from '~/app/shared/models/finished-task'; import { Icons } from '~/app/shared/enum/icons.enum'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; import { RgwZonegroupService } from '~/app/shared/api/rgw-zonegroup.service'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { ModalCdsService } from '~/app/shared/services/modal-cds.service'; import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; import { RgwStorageClassService } from '~/app/shared/api/rgw-storage-class.service'; @@ -140,7 +140,7 @@ export class RgwStorageClassListComponent extends ListWithDetails implements OnI removeStorageClassModal() { const storage_class = this.selection.first().storage_class; const placement_target = this.selection.first().placement_target; - this.cdsModalService.show(CriticalConfirmationModalComponent, { + this.cdsModalService.show(DeleteConfirmationModalComponent, { itemDescription: $localize`Tiering Storage Class`, itemNames: [storage_class], actionDescription: 'remove', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-accounts/rgw-user-accounts.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-accounts/rgw-user-accounts.component.ts index dd4cf1b21ac..6ac218093ea 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-accounts/rgw-user-accounts.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-accounts/rgw-user-accounts.component.ts @@ -14,7 +14,7 @@ import { URLBuilderService } from '~/app/shared/services/url-builder.service'; import { Icons } from '~/app/shared/enum/icons.enum'; import { Router } from '@angular/router'; import { ListWithDetails } from '~/app/shared/classes/list-with-details.class'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { ModalCdsService } from '~/app/shared/services/modal-cds.service'; import { Observable, Subscriber, forkJoin as observableForkJoin } from 'rxjs'; import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; @@ -175,7 +175,7 @@ export class RgwUserAccountsComponent extends ListWithDetails implements OnInit deleteAction() { const account_name = this.selection.first().name; - this.cdsModalService.show(CriticalConfirmationModalComponent, { + this.cdsModalService.show(DeleteConfirmationModalComponent, { itemDescription: $localize`Account`, itemNames: [account_name], submitActionObservable: () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-list/rgw-user-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-list/rgw-user-list.component.ts index d7d74695864..f44e8f8c2cd 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-list/rgw-user-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-list/rgw-user-list.component.ts @@ -4,11 +4,11 @@ import { forkJoin as observableForkJoin, Observable, Subscriber } from 'rxjs'; import { RgwUserService } from '~/app/shared/api/rgw-user.service'; import { ListWithDetails } from '~/app/shared/classes/list-with-details.class'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; import { TableComponent } from '~/app/shared/datatable/table/table.component'; import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; -import { DeletionImpact } from '~/app/shared/enum/critical-confirmation-modal-impact.enum'; +import { DeletionImpact } from '~/app/shared/enum/delete-confirmation-modal-impact.enum'; import { Icons } from '~/app/shared/enum/icons.enum'; import { CdTableAction } from '~/app/shared/models/cd-table-action'; import { CdTableColumn } from '~/app/shared/models/cd-table-column'; @@ -148,7 +148,7 @@ export class RgwUserListComponent extends ListWithDetails implements OnInit { } deleteAction() { - this.modalService.show(CriticalConfirmationModalComponent, { + this.modalService.show(DeleteConfirmationModalComponent, { impact: DeletionImpact.high, itemDescription: this.selection.hasSingleSelection ? $localize`user` : $localize`users`, itemNames: this.selection.selected.map((user: any) => user['uid']), diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-cluster-list/smb-cluster-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-cluster-list/smb-cluster-list.component.ts index d1217d87fb1..4413d6486a1 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-cluster-list/smb-cluster-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-cluster-list/smb-cluster-list.component.ts @@ -21,7 +21,7 @@ import { URLBuilderService } from '~/app/shared/services/url-builder.service'; import { SMBCluster } from '../smb.model'; import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { ModalCdsService } from '~/app/shared/services/modal-cds.service'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; import { FinishedTask } from '~/app/shared/models/finished-task'; @@ -109,7 +109,7 @@ export class SmbClusterListComponent extends ListWithDetails implements OnInit { removeSMBClusterModal() { const cluster_id = this.selection.first().cluster_id; - this.modalService.show(CriticalConfirmationModalComponent, { + this.modalService.show(DeleteConfirmationModalComponent, { itemDescription: $localize`Cluster`, itemNames: [cluster_id], actionDescription: $localize`remove`, diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-list/role-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-list/role-list.component.ts index 8e7e12b3692..71e1e414df6 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-list/role-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-list/role-list.component.ts @@ -6,7 +6,7 @@ import { forkJoin } from 'rxjs'; import { RoleService } from '~/app/shared/api/role.service'; import { ScopeService } from '~/app/shared/api/scope.service'; import { ListWithDetails } from '~/app/shared/classes/list-with-details.class'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { FormModalComponent } from '~/app/shared/components/form-modal/form-modal.component'; import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; @@ -134,7 +134,7 @@ export class RoleListComponent extends ListWithDetails implements OnInit { deleteRoleModal() { const name = this.selection.first().name; - this.modalRef = this.modalService.show(CriticalConfirmationModalComponent, { + this.modalRef = this.modalService.show(DeleteConfirmationModalComponent, { itemDescription: 'Role', itemNames: [name], submitAction: () => this.deleteRole(name) diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-list/user-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-list/user-list.component.ts index a414b6a154a..18c07cb445e 100755 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-list/user-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-list/user-list.component.ts @@ -4,10 +4,10 @@ import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { SettingsService } from '~/app/shared/api/settings.service'; import { UserService } from '~/app/shared/api/user.service'; -import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component'; import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; -import { DeletionImpact } from '~/app/shared/enum/critical-confirmation-modal-impact.enum'; +import { DeletionImpact } from '~/app/shared/enum/delete-confirmation-modal-impact.enum'; import { Icons } from '~/app/shared/enum/icons.enum'; import { NotificationType } from '~/app/shared/enum/notification-type.enum'; import { CdTableAction } from '~/app/shared/models/cd-table-action'; @@ -174,7 +174,7 @@ export class UserListComponent implements OnInit { return; } - this.modalRef = this.modalService.show(CriticalConfirmationModalComponent, { + this.modalRef = this.modalService.show(DeleteConfirmationModalComponent, { impact: DeletionImpact.high, itemDescription: 'User', itemNames: [username], diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/components.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/components.module.ts index 47657aedf61..8f335822a77 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/components.module.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/components.module.ts @@ -48,7 +48,7 @@ import { ColorClassFromTextPipe } from './cd-label/color-class-from-text.pipe'; import { ConfigOptionComponent } from './config-option/config-option.component'; import { ConfirmationModalComponent } from './confirmation-modal/confirmation-modal.component'; import { Copy2ClipboardButtonComponent } from './copy2clipboard-button/copy2clipboard-button.component'; -import { CriticalConfirmationModalComponent } from './critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from './delete-confirmation-modal/delete-confirmation-modal.component'; import { CustomLoginBannerComponent } from './custom-login-banner/custom-login-banner.component'; import { DateTimePickerComponent } from './date-time-picker/date-time-picker.component'; import { DocComponent } from './doc/doc.component'; @@ -132,7 +132,7 @@ import InfoIcon from '@carbon/icons/es/information/16'; LoadingPanelComponent, ModalComponent, NotificationsSidebarComponent, - CriticalConfirmationModalComponent, + DeleteConfirmationModalComponent, ConfirmationModalComponent, LanguageSelectorComponent, GrafanaComponent, diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component.html similarity index 92% rename from src/pybind/mgr/dashboard/frontend/src/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component.html rename to src/pybind/mgr/dashboard/frontend/src/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component.html index 3ae4b339da3..e041e6d8a71 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component.html @@ -33,9 +33,8 @@
- + Resource Name + i18n + i18n-label>Resource Name + formControlName="confirmInput" + i18n-placeholder/> { +describe('DeleteConfirmationModalComponent', () => { let mockComponent: MockComponent; - let component: CriticalConfirmationModalComponent; + let component: DeleteConfirmationModalComponent; let mockFixture: ComponentFixture; configureTestBed({ declarations: [ MockComponent, - CriticalConfirmationModalComponent, + DeleteConfirmationModalComponent, LoadingPanelComponent, AlertPanelComponent ], - imports: [ReactiveFormsModule, MockModule, DirectivesModule, CheckboxModule], + schemas: [NO_ERRORS_SCHEMA], + imports: [ReactiveFormsModule, MockModule, DirectivesModule], providers: [ ModalService, PlaceholderService, { provide: 'itemNames', useValue: [] }, { provide: 'itemDescription', useValue: 'entry' }, - { provide: 'actionDescription', useValue: 'delete' } + { provide: 'actionDescription', useValue: 'delete' }, + { provide: 'impact', useValue: DeletionImpact.medium } ] }); @@ -110,7 +112,7 @@ describe('CriticalConfirmationModalComponent', () => { mockFixture = TestBed.createComponent(MockComponent); mockComponent = mockFixture.componentInstance; spyOn(mockComponent.modalService, 'show').and.callFake((_modalComp, config) => { - const data = modalServiceShow(CriticalConfirmationModalComponent, config); + const data = modalServiceShow(DeleteConfirmationModalComponent, config); component = data.componentInstance; return data; }); @@ -144,7 +146,7 @@ describe('CriticalConfirmationModalComponent', () => { }); describe('component functions', () => { - const changeValue = (formControl: string, value: any) => { + const changeValue = (formControl: string, value: string | boolean) => { const ctrl = component.deletionForm.get(formControl); ctrl.setValue(value); ctrl.markAsDirty(); @@ -169,7 +171,7 @@ describe('CriticalConfirmationModalComponent', () => { beforeEach(() => { component.deletionForm.reset(); const ctrl = component.deletionForm.get('impact'); - ctrl.setValue(DeletionImpact.normal); + ctrl.setValue(DeletionImpact.medium); ctrl.markAsDirty(); ctrl.updateValueAndValidity(); component.deletionForm.get('confirmation').updateValueAndValidity(); diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component.ts similarity index 87% rename from src/pybind/mgr/dashboard/frontend/src/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component.ts index 5dc45f7fc8b..440ed0b1040 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component.ts @@ -6,14 +6,14 @@ import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; import { SubmitButtonComponent } from '../submit-button/submit-button.component'; import { BaseModal } from 'carbon-components-angular'; import { CdValidators } from '../../forms/cd-validators'; -import { DeletionImpact } from '../../enum/critical-confirmation-modal-impact.enum'; +import { DeletionImpact } from '../../enum/delete-confirmation-modal-impact.enum'; @Component({ selector: 'cd-deletion-modal', - templateUrl: './critical-confirmation-modal.component.html', - styleUrls: ['./critical-confirmation-modal.component.scss'] + templateUrl: './delete-confirmation-modal.component.html', + styleUrls: ['./delete-confirmation-modal.component.scss'] }) -export class CriticalConfirmationModalComponent extends BaseModal implements OnInit { +export class DeleteConfirmationModalComponent extends BaseModal implements OnInit { @ViewChild(SubmitButtonComponent, { static: true }) submitButton: SubmitButtonComponent; deletionForm: CdFormGroup; @@ -40,7 +40,7 @@ export class CriticalConfirmationModalComponent extends BaseModal implements OnI ) { super(); this.actionDescription = actionDescription || 'delete'; - this.impact = this.impact || DeletionImpact.normal; + this.impact = this.impact || DeletionImpact.medium; } ngOnInit() { @@ -50,7 +50,7 @@ export class CriticalConfirmationModalComponent extends BaseModal implements OnI validators: [ CdValidators.composeIf( { - impact: DeletionImpact.normal + impact: DeletionImpact.medium }, [Validators.requiredTrue] ) @@ -73,7 +73,7 @@ export class CriticalConfirmationModalComponent extends BaseModal implements OnI } matchResourceName(control: AbstractControl): ValidationErrors | null { - if (this.itemNames && control.value != this.itemNames[0]) { + if (this.itemNames && control.value !== String(this.itemNames?.[0])) { return { matchResource: true }; } return null; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/crud-table/crud-table.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/crud-table/crud-table.component.ts index d380052651f..08f2db4fcc7 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/crud-table/crud-table.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/crud-table/crud-table.component.ts @@ -14,7 +14,7 @@ import { FinishedTask } from '../../models/finished-task'; import { Permission, Permissions } from '../../models/permissions'; import { AuthStorageService } from '../../services/auth-storage.service'; import { TaskWrapperService } from '../../services/task-wrapper.service'; -import { CriticalConfirmationModalComponent } from '../../components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { DeleteConfirmationModalComponent } from '../../components/delete-confirmation-modal/delete-confirmation-modal.component'; import { ModalCdsService } from '../../services/modal-cds.service'; import { BaseModal } from 'carbon-components-angular'; @@ -119,7 +119,7 @@ export class CRUDTableComponent implements OnInit { delete() { const selectedKey = this.selection.first()[this.meta.columnKey]; - this.modalRef = this.modalService.show(CriticalConfirmationModalComponent, { + this.modalRef = this.modalService.show(DeleteConfirmationModalComponent, { itemDescription: $localize`${this.meta.resource}`, itemNames: [selectedKey], submitAction: () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/enum/critical-confirmation-modal-impact.enum.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/enum/delete-confirmation-modal-impact.enum.ts similarity index 85% rename from src/pybind/mgr/dashboard/frontend/src/app/shared/enum/critical-confirmation-modal-impact.enum.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/enum/delete-confirmation-modal-impact.enum.ts index 045d6f52ae6..5009ea28f94 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/enum/critical-confirmation-modal-impact.enum.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/enum/delete-confirmation-modal-impact.enum.ts @@ -1,4 +1,4 @@ export enum DeletionImpact { - normal = 'normal', + medium = 'medium', high = 'high' // NOTE: User should be able to select only single resource while deleting } -- 2.39.5