From cfd932dd5462c564fc947027f543e0fc575d5502 Mon Sep 17 00:00:00 2001
From: Avan Thakkar <athakkar@redhat.com>
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 <athakkar@redhat.com>
(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.
---
 .../cypress/integration/cluster/mgr-modules.e2e-spec.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 +-
 4 files changed, 3 insertions(+), 4 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 e829df00e79d..67d27011102f 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 4e40258f143a..41f4e239ad32 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 75042749a92c..ea9214a6deb7 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 2a42f711fb55..891f674785dd 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">
           <a i18n
-             routerLink="/mgr-modules">Manager modules</a>
+             routerLink="/mgr-modules">Manager Modules</a>
         </li>
         <li routerLinkActive="active"
             class="tc_submenuitem tc_submenuitem_log"
-- 
2.47.3