Modifed version from 6.1.0-alpha to 7.0.0-alpha

abilpraju-aot · Jul 30, 2024 · 9884531 · 9884531
1 parent 677e793
commit 9884531
Show file tree

Hide file tree

Showing 18 changed files with 49 additions and 49 deletions.
diff --git a/.github/workflows/forms-flow-api-cd.yml b/.github/workflows/forms-flow-api-cd.yml
@@ -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
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v6.1.0-rbac-alpha
+v7.0.0-alpha
diff --git a/deployment/docker/docker-compose.yml b/deployment/docker/docker-compose.yml
@@ -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:

diff --git a/deployment/docker/sample.env b/deployment/docker/sample.env
@@ -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 ---+++++++++++++++++++++++++#
 

diff --git a/forms-flow-api-utils/setup.py b/forms-flow-api-utils/setup.py
@@ -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"),

diff --git a/forms-flow-api/requirements.txt b/forms-flow-api/requirements.txt
@@ -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

diff --git a/forms-flow-api/requirements/prod.txt b/forms-flow-api/requirements/prod.txt
@@ -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
diff --git a/forms-flow-api/setup.cfg b/forms-flow-api/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = formsflow_api
-version = 6.1.0
+version = 7.0.0
 author = aot-technologies
 classifiers =
     Development Status :: Production

diff --git a/forms-flow-bpm/forms-flow-bpm-camunda/pom.xml b/forms-flow-bpm/forms-flow-bpm-camunda/pom.xml
@@ -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>
@@ -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 -->

diff --git a/forms-flow-bpm/forms-flow-bpm-utils/pom.xml b/forms-flow-bpm/forms-flow-bpm-utils/pom.xml
@@ -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>

diff --git a/forms-flow-bpm/pom-default.xml b/forms-flow-bpm/pom-default.xml
@@ -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>
 

diff --git a/forms-flow-bpm/pom.xml b/forms-flow-bpm/pom.xml
@@ -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>

diff --git a/forms-flow-documents/setup.cfg b/forms-flow-documents/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = formsflow_documents
-version = 6.1.0
+version = 7.0.0
 author = aot-technologies
 classifiers =
     Development Status :: Beta

diff --git a/forms-flow-web-root-config/docker-compose.yml b/forms-flow-web-root-config/docker-compose.yml
@@ -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:

diff --git a/forms-flow-web-root-config/sample.env b/forms-flow-web-root-config/sample.env
@@ -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
 

diff --git a/forms-flow-web-root-config/src/index.ejs b/forms-flow-web-root-config/src/index.ejs
@@ -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 -->

diff --git a/forms-flow-web/package.json b/forms-flow-web/package.json
@@ -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'",

diff --git a/jobs/sentiment-analysis/setup.cfg b/jobs/sentiment-analysis/setup.cfg
@@ -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