Skip to content

Commit

Permalink
Merge pull request #496 from bcgov/dev
Browse files Browse the repository at this point in the history 
Third merge for 5th Sept PROD release
  • Loading branch information
@nikhila-aot
nikhila-aot authored Sep 5, 2023
2 parents cee44ad + d3d6d11 commit 302b02b
Show file tree
Hide file tree
Showing 13 changed files with 57,327 additions and 24,322 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cd-openshift-prod.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,5 +151,5 @@ 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-prod-build --wait
88 changes: 83 additions & 5 deletions forms-flow-ai/epd-forms/Site Disclosure Statements.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6970,7 +6970,7 @@
}
],
"collapsible": false,
"id": "e7nge5b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"id": "e7nge5b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"placeholder": "",
"prefix": "",
"customClass": "",
Expand Down Expand Up @@ -7444,7 +7444,7 @@
}
],
"collapsible": false,
"id": "eapos76000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"id": "eapos76000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"placeholder": "",
"prefix": "",
"customClass": "",
Expand Down Expand Up @@ -7660,7 +7660,7 @@
"input": true,
"label": "Crown Land File Numbers",
"tableView": true,
"id": "e7fs5c5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"id": "e7fs5c5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"placeholder": "",
"prefix": "",
"customClass": "",
Expand Down Expand Up @@ -9990,6 +9990,84 @@
"truncateMultipleSpaces": false,
"id": "e2di33b"
},
{
"label": "Job Title",
"autoExpand": false,
"tableView": true,
"key": "jobTitle",
"type": "textfield",
"input": true,
"placeholder": "",
"prefix": "",
"customClass": "",
"suffix": "",
"multiple": false,
"defaultValue": null,
"protected": false,
"unique": false,
"persistent": true,
"hidden": false,
"clearOnHide": true,
"refreshOn": "",
"redrawOn": "",
"modalEdit": false,
"dataGridLabel": false,
"labelPosition": "top",
"description": "",
"errorLabel": "",
"tooltip": "",
"hideLabel": false,
"tabindex": "",
"disabled": false,
"autofocus": false,
"dbIndex": false,
"customDefaultValue": "",
"calculateValue": "",
"calculateServer": false,
"widget": {
"type": "input"
},
"attributes": {},
"validateOn": "change",
"validate": {
"required": false,
"custom": "",
"customPrivate": false,
"strictDateValidation": false,
"multiple": false,
"unique": false,
"minLength": "",
"maxLength": "",
"pattern": ""
},
"conditional": {
"show": null,
"when": null,
"eq": ""
},
"overlay": {
"style": "",
"left": "",
"top": "",
"width": "",
"height": ""
},
"allowCalculateOverride": false,
"encrypted": false,
"showCharCount": false,
"showWordCount": false,
"properties": {},
"allowMultipleMasks": false,
"addons": [],
"mask": false,
"inputType": "text",
"inputFormat": "plain",
"inputMask": "",
"displayMask": "",
"spellcheck": true,
"truncateMultipleSpaces": false,
"id": "e9be88"
},
{
"logic": [
{
Expand Down Expand Up @@ -10378,7 +10456,7 @@
"eq": "",
"json": ""
},
"customConditional": "const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"));\r\nconst roles = UserDetails[\"role\"];\r\nif(roles.includes(\"formsflow-reviewer/lrs-approving-authority\")|| \r\nroles.includes(\"formsflow-reviewer/site-information-advisor\")\r\n) {\r\n show = false;\r\n}\r\nelse\r\n{\r\n show = true;\r\n}\r\n",
"customConditional": "const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"));\r\nconst roles = UserDetails[\"role\"];\r\nif(roles.includes(\"formsflow-reviewer/lrs-approving-authority\")|| \r\nroles.includes(\"formsflow-reviewer/site-information-advisor\")\r\n) {\r\n show = false;\r\n}\r\nelse\r\n{\r\n if (roles.includes(\"formsflow-reviewer/formsflow-client-reviewer\") &&\r\n data.section1BAgentCheckbox){\r\n show = false \r\n } else {\r\n show = true;\r\n }\r\n}\r\n",
"logic": [],
"attributes": {},
"overlay": {
Expand Down Expand Up @@ -10429,7 +10507,7 @@
"showWordCount": false,
"allowMultipleMasks": false,
"addons": [],
"id": "exmil7e"
"id": "e1d05b4"
},
{
"title": "APPROVING AUTHORITY CONTACT INFORMATION",
Expand Down
Loading

0 comments on commit 302b02b

Please sign in to comment.