generator-jhipster 7.7.0 → 7.9.0

package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-update.tsx.ejs

@@ -25,7 +25,7 @@ for (const field of fields.filter(field => !field.id)) {
 }
 _%>
 import React, { useState, useEffect } from 'react';
-import { Link, RouteComponentProps } from 'react-router-dom';
+import { Link, useNavigate, useParams } from 'react-router-dom';
 import {
   Button,
   Row,
@@ -43,6 +43,12 @@ import {
 } from 'react-jhipster';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 
+import { convertDateTimeFromServer, convertDateTimeToServer, displayDefaultDateTime } from 'app/shared/util/date-utils';
+<%_ if (relationships.filter(e => e.relationshipManyToMany) !== undefined) { _%>
+import { mapIdList } from 'app/shared/util/entity-utils';
+<%_ } _%>
+import { useAppDispatch, useAppSelector } from 'app/config/store';
+
 <%_
 let hasRelationshipQuery = false;
 let otherEntityActions = new Set();
@@ -72,7 +78,7 @@ Object.keys(differentRelationships).forEach(key => {
       action: `get${upperFirstCamelCase(uniqueRel.otherEntityNamePlural)}`,
       instance: `${uniqueRel.otherEntityNamePlural}`,
       entity: uniqueRel.otherEntityAngularName,
-      reducer: uniqueRel.otherEntityAngularName === 'User' ? 'userManagement' : uniqueRel.otherEntityName
+      reducer: uniqueRel.otherEntity.builtInUser ? `userManagement.${uniqueRel.otherEntityNamePlural}` : `${uniqueRel.otherEntity.entityReactState}.entities`,
     });
     if (uniqueRel.otherEntityAngularName === 'User') {
 _%>
@@ -90,52 +96,52 @@ import { getEntities as get<%= upperFirstCamelCase(uniqueRel.otherEntityNamePlur
     <%_ } _%>
   <%_ } _%>
 <%_ }); _%>
+import { I<%= entityReactName %> } from 'app/shared/model/<%= entityModelFileName %>.model';
+<%_ const enumImports = generateEntityClientEnumImports(fields); _%>
+<%_ enumImports.forEach( (importedPath, importedType) => { _%>
+import { <%- importedType %> } from '<%- importedPath %>';
+<%_ }); _%>
 import {
   getEntity,
   updateEntity,
   createEntity,
   reset
 } from './<%= entityFileName %>.reducer';
-import { I<%= entityReactName %> } from 'app/shared/model/<%= entityModelFileName %>.model';
-import { convertDateTimeFromServer, convertDateTimeToServer, displayDefaultDateTime } from 'app/shared/util/date-utils';
-<%_ if (relationships.filter(e => e.relationshipManyToMany) !== undefined) { _%>
-import { mapIdList } from 'app/shared/util/entity-utils';
-<%_ } _%>
-import { useAppDispatch, useAppSelector } from 'app/config/store';
-<%_ const enumImports = generateEntityClientEnumImports(fields); _%>
-<%_ enumImports.forEach( (importedPath, importedType) => { _%>
-import { <%- importedType %> } from '<%- importedPath %>';
-<%_ }); _%>
 
-export const <%= entityReactName %>Update = (props: RouteComponentProps<{id: string}>) => {
+export const <%= entityReactName %>Update = () => {
   const dispatch = useAppDispatch();
 
-  const [isNew] = useState(!props.match.params || !props.match.params.id);
+  const navigate = useNavigate();
+
+  const { id } = useParams<'id'>();
+  const isNew = id === undefined;
+
 
   <%_ otherEntityActions.forEach(val => { _%>
-  const <%= val.instance %> = useAppSelector(state => state.<%= val.reducer %>.<%= val.entity === 'User' ? val.instance : 'entities' %>);
+  const <%= val.instance %> = useAppSelector(state => state.<%= val.reducer %>);
   <%_ }) _%>
-  const <%= entityInstance %>Entity = useAppSelector(state => state.<%= entityInstance %>.entity);
-  const loading = useAppSelector(state => state.<%= entityInstance %>.loading);
-  const updating = useAppSelector(state => state.<%= entityInstance %>.updating);
-  const updateSuccess = useAppSelector(state => state.<%= entityInstance %>.updateSuccess);
+  const <%= entityInstance %>Entity = useAppSelector(state => state.<%= entityReactState %>.entity);
+  const loading = useAppSelector(state => state.<%= entityReactState %>.loading);
+  const updating = useAppSelector(state => state.<%= entityReactState %>.updating);
+  const updateSuccess = useAppSelector(state => state.<%= entityReactState %>.updateSuccess);
   <%_ enumImports.forEach( (importedPath, importedType) => { _%>
   const <%- _.lowerFirst(importedType) %>Values = Object.keys(<%- importedType %>);
   <%_ }); _%>
+
   const handleClose = () => {
-    props.history.push('/<%= entityFileName %>'<%_ if (paginationPagination) { _%> + props.location.search<%_ } _%>);
+    navigate('/<%= entityPage %>'<%_ if (paginationPagination) { _%> + location.search<%_ } _%>);
   }
 
   useEffect(() => {
 <%_ if (paginationInfiniteScroll) { _%>
     if (!isNew) {
-      dispatch(getEntity(props.match.params.id));
+      dispatch(getEntity(id));
     }
 <%_ } else { _%>
     if (isNew) {
       dispatch(reset());
     } else {
-      dispatch(getEntity(props.match.params.id));
+      dispatch(getEntity(id));
     }
 <%_ } _%>
 
@@ -383,7 +389,7 @@ _%>
           </ValidatedField>
   <%_ } _%>
 <%_ }) _%>
-          <Button tag={Link} id="cancel-save" data-cy="entityCreateCancelButton" to="/<%= entityFileName %>" replace color="info">
+          <Button tag={Link} id="cancel-save" data-cy="entityCreateCancelButton" to="/<%= entityPage %>" replace color="info">
             <FontAwesomeIcon icon="arrow-left" />&nbsp;
             <span className="d-none d-md-inline" ><Translate contentKey="entity.action.back">Back</Translate></span>
           </Button>

package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity.reducer.ts.ejs

@@ -45,9 +45,9 @@ const initialState: EntityState<I<%= entityReactName %>> = {
   updateSuccess: false
 };
 
-const apiUrl = '<% if (applicationTypeGateway && locals.microserviceName) { %>services/<%= microserviceName.toLowerCase() %>/<% } %>api/<%= entityApiUrl %>';
+const apiUrl = '<%= entityApi %>api/<%= entityApiUrl %>';
 <%_ if (searchEngine) { _%>
-const apiSearchUrl = '<% if (applicationTypeGateway && locals.microserviceName) { %>services/<%= microserviceName.toLowerCase() %>/<% } %>api/_search/<%= entityApiUrl %>';
+const apiSearchUrl = '<%= entityApi %>api/_search/<%= entityApiUrl %>';
 <%_ } _%>
 
 // Actions

package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity.tsx.ejs

@@ -20,7 +20,7 @@ import React, { useState, useEffect } from 'react';
 <%_ if (paginationInfiniteScroll) { _%>
 import InfiniteScroll from 'react-infinite-scroll-component';
 <%_ } _%>
-import { Link, RouteComponentProps } from 'react-router-dom';
+import { Link, useLocation, useNavigate } from 'react-router-dom';
 import { Button, <% if (searchEngine) { %>Input, InputGroup, FormGroup, Form, Row, Col, <% } %>Table } from 'reactstrap';
 import {
   <%_ if (blobFields.length > 0) { _%>
@@ -40,10 +40,17 @@ import {
 } from 'react-jhipster';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 
+import { APP_DATE_FORMAT, APP_LOCAL_DATE_FORMAT } from 'app/config/constants';
+<%_ if (!paginationNo) { _%>
+import { ASC, DESC, ITEMS_PER_PAGE, SORT } from 'app/shared/util/pagination.constants';
+import { overridePaginationStateWithQueryParams } from 'app/shared/util/entity-utils';
+<%_ } _%>
+import { useAppDispatch, useAppSelector } from 'app/config/store';
 <%_ if (fieldsContainDuration) { _%>
 import { DurationFormat } from 'app/shared/DurationFormat';
 <%_ } _%>
 
+import { I<%= entityReactName %> } from 'app/shared/model/<%= entityModelFileName %>.model';
 import {
 <%_ if (searchEngine) { _%>
   searchEntities,
@@ -53,36 +60,32 @@ import {
   reset,
 <%_ } _%>
 } from './<%= entityFileName %>.reducer';
-import { I<%= entityReactName %> } from 'app/shared/model/<%= entityModelFileName %>.model';
-import { APP_DATE_FORMAT, APP_LOCAL_DATE_FORMAT } from 'app/config/constants';
-<%_ if (!paginationNo) { _%>
-import { ASC, DESC, ITEMS_PER_PAGE, SORT } from 'app/shared/util/pagination.constants';
-import { overridePaginationStateWithQueryParams } from 'app/shared/util/entity-utils';
-<%_ } _%>
-import { useAppDispatch, useAppSelector } from 'app/config/store';
 
-export const <%= entityReactName %> = (props: RouteComponentProps<{url: string}>) => {
+export const <%= entityReactName %> = () => {
   const dispatch = useAppDispatch();
 
+  const location = useLocation();
+  const navigate = useNavigate();
+
 <%_ if (searchEngine) { _%>
   const [search, setSearch] = useState('');
 <%_ } _%>
 <%_ if (!paginationNo) { _%>
-  const [paginationState, setPaginationState] = useState(overridePaginationStateWithQueryParams(getSortState(props.location, ITEMS_PER_PAGE, '<%= primaryKey.name %>'), props.location.search));
+  const [paginationState, setPaginationState] = useState(overridePaginationStateWithQueryParams(getSortState(location, ITEMS_PER_PAGE, '<%= primaryKey.name %>'), location.search));
 <%_ } _%>
 <%_ if (paginationInfiniteScroll) { _%>
   const [sorting, setSorting] = useState(false);
 <%_ } _%>
 
-  const <%= entityInstance %>List = useAppSelector(state => state.<%= entityInstance %>.entities);
-  const loading = useAppSelector(state => state.<%= entityInstance %>.loading);
+  const <%= entityInstance %>List = useAppSelector(state => state.<%= entityReactState %>.entities);
+  const loading = useAppSelector(state => state.<%= entityReactState %>.loading);
   <%_ if (!paginationNo) { _%>
-  const totalItems = useAppSelector(state => state.<%= entityInstance %>.totalItems);
+  const totalItems = useAppSelector(state => state.<%= entityReactState %>.totalItems);
   <%_ } _%>
   <%_ if (paginationInfiniteScroll) { _%>
-  const links = useAppSelector(state => state.<%= entityInstance %>.links);
-  const entity = useAppSelector(state => state.<%= entityInstance %>.entity);
-  const updateSuccess = useAppSelector(state => state.<%= entityInstance %>.updateSuccess);
+  const links = useAppSelector(state => state.<%= entityReactState %>.links);
+  const entity = useAppSelector(state => state.<%= entityReactState %>.entity);
+  const updateSuccess = useAppSelector(state => state.<%= entityReactState %>.updateSuccess);
   <%_ } _%>
 
 <%_ if (paginationPagination || paginationInfiniteScroll || !paginationNo && !paginationInfiniteScroll) { _%>
@@ -208,8 +211,8 @@ export const <%= entityReactName %> = (props: RouteComponentProps<{url: string}>
   const sortEntities = () => {
     getAllEntities();
     const endURL = `?page=${paginationState.activePage}&sort=${paginationState.sort},${paginationState.order}`;
-    if (props.location.search !== endURL) {
-      props.history.push(`${props.location.pathname}${endURL}`);
+    if (location.search !== endURL) {
+      navigate(`${location.pathname}${endURL}`);
     }
   };
   <%_ } _%>
@@ -227,7 +230,7 @@ export const <%= entityReactName %> = (props: RouteComponentProps<{url: string}>
 
   <%_ if (paginationPagination) { _%>
   useEffect(() => {
-    const params = new URLSearchParams(props.location.search);
+    const params = new URLSearchParams(location.search);
     const page = params.get('page');
     const sort = params.get(SORT);
     if (page && sort) {
@@ -239,7 +242,7 @@ export const <%= entityReactName %> = (props: RouteComponentProps<{url: string}>
         order: sortSplit[1]
       });
     }
-  }, [props.location.search]);
+  }, [location.search]);
   <%_ } _%>
 
   const sort = p => () => {
@@ -282,8 +285,6 @@ export const <%= entityReactName %> = (props: RouteComponentProps<{url: string}>
 <%_ } _%>
   };
 
-  const { match } = props;
-
   return (
     <div>
       <h2 id="<%= entityFileName %>-heading" data-cy="<%= entityClass %>Heading">
@@ -293,7 +294,7 @@ export const <%= entityReactName %> = (props: RouteComponentProps<{url: string}>
             <FontAwesomeIcon icon="sync" spin={loading} /> <Translate contentKey="<%= i18nKeyPrefix %>.home.refreshListLabel">Refresh List</Translate>
           </Button>
 <%_ if (!readOnly) { _%>
-            <Link to={`${match.url}/new`} className="btn btn-primary jh-create-entity" id="jh-create-entity" data-cy="entityCreateButton">
+            <Link to="/<%= entityPage %>/new" className="btn btn-primary jh-create-entity" id="jh-create-entity" data-cy="entityCreateButton">
               <FontAwesomeIcon icon="plus" />&nbsp;
               <Translate contentKey="<%= i18nKeyPrefix %>.home.createLabel">
                 Create new <%= entityClassHumanized %>
@@ -324,7 +325,7 @@ export const <%= entityReactName %> = (props: RouteComponentProps<{url: string}>
 <%_ } _%>
       <div className="table-responsive">
 <%_ if (paginationInfiniteScroll) { _%>
-        <InfiniteScroll dataLength={<%= entityInstance %>List ? <%= entityInstance %>List.length : 0} 
+        <InfiniteScroll dataLength={<%= entityInstance %>List ? <%= entityInstance %>List.length : 0}
                         next={handleLoadMore}
                         hasMore={paginationState.activePage - 1 < links.next}
                         loader={<div className="loader">Loading ...</div>}>
@@ -352,7 +353,7 @@ export const <%= entityReactName %> = (props: RouteComponentProps<{url: string}>
                   <%= entityInstance %>List.map((<%= entityInstance %>, i) => (
                   <tr key={`entity-${i}`} data-cy="entityTable">
                     <td>
-                      <Button tag={Link} to={`${match.url}/${<%= entityInstance %>.<%= primaryKey.name %>}`} color="link" size="sm">
+                      <Button tag={Link} to={`/<%= entityPage %>/${<%= entityInstance %>.<%= primaryKey.name %>}`} color="link" size="sm">
                         {<%= entityInstance %>.<%= primaryKey.name %>}
                       </Button>
                     </td>
@@ -403,6 +404,7 @@ _%>
   <%_ } _%>
 <%_ } _%>
 <%_ for (relationship of relationships) {
+  const otherEntity = relationship.otherEntity;
   const ownerSide = relationship.ownerSide;
   const relationshipFieldName = relationship.relationshipFieldName;
   const relationshipFieldNamePlural = relationship.relationshipFieldNamePlural;
@@ -430,13 +432,13 @@ _%>
                         {
                           (<%= entityInstance %>.<%= relationshipFieldNamePlural %>) ?
                               (<%= entityInstance %>.<%= relationshipFieldNamePlural %>.map((val, j) =>
-                                  <span key={j}><Link to={`<%= otherEntityStateName %>/${val.id}`}>{val.<%= otherEntityField %>}</Link>{(j === <%= entityInstance %>.<%= relationshipFieldNamePlural %>.length - 1) ? '' : ', '}</span>
+                                  <span key={j}><Link to={`/<%= otherEntity.entityPage %>/${val.<%= otherEntity.primaryKey.name %>}`}>{val.<%= otherEntityField %>}</Link>{(j === <%= entityInstance %>.<%= relationshipFieldNamePlural %>.length - 1) ? '' : ', '}</span>
                               )
                           ) : null
                         }
       <%_ } else { _%>
                         {<%= entityInstance + "." + relationshipFieldName %> ?
-                        <Link to={`<%= otherEntityStateName %>/${<%= entityInstance + "." + relationshipFieldName + "." + otherEntityPkName + "}" %>`}>
+                        <Link to={`/<%= otherEntity.entityPage %>/${<%= entityInstance + "." + relationshipFieldName + "." + otherEntityPkName + "}" %>`}>
                           {<%= entityInstance + "." + relationshipFieldName + "." + otherEntityField %>}
                         </Link> : ''}
       <%_ } _%>
@@ -446,14 +448,14 @@ _%>
 <%_ } _%>
                       <td className="text-end">
                         <div className="btn-group flex-btn-group-container">
-                          <Button tag={Link} to={`${match.url}/${<%= entityInstance %>.<%= primaryKey.name %>}`} color="info" size="sm" data-cy="entityDetailsButton">
+                          <Button tag={Link} to={`/<%= entityPage %>/${<%= entityInstance %>.<%= primaryKey.name %>}`} color="info" size="sm" data-cy="entityDetailsButton">
                             <FontAwesomeIcon icon="eye" /> <span className="d-none d-md-inline" ><Translate contentKey="entity.action.view">View</Translate></span>
                           </Button>
 <%_ if (!readOnly) { _%>
-                          <Button tag={Link} to={`${match.url}/${<%= entityInstance %>.<%= primaryKey.name %>}/edit<%_ if (paginationPagination) { _%>?page=${paginationState.activePage}&sort=${paginationState.sort},${paginationState.order}<%_ } _%>`} color="primary" size="sm" data-cy="entityEditButton">
+                          <Button tag={Link} to={`/<%= entityPage %>/${<%= entityInstance %>.<%= primaryKey.name %>}/edit<%_ if (paginationPagination) { _%>?page=${paginationState.activePage}&sort=${paginationState.sort},${paginationState.order}<%_ } _%>`} color="primary" size="sm" data-cy="entityEditButton">
                             <FontAwesomeIcon icon="pencil-alt" /> <span className="d-none d-md-inline"><Translate contentKey="entity.action.edit">Edit</Translate></span>
                           </Button>
-                          <Button tag={Link} to={`${match.url}/${<%= entityInstance %>.<%= primaryKey.name %>}/delete<%_ if (paginationPagination) { _%>?page=${paginationState.activePage}&sort=${paginationState.sort},${paginationState.order}<%_ } _%>`} color="danger" size="sm" data-cy="entityDeleteButton">
+                          <Button tag={Link} to={`/<%= entityPage %>/${<%= entityInstance %>.<%= primaryKey.name %>}/delete<%_ if (paginationPagination) { _%>?page=${paginationState.activePage}&sort=${paginationState.sort},${paginationState.order}<%_ } _%>`} color="danger" size="sm" data-cy="entityDeleteButton">
                             <FontAwesomeIcon icon="trash" /> <span className="d-none d-md-inline"><Translate contentKey="entity.action.delete">Delete</Translate></span>
                           </Button>
 <%_ } _%>

package/generators/entity-client/templates/react/src/main/webapp/app/entities/index.tsx.ejs

@@ -17,9 +17,9 @@
  limitations under the License.
 -%>
 import React from 'react';
-import { Switch } from 'react-router-dom';
+import { Route } from 'react-router-dom';
 
-import ErrorBoundaryRoute from 'app/shared/error/error-boundary-route';
+import ErrorBoundaryRoutes from 'app/shared/error/error-boundary-routes';
 
 import <%= entityReactName %> from './<%= entityFileName %>';
 import <%= entityReactName %>Detail from './<%= entityFileName %>-detail';
@@ -28,20 +28,20 @@ import <%= entityReactName %>Update from './<%= entityFileName %>-update';
 import <%= entityReactName %>DeleteDialog from './<%= entityFileName %>-delete-dialog';
 <%_ } _%>
 
-const Routes = ({ match }) => (
-  <>
-    <Switch>
+const <%= entityReactName %>Routes = () => (
+  <ErrorBoundaryRoutes>
+    <Route index element={<<%= entityReactName %> />} />
 <%_ if (!readOnly) { _%>
-      <ErrorBoundaryRoute exact path={`${match.url}/new`} component={<%= entityReactName %>Update} />
-      <ErrorBoundaryRoute exact path={`${match.url}/:id/edit`} component={<%= entityReactName %>Update} />
+    <Route path="new" element={<<%= entityReactName %>Update />} />
 <%_ } _%>
-      <ErrorBoundaryRoute exact path={`${match.url}/:id`} component={<%= entityReactName %>Detail}  />
-      <ErrorBoundaryRoute path={match.url} component={<%= entityReactName %>} />
-    </Switch>
+    <Route path=":id">
+      <Route index element={<<%= entityReactName %>Detail />} />
 <%_ if (!readOnly) { _%>
-    <ErrorBoundaryRoute exact path={`${match.url}/:id/delete`} component={<%= entityReactName %>DeleteDialog} />
+      <Route path="edit" element={<<%= entityReactName %>Update />} />
+      <Route path="delete" element={<<%= entityReactName %>DeleteDialog />} />
 <%_ } _%>
-  </>
+    </Route>
+  </ErrorBoundaryRoutes>
 );
 
-export default Routes;
+export default <%= entityReactName %>Routes;

package/generators/entity-client/templates/react/src/main/webapp/app/entities/react_validators.ejs

@@ -17,35 +17,28 @@
  limitations under the License.
 -%>
 <%# Returns a string of all react validators required for the input field. -%>
-<%
-let result = '';
-
-if (field.fieldValidate === true) {
-    const validators = [];
-    if (field.fieldValidationRequired && !field.fieldTypeBoolean) {
-        validators.push('required: { value: true, message: translate(\'entity.validation.required\') }');
-    }
-    if (field.fieldValidationMinLength) {
-        validators.push('minLength: { value: ' + field.fieldValidateRulesMinlength + ', message: translate(\'entity.validation.minlength\', { min: ' + field.fieldValidateRulesMinlength + ' }) }');
-    }
-    if (field.fieldValidationMaxLength) {
-        validators.push('maxLength: { value: ' + field.fieldValidateRulesMaxlength + ', message: translate(\'entity.validation.maxlength\', { max: ' + field.fieldValidateRulesMaxlength + ' }) }');
-    }
-    if (field.fieldValidationMin) {
-        validators.push('min: { value: ' + field.fieldValidateRulesMin + ', message: translate(\'entity.validation.min\', { min: ' + field.fieldValidateRulesMin + ' }) }');
-    }
-    if (field.fieldValidationMax) {
-        validators.push('max: { value: ' + field.fieldValidateRulesMax + ', message: translate(\'entity.validation.max\', { max: ' + field.fieldValidateRulesMax + ' }) }');
-    }
-    if (field.fieldValidationPattern) {
-        validators.push('pattern: { value: /' + field.fieldValidateRulesPatternReact + '/, message: translate(\'entity.validation.pattern\', { pattern: \'' + field.fieldValidateRulesPatternReact.replace(/\\/g, '\\\\') + '\' }) }');
-    }
-    if (field.fieldTypeNumeric) {
-        validators.push('validate: v => isNumber(v) || translate(\'entity.validation.number\')');
-    }
-
-    result = validators.join(',\n                ');
-    result = `validate={{\n                ${result}\n                }}`;
-}
--%>
-<%- result -%>
+<%_ if (field.fieldValidate === true) { _%>
+        validate={{
+  <%_ if (field.fieldValidationRequired && !field.fieldTypeBoolean) { _%>
+          required: { value: true, message: translate('entity.validation.required') },
+  <%_ } _%>
+  <%_ if (field.fieldValidationMinLength) { _%>
+          minLength: { value: <%= field.fieldValidateRulesMinlength %>, message: translate('entity.validation.minlength', { min: <%= field.fieldValidateRulesMinlength %> }) },
+  <%_ } _%>
+  <%_ if (field.fieldValidationMaxLength) { _%>
+          maxLength: { value: <%= field.fieldValidateRulesMaxlength %>, message: translate('entity.validation.maxlength', { max: <%= field.fieldValidateRulesMaxlength %> }) },
+  <%_ } _%>
+  <%_ if (field.fieldValidationMin) { _%>
+          min: { value: <%= field.fieldValidateRulesMin %>, message: translate('entity.validation.min', { min: <%= field.fieldValidateRulesMin %> }) },
+  <%_ } _%>
+  <%_ if (field.fieldValidationMax) { _%>
+          max: { value: <%= field.fieldValidateRulesMax %>, message: translate('entity.validation.max', { max: <%= field.fieldValidateRulesMax %> }) },
+  <%_ } _%>
+  <%_ if (field.fieldValidationPattern) { _%>
+          pattern: { value: /<%= field.fieldValidateRulesPatternReact%>/, message: translate('entity.validation.pattern', { pattern: '<%= field.fieldValidateRulesPatternReact.replace(/\\/g, '\\\\')%>' }) },
+  <%_ } _%>
+  <%_ if (field.fieldTypeNumeric) { _%>
+          validate: v => isNumber(v) || translate('entity.validation.number'),
+  <%_ } _%>
+        }}
+<%_ } _%>

package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity-update.component.ts.ejs

@@ -206,7 +206,7 @@ export default class <%= entityAngularName %>Update extends <% if (fieldsContain
         <%_ } else {_%>
         const message = 'A <%= entityAngularName %> is updated with identifier ' + param.id;
         <%_ } _%>
-        return this.$root.$bvToast.toast(message.toString(), {
+        return (this.$root as any).$bvToast.toast(message.toString(), {
           toaster: 'b-toaster-top-center',
           title: 'Info',
           variant: 'info',
@@ -226,7 +226,7 @@ export default class <%= entityAngularName %>Update extends <% if (fieldsContain
         <%_ } else {_%>
         const message = 'A <%= entityAngularName %> is created with identifier ' + param.id;
         <%_ } _%>
-        this.$root.$bvToast.toast(message.toString(), {
+        (this.$root as any).$bvToast.toast(message.toString(), {
           toaster: 'b-toaster-top-center',
           title: 'Success',
           variant: 'success',

package/generators/entity-i18n/templates/i18n/entity_fr.json.ejs

@@ -39,7 +39,7 @@ let helpBlocks = 0; %>
 <%_ } _%>
 <%_ if (!readOnly) { _%>
             "delete": {
-                "question": "Etes-vous certain de vouloir supprimer le <%= entityClassHumanized %> {{ id }} ?"
+                "question": "Êtes-vous certain de vouloir supprimer le <%= entityClassHumanized %> {{ id }} ?"
             },
 <%_ } _%>
             "detail": {

package/generators/entity-server/cleanup.js

@@ -0,0 +1,41 @@
+/**
+ * Copyright 2013-2022 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Removes server files that where generated in previous JHipster versions and therefore
+ * need to be removed.
+ *
+ * @param {any} generator - reference to generator
+ * @param {string} javaDir - Java directory
+ * @param {string} testDir - Java tests directory
+ */
+function cleanupOldFiles(generator, javaDir, testDir) {
+  if (generator.isJhipsterVersionLessThan('7.6.1')) {
+    if (generator.searchEngineElasticsearch) {
+      generator.removeFile(`${javaDir}/repository/search/SortToFieldSortBuilderConverter.java`);
+    }
+  }
+  if (generator.isJhipsterVersionLessThan('7.7.1')) {
+    generator.removeFile(`${javaDir}/repository/search/SortToSortBuilderListConverter.java`);
+    generator.removeFile(`${testDir}/repository/search/${generator.entityClass}SearchRepositoryMockConfiguration.java`);
+  }
+}
+
+module.exports = {
+  cleanupOldFiles,
+};