Skip to content

Commit

Permalink
FWF-3319: [Added] Spanish resource bundle (#2049)
Browse files Browse the repository at this point in the history
* FWF-3319: Added spanish resource bundle
- removed unwanted files of resource bundle
- changed version to 6.0.1

* FWF3319: changed utils head to 6.0.1

* FWF3319: changed changelog date format

* FWF3319: fixed typo of dashboard

* FWF3319: Fixed pylint error

* FWF3319: Changed sample.env values
  • Loading branch information
shuhaib-aot authored May 17, 2024
1 parent ba4b9be commit 2bb1e3f
Show file tree
Hide file tree
Showing 31 changed files with 333 additions and 43 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

Mark items as `Added`, `Changed`, `Fixed`, `Modified`, `Removed`, `Untested Features`, `Upcoming Features`, `Known Issues`

## 6.0.1 - 2024-05-16

`Added`

**forms-flow-web-root-config**
* Added resouce bundle for Spanish

## 6.0.0 - 2024-04-05

`Added`
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[![FormsFlow BPM CI](https://github.com/AOT-Technologies/forms-flow-ai/actions/workflows/forms-flow-bpm-ci.yml/badge.svg)](https://github.com/AOT-Technologies/forms-flow-ai/actions)
[![Join the chat at https://gitter.im/forms-flow-ai/community](https://badges.gitter.im/forms-flow-ai/community.svg)](https://gitter.im/forms-flow-ai/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![Join the chat at https://stackoverflow.com/questions/tagged/formsflow.ai](https://img.shields.io/badge/ask%20-on%20%20stackoverflow-F47F24)](https://stackoverflow.com/questions/tagged/formsflow.ai?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
<img src="https://img.shields.io/badge/release-v6.0.0-blue"/>
<img src="https://img.shields.io/badge/release-v6.0.1-blue"/>
<img src="https://img.shields.io/badge/LICENSE-Apache%202-green"/>

[**formsflow.ai**](https://formsflow.ai/) is a Free, Open-Source, Low Code Development Platform for rapidly building powerful business applications. [**formsflow.ai**](https://formsflow.ai/) combines leading Open-Source applications including [form.io](https://form.io) forms, Camunda’s workflow engine, Keycloak’s security, and Redash’s data analytics into a seamless, integrated platform.
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v6.0.0
v6.0.1
10 changes: 5 additions & 5 deletions deployment/docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,11 @@ 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].0/forms-flow-web.gz.js}
- MF_FORMSFLOW_NAV_URL=${MF_FORMSFLOW_NAV_URL:-https://forms-flow-microfrontends.aot-technologies.com/[email protected].0/forms-flow-nav.gz.js}
- MF_FORMSFLOW_SERVICE_URL=${MF_FORMSFLOW_SERVICE_URL:-https://forms-flow-microfrontends.aot-technologies.com/[email protected].0/forms-flow-service.gz.js}
- MF_FORMSFLOW_ADMIN_URL=${MF_FORMSFLOW_ADMIN_URL:-https://forms-flow-microfrontends.aot-technologies.com/[email protected].0/forms-flow-admin.gz.js}
- MF_FORMSFLOW_THEME_URL=${MF_FORMSFLOW_THEME_URL:-https://forms-flow-microfrontends.aot-technologies.com/[email protected].0/forms-flow-theme.gz.js}
- 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}
- NODE_ENV=${NODE_ENV:-production}
entrypoint: /bin/sh -c "/usr/share/nginx/html/config/env.sh && nginx -g 'daemon off;'"
environment:
Expand Down
10 changes: 5 additions & 5 deletions deployment/docker/sample.env
Original file line number Diff line number Diff line change
Expand Up @@ -186,13 +186,13 @@ 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].0/forms-flow-web.gz.js
#MF_FORMSFLOW_WEB_URL=https://forms-flow-microfrontends.aot-technologies.com/[email protected].1/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].0/forms-flow-nav.gz.js
#MF_FORMSFLOW_SERVICE_URL=https://forms-flow-microfrontends.aot-technologies.com/[email protected].0/forms-flow-service.gz.js
#MF_FORMSFLOW_ADMIN_URL=https://forms-flow-microfrontends.aot-technologies.com/[email protected].0/forms-flow-admin.gz.js
#MF_FORMSFLOW_THEME_URL=https://forms-flow-microfrontends.aot-technologies.com/[email protected].0/forms-flow-theme.gz.js
#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

#++++++++++++++++--- formsflow.ai Web Microfrontend components ENV Variables - STOP ---+++++++++++++++++++++++++#

Expand Down
2 changes: 1 addition & 1 deletion forms-flow-api-utils/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def read_requirements(filename):

setuptools.setup(
name='formsflow_api_utils',
version='6.0.0',
version='6.0.1',
author='AOT Technologies',
description='Formsflow api related libraries.',
long_description=read("README.md"),
Expand Down
2 changes: 1 addition & 1 deletion forms-flow-api/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ ecdsa==0.18.0
flask-jwt-oidc==0.3.0
flask-marshmallow==1.2.1
flask-restx==1.3.0
formsflow_api_utils @ git+https://github.com/AOT-Technologies/forms-flow-ai.git@release/6.0.0#subdirectory=forms-flow-api-utils
formsflow_api_utils @ git+https://github.com/AOT-Technologies/forms-flow-ai.git@release/6.0.1#subdirectory=forms-flow-api-utils
gunicorn==21.2.0
h11==0.14.0
h2==4.1.0
Expand Down
2 changes: 1 addition & 1 deletion forms-flow-api/requirements/prod.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ sqlalchemy_utils
markupsafe
PyJWT
redis
git+https://github.com/AOT-Technologies/forms-flow-ai.git@release/6.0.0#egg=formsflow_api_utils&subdirectory=forms-flow-api-utils
git+https://github.com/AOT-Technologies/forms-flow-ai.git@release/6.0.1#egg=formsflow_api_utils&subdirectory=forms-flow-api-utils
2 changes: 1 addition & 1 deletion forms-flow-api/setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = formsflow_api
version = 6.0.0
version = 6.0.1
author = aot-technologies
classifiers =
Development Status :: Production
Expand Down
1 change: 1 addition & 0 deletions forms-flow-api/src/formsflow_api/services/external/bpm.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ def _get_url_(cls, endpoint_type: BPMEndpointType):
"""Get Url."""
bpm_api_base = current_app.config.get("BPM_API_URL")
try:
url = None
if endpoint_type == BPMEndpointType.PROCESS_DEFINITION:
url = f"{bpm_api_base}/engine-rest-ext/v1/process-definition"
elif endpoint_type == BPMEndpointType.FORM_AUTH_DETAILS:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ def get_users( # pylint: disable-msg=too-many-arguments
current_app.logger.debug(
f"Fetching users from keycloak under {group_name} group..."
)
user_count = None
if group_name:
group = self.client.get_request(url_path=f"group-by-path/{group_name}")
group_id = group.get("id")
Expand Down
6 changes: 3 additions & 3 deletions forms-flow-bpm/forms-flow-bpm-camunda/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
<parent>
<groupId>formsflow.ai</groupId>
<artifactId>forms-flow-bpm</artifactId>
<version>6.0.0</version>
<version>6.0.1</version>
</parent>

<artifactId>formsflow-bpm-camunda</artifactId>
<version>6.0.0</version>
<version>6.0.1</version>

<name>formsflow BPM Camunda Extension</name>
<description>formsflow BPM Camunda Extension</description>
Expand Down Expand Up @@ -69,7 +69,7 @@
<dependency>
<groupId>formsflow.ai</groupId>
<artifactId>forms-flow-bpm-utils</artifactId>
<version>6.0.0</version>
<version>6.0.1</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.yaml/snakeyaml -->
Expand Down
4 changes: 2 additions & 2 deletions forms-flow-bpm/forms-flow-bpm-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
<parent>
<groupId>formsflow.ai</groupId>
<artifactId>forms-flow-bpm</artifactId>
<version>6.0.0</version>
<version>6.0.1</version>
</parent>

<artifactId>forms-flow-bpm-utils</artifactId>
<version>6.0.0</version>
<version>6.0.1</version>

<name>formsflow BPM Extension Utils</name>
<description>formsflow BPM Extension</description>
Expand Down
2 changes: 1 addition & 1 deletion forms-flow-bpm/pom-default.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>formsflow.ai</groupId>
<artifactId>forms-flow-bpm</artifactId>
<version>6.0.0</version>
<version>6.0.1</version>
<relativePath>pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion forms-flow-bpm/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>formsflow.ai</groupId>
<artifactId>forms-flow-bpm</artifactId>
<version>6.0.0</version>
<version>6.0.1</version>
<packaging>pom</packaging>

<name>formsflow BPM Extension</name>
Expand Down
2 changes: 1 addition & 1 deletion forms-flow-documents/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ ecdsa==0.18.0
flask-jwt-oidc==0.3.0
flask-marshmallow==1.2.1
flask-restx==1.3.0
formsflow_api_utils @ git+https://github.com/AOT-Technologies/forms-flow-ai.git@release/6.0.0#subdirectory=forms-flow-api-utils
formsflow_api_utils @ git+https://github.com/AOT-Technologies/forms-flow-ai.git@release/6.0.1#subdirectory=forms-flow-api-utils
gunicorn==21.2.0
h11==0.14.0
h2==4.1.0
Expand Down
2 changes: 1 addition & 1 deletion forms-flow-documents/requirements/prod.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ PyJWT
selenium
selenium-wire
nested-lookup
git+https://github.com/AOT-Technologies/forms-flow-ai.git@release/6.0.0#egg=formsflow_api_utils&subdirectory=forms-flow-api-utils
git+https://github.com/AOT-Technologies/forms-flow-ai.git@release/6.0.1#egg=formsflow_api_utils&subdirectory=forms-flow-api-utils
2 changes: 1 addition & 1 deletion forms-flow-documents/setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = formsflow_documents
version = 6.0.0
version = 6.0.1
author = aot-technologies
classifiers =
Development Status :: Beta
Expand Down
10 changes: 5 additions & 5 deletions forms-flow-web-root-config/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ 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].0/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].0/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].0/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].0/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].0/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].0/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].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`
`NODE_ENV`| Define project level configuration | `development, test, production` | `production`
`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`
Expand Down
10 changes: 5 additions & 5 deletions forms-flow-web-root-config/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ services:
context: .
dockerfile: Dockerfile
args:
- MF_FORMSFLOW_WEB_URL=${MF_FORMSFLOW_WEB_URL:-https://forms-flow-microfrontends.aot-technologies.com/[email protected].0/forms-flow-web.gz.js}
- MF_FORMSFLOW_NAV_URL=${MF_FORMSFLOW_NAV_URL:-https://forms-flow-microfrontends.aot-technologies.com/[email protected].0/forms-flow-nav.gz.js}
- MF_FORMSFLOW_SERVICE_URL=${MF_FORMSFLOW_SERVICE_URL:-https://forms-flow-microfrontends.aot-technologies.com/[email protected].0/forms-flow-service.gz.js}
- MF_FORMSFLOW_ADMIN_URL=${MF_FORMSFLOW_ADMIN_URL:-https://forms-flow-microfrontends.aot-technologies.com/[email protected].0/forms-flow-admin.gz.js}
- MF_FORMSFLOW_THEME_URL=${MF_FORMSFLOW_THEME_URL:-https://forms-flow-microfrontends.aot-technologies.com/[email protected].0/forms-flow-theme.gz.js}
- 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}
- NODE_ENV=${NODE_ENV:-production}
entrypoint: /bin/sh -c "/usr/share/nginx/html/config/env.sh && nginx -g 'daemon off;'"
environment:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,9 @@
{
"name": "de",
"value": "Deutsch"
},
{
"name": "es",
"value": "español"
}
]
10 changes: 5 additions & 5 deletions forms-flow-web-root-config/sample.env
Original file line number Diff line number Diff line change
Expand Up @@ -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].0/forms-flow-web.gz.js
#MF_FORMSFLOW_WEB_URL=https://forms-flow-microfrontends.aot-technologies.com/[email protected].1/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].0/forms-flow-nav.gz.js
#MF_FORMSFLOW_SERVICE_URL=https://forms-flow-microfrontends.aot-technologies.com/[email protected].0/forms-flow-service.gz.js
#MF_FORMSFLOW_ADMIN_URL=https://forms-flow-microfrontends.aot-technologies.com/[email protected].0/forms-flow-admin.gz.js
#MF_FORMSFLOW_THEME_URL=https://forms-flow-microfrontends.aot-technologies.com/[email protected].0/forms-flow-theme.gz.js
#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

#OR

Expand Down
2 changes: 1 addition & 1 deletion forms-flow-web/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "formsflow-ai-react",
"description": "React web app for formsflow.ai project",
"version": "6.0.0",
"version": "6.0.1",
"main": "single-spa-index.js",
"scripts": {
"analyze": "source-map-explorer 'build/static/js/*.js'",
Expand Down
Empty file.
Empty file.
Empty file.
Loading

0 comments on commit 2bb1e3f

Please sign in to comment.