From ecda1b95816d2d73f09c20e9623f17afa3f04a7f Mon Sep 17 00:00:00 2001 From: Aashish Sharma Date: Mon, 30 Oct 2023 18:09:09 +0530 Subject: [PATCH] mgr/dashboard: fix rgw multisite error when no rgw entity is present Signed-off-by: Aashish Sharma (cherry picked from commit 7f57798b7f82b07eb69d87312114d41e44d3c7f3) --- .../frontend/src/app/ceph/rgw/rgw.module.ts | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw.module.ts index 8e3cddf732ea1..8668f8d03b786 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw.module.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw.module.ts @@ -29,8 +29,6 @@ import { CrudFormComponent } from '~/app/shared/forms/crud-form/crud-form.compon import { RgwMultisiteDetailsComponent } from './rgw-multisite-details/rgw-multisite-details.component'; import { TreeModule } from '@circlon/angular-tree-component'; import { DataTableModule } from '~/app/shared/datatable/datatable.module'; -import { FeatureTogglesGuardService } from '~/app/shared/services/feature-toggles-guard.service'; -import { ModuleStatusGuardService } from '~/app/shared/services/module-status-guard.service'; import { RgwMultisiteRealmFormComponent } from './rgw-multisite-realm-form/rgw-multisite-realm-form.component'; import { RgwMultisiteZonegroupFormComponent } from './rgw-multisite-zonegroup-form/rgw-multisite-zonegroup-form.component'; import { RgwMultisiteZoneFormComponent } from './rgw-multisite-zone-form/rgw-multisite-zone-form.component'; @@ -185,22 +183,6 @@ const routes: Routes = [ }, { path: 'multisite', - canActivate: [FeatureTogglesGuardService, ModuleStatusGuardService], - data: { - moduleStatusGuardConfig: { - uiApiPath: 'rgw/multisite', - redirectTo: 'error', - header: 'Multi-site not configured', - button_name: 'Add Multi-site Configuration', - button_route: '/rgw/multisite/create', - button_title: 'Add multi-site configuration (realms/zonegroups/zones)', - secondary_button_name: 'Import Multi-site Configuration', - secondary_button_route: 'rgw/multisite/import', - secondary_button_title: - 'Import multi-site configuration (import realm token from a secondary cluster)' - }, - breadcrumbs: 'Multi-Site' - }, children: [{ path: '', component: RgwMultisiteDetailsComponent }] } ]; -- 2.39.5