generator-jhipster 8.6.0 → 8.7.1

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

@@ -30,7 +30,7 @@ import Metrics from './metrics/metrics';
 import Configuration from './configuration/configuration';
 <%_ } _%>
 import Docs from './docs/docs';
-<%_ if (applicationTypeGateway && serviceDiscoveryAny) { _%>
+<%_ if (applicationTypeGateway && gatewayServicesApiAvailable) { _%>
 import Gateway from './gateway/gateway';
 <%_ } _%>
 <%_ if (communicationSpringWebsocket) { _%>
@@ -46,7 +46,7 @@ const AdministrationRoutes = () => (
 <%_ if (communicationSpringWebsocket) { _%>
       <Route path="tracker" element={<Tracker />} />
 <%_ } _%>
-<%_ if (applicationTypeGateway && serviceDiscoveryAny) { _%>
+<%_ if (applicationTypeGateway && gatewayServicesApiAvailable) { _%>
       <Route path="gateway" element={<Gateway />} />
 <%_ } _%>
 <%_ if (withAdminUi) { _%>

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

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

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

@@ -56,9 +56,7 @@ export const MetricsPage = () => {
   return (
     <div>
       <h2 id="metrics-page-heading" data-cy="metricsPageHeading">
-        <Translate contentKey="metrics.title">
-          Application Metrics
-        </Translate>
+        <Translate contentKey="metrics.title">Application Metrics</Translate>
       </h2>
       <p>
         <Button onClick={getMetrics} color={isFetching ? 'btn btn-danger' : 'btn btn-primary'} disabled={isFetching}>
@@ -74,14 +72,10 @@ export const MetricsPage = () => {
       <Row>
         <Col sm="12">
           <h3>
-            <Translate contentKey="metrics.jvm.title">
-              JVM Metrics
-            </Translate>
+            <Translate contentKey="metrics.jvm.title">JVM Metrics</Translate>
           </h3>
           <Row>
-            <Col md="4">
-              {metrics?.jvm ? <JvmMemory jvmMetrics={metrics.jvm} wholeNumberFormat={APP_WHOLE_NUMBER_FORMAT} /> : ''}
-            </Col>
+            <Col md="4">{metrics?.jvm ? <JvmMemory jvmMetrics={metrics.jvm} wholeNumberFormat={APP_WHOLE_NUMBER_FORMAT} /> : ''}</Col>
             <Col md="4">{threadDump ? <JvmThreads jvmThreads={threadDump} wholeNumberFormat={APP_WHOLE_NUMBER_FORMAT} /> : ''}</Col>
             <Col md="4">
               {metrics?.processMetrics ? (
@@ -142,4 +136,3 @@ export const MetricsPage = () => {
 };
 
 export default MetricsPage;
-

package/dist/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management-delete-dialog.tsx.ejs

@@ -49,17 +49,23 @@ export const UserManagementDeleteDialog = () => {
 
   return (
     <Modal isOpen toggle={handleClose}>
-      <ModalHeader toggle={handleClose}><Translate contentKey="entity.delete.title">Confirm delete operation</Translate></ModalHeader>
+      <ModalHeader toggle={handleClose}>
+        <Translate contentKey="entity.delete.title">Confirm delete operation</Translate>
+      </ModalHeader>
       <ModalBody>
-        <Translate contentKey="userManagement.delete.question" interpolate={{ login: user.login }}>Are you sure you want to delete this User?</Translate>
+        <Translate contentKey="userManagement.delete.question" interpolate={{ login: user.login }}>
+          Are you sure you want to delete this User?
+        </Translate>
       </ModalBody>
       <ModalFooter>
         <Button color="secondary" onClick={handleClose}>
-          <FontAwesomeIcon icon="ban"/>&nbsp;
+          <FontAwesomeIcon icon="ban" />
+          &nbsp;
           <Translate contentKey="entity.action.cancel">Cancel</Translate>
         </Button>
         <Button color="danger" onClick={confirmDelete}>
-          <FontAwesomeIcon icon="trash" />&nbsp;
+          <FontAwesomeIcon icon="trash" />
+          &nbsp;
           <Translate contentKey="entity.action.delete">Delete</Translate>
         </Button>
       </ModalFooter>

package/dist/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management-detail.tsx.ejs

@@ -79,21 +79,24 @@ export const UserManagementDetail = () => {
             <ul className="list-unstyled">
               {
                 user.authorities ? (
-                user.authorities.map((authority, i) => (
-                    <li key={`user-auth-${i}`}>
-                      <Badge color="info">{authority}</Badge>
-                    </li>
-                ))) : null
-              }
+                  user.authorities.map(
+                    (authority, i) => (
+                      <li key={`user-auth-${i}`}>
+                        <Badge color="info">{authority}</Badge>
+                      </li>
+                    )
+                  )
+                )
+                : null}
             </ul>
           </dd>
         </dl>
       </Row>
-      <Button
-        tag={Link} to="/admin/user-management" replace
-        color="info"
-      >
-        <FontAwesomeIcon icon="arrow-left" /> <span className="d-none d-md-inline" ><Translate contentKey="entity.action.back">Back</Translate></span>
+      <Button tag={Link} to="/admin/user-management" replace color="info">
+        <FontAwesomeIcon icon="arrow-left" />{' '}
+        <span className="d-none d-md-inline">
+          <Translate contentKey="entity.action.back">Back</Translate>
+        </span>
       </Button>
     </div>
   );

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

@@ -16,7 +16,6 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-
 import { configureStore } from '@reduxjs/toolkit';
 import axios from 'axios';
 import sinon from 'sinon';
@@ -29,7 +28,7 @@ import userManagement, {
   createUser,
   updateUser,
   deleteUser,
-  reset
+  reset,
 } from './user-management.reducer';
 import { defaultValue } from 'app/shared/model/user.model';
 import { AUTHORITIES } from 'app/config/constants';
@@ -40,9 +39,8 @@ describe('User management reducer tests', () => {
   function isEmpty(element): boolean {
     if (element instanceof Array) {
       return element.length === 0;
-    } else {
-      return Object.keys(element).length === 0;
     }
+    return Object.keys(element).length === 0;
   }
 
   function testInitialState(state) {
@@ -51,7 +49,7 @@ describe('User management reducer tests', () => {
       errorMessage: null,
       updating: false,
       updateSuccess: false,
-      totalItems: 0
+      totalItems: 0,
     });
     expect(isEmpty(state.users));
     expect(isEmpty(state.authorities));
@@ -76,31 +74,23 @@ describe('User management reducer tests', () => {
     });
 
     it('should set state to loading', () => {
-      testMultipleTypes(
-        [getUsers.pending.type, getUsersAsAdmin.pending.type, getUser.pending.type],
-        {},
-        state => {
-          expect(state).toMatchObject({
-            errorMessage: null,
-            updateSuccess: false,
-            loading: true,
-          });
-        }
-      );
+      testMultipleTypes([getUsers.pending.type, getUsersAsAdmin.pending.type, getUser.pending.type], {}, state => {
+        expect(state).toMatchObject({
+          errorMessage: null,
+          updateSuccess: false,
+          loading: true,
+        });
+      });
     });
 
     it('should set state to updating', () => {
-      testMultipleTypes(
-        [createUser.pending.type, updateUser.pending.type, deleteUser.pending.type],
-        {},
-        state => {
-          expect(state).toMatchObject({
-            errorMessage: null,
-            updateSuccess: false,
-            updating: true,
-          });
-        }
-      );
+      testMultipleTypes([createUser.pending.type, updateUser.pending.type, deleteUser.pending.type], {}, state => {
+        expect(state).toMatchObject({
+          errorMessage: null,
+          updateSuccess: false,
+          updating: true,
+        });
+      });
     });
   });
 
@@ -125,7 +115,7 @@ describe('User management reducer tests', () => {
             errorMessage: 'error happened',
           });
         },
-        { message: 'error happened' }
+        { message: 'error happened' },
       );
     });
   });
@@ -155,7 +145,7 @@ describe('User management reducer tests', () => {
 
       expect(toTest).toMatchObject({
         loading: false,
-        user: payload.data
+        user: payload.data,
       });
     });
 
@@ -165,22 +155,18 @@ describe('User management reducer tests', () => {
 
       expect(toTest).toMatchObject({
         loading: false,
-        authorities: payload.data
+        authorities: payload.data,
       });
     });
 
     it('should set state to successful update', () => {
-      testMultipleTypes(
-        [createUser.fulfilled.type, updateUser.fulfilled.type],
-        { data: 'some handsome user' },
-        types => {
-          expect(types).toMatchObject({
-            updating: false,
-            updateSuccess: true,
-            user: 'some handsome user',
-          });
-        }
-      );
+      testMultipleTypes([createUser.fulfilled.type, updateUser.fulfilled.type], { data: 'some handsome user' }, types => {
+        expect(types).toMatchObject({
+          updating: false,
+          updateSuccess: true,
+          user: 'some handsome user',
+        });
+      });
     });
 
     it('should set state to successful update with an empty user', () => {
@@ -188,7 +174,7 @@ describe('User management reducer tests', () => {
 
       expect(toTest).toMatchObject({
         updating: false,
-        updateSuccess: true
+        updateSuccess: true,
       });
       expect(isEmpty(toTest.user));
     });
@@ -204,7 +190,7 @@ describe('User management reducer tests', () => {
         user: defaultValue,
         updating: false,
         updateSuccess: false,
-        totalItems: 0
+        totalItems: 0,
       };
       const initialStateNew = {
         ...initialState,
@@ -317,10 +303,7 @@ describe('User management 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/administration/user-management/user-management.reducer.ts.ejs

@@ -30,10 +30,9 @@ const initialState = {
   user: defaultValue,
   updating: false,
   updateSuccess: false,
-  totalItems: 0
+  totalItems: 0,
 };
 
-
 const apiUrl = 'api/users';
 const adminUrl = 'api/admin/users';
 
@@ -61,7 +60,7 @@ export const getUser = createAsyncThunk(
     const requestUrl = `${adminUrl}/${id}`;
     return axios.get<IUser>(requestUrl);
   },
-  { serializeError: serializeAxiosError }
+  { serializeError: serializeAxiosError },
 );
 
 export const createUser = createAsyncThunk(
@@ -71,7 +70,7 @@ export const createUser = createAsyncThunk(
     thunkAPI.dispatch(getUsersAsAdmin({}));
     return result;
   },
-  { serializeError: serializeAxiosError }
+  { serializeError: serializeAxiosError },
 );
 
 export const updateUser = createAsyncThunk(
@@ -81,7 +80,7 @@ export const updateUser = createAsyncThunk(
     thunkAPI.dispatch(getUsersAsAdmin({}));
     return result;
   },
-  { serializeError: serializeAxiosError }
+  { serializeError: serializeAxiosError },
 );
 
 export const deleteUser = createAsyncThunk(
@@ -92,7 +91,7 @@ export const deleteUser = createAsyncThunk(
     thunkAPI.dispatch(getUsersAsAdmin({}));
     return result;
   },
-  { serializeError: serializeAxiosError }
+  { serializeError: serializeAxiosError },
 );
 
 export type UserManagementState = Readonly<typeof initialState>;
@@ -142,23 +141,12 @@ export const UserManagementSlice = createSlice({
         state.updateSuccess = false;
         state.updating = true;
       })
-      .addMatcher(
-        isRejected(
-          getUsers,
-          getUsersAsAdmin,
-          getUser,
-          getRoles,
-          createUser,
-          updateUser,
-          deleteUser
-        ),
-        (state, action) => {
-          state.loading = false;
-          state.updating = false;
-          state.updateSuccess = false;
-          state.errorMessage = action.error.message;
-        }
-      );
+      .addMatcher(isRejected(getUsers, getUsersAsAdmin, getUser, getRoles, createUser, updateUser, deleteUser), (state, action) => {
+        state.loading = false;
+        state.updating = false;
+        state.updateSuccess = false;
+        state.errorMessage = action.error.message;
+      });
   },
 });
 

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

@@ -42,7 +42,7 @@ export const UserManagement = () => {
   const navigate = useNavigate();
 
   const [pagination, setPagination] = useState(
-    overridePaginationStateWithQueryParams(getPaginationState(pageLocation, ITEMS_PER_PAGE, 'id'), pageLocation.search)
+    overridePaginationStateWithQueryParams(getPaginationState(pageLocation, ITEMS_PER_PAGE, 'id'), pageLocation.search),
   );
 
   const getUsersFromProps = () => {
@@ -51,7 +51,7 @@ export const UserManagement = () => {
         page: pagination.activePage - 1,
         size: pagination.itemsPerPage,
         sort: `${pagination.sort},${pagination.order}`,
-      })
+      }),
     );
     const endURL = `?page=${pagination.activePage}&sort=${pagination.sort},${pagination.order}`;
     if (pageLocation.search !== endURL) {
@@ -73,7 +73,7 @@ export const UserManagement = () => {
         ...pagination,
         activePage: +page,
         sort: sortSplit[0],
-        order: sortSplit[1]
+        order: sortSplit[1],
       });
     }
   }, [pageLocation.search]);
@@ -82,13 +82,13 @@ export const UserManagement = () => {
     setPagination({
       ...pagination,
       order: pagination.order === ASC ? DESC : ASC,
-      sort: p
+      sort: p,
     });
 
   const handlePagination = currentPage =>
     setPagination({
       ...pagination,
-      activePage: currentPage
+      activePage: currentPage,
     });
 
   const handleSyncList = () => {
@@ -100,7 +100,7 @@ export const UserManagement = () => {
       updateUser({
         ...user,
         activated: !user.activated,
-      })
+      }),
     );
   };
 
@@ -114,7 +114,7 @@ export const UserManagement = () => {
     if (sortFieldName !== fieldName) {
       return faSort;
     } else {
-      return (order === ASC) ? faSortUp : faSortDown;
+      return order === ASC ? faSortUp : faSortDown;
     }
   };
 
@@ -124,7 +124,8 @@ export const UserManagement = () => {
         <Translate contentKey="userManagement.home.title">Users</Translate>
         <div className="d-flex justify-content-end">
           <Button className="me-2" color="info" onClick={handleSyncList} disabled={loading}>
-            <FontAwesomeIcon icon="sync" spin={loading} /> <Translate contentKey="userManagement.home.refreshListLabel">Refresh List</Translate>
+            <FontAwesomeIcon icon="sync" spin={loading} />{' '}
+            <Translate contentKey="userManagement.home.refreshListLabel">Refresh List</Translate>
           </Button>
           <Link to="new" className="btn btn-primary jh-create-entity">
             <FontAwesomeIcon icon="plus" /> <Translate contentKey="userManagement.home.createLabel">Create a new user</Translate>
@@ -155,8 +156,7 @@ export const UserManagement = () => {
           </tr>
         </thead>
         <tbody>
-          {
-          users.map((user, i) => (
+          {users.map((user, i) => (
             <tr id={user.login} key={`user-${i}`}>
               <td>
                 <Button tag={Link} to={user.login} color="link" size="sm">
@@ -167,11 +167,11 @@ export const UserManagement = () => {
               <td>{user.email}</td>
               <td>
                 {user.activated ? (
-                  <Button color="success" onClick={toggleActive(user) }>
+                  <Button color="success" onClick={toggleActive(user)}>
                     <Translate contentKey="userManagement.activated">Activated</Translate>
                   </Button>
                 ) : (
-                  <Button color="danger" onClick={toggleActive(user) }>
+                  <Button color="danger" onClick={toggleActive(user)}>
                     <Translate contentKey="userManagement.deactivated">Deactivated</Translate>
                   </Button>
                 )}
@@ -180,14 +180,13 @@ export const UserManagement = () => {
               <td>{user.langKey}</td>
 <%_ } _%>
               <td>
-                {
-                  user.authorities ? (
-                  user.authorities.map((authority, j) => (
-                    <div key={`user-auth-${i}-${j}`}>
-                      <Badge color="info">{authority}</Badge>
-                    </div>
-                  ))) : null
-                }
+                {user.authorities
+                  ? user.authorities.map((authority, j) => (
+                      <div key={`user-auth-${i}-${j}`}>
+                        <Badge color="info">{authority}</Badge>
+                      </div>
+                    ))
+                  : null}
               </td>
 <%_ if (!databaseTypeCassandra) { _%>
               <td>
@@ -203,13 +202,22 @@ export const UserManagement = () => {
               <td className="text-end">
                 <div className="btn-group flex-btn-group-container">
                   <Button tag={Link} to={user.login} color="info" size="sm">
-                    <FontAwesomeIcon icon="eye" /> <span className="d-none d-md-inline"><Translate contentKey="entity.action.view">View</Translate></span>
+                    <FontAwesomeIcon icon="eye" />{' '}
+                    <span className="d-none d-md-inline">
+                      <Translate contentKey="entity.action.view">View</Translate>
+                    </span>
                   </Button>
                   <Button tag={Link} to={`${user.login}/edit`} color="primary" size="sm">
-                    <FontAwesomeIcon icon="pencil-alt" /> <span className="d-none d-md-inline"><Translate contentKey="entity.action.edit">Edit</Translate></span>
+                    <FontAwesomeIcon icon="pencil-alt" />{' '}
+                    <span className="d-none d-md-inline">
+                      <Translate contentKey="entity.action.edit">Edit</Translate>
+                    </span>
                   </Button>
                   <Button tag={Link} to={`${user.login}/delete`} color="danger" size="sm" disabled={account.login === user.login}>
-                    <FontAwesomeIcon icon="trash" /> <span className="d-none d-md-inline"><Translate contentKey="entity.action.delete">Delete</Translate></span>
+                    <FontAwesomeIcon icon="trash" />{' '}
+                    <span className="d-none d-md-inline">
+                      <Translate contentKey="entity.action.delete">Delete</Translate>
+                    </span>
                   </Button>
                 </div>
               </td>

package/dist/generators/react/templates/src/main/webapp/app/routes.tsx.ejs

@@ -49,7 +49,7 @@ import { sendActivity } from 'app/config/websocket-middleware';
 const loading = <div>loading ...</div>;
 <%_ if (generateUserManagement) { _%>
 
-  const Account = Loadable({
+const Account = Loadable({
   loader: () => import(/* webpackChunkName: "account" */ 'app/modules/account'),
   loading: () => loading,
 });

package/dist/generators/react/templates/src/main/webapp/app/setup-tests.ts.ejs

@@ -1,3 +1,3 @@
 import { loadIcons } from './config/icon-loader';
 
-loadIcons();
+loadIcons();

package/dist/generators/react/templates/src/main/webapp/app/shared/DurationFormat.tsx.ejs

@@ -17,5 +17,12 @@ export const DurationFormat = ({ value, blankOnInvalid, locale }: IDurationForma
     locale = TranslatorContext.context.locale;
   }
 
-  return <span title={value}>{dayjs.duration(value).locale(locale || '<% if (enableTranslation) { %><%= nativeLanguage %><% } else { %>en<% } %>').humanize()}</span>;
+  return (
+    <span title={value}>
+      {dayjs
+        .duration(value)
+        .locale(locale || '<% if (enableTranslation) { %><%= nativeLanguage %><% } else { %>en<% } %>')
+        .humanize()}
+    </span>
+  );
 };

package/dist/generators/react/templates/src/main/webapp/app/shared/auth/private-route.spec.tsx.ejs

@@ -27,7 +27,7 @@ describe('private-route component', () => {
     return render(
       <Provider store={store}>
         <MemoryRouter>{Elem}</MemoryRouter>
-      </Provider>
+      </Provider>,
     );
   };
 
@@ -42,7 +42,7 @@ describe('private-route component', () => {
         account: {
           authorities: [],
         },
-      })
+      }),
     ).toThrow(Error);
     console.error = originalError;
   });
@@ -58,11 +58,9 @@ describe('private-route component', () => {
         account: {
           authorities: [],
         },
-      }
-    );
-    expect(container.innerHTML).toMatch(
-      /<div class="insufficient-authority"><div class="alert alert-danger">.*<\/div><\/div>/
+      },
     );
+    expect(container.innerHTML).toMatch(/<div class="insufficient-authority"><div class="alert alert-danger">.*<\/div><\/div>/);
   });
 
   it('Should render a route for the component provided when authenticated', () => {
@@ -76,7 +74,7 @@ describe('private-route component', () => {
         account: {
           authorities: ['ADMIN'],
         },
-      }
+      },
     );
     expect(container.innerHTML).toEqual('<div>Test</div>');
   });
@@ -100,7 +98,7 @@ describe('private-route component', () => {
         account: {
           authorities: ['ADMIN'],
         },
-      }
+      },
     );
     expect(container.innerHTML).not.toEqual('<div>Test</div>');
     expect(container.innerHTML).toEqual('<div>Login</div>');

package/dist/generators/react/templates/src/main/webapp/app/shared/error/error-boundary-routes.spec.tsx.ejs

@@ -25,7 +25,7 @@ describe('error-boundary-routes component', () => {
         <ErrorBoundaryRoutes>
           <Route path="*" element={<ErrorComp />} />
         </ErrorBoundaryRoutes>
-      </MemoryRouter>
+      </MemoryRouter>,
     );
     expect(container.innerHTML).toEqual('<div><h2 class="error">An unexpected error has occurred.</h2></div>');
   });
@@ -37,7 +37,7 @@ describe('error-boundary-routes component', () => {
           <Route path="/path" element={<NoErrorComp />} />
           <Route path="*" element={<ErrorComp />} />
         </ErrorBoundaryRoutes>
-      </MemoryRouter>
+      </MemoryRouter>,
     );
     expect(container.innerHTML).toEqual('<div>No error</div>');
   });
@@ -48,7 +48,7 @@ describe('error-boundary-routes component', () => {
         <ErrorBoundaryRoutes>
           <Route path="*" element={<NoErrorComp />} />
         </ErrorBoundaryRoutes>
-      </MemoryRouter>
+      </MemoryRouter>,
     );
     expect(container.innerHTML).toEqual('<div>No error</div>');
   });

package/dist/generators/react/templates/src/main/webapp/app/shared/error/error-boundary.spec.tsx.ejs

@@ -8,9 +8,7 @@ const ErrorComp = () => {
 };
 
 describe('error component', () => {
-
   beforeEach(() => {
-
     // ignore console and jsdom errors
     jest.spyOn((window as any)._virtualConsole, 'emit').mockImplementation(() => false);
     jest.spyOn((window as any).console, 'error').mockImplementation(() => false);
@@ -25,7 +23,7 @@ describe('error component', () => {
     render(
       <ErrorBoundary>
         <ErrorComp />
-      </ErrorBoundary>
+      </ErrorBoundary>,
     );
     expect(spy).toHaveBeenCalled();
   });

package/dist/generators/react/templates/src/main/webapp/app/shared/error/error-boundary.tsx.ejs

@@ -15,7 +15,7 @@ class ErrorBoundary extends React.Component<IErrorBoundaryProps, IErrorBoundaryS
   componentDidCatch(error, errorInfo) {
     this.setState({
       error,
-      errorInfo
+      errorInfo,
     });
   }
 
@@ -23,12 +23,12 @@ class ErrorBoundary extends React.Component<IErrorBoundaryProps, IErrorBoundaryS
     const { error, errorInfo } = this.state;
     if (errorInfo) {
       const errorDetails = DEVELOPMENT ? (
-          <details className="preserve-space">
-            {error && error.toString()}
-            <br />
-            {errorInfo.componentStack}
-          </details>
-        ) : undefined;
+        <details className="preserve-space">
+          {error && error.toString()}
+          <br />
+          {errorInfo.componentStack}
+        </details>
+      ) : undefined;
       return (
         <div>
           <h2 className="error">An unexpected error has occurred.</h2>