Skip to content

Commit

Permalink
changed version to 5.2.1
Browse files Browse the repository at this point in the history
1. updated all MFA variable  to 5.2.1
2. fixed docker file issue in flow-flow-documents
3. fixed bpmn property panel css issue
  • Loading branch information
shuhaib-aot committed Sep 1, 2023
1 parent 9cbae0d commit fcc4116
Show file tree
Hide file tree
Showing 11 changed files with 47 additions and 45 deletions.
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-v5.2.0-blue"/>
<img src="https://img.shields.io/badge/release-v5.2.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 @@
v5.2.0
v5.2.1
12 changes: 6 additions & 6 deletions deployment/docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ services:

forms-flow-forms:
container_name: forms-flow-forms
image: formsflow/forms-flow-forms:v5.2.0
image: formsflow/forms-flow-forms:v5.2.1

# The app will restart until Mongo is listening
restart: always
Expand Down Expand Up @@ -131,11 +131,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 @@ -179,13 +179,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
28 changes: 15 additions & 13 deletions forms-flow-documents/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,31 +1,33 @@
#Author: Kurian Benoy
FROM python:3.9-slim-buster

# set label for image
LABEL Name="formsflow"

WORKDIR /forms-flow-documents/app

# install curl, gnupg2 and unzip
RUN apt-get update \
&& apt-get install -y gnupg2 \
&& apt-get install -y curl \
&& apt-get install -y wget \
&& apt-get install -y unzip \
&& apt-get install -y git \
&& rm -rf /var/lib/apt/lists/*

# Install Chrome WebDriver
RUN CHROMEDRIVER_VERSION=`curl -sS chromedriver.storage.googleapis.com/LATEST_RELEASE` && \
mkdir -p /opt/chromedriver-$CHROMEDRIVER_VERSION && \
curl -sS -o /tmp/chromedriver_linux64.zip http://chromedriver.storage.googleapis.com/$CHROMEDRIVER_VERSION/chromedriver_linux64.zip && \
unzip -qq /tmp/chromedriver_linux64.zip -d /opt/chromedriver-$CHROMEDRIVER_VERSION && \
# Install Chrome WebDriver - version 116.0.5845.96
RUN mkdir -p /opt/chromedriver && \
curl -sS -o /tmp/chromedriver_linux64.zip https://d3nrunty6xywgz.cloudfront.net/chromedriver-linux64.zip && \
unzip -qq /tmp/chromedriver_linux64.zip -d /opt/chromedriver && \
rm /tmp/chromedriver_linux64.zip && \
chmod +x /opt/chromedriver-$CHROMEDRIVER_VERSION/chromedriver && \
ln -fs /opt/chromedriver-$CHROMEDRIVER_VERSION/chromedriver /usr/local/bin/chromedriver
chmod +x /opt/chromedriver/chromedriver-linux64/chromedriver && \
ln -fs /opt/chromedriver/chromedriver-linux64/chromedriver /usr/local/bin/chromedriver

# Install Google Chrome
RUN curl -sS -o - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list && \
apt-get -yqq update && \
apt-get -yqq install google-chrome-stable && \
rm -rf /var/lib/apt/lists/*
RUN wget --no-verbose -O /tmp/chrome.deb https://d3nrunty6xywgz.cloudfront.net/google-chrome-stable_116.0.5845.140-1_amd64.deb &&\
apt-get update && \
apt install -y /tmp/chrome.deb &&\
rm /tmp/chrome.deb


# set display port to avoid crash
Expand All @@ -44,4 +46,4 @@ RUN pip install -e .

EXPOSE 5006
RUN chmod u+x ./entrypoint
ENTRYPOINT ["/bin/sh", "entrypoint"]
ENTRYPOINT ["/bin/sh", "entrypoint"]
2 changes: 1 addition & 1 deletion forms-flow-forms/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ services:

forms-flow-forms:
container_name: forms-flow-forms
image: formsflow/forms-flow-forms:v5.2.0
image: formsflow/forms-flow-forms:v5.2.1
# The app will restart until Mongo is listening
restart: always
links:
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 @@ -53,11 +53,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
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
4 changes: 2 additions & 2 deletions forms-flow-web-root-config/src/index.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>formsflow.ai</title>
<script src="/config/config.js"></script>
<link rel="stylesheet" href="https://unpkg.com/bpmn-js-properties-panel/dist/assets/properties-panel.css">
<link rel="stylesheet" href="https://unpkg.com/bpmn-js-properties-panel/dist/assets/element-templates.css">
<link rel="stylesheet" href="https://unpkg.com/bpmn-js-properties-panel@1.3.0/dist/assets/element-templates.css">
<link rel="stylesheet" href="https://unpkg.com/bpmn-js-properties-panel@1.3.0/dist/assets/properties-panel.css">
<!-- required dmn modeler styles -->
<link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/assets/diagram-js.css">
<link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/assets/dmn-js-shared.css">
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": "5.2.0",
"version": "5.2.1",
"main": "single-spa-index.js",
"scripts": {
"analyze": "source-map-explorer 'build/static/js/*.js'",
Expand Down

0 comments on commit fcc4116

Please sign in to comment.