From 30b41fba49c9c128559117ccbce349389a6198a3 Mon Sep 17 00:00:00 2001 From: Avan Thakkar Date: Thu, 24 Sep 2020 14:45:19 +0530 Subject: [PATCH] mgr/dashboard: cluster > manager modules Fixes: https://tracker.ceph.com/issues/47484 Signed-off-by: Avan Thakkar --- .../cypress/integration/cluster/mgr-modules.e2e-spec.ts | 2 +- .../dashboard/frontend/cypress/integration/ui/navigation.po.ts | 2 +- src/pybind/mgr/dashboard/frontend/src/app/app-routing.module.ts | 2 +- .../mgr-modules/mgr-module-list/mgr-module-list.component.ts | 1 - .../app/core/navigation/navigation/navigation.component.html | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/pybind/mgr/dashboard/frontend/cypress/integration/cluster/mgr-modules.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/cypress/integration/cluster/mgr-modules.e2e-spec.ts index c1ea297610f..f163b0c230f 100644 --- a/src/pybind/mgr/dashboard/frontend/cypress/integration/cluster/mgr-modules.e2e-spec.ts +++ b/src/pybind/mgr/dashboard/frontend/cypress/integration/cluster/mgr-modules.e2e-spec.ts @@ -10,7 +10,7 @@ describe('Manager modules page', () => { describe('breadcrumb test', () => { it('should open and show breadcrumb', () => { - mgrmodules.expectBreadcrumbText('Manager modules'); + mgrmodules.expectBreadcrumbText('Manager Modules'); }); }); diff --git a/src/pybind/mgr/dashboard/frontend/cypress/integration/ui/navigation.po.ts b/src/pybind/mgr/dashboard/frontend/cypress/integration/ui/navigation.po.ts index 31215cddbd9..a26a5ff10c4 100644 --- a/src/pybind/mgr/dashboard/frontend/cypress/integration/ui/navigation.po.ts +++ b/src/pybind/mgr/dashboard/frontend/cypress/integration/ui/navigation.po.ts @@ -26,7 +26,7 @@ export class NavigationPageHelper extends PageHelper { { menu: 'OSDs', component: 'cd-osd-list' }, { menu: 'Configuration', component: 'cd-configuration' }, { menu: 'CRUSH map', component: 'cd-crushmap' }, - { menu: 'Manager modules', component: 'cd-mgr-module-list' }, + { menu: 'Manager Modules', component: 'cd-mgr-module-list' }, { menu: 'Logs', component: 'cd-logs' }, { menu: 'Monitoring', component: 'cd-prometheus-tabs' } ] diff --git a/src/pybind/mgr/dashboard/frontend/src/app/app-routing.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/app-routing.module.ts index ad65a078347..f9614c9c577 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/app-routing.module.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/app-routing.module.ts @@ -218,7 +218,7 @@ const routes: Routes = [ // Mgr modules { path: 'mgr-modules', - data: { breadcrumbs: 'Cluster/Manager modules' }, + data: { breadcrumbs: 'Cluster/Manager Modules' }, children: [ { path: '', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-module-list/mgr-module-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-module-list/mgr-module-list.component.ts index b0f4a9fefab..3e75ab9792b 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-module-list/mgr-module-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-module-list/mgr-module-list.component.ts @@ -56,7 +56,6 @@ export class MgrModuleListComponent extends ListWithDetails { { name: $localize`Always-On`, prop: 'always_on', - isHidden: true, flexGrow: 1, cellClass: 'text-center', cellTransformation: CellTemplate.checkIcon diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html index 83e37d4fa06..0b2fd7aa429 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html @@ -143,7 +143,7 @@ class="tc_submenuitem tc_submenuitem_modules" *ngIf="permissions.configOpt.read"> Manager modules + routerLink="/mgr-modules">Manager Modules