From: Avan Thakkar Date: Thu, 24 Sep 2020 09:15:19 +0000 (+0530) Subject: mgr/dashboard: cluster > manager modules X-Git-Tag: v15.2.9~122^2~5^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cfd932dd5462c564fc947027f543e0fc575d5502;p=ceph.git mgr/dashboard: cluster > manager modules Fixes: https://tracker.ceph.com/issues/47484 Signed-off-by: Avan Thakkar (cherry picked from commit 30b41fba49c9c128559117ccbce349389a6198a3) Conflicts: src/pybind/mgr/dashboard/frontend/cypress/integration/ui/navigation.po.ts - Omitted the changes to this file because the file does not exist in octopus. --- 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 e829df00e79..67d27011102 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/src/app/app-routing.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/app-routing.module.ts index 4e40258f143..41f4e239ad3 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 @@ -189,7 +189,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 75042749a92..ea9214a6deb 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 @@ -58,7 +58,6 @@ export class MgrModuleListComponent extends ListWithDetails { { name: this.i18n('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 2a42f711fb5..891f674785d 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 @@ -145,7 +145,7 @@ class="tc_submenuitem tc_submenuitem_modules" *ngIf="permissions.configOpt.read"> Manager modules + routerLink="/mgr-modules">Manager Modules