Merge pull request ceph#60049 from rhcs-dashboard/fix-68307-main

mgr/dashboard: Do not display restart gateway message on completion of Setup Multisite Replication wizard

Reviewed-by: Afreen Misbah <[email protected]>

Author: afreen23

src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-details/rgw-multisite-details.component.ts

@@ -40,6 +40,7 @@ import { Router } from '@angular/router';
 import { RgwMultisiteWizardComponent } from '../rgw-multisite-wizard/rgw-multisite-wizard.component';
 import { RgwMultisiteSyncPolicyComponent } from '../rgw-multisite-sync-policy/rgw-multisite-sync-policy.component';
 import { ModalCdsService } from '~/app/shared/services/modal-cds.service';
+import { RgwMultisiteService } from '~/app/shared/api/rgw-multisite.service';
 
 const BASE_URL = 'rgw/multisite/configuration';
 
@@ -121,7 +122,8 @@ export class RgwMultisiteDetailsComponent implements OnDestroy, OnInit {
     public rgwDaemonService: RgwDaemonService,
     public mgrModuleService: MgrModuleService,
     private notificationService: NotificationService,
-    private cdsModalService: ModalCdsService
+    private cdsModalService: ModalCdsService,
+    private rgwMultisiteService: RgwMultisiteService
   ) {
     this.permission = this.authStorageService.getPermissions().rgw;
   }
@@ -412,22 +414,30 @@ export class RgwMultisiteDetailsComponent implements OnDestroy, OnInit {
     this.realmIds = [];
     this.zoneIds = [];
     this.evaluateMigrateAndReplicationActions();
+    this.rgwMultisiteService.restartGatewayMessage$.subscribe((value) => {
+      if (value !== null) {
+        this.restartGatewayMessage = value;
+      } else {
+        this.checkRestartGatewayMessage();
+      }
+    });
+    return allNodes;
+  }
+
+  checkRestartGatewayMessage() {
     this.rgwDaemonService.list().subscribe((data: any) => {
-      const hasEmptyRealmName = data.some(
-        (item: { [x: string]: any }) =>
-          item['realm_name'] === '' &&
-          !data.some((i: { [x: string]: any }) => i['id'] === item['id'] && i['realm_name'] !== '')
-      );
+      const realmName = data.map((item: { [x: string]: any }) => item['realm_name']);
       if (
         this.defaultRealmId !== '' &&
         this.defaultZonegroupId !== '' &&
         this.defaultZoneId !== '' &&
-        hasEmptyRealmName
+        realmName.includes('')
       ) {
         this.restartGatewayMessage = true;
+      } else {
+        this.restartGatewayMessage = false;
       }
     });
-    return allNodes;
   }
 
   getDefaultsEntities(

src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-wizard/rgw-multisite-wizard.component.ts

@@ -236,6 +236,7 @@ export class RgwMultisiteWizardComponent extends BaseModal implements OnInit {
         )
         .subscribe((data: object[]) => {
           this.setupCompleted = true;
+          this.rgwMultisiteService.setRestartGatewayMessage(false);
           this.loading = false;
           this.realms = data;
           this.showSuccessNotification();
@@ -258,6 +259,7 @@ export class RgwMultisiteWizardComponent extends BaseModal implements OnInit {
         .subscribe(
           () => {
             this.setupCompleted = true;
+            this.rgwMultisiteService.setRestartGatewayMessage(false);
             this.loading = false;
             this.showSuccessNotification();
           },

src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-multisite.service.ts

@@ -2,6 +2,7 @@ import { HttpClient, HttpParams } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { RgwRealm, RgwZone, RgwZonegroup } from '~/app/ceph/rgw/models/rgw-multisite';
 import { RgwDaemonService } from './rgw-daemon.service';
+import { BehaviorSubject } from 'rxjs';
 
 @Injectable({
   providedIn: 'root'
@@ -10,6 +11,9 @@ export class RgwMultisiteService {
   private uiUrl = 'ui-api/rgw/multisite';
   private url = 'api/rgw/multisite';
 
+  private restartGatewayMessageSource = new BehaviorSubject<boolean>(null);
+  restartGatewayMessage$ = this.restartGatewayMessageSource.asObservable();
+
   constructor(private http: HttpClient, public rgwDaemonService: RgwDaemonService) {}
 
   migrate(realm: RgwRealm, zonegroup: RgwZonegroup, zone: RgwZone) {
@@ -137,4 +141,8 @@ export class RgwMultisiteService {
       { params }
     );
   }
+
+  setRestartGatewayMessage(value: boolean): void {
+    this.restartGatewayMessageSource.next(value);
+  }
 }