generator-jhipster 7.9.0 → 7.9.1

package/generators/client/templates/angular/package.json

@@ -24,11 +24,11 @@
     "@angular-eslint/eslint-plugin": "14.0.2",
     "@types/node": "16.11.47",
     "@types/jest": "28.1.6",
-    "@typescript-eslint/eslint-plugin": "5.31.0",
+    "@typescript-eslint/eslint-plugin": "5.32.0",
     "browser-sync": "2.27.10",
     "browser-sync-webpack-plugin": "2.3.0",
     "copy-webpack-plugin": "11.0.0",
-    "eslint": "8.20.0",
+    "eslint": "8.21.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-webpack-plugin": "3.2.0",
     "folder-hash": "4.0.2",

package/generators/client/templates/angular/src/main/webapp/app/admin/gateway/gateway.component.ts.ejs

@@ -39,6 +39,20 @@ export class GatewayComponent implements OnInit {
   refresh(): void {
     this.updatingRoutes = true;
     this.gatewayRoutesService.findAll().subscribe(gatewayRoutes => {
+      <%_ if (serviceDiscoveryType === 'consul') { _%>
+      gatewayRoutes.serviceInstances = gatewayRoutes.serviceInstances.map(serviceInstance => {
+        if (serviceInstance.healthService && serviceInstance.healthService.checks) {
+          if (serviceInstance.healthService.checks.filter(
+            check => check.status === 'PASSING'
+          ).length === serviceInstance.healthService.checks.length) {
+            serviceInstance.instanceInfo.status = 'UP'
+          } else {
+            serviceInstance.instanceInfo.status = 'DOWN'
+          }
+        }
+        return serviceInstance;
+      });
+      <%_ } _%>
       this.gatewayRoutes = gatewayRoutes;
       this.updatingRoutes = false;
     });

package/generators/client/templates/common/package.json

@@ -3,12 +3,12 @@
     "@cypress/code-coverage": "3.10.0",
     "babel-loader": "8.2.5",
     "babel-plugin-istanbul": "6.1.1",
-    "cypress": "10.3.1",
+    "cypress": "10.4.0",
     "cypress-audit": "1.1.0",
     "eslint-plugin-cypress": "2.12.1",
-    "lighthouse": "9.6.4",
+    "lighthouse": "9.6.5",
     "nyc": "15.1.0",
-    "swagger-ui-dist": "4.13.0"
+    "swagger-ui-dist": "4.13.1"
   },
   "dependencies": {
     "dayjs": "1.11.4"

package/generators/client/templates/react/package.json

@@ -18,7 +18,7 @@
     "react-redux-loading-bar": "5.0.4",
     "react-router-dom": "6.3.0",
     "react-toastify": "9.0.7",
-    "react-transition-group": "4.4.4",
+    "react-transition-group": "4.4.5",
     "reactstrap": "9.1.2",
     "redux": "4.2.0",
     "redux-thunk": "2.4.1",
@@ -36,8 +36,8 @@
     "@types/react-redux": "7.1.24",
     "@types/redux": "3.6.31",
     "@types/webpack-env": "1.17.0",
-    "@typescript-eslint/eslint-plugin": "5.31.0",
-    "@typescript-eslint/parser": "5.31.0",
+    "@typescript-eslint/eslint-plugin": "5.32.0",
+    "@typescript-eslint/parser": "5.32.0",
     "autoprefixer": "10.4.8",
     "browser-sync": "2.27.10",
     "browser-sync-webpack-plugin": "2.3.0",
@@ -46,7 +46,7 @@
     "cross-env": "7.0.3",
     "css-loader": "6.7.1",
     "css-minimizer-webpack-plugin": "4.0.0",
-    "eslint": "8.20.0",
+    "eslint": "8.21.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-react": "7.30.1",
     "eslint-webpack-plugin": "3.2.0",
@@ -66,7 +66,7 @@
     "react-infinite-scroll-component": "6.1.0",
     "redux-mock-store": "1.5.4",
     "rimraf": "3.0.2",
-    "sass": "1.54.0",
+    "sass": "1.54.1",
     "sass-loader": "13.0.2",
     "simple-progress-webpack-plugin": "2.0.0",
     "sinon": "14.0.0",

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

@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 import React from 'react';
-import ReactDOM from 'react-dom';
+import { createRoot } from 'react-dom/client';
 import { Provider } from 'react-redux';
 import { bindActionCreators } from 'redux';
 
@@ -42,18 +42,17 @@ setupAxiosInterceptors(() => actions.clearAuthentication('login.error.unauthoriz
 loadIcons();
 
 const rootEl = document.getElementById('root');
+const root = createRoot(rootEl);
 
 const render = Component =>
-  // eslint-disable-next-line react/no-render-return-value
-  ReactDOM.render(
+  root.render(
     <ErrorBoundary>
       <Provider store={store}>
         <div>
           <Component />
         </div>
       </Provider>
-    </ErrorBoundary>,
-    rootEl
+    </ErrorBoundary>
   );
 
 render(AppComponent);

package/generators/client/templates/react/src/main/webapp/app/modules/administration/gateway/gateway.tsx.ejs

@@ -50,11 +50,19 @@ export const GatewayPage = () => {
 
   const badgeInfo = info => {
     if (info) {
+      <%_ if (serviceDiscoveryType === 'consul') { _%>
+      if (info.checks && info.checks.filter(check => check.status === 'PASSING').length === info.checks.length) {
+        return <Badge color="success">UP</Badge>;
+      } else {
+        return <Badge color="danger">DOWN</Badge>;
+      }
+      <%_ } else { _%>
       if (info.status === 'UP') {
         return <Badge color="success">{info.status}</Badge>;
       } else {
         return <Badge color="danger">{info.status}</Badge>;
       }
+      <%_ } _%>
     } else {
       return <Badge color="warning">?</Badge>;
     }
@@ -68,7 +76,7 @@ export const GatewayPage = () => {
             {route.serviceInstances.map((instance, i) =>
               <tr key={instance.instanceInfo + '-info'}>
                 <td><a href={instance.uri} target="_blank" rel="noopener noreferrer">{instance.uri}</a></td>
-                <td>{badgeInfo(instance.instanceInfo)}</td>
+                <td>{badgeInfo(<% if (serviceDiscoveryType === 'consul') { %>instance.healthService<% } else { %>instance.instanceInfo<% } %>)}</td>
                 <td>{metadata(instance.metadata)}</td>
               </tr>
             )}

package/generators/client/templates/vue/package.json

@@ -50,13 +50,13 @@
     "postcss-loader": "7.0.1",
     "postcss-url": "10.1.3",
     "rimraf": "3.0.2",
-    "sass": "1.54.0",
+    "sass": "1.54.1",
     "sass-loader": "13.0.2",
     "sinon": "14.0.0",
     "terser-webpack-plugin": "5.3.3",
     "ts-jest": "28.0.7",
     "ts-loader": "9.3.1",
-    "eslint": "8.20.0",
+    "eslint": "8.21.0",
     "eslint-plugin-prettier": "4.2.1",
     "eslint-plugin-vue": "8.7.1",
     "typescript": "4.7.4",

package/generators/client/templates/vue/src/main/webapp/app/admin/gateway/gateway.component.ts.ejs

@@ -16,6 +16,20 @@ export default class <%=jhiPrefixCapitalized%>GatewayComponent extends Vue {
     this.updatingRoutes = true;
     this.gatewayService().findAll().then((res) => {
       this.gatewayRoutes = res.data;
+      <%_ if (serviceDiscoveryType === 'consul') { _%>
+      this.gatewayRoutes.serviceInstances = this.gatewayRoutes.serviceInstances.map(serviceInstance => {
+        if (serviceInstance.healthService && serviceInstance.healthService.checks) {
+          if (serviceInstance.healthService.checks.filter(
+            check => check.status === 'PASSING'
+          ).length === serviceInstance.healthService.checks.length) {
+            serviceInstance.instanceInfo.status = 'UP'
+          } else {
+            serviceInstance.instanceInfo.status = 'DOWN'
+          }
+        }
+        return serviceInstance;
+      });
+      <%_ } _%>
       this.updatingRoutes = false;
     });
   }

package/generators/generator-constants.js

@@ -33,7 +33,7 @@ const NPM_VERSION = commonPackageJson.devDependencies.npm;
 const OPENAPI_GENERATOR_CLI_VERSION = '2.5.1';
 
 // Libraries version
-const JHIPSTER_DEPENDENCIES_VERSION = '7.9.0';
+const JHIPSTER_DEPENDENCIES_VERSION = '7.9.1';
 // The spring-boot version should match the one managed by https://mvnrepository.com/artifact/tech.jhipster/jhipster-dependencies/JHIPSTER_DEPENDENCIES_VERSION
 const SPRING_BOOT_VERSION = '2.7.2';
 const LIQUIBASE_VERSION = '4.12.0';

package/generators/server/templates/src/main/resources/config/application-prod.yml.ejs

@@ -229,7 +229,7 @@ spring:
 # keytool -genkey -alias <%= baseName.toLowerCase() %> -storetype PKCS12 -keyalg RSA -keysize 2048 -keystore keystore.p12 -validity 3650
 #
 # You can also use Let's Encrypt:
-# https://maximilian-boehm.com/hp2121/Create-a-Java-Keystore-JKS-from-Let-s-Encrypt-Certificates.htm
+# See details in topic "Create a Java Keystore (.JKS) from Let's Encrypt Certificates" on https://maximilian-boehm.com/en-gb/blog
 #
 # Then, modify the server.ssl properties so your "server" configuration looks like:
 #

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-jhipster",
-  "version": "7.9.0",
+  "version": "7.9.1",
   "description": "Spring Boot + Angular/React/Vue in one handy generator",
   "keywords": [
     "yeoman-generator",
@@ -123,7 +123,7 @@
   "devDependencies": {
     "chai": "4.3.6",
     "ejs-lint": "1.2.2",
-    "eslint": "8.20.0",
+    "eslint": "8.21.0",
     "eslint-config-airbnb-base": "15.0.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-chai-friendly": "0.7.2",

package/utils/field.js

@@ -187,15 +187,13 @@ const generateFakeDataForField = (field, faker, changelogDate, type = 'csv') =>
       data = undefined;
     }
   }
-  if (
-    data !== undefined &&
-    type === 'ts' &&
+  if (data !== undefined) {
     // eslint-disable-next-line no-template-curly-in-string
-    ![BOOLEAN, INTEGER, LONG, FLOAT, '${floatType}', DOUBLE, BIG_DECIMAL].includes(field.fieldType)
-  ) {
-    data = `'${data}'`;
-  } else if (data !== undefined && type === 'csv' && field.fieldValidate && field.fieldValidateRules.includes(PATTERN)) {
-    data = `"${data}"`;
+    if (type === 'ts' && ![BOOLEAN, INTEGER, LONG, FLOAT, '${floatType}', DOUBLE, BIG_DECIMAL].includes(field.fieldType)) {
+      data = `'${typeof data === 'string' ? data.replace(/'/g, "\\'") : data}'`;
+    } else if (type === 'csv' && field.fieldValidate && field.fieldValidateRules.includes(PATTERN)) {
+      data = `"${typeof data === 'string' ? data.replace(/"/g, '\\"') : data}"`;
+    }
   }
 
   return data;