generator-jhipster 7.9.1 → 7.9.2

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

@@ -39,20 +39,6 @@ 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/react/src/main/webapp/app/modules/administration/gateway/gateway.tsx.ejs

@@ -50,19 +50,11 @@ 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>;
     }
@@ -76,7 +68,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(<% if (serviceDiscoveryType === 'consul') { %>instance.healthService<% } else { %>instance.instanceInfo<% } %>)}</td>
+                <td>{badgeInfo(instance.instanceInfo)}</td>
                 <td>{metadata(instance.metadata)}</td>
               </tr>
             )}

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

@@ -16,20 +16,6 @@ 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.1';
+const JHIPSTER_DEPENDENCIES_VERSION = '7.9.2';
 // 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-jhipster",
-  "version": "7.9.1",
+  "version": "7.9.2",
   "description": "Spring Boot + Angular/React/Vue in one handy generator",
   "keywords": [
     "yeoman-generator",