[React] Remove admin components according to the withAdminUi

Author: avdev4j

generators/client/templates/react/src/main/webapp/app/modules/administration/administration.reducer.ts.ejs

@@ -24,13 +24,15 @@ export const ACTION_TYPES = {
   <%_ if (applicationType === 'gateway' && serviceDiscoveryType) { _%>
   FETCH_GATEWAY_ROUTE: 'administration/FETCH_GATEWAY_ROUTE',
   <%_ } _%>
+<%_ if (withAdminUi) { _%>
   FETCH_LOGS: 'administration/FETCH_LOGS',
   FETCH_LOGS_CHANGE_LEVEL: 'administration/FETCH_LOGS_CHANGE_LEVEL',
   FETCH_HEALTH: 'administration/FETCH_HEALTH',
   FETCH_METRICS: 'administration/FETCH_METRICS',
   FETCH_THREAD_DUMP: 'administration/FETCH_THREAD_DUMP',
   FETCH_CONFIGURATIONS: 'administration/FETCH_CONFIGURATIONS',
   FETCH_ENV: 'administration/FETCH_ENV',
+<%_ } _%>
   <%_ if (websocket === 'spring-websocket') { _%>
   WEBSOCKET_ACTIVITY_MESSAGE: 'administration/WEBSOCKET_ACTIVITY_MESSAGE'
   <%_ } _%>
@@ -44,6 +46,7 @@ const initialState = {
     routes: []
   },
   <%_ } _%>
+<%_ if (withAdminUi) { _%>
   logs: {
     loggers: [] as any[]
   },
@@ -54,6 +57,7 @@ const initialState = {
     configProps: {} as any,
     env: {} as any
   },
+<%_ } _%>
   <%_ if (websocket === 'spring-websocket') { _%>
   tracker: {
     activities: []
@@ -71,31 +75,39 @@ export default (state: AdministrationState = initialState, action): Administrati
     <%_ if (applicationType === 'gateway' && serviceDiscoveryType) { _%>
     case REQUEST(ACTION_TYPES.FETCH_GATEWAY_ROUTE):
     <%_ } _%>
+  <%_ if (withAdminUi) { _%>
     case REQUEST(ACTION_TYPES.FETCH_METRICS):
     case REQUEST(ACTION_TYPES.FETCH_THREAD_DUMP):
     case REQUEST(ACTION_TYPES.FETCH_LOGS):
     case REQUEST(ACTION_TYPES.FETCH_CONFIGURATIONS):
     case REQUEST(ACTION_TYPES.FETCH_ENV):
     case REQUEST(ACTION_TYPES.FETCH_HEALTH):
+  <%_ } _%>
+  <%_ if (withAdminUi ||  (applicationType === 'gateway' && serviceDiscoveryType)) { _%>
       return {
         ...state,
         errorMessage: null,
         loading: true
       };
+  <%_ } _%>
     <%_ if (applicationType === 'gateway' && serviceDiscoveryType) { _%>
     case FAILURE(ACTION_TYPES.FETCH_GATEWAY_ROUTE):
     <%_ } _%>
+  <%_ if (withAdminUi) { _%>
     case FAILURE(ACTION_TYPES.FETCH_METRICS):
     case FAILURE(ACTION_TYPES.FETCH_THREAD_DUMP):
     case FAILURE(ACTION_TYPES.FETCH_LOGS):
     case FAILURE(ACTION_TYPES.FETCH_CONFIGURATIONS):
     case FAILURE(ACTION_TYPES.FETCH_ENV):
     case FAILURE(ACTION_TYPES.FETCH_HEALTH):
+  <%_ } _%>
+  <%_ if (withAdminUi ||  (applicationType === 'gateway' && serviceDiscoveryType)) { _%>
       return {
         ...state,
         loading: false,
         errorMessage: action.payload
       };
+  <%_ } _%>
     <%_ if (applicationType === 'gateway' && serviceDiscoveryType) { _%>
     case SUCCESS(ACTION_TYPES.FETCH_GATEWAY_ROUTE):
       return {
@@ -106,6 +118,7 @@ export default (state: AdministrationState = initialState, action): Administrati
         }
       };
     <%_ } _%>
+  <%_ if (withAdminUi) { _%>
     case SUCCESS(ACTION_TYPES.FETCH_METRICS):
       return {
         ...state,
@@ -150,6 +163,7 @@ export default (state: AdministrationState = initialState, action): Administrati
         loading: false,
         health: action.payload.data
       };
+  <%_ } _%>
      <%_ if (websocket === 'spring-websocket') { _%>
      case ACTION_TYPES.WEBSOCKET_ACTIVITY_MESSAGE: {
        // filter out activities from the same session
@@ -175,6 +189,7 @@ export const gatewayRoutes = () => ({
 });
 <%_ } _%>
 
+<%_ if (withAdminUi) { _%>
 export const systemHealth = () => ({
   type: ACTION_TYPES.FETCH_HEALTH,
   payload: axios.get('management/health')
@@ -215,3 +230,4 @@ export const getEnv = () => ({
   type: ACTION_TYPES.FETCH_ENV,
   payload: axios.get('management/env')
 });
+<%_ } _%>

generators/client/templates/react/src/test/javascript/spec/app/modules/administration/administration.reducer.spec.ts.ejs

@@ -29,13 +29,15 @@ import administration, {
   <%_ if (applicationType === 'gateway' && serviceDiscoveryType) { _%>
   gatewayRoutes,
   <%_ } _%>
+<%_ if (withAdminUi) { _%>
   systemHealth,
   systemMetrics,
   systemThreadDump,
   getLoggers,
   changeLogLevel,
   getConfigurations,
   getEnv
+<%_ } _%>
 } from 'app/modules/administration/administration.reducer';
 
 describe('Administration reducer tests', () => {
@@ -58,8 +60,10 @@ describe('Administration reducer tests', () => {
     <%_ if (applicationType === 'gateway' && serviceDiscoveryType) { _%>
     expect(isEmpty(state.gateway.routes));
     <%_ } _%>
+    <%_ if (withAdminUi) { _%>
     expect(isEmpty(state.logs.loggers));
     expect(isEmpty(state.threadDump));
+    <%_ } _%>
     <%_ if (websocket === 'spring-websocket') { _%>
     expect(isEmpty(state.tracker.activities));
     <%_ } _%>
@@ -84,12 +88,14 @@ describe('Administration reducer tests', () => {
           <%_ if (applicationType === 'gateway' && serviceDiscoveryType) { _%>
           REQUEST(ACTION_TYPES.FETCH_GATEWAY_ROUTE),
           <%_ } _%>
+          <%_ if (withAdminUi) { _%>
           REQUEST(ACTION_TYPES.FETCH_LOGS),
           REQUEST(ACTION_TYPES.FETCH_HEALTH),
           REQUEST(ACTION_TYPES.FETCH_METRICS),
           REQUEST(ACTION_TYPES.FETCH_THREAD_DUMP),
           REQUEST(ACTION_TYPES.FETCH_CONFIGURATIONS),
           REQUEST(ACTION_TYPES.FETCH_ENV)
+          <%_ } _%>
         ],
         {},
         state => {
@@ -109,12 +115,14 @@ describe('Administration reducer tests', () => {
           <%_ if (applicationType === 'gateway' && serviceDiscoveryType) { _%>
           FAILURE(ACTION_TYPES.FETCH_GATEWAY_ROUTE),
           <%_ } _%>
+        <%_ if (withAdminUi) { _%>
           FAILURE(ACTION_TYPES.FETCH_LOGS),
           FAILURE(ACTION_TYPES.FETCH_HEALTH),
           FAILURE(ACTION_TYPES.FETCH_METRICS),
           FAILURE(ACTION_TYPES.FETCH_THREAD_DUMP),
           FAILURE(ACTION_TYPES.FETCH_CONFIGURATIONS),
           FAILURE(ACTION_TYPES.FETCH_ENV)
+        <%_ } _%>
         ],
         'something happened',
         state => {
@@ -139,6 +147,7 @@ describe('Administration reducer tests', () => {
       });
     });
     <%_ } _%>
+    <%_ if (withAdminUi) { _%>
     it('should update state according to a successful fetch logs request', () => {
       const payload = { data: {
           loggers: {
@@ -211,7 +220,7 @@ describe('Administration reducer tests', () => {
         }
       });
     });
-
+    <%_ } _%>
   });
 <%_ if (websocket === 'spring-websocket') { _%>
   describe('Websocket Message Handling', () => {
@@ -271,6 +280,7 @@ describe('Administration reducer tests', () => {
       await store.dispatch(gatewayRoutes()).then(() => expect(store.getActions()).toEqual(expectedActions));
     });
     <%_ } _%>
+    <%_ if (withAdminUi) { _%>
     it('dispatches FETCH_HEALTH_PENDING and FETCH_HEALTH_FULFILLED actions', async () => {
       const expectedActions = [
         {
@@ -362,5 +372,6 @@ describe('Administration reducer tests', () => {
       ];
       await store.dispatch(getEnv()).then(() => expect(store.getActions()).toEqual(expectedActions));
     });
+  <%_ } _%>
   });
 });

test/client.spec.js

@@ -364,6 +364,53 @@ describe('JHipster client generator', () => {
                     /* eslint-enable no-template-curly-in-string */
                 );
             });
+
+            it('admin reducer should contains admin component related code', () => {
+                runResult.assertFileContent(
+                    `${CLIENT_MAIN_SRC_DIR}app/modules/administration/administration.reducer.ts`,
+                    "  FETCH_LOGS: 'administration/FETCH_LOGS',\n" +
+                        "  FETCH_LOGS_CHANGE_LEVEL: 'administration/FETCH_LOGS_CHANGE_LEVEL',\n" +
+                        "  FETCH_HEALTH: 'administration/FETCH_HEALTH',\n" +
+                        "  FETCH_METRICS: 'administration/FETCH_METRICS',\n" +
+                        "  FETCH_THREAD_DUMP: 'administration/FETCH_THREAD_DUMP',\n" +
+                        "  FETCH_CONFIGURATIONS: 'administration/FETCH_CONFIGURATIONS',\n" +
+                        "  FETCH_ENV: 'administration/FETCH_ENV',"
+                );
+
+                runResult.assertFileContent(
+                    `${CLIENT_MAIN_SRC_DIR}app/modules/administration/administration.reducer.ts`,
+                    'logs: {\n' +
+                        '    loggers: [] as any[]\n' +
+                        '  },\n' +
+                        '  health: {} as any,\n' +
+                        '  metrics: {} as any,\n' +
+                        '  threadDump: [],\n' +
+                        '  configuration: {\n' +
+                        '    configProps: {} as any,\n' +
+                        '    env: {} as any\n' +
+                        '  },'
+                );
+
+                runResult.assertFileContent(
+                    `${CLIENT_MAIN_SRC_DIR}app/modules/administration/administration.reducer.ts`,
+                    'case REQUEST(ACTION_TYPES.FETCH_METRICS):\n' +
+                        '    case REQUEST(ACTION_TYPES.FETCH_THREAD_DUMP):\n' +
+                        '    case REQUEST(ACTION_TYPES.FETCH_LOGS):\n' +
+                        '    case REQUEST(ACTION_TYPES.FETCH_CONFIGURATIONS):\n' +
+                        '    case REQUEST(ACTION_TYPES.FETCH_ENV):\n' +
+                        '    case REQUEST(ACTION_TYPES.FETCH_HEALTH):'
+                );
+            });
+
+            it('Admin menu should contains admin entries', () => {
+                runResult.assertFileContent(
+                    `${CLIENT_MAIN_SRC_DIR}app/shared/layout/menus/admin.tsx`,
+                    '    <MenuItem icon="tachometer-alt" to="/admin/metrics"><Translate contentKey="global.menu.admin.metrics">Metrics</Translate></MenuItem>\n' +
+                        '    <MenuItem icon="heart" to="/admin/health"><Translate contentKey="global.menu.admin.health">Health</Translate></MenuItem>\n' +
+                        '    <MenuItem icon="cogs" to="/admin/configuration"><Translate contentKey="global.menu.admin.configuration">Configuration</Translate></MenuItem>\n' +
+                        '    <MenuItem icon="tasks" to="/admin/logs"><Translate contentKey="global.menu.admin.logs">Logs</Translate></MenuItem>'
+                );
+            });
         });
 
         describe('not selected and React', () => {
@@ -405,6 +452,53 @@ describe('JHipster client generator', () => {
                     /* eslint-enable no-template-curly-in-string */
                 );
             });
+
+            it('admin reducer should not contains admin component related code', () => {
+                runResult.assertNoFileContent(
+                    `${CLIENT_MAIN_SRC_DIR}app/modules/administration/administration.reducer.ts`,
+                    "  FETCH_LOGS: 'administration/FETCH_LOGS',\n" +
+                        "  FETCH_LOGS_CHANGE_LEVEL: 'administration/FETCH_LOGS_CHANGE_LEVEL',\n" +
+                        "  FETCH_HEALTH: 'administration/FETCH_HEALTH',\n" +
+                        "  FETCH_METRICS: 'administration/FETCH_METRICS',\n" +
+                        "  FETCH_THREAD_DUMP: 'administration/FETCH_THREAD_DUMP',\n" +
+                        "  FETCH_CONFIGURATIONS: 'administration/FETCH_CONFIGURATIONS',\n" +
+                        "  FETCH_ENV: 'administration/FETCH_ENV',"
+                );
+
+                runResult.assertNoFileContent(
+                    `${CLIENT_MAIN_SRC_DIR}app/modules/administration/administration.reducer.ts`,
+                    'logs: {\n' +
+                        '    loggers: [] as any[]\n' +
+                        '  },\n' +
+                        '  health: {} as any,\n' +
+                        '  metrics: {} as any,\n' +
+                        '  threadDump: [],\n' +
+                        '  configuration: {\n' +
+                        '    configProps: {} as any,\n' +
+                        '    env: {} as any\n' +
+                        '  },'
+                );
+
+                runResult.assertNoFileContent(
+                    `${CLIENT_MAIN_SRC_DIR}app/modules/administration/administration.reducer.ts`,
+                    'case REQUEST(ACTION_TYPES.FETCH_METRICS):\n' +
+                        '    case REQUEST(ACTION_TYPES.FETCH_THREAD_DUMP):\n' +
+                        '    case REQUEST(ACTION_TYPES.FETCH_LOGS):\n' +
+                        '    case REQUEST(ACTION_TYPES.FETCH_CONFIGURATIONS):\n' +
+                        '    case REQUEST(ACTION_TYPES.FETCH_ENV):\n' +
+                        '    case REQUEST(ACTION_TYPES.FETCH_HEALTH):'
+                );
+            });
+
+            it('Admin menu should not contains admin entries', () => {
+                runResult.assertNoFileContent(
+                    `${CLIENT_MAIN_SRC_DIR}app/shared/layout/menus/admin.tsx`,
+                    '    <MenuItem icon="tachometer-alt" to="/admin/metrics"><Translate contentKey="global.menu.admin.metrics">Metrics</Translate></MenuItem>\n' +
+                        '    <MenuItem icon="heart" to="/admin/health"><Translate contentKey="global.menu.admin.health">Health</Translate></MenuItem>\n' +
+                        '    <MenuItem icon="cogs" to="/admin/configuration"><Translate contentKey="global.menu.admin.configuration">Configuration</Translate></MenuItem>\n' +
+                        '    <MenuItem icon="tasks" to="/admin/logs"><Translate contentKey="global.menu.admin.logs">Logs</Translate></MenuItem>'
+                );
+            });
         });
     });
 });