-
Notifications
You must be signed in to change notification settings - Fork 197
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* release fix for access denied * Feature/fwf 3320 set default language per tenant (#2073) * FWF:3320 [feature] Added dynamic select language per tenant * FWF:3320 [Feature] Fixed test case * FWF:3320 [feature] fixed code, Added Language env * FWF:3320 [Feature] Upgraded version to 6.0.2 * FWF:3320 [Feature] Added strong check for language change * FWF:3320 [feature] Added REACT_APP_LANGUAGE in config template * FWF:3385 [Feature] Updated spanish resource bundle * Update CHANGELOG.md * Update CHANGELOG.md --------- Co-authored-by: abilpraju-aot <[email protected]> Co-authored-by: Abil P Raju <[email protected]>
- Loading branch information
1 parent
007eb7e
commit 64e7b11
Showing
29 changed files
with
840 additions
and
327 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
v6.0.1 | ||
v6.0.2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -132,16 +132,17 @@ services: | |
context: ./../../forms-flow-web-root-config/ | ||
dockerfile: Dockerfile | ||
args: | ||
- MF_FORMSFLOW_WEB_URL=${MF_FORMSFLOW_WEB_URL:-https://forms-flow-microfrontends.aot-technologies.com/[email protected].1/forms-flow-web.gz.js} | ||
- MF_FORMSFLOW_NAV_URL=${MF_FORMSFLOW_NAV_URL:-https://forms-flow-microfrontends.aot-technologies.com/[email protected].1/forms-flow-nav.gz.js} | ||
- MF_FORMSFLOW_SERVICE_URL=${MF_FORMSFLOW_SERVICE_URL:-https://forms-flow-microfrontends.aot-technologies.com/[email protected].1/forms-flow-service.gz.js} | ||
- MF_FORMSFLOW_ADMIN_URL=${MF_FORMSFLOW_ADMIN_URL:-https://forms-flow-microfrontends.aot-technologies.com/[email protected].1/forms-flow-admin.gz.js} | ||
- MF_FORMSFLOW_THEME_URL=${MF_FORMSFLOW_THEME_URL:-https://forms-flow-microfrontends.aot-technologies.com/[email protected].1/forms-flow-theme.gz.js} | ||
- MF_FORMSFLOW_WEB_URL=${MF_FORMSFLOW_WEB_URL:-https://forms-flow-microfrontends.aot-technologies.com/[email protected].2/forms-flow-web.gz.js} | ||
- MF_FORMSFLOW_NAV_URL=${MF_FORMSFLOW_NAV_URL:-https://forms-flow-microfrontends.aot-technologies.com/[email protected].2/forms-flow-nav.gz.js} | ||
- MF_FORMSFLOW_SERVICE_URL=${MF_FORMSFLOW_SERVICE_URL:-https://forms-flow-microfrontends.aot-technologies.com/[email protected].2/forms-flow-service.gz.js} | ||
- MF_FORMSFLOW_ADMIN_URL=${MF_FORMSFLOW_ADMIN_URL:-https://forms-flow-microfrontends.aot-technologies.com/[email protected].2/forms-flow-admin.gz.js} | ||
- MF_FORMSFLOW_THEME_URL=${MF_FORMSFLOW_THEME_URL:-https://forms-flow-microfrontends.aot-technologies.com/[email protected].2/forms-flow-theme.gz.js} | ||
- NODE_ENV=${NODE_ENV:-production} | ||
entrypoint: /bin/sh -c "/usr/share/nginx/html/config/env.sh && nginx -g 'daemon off;'" | ||
environment: | ||
- NODE_ENV=${NODE_ENV:-production} | ||
- REACT_APP_API_SERVER_URL=${FORMIO_DEFAULT_PROJECT_URL} | ||
- REACT_APP_LANGUAGE=${LANGUAGE:-en} | ||
- REACT_APP_API_PROJECT_URL=${FORMIO_DEFAULT_PROJECT_URL} | ||
- REACT_APP_KEYCLOAK_CLIENT=${KEYCLOAK_WEB_CLIENT_ID:-forms-flow-web} | ||
- REACT_APP_WEB_BASE_URL=${FORMSFLOW_API_URL} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -186,19 +186,22 @@ CUSTOM_SUBMISSION_URL=http://{your-ip-address}:{port} | |
#The MF Variables below are used to get MicroFrontend Components Created | ||
|
||
##For running locally or if have custom changes then change the url to the one forms-flow-web folder content is running | ||
#MF_FORMSFLOW_WEB_URL=https://forms-flow-microfrontends.aot-technologies.com/[email protected].1/forms-flow-web.gz.js | ||
#MF_FORMSFLOW_WEB_URL=https://forms-flow-microfrontends.aot-technologies.com/[email protected].2/forms-flow-web.gz.js | ||
|
||
## Refer Github Repo https://github.com/AOT-Technologies/forms-flow-ai-micro-front-ends and update to your own custom implementation for the Components here | ||
#MF_FORMSFLOW_NAV_URL=https://forms-flow-microfrontends.aot-technologies.com/[email protected].1/forms-flow-nav.gz.js | ||
#MF_FORMSFLOW_SERVICE_URL=https://forms-flow-microfrontends.aot-technologies.com/[email protected].1/forms-flow-service.gz.js | ||
#MF_FORMSFLOW_ADMIN_URL=https://forms-flow-microfrontends.aot-technologies.com/[email protected].1/forms-flow-admin.gz.js | ||
#MF_FORMSFLOW_THEME_URL=https://forms-flow-microfrontends.aot-technologies.com/[email protected].1/forms-flow-theme.gz.js | ||
#MF_FORMSFLOW_NAV_URL=https://forms-flow-microfrontends.aot-technologies.com/[email protected].2/forms-flow-nav.gz.js | ||
#MF_FORMSFLOW_SERVICE_URL=https://forms-flow-microfrontends.aot-technologies.com/[email protected].2/forms-flow-service.gz.js | ||
#MF_FORMSFLOW_ADMIN_URL=https://forms-flow-microfrontends.aot-technologies.com/[email protected].2/forms-flow-admin.gz.js | ||
#MF_FORMSFLOW_THEME_URL=https://forms-flow-microfrontends.aot-technologies.com/[email protected].2/forms-flow-theme.gz.js | ||
|
||
#++++++++++++++++--- formsflow.ai Web Microfrontend components ENV Variables - STOP ---+++++++++++++++++++++++++# | ||
|
||
|
||
#++++++++++++++++--- formsflow.ai Web Modules and themeing ENV Variables - START ---+++++++++++++++++++++++++# | ||
|
||
# Set Application default LANGUAGE | ||
#LANGUAGE=en | ||
|
||
# Only use if need to disable a particular module in forms-flow-web, default is true for all. | ||
#ENABLE_FORMS_MODULE=true | ||
#ENABLE_TASKS_MODULE=true | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -57,12 +57,13 @@ is mentioned on the [link](../forms-flow-idm/keycloak/README.md#create-forms-flo | |
Variable name | Meaning | Possible values | Default value | | ||
--- | --- |----------| --- | ||
`MF_FORMSFLOW_WEB_URL`:triangular_flag_on_post:| For running locally/ if have custom changes | `//forms-flow-microfrontends.aot-technologies.com/[email protected].1/forms-flow-web.gz.js` <br> <br> For custom changes: `http://{your-ip-address}:3004/forms-flow-web.js` | `//forms-flow-microfrontends.aot-technologies.com/[email protected].1/forms-flow-nav.gz.js` | ||
`MF_FORMSFLOW_NAV_UR`:triangular_flag_on_post:|For custom implementation of Navbar component, refer [here](https://github.com/AOT-Technologies/forms-flow-ai-micro-front-ends/tree/main/forms-flow-nav)| |`//forms-flow-microfrontends.aot-technologies.com/[email protected].1/forms-flow-nav.gz.js` | ||
`MF_FORMSFLOW_SERVICE_URL`:triangular_flag_on_post:|For custom implementation of Service component, refer [here](https://github.com/AOT-Technologies/forms-flow-ai-micro-front-ends/tree/main/forms-flow-service)| |`//forms-flow-microfrontends.aot-technologies.com/[email protected].1/forms-flow-service.gz.js` | ||
`MF_FORMSFLOW_ADMIN_URL`:triangular_flag_on_post:|For custom implementation of Admin component, refer [here](https://github.com/AOT-Technologies/forms-flow-ai-micro-front-ends/tree/main/forms-flow-admin)| |`//forms-flow-microfrontends.aot-technologies.com/[email protected].1/forms-flow-admin.gz.js` | ||
`MF_FORMSFLOW_THEME_URL`:triangular_flag_on_post:| For custom implementation of Theme component, refer [here](https://github.com/AOT-Technologies/forms-flow-ai-micro-front-ends/tree/main/forms-flow-theme) | | `//forms-flow-microfrontends.aot-technologies.com/[email protected].1/forms-flow-theme.gz.js` | ||
`MF_FORMSFLOW_WEB_URL`:triangular_flag_on_post:| For running locally/ if have custom changes | `//forms-flow-microfrontends.aot-technologies.com/[email protected].2/forms-flow-web.gz.js` <br> <br> For custom changes: `http://{your-ip-address}:3004/forms-flow-web.js` | `//forms-flow-microfrontends.aot-technologies.com/[email protected].2/forms-flow-nav.gz.js` | ||
`MF_FORMSFLOW_NAV_UR`:triangular_flag_on_post:|For custom implementation of Navbar component, refer [here](https://github.com/AOT-Technologies/forms-flow-ai-micro-front-ends/tree/main/forms-flow-nav)| |`//forms-flow-microfrontends.aot-technologies.com/[email protected].2/forms-flow-nav.gz.js` | ||
`MF_FORMSFLOW_SERVICE_URL`:triangular_flag_on_post:|For custom implementation of Service component, refer [here](https://github.com/AOT-Technologies/forms-flow-ai-micro-front-ends/tree/main/forms-flow-service)| |`//forms-flow-microfrontends.aot-technologies.com/[email protected].2/forms-flow-service.gz.js` | ||
`MF_FORMSFLOW_ADMIN_URL`:triangular_flag_on_post:|For custom implementation of Admin component, refer [here](https://github.com/AOT-Technologies/forms-flow-ai-micro-front-ends/tree/main/forms-flow-admin)| |`//forms-flow-microfrontends.aot-technologies.com/[email protected].2/forms-flow-admin.gz.js` | ||
`MF_FORMSFLOW_THEME_URL`:triangular_flag_on_post:| For custom implementation of Theme component, refer [here](https://github.com/AOT-Technologies/forms-flow-ai-micro-front-ends/tree/main/forms-flow-theme) | | `//forms-flow-microfrontends.aot-technologies.com/[email protected].2/forms-flow-theme.gz.js` | ||
`NODE_ENV`| Define project level configuration | `development, test, production` | `production` | ||
`LANGUAGE`| Set Application default language | `en` `zh-CN` `pt` `fr` `bg` `de` `es` | `en` | ||
`FORMIO_DEFAULT_PROJECT_URL`:triangular_flag_on_post:|The URL of the form.io server| |`http://{your-ip-address}:3001` | ||
`KEYCLOAK_WEB_CLIENTID`|Your Keycloak Client ID within the realm| eg. forms-flow-web | `forms-flow-web` | ||
`KEYCLOAK_URL_REALM`| The Keycloak realm to use| eg. forms-flow-ai | `forms-flow-ai` | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,16 +5,17 @@ services: | |
context: . | ||
dockerfile: Dockerfile | ||
args: | ||
- MF_FORMSFLOW_WEB_URL=${MF_FORMSFLOW_WEB_URL:-https://forms-flow-microfrontends.aot-technologies.com/[email protected].1/forms-flow-web.gz.js} | ||
- MF_FORMSFLOW_NAV_URL=${MF_FORMSFLOW_NAV_URL:-https://forms-flow-microfrontends.aot-technologies.com/[email protected].1/forms-flow-nav.gz.js} | ||
- MF_FORMSFLOW_SERVICE_URL=${MF_FORMSFLOW_SERVICE_URL:-https://forms-flow-microfrontends.aot-technologies.com/[email protected].1/forms-flow-service.gz.js} | ||
- MF_FORMSFLOW_ADMIN_URL=${MF_FORMSFLOW_ADMIN_URL:-https://forms-flow-microfrontends.aot-technologies.com/[email protected].1/forms-flow-admin.gz.js} | ||
- MF_FORMSFLOW_THEME_URL=${MF_FORMSFLOW_THEME_URL:-https://forms-flow-microfrontends.aot-technologies.com/[email protected].1/forms-flow-theme.gz.js} | ||
- MF_FORMSFLOW_WEB_URL=${MF_FORMSFLOW_WEB_URL:-https://forms-flow-microfrontends.aot-technologies.com/[email protected].2/forms-flow-web.gz.js} | ||
- MF_FORMSFLOW_NAV_URL=${MF_FORMSFLOW_NAV_URL:-https://forms-flow-microfrontends.aot-technologies.com/[email protected].2/forms-flow-nav.gz.js} | ||
- MF_FORMSFLOW_SERVICE_URL=${MF_FORMSFLOW_SERVICE_URL:-https://forms-flow-microfrontends.aot-technologies.com/[email protected].2/forms-flow-service.gz.js} | ||
- MF_FORMSFLOW_ADMIN_URL=${MF_FORMSFLOW_ADMIN_URL:-https://forms-flow-microfrontends.aot-technologies.com/[email protected].2/forms-flow-admin.gz.js} | ||
- MF_FORMSFLOW_THEME_URL=${MF_FORMSFLOW_THEME_URL:-https://forms-flow-microfrontends.aot-technologies.com/[email protected].2/forms-flow-theme.gz.js} | ||
- NODE_ENV=${NODE_ENV:-production} | ||
entrypoint: /bin/sh -c "/usr/share/nginx/html/config/env.sh && nginx -g 'daemon off;'" | ||
environment: | ||
- NODE_ENV=${NODE_ENV:-production} | ||
- REACT_APP_API_SERVER_URL=${FORMIO_DEFAULT_PROJECT_URL} | ||
- REACT_APP_LANGUAGE=${LANGUAGE:-en} | ||
- REACT_APP_API_PROJECT_URL=${FORMIO_DEFAULT_PROJECT_URL} | ||
- REACT_APP_KEYCLOAK_CLIENT=${KEYCLOAK_WEB_CLIENT_ID:-forms-flow-web} | ||
- REACT_APP_WEB_BASE_URL=${FORMSFLOW_API_URL} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,18 +13,18 @@ | |
|
||
|
||
##For running locally or if have custom changes then change the url to the one forms-flow-web folder content is running | ||
#MF_FORMSFLOW_WEB_URL=https://forms-flow-microfrontends.aot-technologies.com/[email protected].1/forms-flow-web.gz.js | ||
#MF_FORMSFLOW_WEB_URL=https://forms-flow-microfrontends.aot-technologies.com/[email protected].2/forms-flow-web.gz.js | ||
|
||
#TODO only for Customised Local delevelopment with code from forms-flow-web folder content use below default values instead | ||
#MF_FORMSFLOW_WEB_URL=//{your-ip-address}:3004/forms-flow-web.js | ||
|
||
## Use this as default values | ||
## (Note: https://forms-flow-microfrontends.aot-technologies.com/{MF-componet-name}@{version}/{MF-componet-name}.gz.js, will be the default format ) | ||
## Refer Github Repo https://github.com/AOT-Technologies/forms-flow-ai-micro-front-ends and update to your own custom implementation for the Components here | ||
#MF_FORMSFLOW_NAV_URL=https://forms-flow-microfrontends.aot-technologies.com/[email protected].1/forms-flow-nav.gz.js | ||
#MF_FORMSFLOW_SERVICE_URL=https://forms-flow-microfrontends.aot-technologies.com/[email protected].1/forms-flow-service.gz.js | ||
#MF_FORMSFLOW_ADMIN_URL=https://forms-flow-microfrontends.aot-technologies.com/[email protected].1/forms-flow-admin.gz.js | ||
#MF_FORMSFLOW_THEME_URL=https://forms-flow-microfrontends.aot-technologies.com/[email protected].1/forms-flow-theme.gz.js | ||
#MF_FORMSFLOW_NAV_URL=https://forms-flow-microfrontends.aot-technologies.com/[email protected].2/forms-flow-nav.gz.js | ||
#MF_FORMSFLOW_SERVICE_URL=https://forms-flow-microfrontends.aot-technologies.com/[email protected].2/forms-flow-service.gz.js | ||
#MF_FORMSFLOW_ADMIN_URL=https://forms-flow-microfrontends.aot-technologies.com/[email protected].2/forms-flow-admin.gz.js | ||
#MF_FORMSFLOW_THEME_URL=https://forms-flow-microfrontends.aot-technologies.com/[email protected].2/forms-flow-theme.gz.js | ||
|
||
#OR | ||
|
||
|
@@ -122,6 +122,9 @@ ENABLE_APPLICATION_ACCESS_PERMISSION_CHECK=false | |
#MT_ADMIN_BASE_URL=http://{your-ip-address}:5010/api | ||
#MT_ADMIN_BASE_URL_VERSION=v1 | ||
|
||
# Set Application default LANGUAGE | ||
#LANGUAGE=en | ||
|
||
# Only use if need to disable a particular module in forms-flow-web, default is true for all. | ||
#ENABLE_FORMS_MODULE=true | ||
#ENABLE_TASKS_MODULE=true | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -139,4 +139,7 @@ export const appState = { | |
isFormChecked: false, | ||
isAllFormChecked: false, | ||
}, | ||
tenants:{ | ||
tenantData: {} | ||
} | ||
}; |
Oops, something went wrong.