feat: move health menu under Home menu #116

admin-ui/app/routes/Apps/Gluu/GluuAppSidebar.js

@@ -56,7 +56,7 @@ function GluuAppSidebar({ scopes }) {
             exact
           />
           <SidebarMenu.Item
-            title={t('menus.license')}
+            title={t('menus.licenseDetails')}
             to="/home/licenseDetails"
             textStyle={{ fontSize: '18px', fontWeight: '600' }}
             exact

admin-ui/app/routes/Dashboards/DashboardPage.js

@@ -119,7 +119,7 @@ function DashboardPage({ statData, permissions, clients, loading, dispatch }) {
 
   return (
     <GluuLoader blocking={loading}>
-      <GluuViewWrapper
+       {!loading &&<GluuViewWrapper
         canShow={hasBoth(permissions, STAT_READ, STAT_JANS_READ)}
       >
         <Card>
@@ -200,7 +200,7 @@ function DashboardPage({ statData, permissions, clients, loading, dispatch }) {
           </CardBody>
           <CardFooter className="p-4 bt-0"></CardFooter>
         </Card>
-      </GluuViewWrapper>
+      </GluuViewWrapper>}
     </GluuLoader>
   )
 }

admin-ui/plugins/auth-server/plugin-metadata.js

@@ -11,7 +11,6 @@ import KeysPage from './components/Configuration/Keys/KeysPage'
 import DefaultPage from './components/Configuration/Defaults/DefaultConfigPage'
 import LoggingPage from './components/Configuration/Defaults/LoggingPage'
 
-import HealthPage from './components/Health/HealthPage'
 import ReportPage from './components/Reports/ReportPage'
 
 import oidcReducer from './redux/reducers/OIDCReducer'
@@ -20,15 +19,14 @@ import jsonReducer from './redux/reducers/JsonConfigReducer'
 import jwksReducer from './redux/reducers/JwksReducer'
 import acrReducer from './redux/reducers/AcrReducer'
 import loggingReducer from './redux/reducers/LoggingReducer'
-import healthReducer from './redux/reducers/HealthReducer'
 
 import scopesSaga from './redux/sagas/OAuthScopeSaga'
 import oidcSaga from './redux/sagas/OIDCSaga'
 import jsonSaga from './redux/sagas/JsonConfigSaga'
 import jwksSaga from './redux/sagas/JwksSaga'
 import acrSaga from './redux/sagas/AcrsSaga'
 import loggingSaga from './redux/sagas/LoggingSaga'
-import healthSaga from './redux/sagas/HealthSaga'
+
 import {
   ACR_READ,
   CLIENT_READ,
@@ -76,11 +74,6 @@ const pluginMetadata = {
           path: PLUGIN_BASE_APTH + '/clients',
           permission: CLIENT_READ,
         },
-        {
-          title: 'menus.health',
-          path: PLUGIN_BASE_APTH + '/health',
-          permission: ACR_READ,
-        },
         {
           title: 'menus.scopes',
           path: PLUGIN_BASE_APTH + '/scopes',
@@ -140,11 +133,6 @@ const pluginMetadata = {
       path: PLUGIN_BASE_APTH + '/config/logging',
       permission: ACR_READ,
     },
-    {
-      component: HealthPage,
-      path: PLUGIN_BASE_APTH + '/health',
-      permission: ACR_READ,
-    },
     {
       component: ReportPage,
       path: PLUGIN_BASE_APTH + '/reports',
@@ -158,7 +146,6 @@ const pluginMetadata = {
     { name: 'jwksReducer', reducer: jwksReducer },
     { name: 'acrReducer', reducer: acrReducer },
     { name: 'loggingReducer', reducer: loggingReducer },
-    { name: 'healthReducer', reducer: healthReducer },
   ],
   sagas: [
     scopesSaga(),
@@ -167,7 +154,6 @@ const pluginMetadata = {
     jwksSaga(),
     acrSaga(),
     loggingSaga(),
-    healthSaga(),
   ],
 }