Merge pull request #119 from entando/ENG-1666-when-deployed-a-widget-…

…mfe-fails-because-its-not-calling-the-correct-microservice-endpoint

ENG-1666: Explicitly add the "/api" path prefix to the FE api call

generators/entity-server/templates/ui/widgets/detailsWidget/.env.local.ejs

@@ -1,5 +1,5 @@
 <%# { "useBluePrint": true } -%>
-REACT_APP_SERVICE_URL=http://localhost:<%= serverPort %>/services/<%= baseName %>/api
+REACT_APP_SERVICE_URL=http://localhost:<%= serverPort %>/services/<%= baseName %>
 REACT_APP_KEYCLOAK_URL=http://localhost:9080/auth
 REACT_APP_KEYCLOAK_REALM=jhipster
 REACT_APP_KEYCLOAK_CLIENT_ID=web_app

generators/entity-server/templates/ui/widgets/detailsWidget/.env.production.ejs

@@ -1,5 +1,5 @@
 <%# { "useBluePrint": true } -%>
-REACT_APP_SERVICE_URL=http://localhost:<%= serverPort %>/services/<%= baseName %>/api
+REACT_APP_SERVICE_URL=http://localhost:<%= serverPort %>/services/<%= baseName %>
 REACT_APP_KEYCLOAK_URL=http://localhost:9080/auth
 REACT_APP_KEYCLOAK_REALM=jhipster
 REACT_APP_KEYCLOAK_CLIENT_ID=web_app

generators/entity-server/templates/ui/widgets/detailsWidget/bundle/details-widget.ftl.ejs

@@ -3,4 +3,4 @@
 <#-- entando_resource_injection_point -->
 <#-- Don't add anything above this line. The build scripts will automatically link the compiled JS and CSS for you and add them above this line so that the widget can be loaded-->
 
-<<%= entityFileName %>-details service-url="/<%= baseName %>/api" />
+<<%= entityFileName %>-details service-url="/<%= baseName %>" />

generators/entity-server/templates/ui/widgets/detailsWidget/src/api/entity.js.ejs

@@ -1,7 +1,7 @@
 <%# { "useBluePrint": true, "renameTo": "`/${generator.entityFileName}/detailsWidget/src/api/${generator.entityInstance}.js`" } -%>
 import { getDefaultOptions, request } from 'api/helpers';
 
-const resource = '<%= entityApiUrl %>';
+const resource = 'api/<%= entityApiUrl %>';
 
 /* eslint-disable-next-line import/prefer-default-export */
 export const api<%= entityClass %>Get = async (serviceUrl, id) => {

generators/entity-server/templates/ui/widgets/formWidget/.env.local.ejs

@@ -1,5 +1,5 @@
 <%# { "useBluePrint": true } -%>
-REACT_APP_SERVICE_URL=http://localhost:<%= serverPort %>/services/<%= baseName %>/api
+REACT_APP_SERVICE_URL=http://localhost:<%= serverPort %>/services/<%= baseName %>
 REACT_APP_KEYCLOAK_URL=http://localhost:9080/auth
 REACT_APP_KEYCLOAK_REALM=jhipster
 REACT_APP_KEYCLOAK_CLIENT_ID=web_app

generators/entity-server/templates/ui/widgets/formWidget/.env.production.ejs

@@ -1,5 +1,5 @@
 <%# { "useBluePrint": true } -%>
-REACT_APP_SERVICE_URL=http://localhost:<%= serverPort %>/services/<%= baseName %>/api
+REACT_APP_SERVICE_URL=http://localhost:<%= serverPort %>/services/<%= baseName %>
 REACT_APP_KEYCLOAK_URL=http://localhost:9080/auth
 REACT_APP_KEYCLOAK_REALM=jhipster
 REACT_APP_KEYCLOAK_CLIENT_ID=web_app

generators/entity-server/templates/ui/widgets/formWidget/bundle/form-widget.ftl.ejs

@@ -4,4 +4,4 @@
 <#-- Don't add anything above this line. The build scripts will automatically link the compiled JS and CSS for you and add them above this line so that the widget can be loaded-->
 
 <#-- This is the custom element -->
-<<%= entityFileName %>-form service-url="/<%= baseName %>/api" />
+<<%= entityFileName %>-form service-url="/<%= baseName %>" />

generators/entity-server/templates/ui/widgets/formWidget/src/api/entities.js.ejs

@@ -1,7 +1,7 @@
 <%# { "useBluePrint": true, "renameTo": "`/${generator.entityFileName}/formWidget/src/api/${generator.entityInstancePlural}.js`" } -%>
 import { getDefaultOptions, request } from 'api/helpers';
 
-const resource = '<%= entityApiUrl %>';
+const resource = 'api/<%= entityApiUrl %>';
 
 export const api<%= entityClass %>Get = async (serviceUrl, id) => {
   const url = `${serviceUrl}/${resource}/${id}`;

generators/entity-server/templates/ui/widgets/tableWidget/.env.local.ejs

@@ -1,5 +1,5 @@
 <%# { "useBluePrint": true } -%>
-REACT_APP_SERVICE_URL=http://localhost:<%= serverPort %>/services/<%= baseName %>/api
+REACT_APP_SERVICE_URL=http://localhost:<%= serverPort %>/services/<%= baseName %>
 REACT_APP_KEYCLOAK_URL=http://localhost:9080/auth
 REACT_APP_KEYCLOAK_REALM=jhipster
 REACT_APP_KEYCLOAK_CLIENT_ID=web_app

generators/entity-server/templates/ui/widgets/tableWidget/.env.production.ejs

@@ -1,5 +1,5 @@
 <%# { "useBluePrint": true } -%>
-REACT_APP_SERVICE_URL=http://localhost:<%= serverPort %>/services/<%= baseName %>/api
+REACT_APP_SERVICE_URL=http://localhost:<%= serverPort %>/services/<%= baseName %>
 REACT_APP_KEYCLOAK_URL=http://localhost:9080/auth
 REACT_APP_KEYCLOAK_REALM=jhipster
 REACT_APP_KEYCLOAK_CLIENT_ID=web_app

generators/entity-server/templates/ui/widgets/tableWidget/bundle/table-widget.ftl.ejs

@@ -4,4 +4,4 @@
 <#-- Don't add anything above this line. The build scripts will automatically link the compiled JS and CSS for you and add them above this line so that the widget can be loaded-->
 
 <#-- This is the custom element -->
-<<%= entityFileName %>-table service-url="/<%= baseName %>/api" />
+<<%= entityFileName %>-table service-url="/<%= baseName %>" />

generators/entity-server/templates/ui/widgets/tableWidget/src/api/entities.js.ejs

@@ -2,7 +2,7 @@
 import { getFilterQuery } from 'components/filters/utils';
 import { getDefaultOptions, request, getUrl } from 'api/helpers';
 
-const resource = '<%= entityApiUrl %>';
+const resource = 'api/<%= entityApiUrl %>';
 
 export const api<%= entityClassPlural %>Delete = async (serviceUrl, id) => {
   const url = `${serviceUrl}/${resource}/${id}`;