mgr/dashboard: disable delete on multisite

src/pybind/mgr/dashboard/controllers/rgw.py

@@ -839,10 +839,13 @@ def get_all_zonegroups_info(self):
         except NoRgwDaemonsException as e:
             raise DashboardException(e, http_status_code=404, component='rgw')
 
-    def delete(self, zonegroup_name, delete_pools, daemon_name=None):
+    def delete(self, zonegroup_name, delete_pools, pools: Optional[List[str]] = None,
+               daemon_name=None):
+        if pools is None:
+            pools = []
         try:
             instance = RgwClient.admin_instance(daemon_name)
-            result = instance.delete_zonegroup(zonegroup_name, delete_pools)
+            result = instance.delete_zonegroup(zonegroup_name, delete_pools, pools)
             return result
         except NoRgwDaemonsException as e:
             raise DashboardException(e, http_status_code=404, component='rgw')
@@ -909,10 +912,15 @@ def get_all_zones_info(self):
         except NoRgwDaemonsException as e:
             raise DashboardException(e, http_status_code=404, component='rgw')
 
-    def delete(self, zonegroup_name, zone_name, delete_pools, daemon_name=None):
+    def delete(self, zone_name, delete_pools, pools: Optional[List[str]] = None,
+               zonegroup_name=None, daemon_name=None):
+        if pools is None:
+            pools = []
+        if zonegroup_name is None:
+            zonegroup_name = ''
         try:
             instance = RgwClient.admin_instance(daemon_name)
-            result = instance.delete_zone(zonegroup_name, zone_name, delete_pools)
+            result = instance.delete_zone(zone_name, delete_pools, pools, zonegroup_name)
             return result
         except NoRgwDaemonsException as e:
             raise DashboardException(e, http_status_code=404, component='rgw')

src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/models/rgw-multisite-zone-deletion-form/rgw-multisite-zone-deletion-form.component.html

@@ -6,41 +6,40 @@
     <form name="zoneForm"
           [formGroup]="zoneForm"
           novalidate>
-      <div class="custom-control ms-4 mt-4">
+      <div class="modal-body ms-4">
         <label i18n>
-            Do you want to delete all pools associated with it?</label>
-        <label class="mb-4"
-               i18n>
-            This will delete the following pools and any data stored in these pools:</label>
-        <ng-container *ngIf="zoneData$ | async as data">
-          <div id="scroll">
-            <ng-container *ngFor="let pool of data.placement_pools">
-              <strong>{{pool?.val.data_extra_pool}}</strong>
-              <strong>{{pool?.val.index_pool}}</strong>
-              <strong>{{pool?.val.storage_classes.STANDARD.data_pool}}</strong>
-            </ng-container>
+          This will delete your <strong>{{zone?.name}}</strong> Zone.
+        </label>
+        <ng-container *ngIf="includedPools.size">
+          <label class="mt-3"
+                 i18n>
+              Do you want to delete the associated pools with the <strong>{{zone?.name}}</strong> Zone?</label>
+          <label class="mb-4"
+                 i18n>
+              This will delete the following pools and any data stored in these pools:</label>
+            <strong *ngFor="let pool of includedPools"
+                    class="block">{{ pool }}</strong>
+          <div class="form-group">
+            <div class="custom-control custom-checkbox mt-2">
+              <input type="checkbox"
+                     class="custom-control-input"
+                     name="deletePools"
+                     id="deletePools"
+                     formControlName="deletePools"
+                     (change)="showDangerText()">
+              <label class="custom-control-label"
+                     for="deletePools"
+                     i18n>Yes, I want to delete the pools.</label>
+            </div>
+            <div *ngIf="displayText"
+                 class="me-4">
+              <cd-alert-panel type="danger"
+                              i18n>
+                              This will delete all the data in the pools!
+              </cd-alert-panel>
+            </div>
           </div>
         </ng-container>
-        <div class="form-group">
-          <div class="custom-control custom-checkbox mt-2">
-            <input type="checkbox"
-                   class="custom-control-input"
-                   name="deletePools"
-                   id="deletePools"
-                   formControlName="deletePools"
-                   (change)="showDangerText()">
-            <label class="custom-control-label"
-                   for="deletePools"
-                   i18n>Yes, I want to delete the pools.</label>
-          </div>
-          <div *ngIf="displayText"
-               class="me-4">
-            <cd-alert-panel type="danger"
-                            i18n>
-                            This will delete all the data in the pools!
-            </cd-alert-panel>
-          </div>
-        </div>
       </div>
 
       <div class="modal-footer">

src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/models/rgw-multisite-zone-deletion-form/rgw-multisite-zone-deletion-form.component.scss

@@ -1,4 +1,4 @@
-strong {
+.block {
   display: block;
 }
 

src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/models/rgw-multisite-zone-deletion-form/rgw-multisite-zone-deletion-form.component.ts

@@ -1,6 +1,7 @@
-import { Component, OnInit } from '@angular/core';
+import { AfterViewInit, Component, OnInit } from '@angular/core';
 import { FormControl } from '@angular/forms';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { PoolService } from '~/app/shared/api/pool.service';
 import { RgwZoneService } from '~/app/shared/api/rgw-zone.service';
 import { ActionLabelsI18n } from '~/app/shared/constants/app.constants';
 import { NotificationType } from '~/app/shared/enum/notification-type.enum';
@@ -12,23 +13,31 @@ import { NotificationService } from '~/app/shared/services/notification.service'
   templateUrl: './rgw-multisite-zone-deletion-form.component.html',
   styleUrls: ['./rgw-multisite-zone-deletion-form.component.scss']
 })
-export class RgwMultisiteZoneDeletionFormComponent implements OnInit {
+export class RgwMultisiteZoneDeletionFormComponent implements OnInit, AfterViewInit {
   zoneData$: any;
+  poolList$: any;
   zone: any;
   zoneForm: CdFormGroup;
   displayText: boolean = false;
+  includedPools: Set<string> = new Set<string>();
 
   constructor(
     public activeModal: NgbActiveModal,
     public actionLabels: ActionLabelsI18n,
     public notificationService: NotificationService,
-    private rgwZoneService: RgwZoneService
+    private rgwZoneService: RgwZoneService,
+    private poolService: PoolService
   ) {
     this.createForm();
   }
 
   ngOnInit(): void {
     this.zoneData$ = this.rgwZoneService.get(this.zone);
+    this.poolList$ = this.poolService.getList();
+  }
+
+  ngAfterViewInit(): void {
+    this.updateIncludedPools();
   }
 
   createForm() {
@@ -39,7 +48,7 @@ export class RgwMultisiteZoneDeletionFormComponent implements OnInit {
 
   submit() {
     this.rgwZoneService
-      .delete(this.zone.parent, this.zone.name, this.zoneForm.value.deletePools)
+      .delete(this.zone.name, this.zoneForm.value.deletePools, this.includedPools, this.zone.parent)
       .subscribe(
         () => {
           this.notificationService.show(
@@ -57,4 +66,34 @@ export class RgwMultisiteZoneDeletionFormComponent implements OnInit {
   showDangerText() {
     this.displayText = !this.displayText;
   }
+
+  updateIncludedPools(): void {
+    if (!this.zoneData$ || !this.poolList$) {
+      return;
+    }
+    this.zoneData$.subscribe((data: any) => {
+      this.poolList$.subscribe((poolList: any) => {
+        for (const pool of poolList) {
+          for (const zonePool of Object.values(data)) {
+            if (typeof zonePool === 'string' && zonePool.includes(pool.pool_name)) {
+              this.includedPools.add(pool.pool_name);
+            } else if (Array.isArray(zonePool) && zonePool[0].val) {
+              for (const item of zonePool) {
+                const val = item.val;
+                if (val.storage_classes.STANDARD.data_pool === pool.pool_name) {
+                  this.includedPools.add(val.storage_classes.STANDARD.data_pool);
+                }
+                if (val.data_extra_pool === pool.pool_name) {
+                  this.includedPools.add(val.data_extra_pool);
+                }
+                if (val.index_pool === pool.pool_name) {
+                  this.includedPools.add(val.index_pool);
+                }
+              }
+            }
+          }
+        }
+      });
+    });
+  }
 }

src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/models/rgw-multisite-zonegroup-deletion-form/rgw-multisite-zonegroup-deletion-form.component.html

@@ -6,44 +6,55 @@
     <form name="zonegroupForm"
           [formGroup]="zonegroupForm"
           novalidate>
-      <div class="modal-body ms-4 mt-4">
+      <div class="modal-body ms-4">
         <label i18n>
-            Are you sure that you want to delete the selected zonegroup and its zones?</label>
-        <label i18n>
-            This will delete the following zones and pools and any data stored in these pools:</label>
-        <ng-container *ngIf="zonegroupData$ | async as data">
-          <strong class="mt-3 mb-2 h5">Zones:</strong>
+          This will delete your <strong>{{zonegroup?.name}}</strong> Zonegroup.
+        </label>
+        <ng-container *ngIf="zonesList.length > 0">
+          <label class="mt-3"
+                 i18n>
+              Do you want to delete the associated zones and pools with the <strong>{{zonegroup?.name}}</strong> Zonegroup?</label>
+          <ng-container *ngIf="includedPools.size > 0">
+            <label i18n>
+              This will delete the following:</label>
+          </ng-container>
+          <strong class="mt-3 mb-2 h5 block">Zones:</strong>
           <div id="scroll">
-            <strong *ngFor="let zone of data.zones">{{zone?.name}}</strong>
+            <strong *ngFor="let zone of zonesList"
+                    class="block">{{zone}}</strong>
           </div>
-          <strong class="mt-3 mb-2 h5">Pools:</strong>
-          <div id="scroll"
-               class="mb-2">
-            <ng-container *ngFor="let pool of data.placement_targets">
-              <strong *ngIf="pool.name !== 'default-placement'">{{pool?.name}}</strong>
-            </ng-container>
+          <ng-container *ngIf="includedPools.size > 0">
+            <strong class="mt-3 mb-2 h5 block">Pools:</strong>
+            <div id="scroll"
+                 class="mb-2">
+              <strong *ngFor="let pool of includedPools"
+                      class="block">{{ pool }}</strong>
+            </div>
+          </ng-container>
+
+          <div class="form-group">
+            <div class="custom-control custom-checkbox mt-2">
+              <input type="checkbox"
+                     class="custom-control-input"
+                     name="deletePools"
+                     id="deletePools"
+                     formControlName="deletePools"
+                     (change)="showDangerText()">
+              <ng-container *ngIf="includedPools.size > 0 else noPoolsConfirmation">
+                <label class="custom-control-label"
+                       for="deletePools"
+                       i18n>Yes, I want to delete the zones and their pools.</label>
+              </ng-container>
+            </div>
+            <div *ngIf="displayText"
+                 class="me-4">
+              <cd-alert-panel type="danger"
+                              i18n>
+                              This will delete all the data in the pools!
+              </cd-alert-panel>
+            </div>
           </div>
         </ng-container>
-        <div class="form-group">
-          <div class="custom-control custom-checkbox mt-2">
-            <input type="checkbox"
-                   class="custom-control-input"
-                   name="deletePools"
-                   id="deletePools"
-                   formControlName="deletePools"
-                   (change)="showDangerText()">
-            <label class="custom-control-label"
-                   for="deletePools"
-                   i18n>Yes, I want to delete the zones and their pools.</label>
-          </div>
-          <div *ngIf="displayText"
-               class="me-4">
-            <cd-alert-panel type="danger"
-                            i18n>
-                            This will delete all the data in the pools!
-            </cd-alert-panel>
-          </div>
-        </div>
       </div>
 
       <div class="modal-footer">
@@ -56,3 +67,9 @@
   </ng-container>
 
 </cd-modal>
+
+<ng-template #noPoolsConfirmation>
+  <label class="custom-control-label"
+         for="deletePools"
+         i18n>Yes, I want to delete the zones.</label>
+</ng-template>

src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/models/rgw-multisite-zonegroup-deletion-form/rgw-multisite-zonegroup-deletion-form.component.scss

@@ -1,4 +1,4 @@
-strong {
+.block {
   display: block;
 }