generator-jhipster 8.6.0 → 8.7.1

package/dist/generators/react/templates/src/main/webapp/app/modules/account/register/register.reducer.spec.ts.ejs

@@ -50,13 +50,13 @@ describe('Creating account tests', () => {
   it('should detect a request', () => {
     expect(register(undefined, { type: handleRegister.pending.type })).toEqual({
       ...initialState,
-      loading: true
+      loading: true,
     });
   });
 
   it('should handle RESET', () => {
     expect(
-      register({ loading: true, registrationSuccess: true, registrationFailure: true, errorMessage: '', successMessage: '' }, reset())
+      register({ loading: true, registrationSuccess: true, registrationFailure: true, errorMessage: '', successMessage: '' }, reset()),
     ).toEqual({
       ...initialState,
     });
@@ -67,7 +67,7 @@ describe('Creating account tests', () => {
       register(undefined, {
         type: handleRegister.fulfilled.type,
         payload: 'fake payload',
-      })
+      }),
     ).toEqual({
       ...initialState,
       registrationSuccess: true,
@@ -85,7 +85,7 @@ describe('Creating account tests', () => {
       register(undefined, {
         type: handleRegister.rejected.type,
         error,
-      })
+      }),
     ).toEqual({
       ...initialState,
       registrationFailure: true,
@@ -119,10 +119,7 @@ describe('Creating account tests', () => {
     });
     it('dispatches RESET actions', async () => {
       await store.dispatch(reset());
-      expect(store.getState()).toEqual([
-        expect.any(Object),
-        expect.objectContaining(reset()),
-      ]);
+      expect(store.getState()).toEqual([expect.any(Object), expect.objectContaining(reset())]);
     });
   });
 });

package/dist/generators/react/templates/src/main/webapp/app/modules/account/register/register.reducer.ts.ejs

@@ -36,7 +36,7 @@ export type RegisterState = Readonly<typeof initialState>;
 export const handleRegister = createAsyncThunk(
   'register/create_account',
   async (data: { login: string; email: string; password: string; langKey?: string }) => axios.post<any>('api/register', data),
-  { serializeError: serializeAxiosError }
+  { serializeError: serializeAxiosError },
 );
 
 export const RegisterSlice = createSlice({

package/dist/generators/react/templates/src/main/webapp/app/modules/account/register/register.tsx.ejs

@@ -37,7 +37,7 @@ export const RegisterPage = () => {
     () => () => {
       dispatch(reset());
     },
-    []
+    [],
   );
 
 <%_ if (enableTranslation) { _%>
@@ -161,6 +161,6 @@ export const RegisterPage = () => {
       </Row>
     </div>
   );
-}
+};
 
 export default RegisterPage;

package/dist/generators/react/templates/src/main/webapp/app/modules/account/sessions/sessions.reducer.ts.ejs

@@ -25,10 +25,10 @@ const initialState = {
   loading: false,
   sessions: [],
   updateSuccess: false,
-  updateFailure: false
+  updateFailure: false,
 };
 
-export type SessionsState =  Readonly<typeof initialState>;
+export type SessionsState = Readonly<typeof initialState>;
 
 // Actions
 const apiUrl = '/api/account/sessions';
@@ -56,21 +56,15 @@ export const SessionsSlice = createSlice({
       })
       .addCase(findAll.fulfilled, (state, action) => {
         state.loading = false;
-        state.sessions= action.payload.data;
+        state.sessions = action.payload.data;
       })
       .addCase(invalidateSession.fulfilled, state => {
         state.loading = false;
-        state.updateSuccess= true;
+        state.updateSuccess = true;
       })
-      .addMatcher(
-        isPending(
-          findAll,
-          invalidateSession,
-        ),
-        (state) => {
-          state.loading = true;
-        }
-      );
+      .addMatcher(isPending(findAll, invalidateSession), state => {
+        state.loading = true;
+      });
   },
 });
 

package/dist/generators/react/templates/src/main/webapp/app/modules/account/sessions/sessions.tsx.ejs

@@ -47,43 +47,53 @@ export const SessionsPage = () => {
   const updateFailure = useAppSelector(state => state.sessions.updateFailure);
 
   return (
-      <div>
-        <h2>
-          <Translate contentKey="sessions.title" interpolate={{ username: account.login }}>
-            Active sessions for [<strong>{account.login}</strong>]
-          </Translate>
-        </h2>
-
-        {(updateSuccess) ? (
+    <div>
+      <h2>
+        <Translate contentKey="sessions.title" interpolate={{ username: account.login }}>
+          Active sessions for [<strong>{account.login}</strong>]
+        </Translate>
+      </h2>
+
+      {updateSuccess ? (
         <Alert color="success">
           <Translate contentKey="sessions.messages.success">
             <strong>Session invalidated!</strong>
           </Translate>
         </Alert>
-        ) : null}
+      ) : null}
 
-        {(updateFailure) ? (
+      {updateFailure ? (
         <Alert color="danger">
           <Translate contentKey="sessions.messages.error">
-            <span><strong>An error has occurred!</strong> The session could not be invalidated.</span>
+            <span>
+              <strong>An error has occurred!</strong> The session could not be invalidated.
+            </span>
           </Translate>
         </Alert>
-        ) : null}
+      ) : null}
 
-        <Button color="primary" onClick={refreshList}>Refresh</Button>
+      <Button color="primary" onClick={refreshList}>
+        Refresh
+      </Button>
 
-        <div className="table-responsive">
-          <Table className="table-striped">
-            <thead>
+      <div className="table-responsive">
+        <Table className="table-striped">
+          <thead>
             <tr>
-              <th><Translate contentKey="sessions.table.ipaddress">IP Address</Translate></th>
-              <th><Translate contentKey="sessions.table.useragent">User agent</Translate></th>
-              <th><Translate contentKey="sessions.table.date">Date</Translate></th>
+              <th>
+                <Translate contentKey="sessions.table.ipaddress">IP Address</Translate>
+              </th>
+              <th>
+                <Translate contentKey="sessions.table.useragent">User agent</Translate>
+              </th>
+              <th>
+                <Translate contentKey="sessions.table.date">Date</Translate>
+              </th>
               <th />
             </tr>
-            </thead>
+          </thead>
 
-            <tbody>
+          <tbody>
             {sessions.map((s, index) => (
               <tr key={index}>
                 <td>{s.ipAddress}</td>
@@ -96,12 +106,11 @@ export const SessionsPage = () => {
                 </td>
               </tr>
             ))}
-            </tbody>
-          </Table>
-        </div>
+          </tbody>
+        </Table>
       </div>
+    </div>
   );
 };
 
 export default SessionsPage;
-

package/dist/generators/react/templates/src/main/webapp/app/modules/account/settings/settings.reducer.spec.ts.ejs

@@ -40,7 +40,7 @@ describe('Settings reducer tests', () => {
         loading: false,
         errorMessage: null,
         updateSuccess: false,
-        updateFailure: false
+        updateFailure: false,
       });
     });
   });
@@ -51,7 +51,7 @@ describe('Settings reducer tests', () => {
       expect(toTest).toMatchObject({
         updateSuccess: false,
         updateFailure: false,
-        loading: true
+        loading: true,
       });
     });
     it('should detect a success', () => {
@@ -59,7 +59,7 @@ describe('Settings reducer tests', () => {
       expect(toTest).toMatchObject({
         updateSuccess: true,
         updateFailure: false,
-        loading: false
+        loading: false,
       });
     });
     it('should detect a failure', () => {
@@ -67,7 +67,7 @@ describe('Settings reducer tests', () => {
       expect(toTest).toMatchObject({
         updateSuccess: false,
         updateFailure: true,
-        loading: false
+        loading: false,
       });
     });
 
@@ -77,7 +77,7 @@ describe('Settings reducer tests', () => {
         errorMessage: null,
         successMessage: null,
         updateSuccess: false,
-        updateFailure: false
+        updateFailure: false,
       };
       expect(account({ ...initialState, loading: true }, reset())).toEqual({
         ...initialState,
@@ -112,10 +112,7 @@ describe('Settings reducer tests', () => {
     });
     it('dispatches RESET actions', async () => {
       await store.dispatch(reset());
-      expect(store.getState()).toEqual([
-        expect.any(Object),
-        expect.objectContaining(reset()),
-      ]);
+      expect(store.getState()).toEqual([expect.any(Object), expect.objectContaining(reset())]);
     });
   });
 });

package/dist/generators/react/templates/src/main/webapp/app/modules/account/settings/settings.reducer.ts.ejs

@@ -29,10 +29,10 @@ const initialState = {
   errorMessage: null,
   successMessage: null,
   updateSuccess: false,
-  updateFailure: false
+  updateFailure: false,
 };
 
-export type SettingsState =  Readonly<typeof initialState>;
+export type SettingsState = Readonly<typeof initialState>;
 
 // Actions
 const apiUrl = 'api/account';

package/dist/generators/react/templates/src/main/webapp/app/modules/account/settings/settings.tsx.ejs

@@ -55,7 +55,7 @@ export const SettingsPage = () => {
       saveAccountSettings({
         ...account,
         ...values,
-      })
+      }),
     );
   };
 

package/dist/generators/react/templates/src/main/webapp/app/modules/administration/administration.reducer.spec.ts.ejs

@@ -16,13 +16,12 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-
 import axios from 'axios';
 import sinon from 'sinon';
 import { configureStore } from '@reduxjs/toolkit';
 
 import administration, {
-<%_ if (applicationTypeGateway && serviceDiscoveryAny) { _%>
+<%_ if (applicationTypeGateway && gatewayServicesApiAvailable) { _%>
   getGatewayRoutes,
 <%_ } _%>
 <%_ if (withAdminUi) { _%>
@@ -53,9 +52,9 @@ describe('Administration reducer tests', () => {
     expect(state).toMatchObject({
       loading: false,
       errorMessage: null,
-      totalItems: 0
+      totalItems: 0,
     });
-<%_ if (applicationTypeGateway && serviceDiscoveryAny) { _%>
+<%_ if (applicationTypeGateway && gatewayServicesApiAvailable) { _%>
     expect(isEmpty(state.gateway.routes));
 <%_ } _%>
 <%_ if (withAdminUi) { _%>
@@ -83,7 +82,7 @@ describe('Administration reducer tests', () => {
     it('should set state to loading', () => {
       testMultipleTypes(
         [
-<%_ if (applicationTypeGateway && serviceDiscoveryAny) { _%>
+<%_ if (applicationTypeGateway && gatewayServicesApiAvailable) { _%>
           getGatewayRoutes.pending.type,
 <%_ } _%>
 <%_ if (withAdminUi) { _%>
@@ -99,9 +98,9 @@ describe('Administration reducer tests', () => {
         state => {
           expect(state).toMatchObject({
             errorMessage: null,
-            loading: true
+            loading: true,
           });
-        }
+        },
       );
     });
   });
@@ -110,7 +109,7 @@ describe('Administration reducer tests', () => {
     it('should set state to failed and put an error message in errorMessage', () => {
       testMultipleTypes(
         [
-<%_ if (applicationTypeGateway && serviceDiscoveryAny) { _%>
+<%_ if (applicationTypeGateway && gatewayServicesApiAvailable) { _%>
           getGatewayRoutes.rejected.type,
 <%_ } _%>
 <%_ if (withAdminUi) { _%>
@@ -131,13 +130,13 @@ describe('Administration reducer tests', () => {
         },
         {
           message: 'error',
-        }
+        },
       );
     });
   });
 
   describe('Success', () => {
-<%_ if (applicationTypeGateway && serviceDiscoveryAny) { _%>
+<%_ if (applicationTypeGateway && gatewayServicesApiAvailable) { _%>
     it('should update state according to a successful fetch gateway routes request', () => {
       const payload = { data: [] };
       const toTest = administration(undefined, { type: getGatewayRoutes.fulfilled.type, payload });
@@ -150,19 +149,20 @@ describe('Administration reducer tests', () => {
 <%_ } _%>
 <%_ if (withAdminUi) { _%>
     it('should update state according to a successful fetch logs request', () => {
-      const payload = { data: {
+      const payload = {
+        data: {
           loggers: {
             main: {
-              effectiveLevel: 'WARN'
-            }
-          }
-        }
+              effectiveLevel: 'WARN',
+            },
+          },
+        },
       };
       const toTest = administration(undefined, { type: getLoggers.fulfilled.type, payload });
 
       expect(toTest).toMatchObject({
         loading: false,
-        logs: payload.data
+        logs: payload.data,
       });
     });
 
@@ -172,7 +172,7 @@ describe('Administration reducer tests', () => {
 
       expect(toTest).toMatchObject({
         loading: false,
-        health: payload.data
+        health: payload.data,
       });
     });
 
@@ -182,7 +182,7 @@ describe('Administration reducer tests', () => {
 
       expect(toTest).toMatchObject({
         loading: false,
-        metrics: payload.data
+        metrics: payload.data,
       });
     });
 
@@ -192,7 +192,7 @@ describe('Administration reducer tests', () => {
 
       expect(toTest).toMatchObject({
         loading: false,
-        threadDump: payload.data
+        threadDump: payload.data,
       });
     });
 
@@ -204,8 +204,8 @@ describe('Administration reducer tests', () => {
         loading: false,
         configuration: {
           configProps: payload.data,
-          env: {}
-        }
+          env: {},
+        },
       });
     });
 
@@ -217,8 +217,8 @@ describe('Administration reducer tests', () => {
         loading: false,
         configuration: {
           configProps: {},
-          env: payload.data
-        }
+          env: payload.data,
+        },
       });
     });
 <%_ } _%>
@@ -266,7 +266,7 @@ describe('Administration reducer tests', () => {
     const getState = jest.fn();
     const dispatch = jest.fn();
     const extra = {};
-<%_ if (applicationTypeGateway && serviceDiscoveryAny || withAdminUi) { _%>
+<%_ if (applicationTypeGateway && gatewayServicesApiAvailable || withAdminUi) { _%>
     beforeEach(() => {
       store = configureStore({
         reducer: (state = [], action) => [...state, action],
@@ -275,7 +275,7 @@ describe('Administration reducer tests', () => {
       axios.post = sinon.stub().returns(Promise.resolve(resolvedObject));
     });
 <%_ } _%>
-<%_ if (applicationTypeGateway && serviceDiscoveryAny) { _%>
+<%_ if (applicationTypeGateway && gatewayServicesApiAvailable) { _%>
     it('dispatches FETCH_GATEWAY_ROUTE_PENDING and FETCH_GATEWAY_ROUTE_FULFILLED actions', async () => {
       const result = await getGatewayRoutes()(dispatch, getState, extra);
 

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

@@ -25,14 +25,14 @@ import { AppThunk } from 'app/config/store';
 const initialState = {
   loading: false,
   errorMessage: null,
-<%_ if (applicationTypeGateway && serviceDiscoveryAny) { _%>
+<%_ if (applicationTypeGateway && gatewayServicesApiAvailable) { _%>
   gateway: {
     routes: []
   },
 <%_ } _%>
 <%_ if (withAdminUi) { _%>
   logs: {
-    loggers: [] as any[]
+    loggers: [] as any[],
   },
   health: {} as any,
   metrics: {} as any,
@@ -53,7 +53,7 @@ const initialState = {
 export type AdministrationState =  Readonly<typeof initialState>;
 
 // Actions
-<%_ if (applicationTypeGateway && serviceDiscoveryAny) { _%>
+<%_ if (applicationTypeGateway && gatewayServicesApiAvailable) { _%>
 export const getGatewayRoutes = createAsyncThunk('administration/fetch_gateway_route', async () => axios.get<any>('api/gateway/routes'), {
   serializeError: serializeAxiosError,
 });
@@ -68,9 +68,13 @@ export const getSystemMetrics = createAsyncThunk('administration/fetch_metrics',
   serializeError: serializeAxiosError,
 });
 
-export const getSystemThreadDump = createAsyncThunk('administration/fetch_thread_dump', async () => axios.get<any>('management/threaddump'), {
-  serializeError: serializeAxiosError,
-});
+export const getSystemThreadDump = createAsyncThunk(
+  'administration/fetch_thread_dump',
+  async () => axios.get<any>('management/threaddump'),
+  {
+    serializeError: serializeAxiosError,
+  },
+);
 
 export const getLoggers = createAsyncThunk('administration/fetch_logs', async () => axios.get<any>('management/loggers'), {
   serializeError: serializeAxiosError,
@@ -81,7 +85,7 @@ export const setLoggers = createAsyncThunk(
   async ({ name, configuredLevel }: any) => axios.post(`management/loggers/${name}`, { configuredLevel }),
   {
     serializeError: serializeAxiosError,
-  }
+  },
 );
 
 export const changeLogLevel: (name, configuredLevel) => AppThunk = (name, configuredLevel) => async dispatch => {
@@ -89,9 +93,13 @@ export const changeLogLevel: (name, configuredLevel) => AppThunk = (name, config
   dispatch(getLoggers());
 };
 
-export const getConfigurations = createAsyncThunk('administration/fetch_configurations', async () => axios.get<any>('management/configprops'), {
-  serializeError: serializeAxiosError,
-});
+export const getConfigurations = createAsyncThunk(
+  'administration/fetch_configurations',
+  async () => axios.get<any>('management/configprops'),
+  {
+    serializeError: serializeAxiosError,
+  },
+);
 
 export const getEnv = createAsyncThunk('administration/fetch_env', async () => axios.get<any>('management/env'), {
   serializeError: serializeAxiosError,
@@ -113,9 +121,9 @@ export const AdministrationSlice = createSlice({
     <%_ } _%>
   },
   extraReducers(builder) {
-<%_ if (withAdminUi || (applicationTypeGateway && serviceDiscoveryAny)) { _%>
+<%_ if (withAdminUi || (applicationTypeGateway && gatewayServicesApiAvailable)) { _%>
     builder
-      <%_ if (applicationTypeGateway && serviceDiscoveryAny) { _%>
+      <%_ if (applicationTypeGateway && gatewayServicesApiAvailable) { _%>
       .addCase(getGatewayRoutes.fulfilled, (state, action) => {
         state.loading = false;
         state.gateway = {
@@ -159,7 +167,7 @@ export const AdministrationSlice = createSlice({
       <%_ } _%>
       .addMatcher(
         isPending(
-          <%_ if (applicationTypeGateway && serviceDiscoveryAny) { _%>
+          <%_ if (applicationTypeGateway && gatewayServicesApiAvailable) { _%>
           getGatewayRoutes,
           <%_ } _%>
           <%_ if (withAdminUi) { _%>
@@ -178,7 +186,7 @@ export const AdministrationSlice = createSlice({
       )
       .addMatcher(
         isRejected(
-          <%_ if (applicationTypeGateway && serviceDiscoveryAny) { _%>
+          <%_ if (applicationTypeGateway && gatewayServicesApiAvailable) { _%>
           getGatewayRoutes,
           <%_ } _%>
           <%_ if (withAdminUi) { _%>
@@ -193,7 +201,7 @@ export const AdministrationSlice = createSlice({
         (state, action) => {
           state.errorMessage = action.error.message;
           state.loading = false;
-        }
+        },
       );
 <%_ } _%>
   },

package/dist/generators/react/templates/src/main/webapp/app/modules/administration/configuration/configuration.tsx.ejs

@@ -132,4 +132,3 @@ export const ConfigurationPage = () => {
 };
 
 export default ConfigurationPage;
-

package/dist/generators/react/templates/src/main/webapp/app/modules/administration/docs/docs.scss.ejs

@@ -16,7 +16,6 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-
 iframe {
   background: white;
 }

package/dist/generators/react/templates/src/main/webapp/app/modules/administration/docs/docs.tsx.ejs

@@ -23,8 +23,12 @@ import React from 'react';
 const DocsPage = () => (
   <div>
     <iframe
-      src="../swagger-ui/index.html" width="100%" height="800"
-      title="Swagger UI" seamless style={{ border: 'none' }}
+      src="../swagger-ui/index.html"
+      width="100%"
+      height="800"
+      title="Swagger UI"
+      seamless
+      style={{ border: 'none' }}
       data-cy="swagger-frame"
     />
   </div>

package/dist/generators/react/templates/src/main/webapp/app/modules/administration/health/health-modal.tsx.ejs

@@ -39,15 +39,19 @@ const HealthModal = ({ handleClose, healthObject, showModal }) => {
         <Table bordered>
           <thead>
             <tr>
-              <th><Translate contentKey="health.details.name">Name</Translate></th>
-              <th><Translate contentKey="health.details.value">Value</Translate></th>
+              <th>
+                <Translate contentKey="health.details.name">Name</Translate>
+              </th>
+              <th>
+                <Translate contentKey="health.details.value">Value</Translate>
+              </th>
             </tr>
           </thead>
           <tbody>
             {Object.keys(data).map((key, index) => (
               <tr key={index}>
                 <td>{key}</td>
-                <td>{(healthObject.name === 'diskSpace') ? formatDiskSpaceOutput(data[key]) : JSON.stringify(data[key]) }</td>
+                <td>{healthObject.name === 'diskSpace' ? formatDiskSpaceOutput(data[key]) : JSON.stringify(data[key])}</td>
               </tr>
             ))}
           </tbody>
@@ -59,6 +63,7 @@ const HealthModal = ({ handleClose, healthObject, showModal }) => {
         </Button>
       </ModalFooter>
     </Modal>
-)};
+  );
+};
 
 export default HealthModal;

package/dist/generators/react/templates/src/main/webapp/app/modules/administration/health/health.tsx.ejs

@@ -48,7 +48,7 @@ export const HealthPage = () => {
     setHealthObject({ ...healthObj, name });
   };
 
-  const getBadgeType = (status: string) => status !== 'UP' ? 'danger' : 'success';
+  const getBadgeType = (status: string) => (status !== 'UP' ? 'danger' : 'success');
 
   const handleClose = () => setShowModal(false);
 
@@ -75,9 +75,15 @@ export const HealthPage = () => {
           <Table bordered aria-describedby="health-page-heading">
             <thead>
               <tr>
-                <th><Translate contentKey="health.table.service">Service Name</Translate></th>
-                <th><Translate contentKey="health.table.status">Status</Translate></th>
-                <th><Translate contentKey="health.details.details">Details</Translate></th>
+                <th>
+                  <Translate contentKey="health.table.service">Service Name</Translate>
+                </th>
+                <th>
+                  <Translate contentKey="health.table.status">Status</Translate>
+                </th>
+                <th>
+                  <Translate contentKey="health.details.details">Details</Translate>
+                </th>
               </tr>
             </thead>
             <tbody>
@@ -96,7 +102,7 @@ export const HealthPage = () => {
                       ) : null}
                     </td>
                   </tr>
-                ) : null
+                ) : null,
               )}
             </tbody>
           </Table>
@@ -108,4 +114,3 @@ export const HealthPage = () => {
 };
 
 export default HealthPage;
-