From: Sagar Gopale Date: Tue, 9 Jun 2026 08:03:07 +0000 (+0530) Subject: mgr/dashboard: Remove global RGW tenant Roles tab and decommission routes X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6dadd2f0309c0c016225a6891e814388d75aecd5;p=ceph.git mgr/dashboard: Remove global RGW tenant Roles tab and decommission routes Fixes: https://tracker.ceph.com/issues/77262 Signed-off-by: Sagar Gopale --- diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-tabs/rgw-user-tabs.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-tabs/rgw-user-tabs.component.html index 92069bb5785..bca61be2c95 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-tabs/rgw-user-tabs.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-tabs/rgw-user-tabs.component.html @@ -15,12 +15,5 @@ [routerLinkActiveOptions]="{exact: true}" i18n>Accounts - + 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 510248cd9d8..c573b617bf0 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 @@ -12,7 +12,7 @@ import { import { PipesModule } from '~/app/shared/pipes/pipes.module'; import { ActionLabels, URLVerbs } from '~/app/shared/constants/app.constants'; -import { CRUDTableComponent } from '~/app/shared/datatable/crud-table/crud-table.component'; + import { FeatureTogglesGuardService } from '~/app/shared/services/feature-toggles-guard.service'; import { ModuleStatusGuardService } from '~/app/shared/services/module-status-guard.service'; @@ -37,7 +37,7 @@ import { DataTableModule } from '~/app/shared/datatable/datatable.module'; 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'; -import { CrudFormComponent } from '~/app/shared/forms/crud-form/crud-form.component'; + import { RgwMultisiteZoneDeletionFormComponent } from './models/rgw-multisite-zone-deletion-form/rgw-multisite-zone-deletion-form.component'; import { RgwMultisiteZonegroupDeletionFormComponent } from './models/rgw-multisite-zonegroup-deletion-form/rgw-multisite-zonegroup-deletion-form.component'; import { RgwSystemUserComponent } from './rgw-system-user/rgw-system-user.component'; @@ -292,47 +292,7 @@ const routes: Routes = [ } ] }, - { - path: 'roles', - data: { - breadcrumbs: 'Roles', - resource: 'api.rgw.roles@1.0', - tabs: [ - { - name: 'Users', - url: '/rgw/user' - }, - { - name: 'Accounts', - url: '/rgw/accounts' - }, - { - name: 'Roles', - url: '/rgw/roles' - } - ] - }, - children: [ - { - path: '', - component: CRUDTableComponent - }, - { - path: URLVerbs.CREATE, - component: CrudFormComponent, - data: { - breadcrumbs: ActionLabels.CREATE - } - }, - { - path: URLVerbs.EDIT, - component: CrudFormComponent, - data: { - breadcrumbs: ActionLabels.EDIT - } - } - ] - }, + { path: 'bucket', data: { breadcrumbs: 'Buckets' }, diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/context/context.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/context/context.component.ts index e652a923d7c..46e293d8d85 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/context/context.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/context/context.component.ts @@ -25,7 +25,6 @@ export class ContextComponent implements OnInit, OnDestroy { private subs = new Subscription(); private rgwUrlPrefix = '/rgw'; private rgwUserUrlPrefix = '/rgw/user'; - private rgwRoleUrlPrefix = '/rgw/roles'; private rgwBuckerUrlPrefix = '/rgw/bucket'; private rgwAccountsUrlPrefix = '/rgw/accounts'; private rgwMultisiteSyncPolicyPrefix = '/rgw/multisite/sync-policy'; @@ -34,7 +33,6 @@ export class ContextComponent implements OnInit, OnDestroy { isRgwRoute = document.location.href.includes(this.rgwUserUrlPrefix) || document.location.href.includes(this.rgwBuckerUrlPrefix) || - document.location.href.includes(this.rgwRoleUrlPrefix) || document.location.href.includes(this.rgwAccountsUrlPrefix) || document.location.href.includes(this.rgwMultisiteSyncPolicyPrefix); @@ -58,7 +56,6 @@ export class ContextComponent implements OnInit, OnDestroy { (this.isRgwRoute = [ this.rgwBuckerUrlPrefix, this.rgwUserUrlPrefix, - this.rgwRoleUrlPrefix, this.rgwAccountsUrlPrefix, this.rgwMultisiteSyncPolicyPrefix ].some((urlPrefix) => this.router.url.startsWith(urlPrefix)))