Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modified version from 6.1.0-alpha to 7.0.0-alpha #2168

Merged
merged 2 commits into from
Jul 31, 2024
Merged

Modified version from 6.1.0-alpha to 7.0.0-alpha #2168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9884531
Modifed version from 6.1.0-alpha to 7.0.0-alpha
shuhaib-aot Jul 30, 2024
eae8f57
Removed feature/FWF-3316-permission-matrix branch form github actions
shuhaib-aot Jul 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions .github/workflows/forms-flow-api-cd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Push Forms flow API to registry
on:
workflow_dispatch:
push:
branches: [ master, develop, release/*, feature/FWF-3316-permission-matrix ]
branches: [ master, develop, release/* ]
paths:
- "forms-flow-api/**"
- "VERSION"
Expand Down Expand Up @@ -109,20 +109,20 @@ jobs:
sarif_file: snyk.sarif

#####
# - name: Set up AWS CLI
# uses: aws-actions/configure-aws-credentials@v1
# with:
# aws-access-key-id: ${{ secrets.AWS_DEPLOYMENT_ACCESS_KEY_ID }}
# aws-secret-access-key: ${{ secrets.AWS_DEPLOYMENT_SECRET_ACCESS_KEY }}
# aws-region: ca-central-1 # Change this to your desired region
# - name: Install kubectl
# run: |
# curl -LO "https://dl.k8s.io/release/$(curl -Ls https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
# chmod +x kubectl
# sudo mv kubectl /usr/local/bin/
# - name: Update Kube config
# run: aws eks update-kubeconfig --region ca-central-1 --name ${{ secrets.DEV_EKS_CLUSTER }}
# - name: Deploy to eks
# run: |
# kubectl -n ${{ secrets.DEV_OPENSOURCE_NAMESPACE }} patch deployment forms-flow-api -p '{"spec":{"template":{"spec":{"containers":[{"name":"forms-flow-api","image":"docker.io/formsflow/forms-flow-webapi:${{ env.VERSION }}"}]}}}}'
# kubectl -n ${{ secrets.DEV_OPENSOURCE_NAMESPACE }} rollout restart deployment forms-flow-api
- name: Set up AWS CLI
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_DEPLOYMENT_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_DEPLOYMENT_SECRET_ACCESS_KEY }}
aws-region: ca-central-1 # Change this to your desired region
- name: Install kubectl
run: |
curl -LO "https://dl.k8s.io/release/$(curl -Ls https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
chmod +x kubectl
sudo mv kubectl /usr/local/bin/
- name: Update Kube config
run: aws eks update-kubeconfig --region ca-central-1 --name ${{ secrets.DEV_EKS_CLUSTER }}
- name: Deploy to eks
run: |
kubectl -n ${{ secrets.DEV_OPENSOURCE_NAMESPACE }} patch deployment forms-flow-api -p '{"spec":{"template":{"spec":{"containers":[{"name":"forms-flow-api","image":"docker.io/formsflow/forms-flow-webapi:${{ env.VERSION }}"}]}}}}'
kubectl -n ${{ secrets.DEV_OPENSOURCE_NAMESPACE }} rollout restart deployment forms-flow-api
2 changes: 0 additions & 2 deletions .github/workflows/forms-flow-api-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,11 @@ on:
- develop
- master
- release/**
- feature/FWF-3316-permission-matrix
pull_request:
branches:
- develop
- master
- release/**
- feature/FWF-3316-permission-matrix
paths:
- "forms-flow-api/**"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/forms-flow-bpm-cd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Push Forms flow BPM to registry
on:
workflow_dispatch:
push:
branches: [ master, develop, release/*, feature/FWF-3316-permission-matrix ]
branches: [ master, develop, release/* ]
paths:
- "forms-flow-bpm/**"
- "VERSION"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/forms-flow-data-analysis-api-cd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Push Forms flow Analysis API to registry
on:
workflow_dispatch:
push:
branches: [ master, develop, release/*, feature/FWF-3316-permission-matrix ]
branches: [ master, develop, release/* ]
paths:
- "forms-flow-data-analysis-api/**"
- "VERSION"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/forms-flow-documents-cd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Push Forms flow Document to registry
on:
workflow_dispatch:
push:
branches: [ master, develop, release/*, feature/FWF-3316-permission-matrix ]
branches: [ master, develop, release/* ]
paths:
- "forms-flow-documents/**"
- "VERSION"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/forms-flow-root-config-cd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Push Forms flow root config to registry
on:
workflow_dispatch:
push:
branches: [ master, develop, release/*, feature/FWF-3316-permission-matrix ]
branches: [ master, develop, release/* ]
paths:
- "forms-flow-web-root-config/**"
- "VERSION"
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/forms-flow-web-cd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ on:
- master
- develop
- release/*
- feature/FWF-3316-permission-matrix
paths:
- "forms-flow-web/**"
- "VERSION"
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v6.1.0-rbac-alpha
v7.0.0-alpha
10 changes: 5 additions & 5 deletions deployment/docker/docker-compose.yml
View file
Open in desktop
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:v6.1.0-alpha
image: formsflow/forms-flow-forms:v7.0.0-alpha

# The app will restart until Mongo is listening
restart: always
Expand Down Expand Up @@ -137,10 +137,10 @@ 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/forms-flow-web@v6.1.0-rbac-alpha/forms-flow-web.gz.js}
- MF_FORMSFLOW_NAV_URL=${MF_FORMSFLOW_NAV_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-nav@v6.1.0-rbac-alpha/forms-flow-nav.gz.js}
- MF_FORMSFLOW_SERVICE_URL=${MF_FORMSFLOW_SERVICE_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-service@v6.1.0-rbac-alpha/forms-flow-service.gz.js}
- MF_FORMSFLOW_ADMIN_URL=${MF_FORMSFLOW_ADMIN_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-admin@v6.1.0-rbac-alpha/forms-flow-admin.gz.js}
- MF_FORMSFLOW_WEB_URL=${MF_FORMSFLOW_WEB_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-web@v7.0.0-alpha/forms-flow-web.gz.js}
- MF_FORMSFLOW_NAV_URL=${MF_FORMSFLOW_NAV_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-nav@v7.0.0-alpha/forms-flow-nav.gz.js}
- MF_FORMSFLOW_SERVICE_URL=${MF_FORMSFLOW_SERVICE_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-service@v7.0.0-alpha/forms-flow-service.gz.js}
- MF_FORMSFLOW_ADMIN_URL=${MF_FORMSFLOW_ADMIN_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-admin@v7.0.0-alpha/forms-flow-admin.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
8 changes: 4 additions & 4 deletions deployment/docker/sample.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,12 +186,12 @@ 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/forms-flow-web@v6.1.0-alpha/forms-flow-web.gz.js
#MF_FORMSFLOW_WEB_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-web@v7.0.0-alpha/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/forms-flow-nav@v6.1.0-alpha/forms-flow-nav.gz.js
#MF_FORMSFLOW_SERVICE_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-service@v6.1.0-alpha/forms-flow-service.gz.js
#MF_FORMSFLOW_ADMIN_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-admin@v6.1.0-alpha/forms-flow-admin.gz.js
#MF_FORMSFLOW_NAV_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-nav@v7.0.0-alpha/forms-flow-nav.gz.js
#MF_FORMSFLOW_SERVICE_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-service@v7.0.0-alpha/forms-flow-service.gz.js
#MF_FORMSFLOW_ADMIN_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-admin@v7.0.0-alpha/forms-flow-admin.gz.js

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

Expand Down
2 changes: 1 addition & 1 deletion forms-flow-api-utils/setup.py
View file
Open in desktop
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.1.0',
version='7.0.0',
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
View file
Open in desktop
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@feature/FWF-3316-permission-matrix#subdirectory=forms-flow-api-utils
formsflow_api_utils @ git+https://github.com/AOT-Technologies/forms-flow-ai.git@develop#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
View file
Open in desktop
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@feature/FWF-3316-permission-matrix#subdirectory=forms-flow-api-utils
git+https://github.com/AOT-Technologies/forms-flow-ai.git@develop#subdirectory=forms-flow-api-utils
2 changes: 1 addition & 1 deletion forms-flow-api/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = formsflow_api
version = 6.1.0
version = 7.0.0
author = aot-technologies
classifiers =
Development Status :: Production
Expand Down
6 changes: 3 additions & 3 deletions forms-flow-bpm/forms-flow-bpm-camunda/pom.xml
View file
Open in desktop
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.1.0</version>
<version>7.0.0</version>
</parent>

<artifactId>formsflow-bpm-camunda</artifactId>
<version>6.1.0</version>
<version>7.0.0</version>

<name>formsflow BPM Camunda Extension</name>
<description>formsflow BPM Camunda Extension</description>
Expand Down Expand Up @@ -77,7 +77,7 @@
<dependency>
<groupId>formsflow.ai</groupId>
<artifactId>forms-flow-bpm-utils</artifactId>
<version>6.1.0</version>
<version>7.0.0</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
View file
Open in desktop
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.1.0</version>
<version>7.0.0</version>
</parent>

<artifactId>forms-flow-bpm-utils</artifactId>
<version>6.1.0</version>
<version>7.0.0</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
View file
Open in desktop
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.1.0</version>
<version>7.0.0</version>
<relativePath>pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion forms-flow-bpm/pom.xml
View file
Open in desktop
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.1.0</version>
<version>7.0.0</version>
<packaging>pom</packaging>

<name>formsflow BPM Extension</name>
Expand Down
2 changes: 1 addition & 1 deletion forms-flow-documents/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = formsflow_documents
version = 6.1.0
version = 7.0.0
author = aot-technologies
classifiers =
Development Status :: Beta
Expand Down
2 changes: 1 addition & 1 deletion forms-flow-forms/docker-compose.yml
View file
Open in desktop
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:v6.1.0-alpha
image: formsflow/forms-flow-forms:v7.0.0-alpha
# The app will restart until Mongo is listening
restart: always
links:
Expand Down
8 changes: 4 additions & 4 deletions forms-flow-web-root-config/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ services:
context: .
dockerfile: Dockerfile
args:
- MF_FORMSFLOW_WEB_URL=${MF_FORMSFLOW_WEB_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-web@v6.1.0-rbac-alpha/forms-flow-web.gz.js}
- MF_FORMSFLOW_NAV_URL=${MF_FORMSFLOW_NAV_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-nav@v6.1.0-rbac-alpha/forms-flow-nav.gz.js}
- MF_FORMSFLOW_SERVICE_URL=${MF_FORMSFLOW_SERVICE_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-service@v6.1.0-rbac-alpha/forms-flow-service.gz.js}
- MF_FORMSFLOW_ADMIN_URL=${MF_FORMSFLOW_ADMIN_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-admin@v6.1.0-rbac-alpha/forms-flow-admin.gz.js}
- MF_FORMSFLOW_WEB_URL=${MF_FORMSFLOW_WEB_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-web@v7.0.0-alpha/forms-flow-web.gz.js}
- MF_FORMSFLOW_NAV_URL=${MF_FORMSFLOW_NAV_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-nav@v7.0.0-alpha/forms-flow-nav.gz.js}
- MF_FORMSFLOW_SERVICE_URL=${MF_FORMSFLOW_SERVICE_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-service@v7.0.0-alpha/forms-flow-service.gz.js}
- MF_FORMSFLOW_ADMIN_URL=${MF_FORMSFLOW_ADMIN_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-admin@v7.0.0-alpha/forms-flow-admin.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
8 changes: 4 additions & 4 deletions forms-flow-web-root-config/sample.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@


##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/forms-flow-web@v6.1.0-alpha/forms-flow-web.gz.js
#MF_FORMSFLOW_WEB_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-web@v7.0.0-alpha/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/forms-flow-nav@v6.1.0-alpha/forms-flow-nav.gz.js
#MF_FORMSFLOW_SERVICE_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-service@v6.1.0-alpha/forms-flow-service.gz.js
#MF_FORMSFLOW_ADMIN_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-admin@v6.1.0-alpha/forms-flow-admin.gz.js
#MF_FORMSFLOW_NAV_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-nav@v7.0.0-alpha/forms-flow-nav.gz.js
#MF_FORMSFLOW_SERVICE_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-service@v7.0.0-alpha/forms-flow-service.gz.js
#MF_FORMSFLOW_ADMIN_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-admin@v7.0.0-alpha/forms-flow-admin.gz.js

#OR

Expand Down
2 changes: 1 addition & 1 deletion forms-flow-web-root-config/src/index.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/assets/dmn-js-decision-table-controls.css">
<link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/assets/dmn-js-literal-expression.css">
<link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/assets/dmn-font/css/dmn.css">
<link rel="stylesheet" href="https://forms-flow-microfrontends.aot-technologies.com/forms-flow-theme@v6.1.0-rbac-alpha/forms-flow-theme.min.css">
<link rel="stylesheet" href="https://forms-flow-microfrontends.aot-technologies.com/forms-flow-theme@v7.0.0-alpha/forms-flow-theme.min.css">


<!-- required styles from cdn -->
Expand Down
2 changes: 1 addition & 1 deletion forms-flow-web/package.json
View file
Open in desktop
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.1.0-alpha",
"version": "7.0.0-alpha",
"main": "single-spa-index.js",
"scripts": {
"analyze": "source-map-explorer 'build/static/js/*.js'",
Expand Down
2 changes: 1 addition & 1 deletion jobs/sentiment-analysis/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = sentiment_analysis
url = https://raw.githubusercontent.com/AOT-Technologies/forms-flow-ai/
author = AOT Technologies
version = 6.1.0
version = 7.0.0
author_email =
classifiers =
Development Status :: Beta
Expand Down
Loading