merged with dev

bcgov · Oct 5, 2023 · d0cdb3e · d0cdb3e
2 parents 05899c3 + 92171fa
commit d0cdb3e
Show file tree

Hide file tree

Showing 19 changed files with 24,227 additions and 23,738 deletions.
diff --git a/.github/workflows/cd-forms-flow-bpm.yaml b/.github/workflows/cd-forms-flow-bpm.yaml
@@ -11,10 +11,12 @@ on:
     branches:
       - dev
       - main
-      - feat/task-228 # Remove in future, just to verify this works
+      - ss-60-github-actions-bug #test auto trigger issue#test1
     paths:
-      - "forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm"
-      - ".github/workflows/cd-forms-flow-bpm.yaml"
+      - 'backend/**'
+      - 'frontend/**'
+      - 'forms-flow-ai/**'
+      - '.github/workflows/**'
 
 defaults:
   run:

diff --git a/.github/workflows/cd-forms-flow-nav.yaml b/.github/workflows/cd-forms-flow-nav.yaml
@@ -1,4 +1,4 @@
-name: forms-flow-web Custom
+name: forms-flow-nav Custom
 
 on:
   workflow_dispatch:
@@ -11,10 +11,12 @@ on:
     branches:
       - dev
       - main
-      - epdds-270 # Remove in future, just to verify this works
+
     paths:
-      - "forms-flow-ai/forms-flow-ai-micro-front-ends/forms-flow-nav"
-      - ".github/workflows/cd-forms-flow-nav.yaml"
+      - 'backend/**'
+      - 'frontend/**'
+      - 'forms-flow-ai/**'
+      - '.github/workflows/**'
 
 defaults:
   run:

diff --git a/.github/workflows/cd-forms-flow-theme.yaml b/.github/workflows/cd-forms-flow-theme.yaml
@@ -1,4 +1,4 @@
-name: forms-flow-web Custom
+name: forms-flow-web-theme Custom
 
 on:
   workflow_dispatch:
@@ -11,10 +11,12 @@ on:
     branches:
       - dev
       - main
-      - epdds-270 # Remove in future, just to verify this works
+
     paths:
-      - "forms-flow-ai/forms-flow-ai-micro-front-ends/forms-flow-theme"
-      - ".github/workflows/cd-forms-flow-theme.yaml"
+      - 'backend/**'
+      - 'frontend/**'
+      - 'forms-flow-ai/**'
+      - '.github/workflows/**'
 
 defaults:
   run:

diff --git a/.github/workflows/cd-forms-flow-web-ee.yaml b/.github/workflows/cd-forms-flow-web-ee.yaml
@@ -1,4 +1,4 @@
-name: forms-flow-web Custom
+name: forms-flow-web-ee Custom
 
 on:
   workflow_dispatch:
@@ -11,10 +11,12 @@ on:
     branches:
       - dev
       - main
-      - epdds-270 # Remove in future, just to verify this works
+
     paths:
-      - "forms-flow-ai/forms-flow-ai-ee/forms-flow-web"
-      - ".github/workflows/cd-forms-flow-web-ee.yaml"
+      - 'backend/**'
+      - 'frontend/**'
+      - 'forms-flow-ai/**'
+      - '.github/workflows/**'
 
 defaults:
   run:

diff --git a/.github/workflows/cd-forms-flow-web-root-config.yaml b/.github/workflows/cd-forms-flow-web-root-config.yaml
@@ -1,4 +1,4 @@
-name: forms-flow-web Custom
+name: forms-flow-web-root-config Custom
 
 on:
   workflow_dispatch:
@@ -11,11 +11,12 @@ on:
     branches:
       - dev
       - main
-      - epdds-270 # Remove in future, just to verify this works
-      - epdds-270-fix # Remove in future, just to verify this works
+
     paths:
-      - "forms-flow-ai/forms-flow-ai-ee/forms-flow-web-root-config"
-      - ".github/workflows/cd-forms-flow-web-root-config.yaml"
+      - 'backend/**'
+      - 'frontend/**'
+      - 'forms-flow-ai/**'
+      - '.github/workflows/**'
 
 defaults:
   run:

diff --git a/.github/workflows/cd-openshift-test.yaml b/.github/workflows/cd-openshift-test.yaml
@@ -144,4 +144,4 @@ jobs:
           - name: Start Build Openshift
             shell: bash
             run: |
-              oc start-build ${{ env.APP_NAME }}-prod-build --wait  
+              oc start-build forms-flow-web-root-config-test-build --wait  
diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
@@ -87,11 +87,10 @@ jobs:
             -Dsonar.cobertura.reportPaths=backend/coverage/cobertura-coverage.xml,frontend/coverage/cobertura-coverage.xml
             -Dsonar.project.monorepo.enabled=true
             -Dsonar.projectKey=${{ github.event.repository.name }}
-            -Dsonar.sources=backend/applications/src/,backend/gateway/src/,backend/users/src/,frontend/src/
-            -Dsonar.tests=backend/applications/src/,backend/gateway/src/,backend/users/src/
+            -Dsonar.sources=backend/applications/src/,backend/gateway/src/,backend/users/src/,frontend/src/,.github/workflows/,forms-flow-ai/epd-forms/,forms-flow-ai/forms-flow-ai-ee/,forms-flow-ai/forms-flow-ai-micro-front-ends/,map-package/src/
+            -Dsonar.tests=backend/applications/src/,backend/gateway/src/,backend/users/src/,forms-flow-ai/epd-forms/,forms-flow-ai/forms-flow-ai-ee/,forms-flow-ai/forms-flow-ai-micro-front-ends/,.github/workflows/,map-package/src/
             -Dsonar.test.inclusions=backend/applications/src/*.spec.ts,backend/gateway/src/*.spec.ts,backend/users/src/*.spec.ts,backend/applications/src/**/*.spec.ts,backend/gateway/src/**/*.spec.ts,backend/users/src/**/*.spec.ts
-           
- 
+    
   # deploys:
   #   name: Deploys
   #   needs:

diff --git a/forms-flow-ai/epd-forms/Site Disclosure Statements.json b/forms-flow-ai/epd-forms/Site Disclosure Statements.json
@@ -3417,7 +3417,7 @@
                                                         "required": true,
                                                         "pattern": "",
                                                         "customMessage": "",
-                                                        "custom": "\r\nvar currentValue = input;\r\nfetch(localStorage.getItem('formsflow.ai.api.url')+'/user?memberOfGroup=formsflow%2Fformsflow-reviewer%2Fformsflow-client-reviewer',\r\n{'headers':{ 'authorization': 'Bearer '+localStorage.getItem('authToken')},'mode':'cors'})\r\n.then((p)=> {return p.json();}).\r\nthen((x)=>{\r\n    data.hiddenUserIdForFormSharing = '' ;\r\n x.data.find((y)=>{\r\n if( y.email=== currentValue ) \r\n { data.hiddenUserIdForFormSharing = y.username}\r\n\r\n })\r\n\r\n if(data.hiddenUserIdForFormSharing==='')\r\n {\r\n    valid = 'Unable to find user with provided email address';\r\n }\r\n else\r\n {\r\n    valid = true;\r\n }\r\n\r\n});",
+                                                        "custom": "\nvar currentValue = input;\n\nif(currentValue!== '')\n{\n\n\nif( data.hiddenUserIdForFormSharing === '')\n{\n   valid = 'Unable to find user with provided email address';\n}\n\n\nfetch(localStorage.getItem('formsflow.ai.api.url')+'/user?memberOfGroup=formsflow%2Fformsflow-reviewer%2Fformsflow-client-reviewer',\n{'headers':{ 'authorization': 'Bearer '+localStorage.getItem('authToken')},'mode':'cors'})\n.then((p)=> {return p.json();}).\nthen((x)=>{\n    data.hiddenUserIdForFormSharing = '' ;\n x.data.find((y)=>{\n if( y.email=== currentValue ) \n { data.hiddenUserIdForFormSharing = y.username}\n\n })\n\n if(data.hiddenUserIdForFormSharing==='')\n {\n    valid = 'Unable to find user with provided email address';\n }\n else\n {\n    valid = true;\n }\n\n}).then(()=>{\n\n\n    var previousValue = localStorage.getItem(\"sdsHiddenUserIdForFormSharing\"); \n\n    if(previousValue != currentValue )\n    {\n\tlocalStorage.setItem(\"sdsHiddenUserIdForFormSharing\", currentValue);\n        instance.triggerChange();\n    }\n\t\n})\n\n}\n\n",
                                                         "customPrivate": false,
                                                         "json": "",
                                                         "minLength": "",
@@ -3465,7 +3465,7 @@
                                                     "addons": [],
                                                     "inputType": "email",
                                                     "inputMask": "",
-                                                    "id": "e083wrc",
+                                                    "id": "e00h8xm",
                                                     "defaultValue": ""
                                                 }
                                             ],
@@ -6980,7 +6980,7 @@
                                                 }
                                             ],
                                             "collapsible": false,
-                                            "id": "e7nge5b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                                            "id": "e7nge5b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                                             "placeholder": "",
                                             "prefix": "",
                                             "customClass": "",
@@ -7454,7 +7454,7 @@
                                         }
                                     ],
                                     "collapsible": false,
-                                    "id": "eapos760000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                                    "id": "eapos76000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                                     "placeholder": "",
                                     "prefix": "",
                                     "customClass": "",
@@ -7670,7 +7670,7 @@
                                             "input": true,
                                             "label": "Crown Land File Numbers",
                                             "tableView": true,
-                                            "id": "e7fs5c50000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                                            "id": "e7fs5c5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                                             "placeholder": "",
                                             "prefix": "",
                                             "customClass": "",