From d495517f59407ca32fbb78bdc2126bccfea264b1 Mon Sep 17 00:00:00 2001
From: nikhila-aot <nikhila.pankaj@aot-technologies.com>
Date: Thu, 22 Aug 2024 10:19:07 -0700
Subject: [PATCH] fixes for bundle pdf

---
 ...nated Sites Services Application Form.json | 603 ++++++++----------
 ... Ecological Risk Assessment Checklist.json |  20 +-
 ...tification of Independent Remediation.json | 244 +++----
 ...ication of Likely or Actual Migration.json | 208 +++---
 4 files changed, 514 insertions(+), 561 deletions(-)

diff --git a/forms-flow-ai/epd-forms/bundling/Contaminated Sites Services Application Form.json b/forms-flow-ai/epd-forms/bundling/Contaminated Sites Services Application Form.json
index bef57f62..5634fdba 100644
--- a/forms-flow-ai/epd-forms/bundling/Contaminated Sites Services Application Form.json	
+++ b/forms-flow-ai/epd-forms/bundling/Contaminated Sites Services Application Form.json	
@@ -222,7 +222,7 @@
                         "eq": "",
                         "json": ""
                     },
-                    "customConditional": "var userData =JSON.parse(localStorage.getItem('UserDetails'))\n\n\nif(!(userData.groups.includes(\"/formsflow/formsflow-client\") || userData.groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\")))\n{\n\n    utils.eachComponent(form.components, (x)=>{\n\n   \n  \n          if(x.type==='select' && (x.key === 'selectCssaSdm' || x.key === 'selectCssaCaseworker' || x.key === 'selectCaseworker' || x.key === 'selectSrco' || x.key === 'selectSdm'  ))\n          {\n            //do nothing\n          }\n          else if ((x.type==='editgrid' && (x.key === 'notes' || x.key === 'srcrNotes' || x.key === 'deraNotes' || x.key === 'cssaNotes') ) ||x.key === 'comments' || x.key === 'commentFor')\n          {\n            //do nothing\n          }\n          else if(x.type === 'button')\n          {\n          //do nothing\n          }\n          else if(x.type === 'approvingAuthorityContactInformation')\n          { \n            if(userData.groups.includes(\"/formsflow/formsflow-reviewer/csap\") || userData.groups.includes(\"/formsflow/formsflow-reviewer/csap-society\"))\n            {\n               x.disabled = false;\n            }\n          }\n          else if(x.properties.apField === \"true\")\n          {\n            if(userData.groups.includes(\"/formsflow/formsflow-reviewer/csap\") || userData.groups.includes(\"/formsflow/formsflow-reviewer/csap-society\"))\n            {\n               x.disabled = false;\n            }\n            else\n            {\n\n            }\n          }\n          else\n          {\n          x.disabled = true;\n          }\n\n        \n\n    })\n\n}\n\nshow = false",
+                    "customConditional": "var userData =JSON.parse(localStorage.getItem('UserDetails'))\r\nif(!userData){\r\n  show = false;\r\n} else {\r\n\r\n\r\nif(!(userData.groups.includes(\"/formsflow/formsflow-client\") || userData.groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\")))\r\n{\r\n\r\n    utils.eachComponent(form.components, (x)=>{\r\n\r\n   \r\n  \r\n          if(x.type==='select' && (x.key === 'selectCssaSdm' || x.key === 'selectCssaCaseworker' || x.key === 'selectCaseworker' || x.key === 'selectSrco' || x.key === 'selectSdm'  ))\r\n          {\r\n            //do nothing\r\n          }\r\n          else if ((x.type==='editgrid' && (x.key === 'notes' || x.key === 'srcrNotes' || x.key === 'deraNotes' || x.key === 'cssaNotes') ) ||x.key === 'comments' || x.key === 'commentFor')\r\n          {\r\n            //do nothing\r\n          }\r\n          else if(x.type === 'button')\r\n          {\r\n          //do nothing\r\n          }\r\n          else if(x.type === 'approvingAuthorityContactInformation')\r\n          { \r\n            if(userData.groups.includes(\"/formsflow/formsflow-reviewer/csap\") || userData.groups.includes(\"/formsflow/formsflow-reviewer/csap-society\"))\r\n            {\r\n               x.disabled = false;\r\n            }\r\n          }\r\n          else if(x.properties.apField === \"true\")\r\n          {\r\n            if(userData.groups.includes(\"/formsflow/formsflow-reviewer/csap\") || userData.groups.includes(\"/formsflow/formsflow-reviewer/csap-society\"))\r\n            {\r\n               x.disabled = false;\r\n            }\r\n            else\r\n            {\r\n\r\n            }\r\n          }\r\n          else\r\n          {\r\n          x.disabled = true;\r\n          }\r\n\r\n        \r\n\r\n    })\r\n\r\n}\r\n\r\nshow = false\r\n}",
                     "logic": [],
                     "attributes": {},
                     "overlay": {
@@ -245,7 +245,7 @@
                     "inputType": "text",
                     "inputMask": "",
                     "fixedSize": true,
-                    "id": "eh0sh1f",
+                    "id": "e0z1joc",
                     "defaultValue": ""
                 },
                 {
@@ -403,7 +403,7 @@
                     "key": "reviewerActions",
                     "tags": [],
                     "properties": {},
-                    "customConditional": "const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"));\r\nconst roles = UserDetails[\"role\"];\r\nconst isSoscAvailable = (data.submissionTypeTwo ? data.submissionTypeTwo.reportsSubmitted : false) || (data.applicationsrequested ? data.applicationsrequested.siteReclassification ||\r\ndata.applicationsrequested.approvalOfBackgroundConcentrations : false) || (data.certificationdocumentradioGroup ? data.certificationdocumentradioGroup.determinationOfContaminatedSite \r\n|| data.certificationdocumentradioGroup.approvalInPrinciple || data.certificationdocumentradioGroup.certificateOfCompliance : false) ? true : false;\r\n\r\n\r\nif(roles.includes(\"formsflow-client\") || \r\nroles.includes(\"formsflow-reviewer/cssa-team\") || \r\nroles.includes(\"formsflow-reviewer/cssa-manager\")|| \r\nroles.includes(\"formsflow-reviewer/csap\") || \r\nroles.includes(\"formsflow-reviewer/csap-society\") ||\r\nroles.includes(\"formsflow-reviewer/formsflow-client-reviewer\")) {\r\n  show = false;\r\n}\r\nelse\r\n{    \r\n  \tif (data.riskclassification === \"exempt\" && !isSoscAvailable) {\r\n\t\tshow = false;\r\n\t} //else if (isSoscAvailable) {\r\n\t\t//show = true;\r\n\t//}\r\n\telse {\r\n\t\tshow = true;\r\n\t}\r\n}",
+                    "customConditional": "const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"));\r\nconst roles = UserDetails?UserDetails[\"role\"]:[];\r\nif(!UserDetails){\r\n  show = false;\r\n} else {\r\nconst isSoscAvailable = (data.submissionTypeTwo ? data.submissionTypeTwo.reportsSubmitted : false) || (data.applicationsrequested ? data.applicationsrequested.siteReclassification ||\r\ndata.applicationsrequested.approvalOfBackgroundConcentrations : false) || (data.certificationdocumentradioGroup ? data.certificationdocumentradioGroup.determinationOfContaminatedSite \r\n|| data.certificationdocumentradioGroup.approvalInPrinciple || data.certificationdocumentradioGroup.certificateOfCompliance : false) ? true : false;\r\n\r\n\r\nif(roles.includes(\"formsflow-client\") || \r\nroles.includes(\"formsflow-reviewer/cssa-team\") || \r\nroles.includes(\"formsflow-reviewer/cssa-manager\")|| \r\nroles.includes(\"formsflow-reviewer/csap\") || \r\nroles.includes(\"formsflow-reviewer/csap-society\") ||\r\nroles.includes(\"formsflow-reviewer/formsflow-client-reviewer\")) {\r\n  show = false;\r\n}\r\nelse\r\n{    \r\n  \tif (data.riskclassification === \"exempt\" && !isSoscAvailable) {\r\n\t\tshow = false;\r\n\t} //else if (isSoscAvailable) {\r\n\t\t//show = true;\r\n\t//}\r\n\telse {\r\n\t\tshow = true;\r\n\t}\r\n}\r\n}",
                     "conditional": {
                         "json": "",
                         "show": null,
@@ -507,7 +507,7 @@
                                             "block": false,
                                             "disableOnInvalid": false,
                                             "theme": "primary",
-                                            "id": "eztoxer"
+                                            "id": "eimjnwh"
                                         }
                                     ],
                                     "offset": 0,
@@ -523,60 +523,35 @@
                                             "label": "Next Reviewer",
                                             "action": "custom",
                                             "showValidations": false,
-                                            "theme": "primary",
-                                            "size": "md",
-                                            "block": false,
-                                            "leftIcon": "",
-                                            "rightIcon": "",
-                                            "shortcut": "",
-                                            "description": "",
-                                            "tooltip": "",
-                                            "customClass": "",
-                                            "tabindex": "",
-                                            "disableOnInvalid": false,
-                                            "hidden": false,
-                                            "autofocus": false,
-                                            "disabled": false,
                                             "tableView": false,
-                                            "modalEdit": false,
                                             "key": "nextReviewer",
-                                            "tags": [],
-                                            "properties": {},
-                                            "conditional": {
-                                                "show": null,
-                                                "when": null,
-                                                "eq": "",
-                                                "json": ""
-                                            },
                                             "customConditional": "const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"));\r\nconst roles = UserDetails[\"role\"];\r\n\r\nif(roles.includes(\"formsflow-reviewer/caseworker\")){\r\n\tif((data.typeOfReview === \"applicationViaTheSocietyOfContaminatedSitesApprovedProfessionalsOfBc\" && data.bundleStatus === 'CSSA Manager Accepted')||\r\n\tdata.bundleStatus === 'Caseworker Accepted CSSA Form')\r\n    show = false;\r\n\telse\r\n\t\tshow = true;\r\n}\r\nelse\r\n{\r\n  show = false;\r\n}",
-                                            "logic": [],
-                                            "attributes": {},
-                                            "overlay": {
-                                                "style": "",
-                                                "page": "",
-                                                "left": "",
-                                                "top": "",
-                                                "width": "",
-                                                "height": ""
-                                            },
                                             "type": "button",
                                             "custom": "const submissionId = form._submission._id;\r\nconst formId = form._submission.form;\r\nconst formDataReqUrl = form.formio?form.formio.formUrl:(localStorage.getItem('customSubmissionUrl')+'/form/'+formId)+'/submission/'+submissionId;\r\n\r\nconst filteredData = _.pick(data, data.cssaUtilKeys);\r\n\r\nconst formDataReqObj1 =  {  \"_id\": submissionId,  \"data\": filteredData};\r\nconst formio = new Formio(formDataReqUrl);\r\nformio.saveSubmission(formDataReqObj1).then( result => {\r\nform.emit('customEvent', {\r\n          type: \"actionComplete\",   \r\n          component: component,\r\n          actionType: 'Accepted'\r\n    }); \r\n}).catch((error)=>{\r\n//Error callback on not Save\r\nform.emit('customEvent', {\r\n          type: \"actionError\",   \r\n          component: component,\r\n          actionType:'Accepted'\r\n    }); \r\n});",
                                             "input": true,
                                             "placeholder": "",
                                             "prefix": "",
+                                            "customClass": "",
                                             "suffix": "",
                                             "multiple": false,
                                             "defaultValue": null,
                                             "protected": false,
                                             "unique": false,
                                             "persistent": false,
+                                            "hidden": false,
                                             "clearOnHide": true,
                                             "refreshOn": "",
                                             "redrawOn": "",
+                                            "modalEdit": false,
                                             "dataGridLabel": true,
                                             "labelPosition": "top",
+                                            "description": "",
                                             "errorLabel": "",
+                                            "tooltip": "",
                                             "hideLabel": false,
+                                            "tabindex": "",
+                                            "disabled": false,
+                                            "autofocus": false,
                                             "dbIndex": false,
                                             "customDefaultValue": "",
                                             "calculateValue": "",
@@ -584,6 +559,7 @@
                                             "widget": {
                                                 "type": "input"
                                             },
+                                            "attributes": {},
                                             "validateOn": "change",
                                             "validate": {
                                                 "required": false,
@@ -593,13 +569,32 @@
                                                 "multiple": false,
                                                 "unique": false
                                             },
+                                            "conditional": {
+                                                "show": null,
+                                                "when": null,
+                                                "eq": ""
+                                            },
+                                            "overlay": {
+                                                "style": "",
+                                                "left": "",
+                                                "top": "",
+                                                "width": "",
+                                                "height": ""
+                                            },
                                             "allowCalculateOverride": false,
                                             "encrypted": false,
                                             "showCharCount": false,
                                             "showWordCount": false,
+                                            "properties": {},
                                             "allowMultipleMasks": false,
                                             "addons": [],
-                                            "id": "ekld3b"
+                                            "size": "md",
+                                            "leftIcon": "",
+                                            "rightIcon": "",
+                                            "block": false,
+                                            "disableOnInvalid": false,
+                                            "theme": "primary",
+                                            "id": "e8iefgk"
                                         },
                                         {
                                             "label": "Approved",
@@ -676,7 +671,7 @@
                                             "block": false,
                                             "disableOnInvalid": false,
                                             "theme": "primary",
-                                            "id": "eloup0m"
+                                            "id": "epx50f8"
                                         }
                                     ],
                                     "width": 3,
@@ -764,7 +759,7 @@
                                             "rightIcon": "",
                                             "block": false,
                                             "disableOnInvalid": false,
-                                            "id": "ezrru9k"
+                                            "id": "ebj80u"
                                         }
                                     ],
                                     "size": "md",
@@ -781,59 +776,35 @@
                                             "action": "custom",
                                             "showValidations": false,
                                             "theme": "danger",
-                                            "size": "md",
-                                            "block": false,
-                                            "leftIcon": "",
-                                            "rightIcon": "",
-                                            "shortcut": "",
-                                            "description": "",
-                                            "tooltip": "",
-                                            "customClass": "",
-                                            "tabindex": "",
-                                            "disableOnInvalid": false,
-                                            "hidden": false,
-                                            "autofocus": false,
-                                            "disabled": false,
                                             "tableView": false,
-                                            "modalEdit": false,
                                             "key": "rejected",
-                                            "tags": [],
-                                            "properties": {},
-                                            "conditional": {
-                                                "show": null,
-                                                "when": null,
-                                                "eq": "",
-                                                "json": ""
-                                            },
                                             "customConditional": "const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))\r\n\r\nconst roles = UserDetails[\"role\"];\r\n\r\nif(roles.includes(\"formsflow-reviewer\") && \r\n!(roles.includes(\"formsflow-reviewer/csap\") ||\r\nroles.includes(\"formsflow-reviewer/csap-society\"))) {\r\n  show = true;\r\n}\r\nelse\r\n{\r\n  show = false;\r\n}",
-                                            "logic": [],
-                                            "attributes": {},
-                                            "overlay": {
-                                                "style": "",
-                                                "page": "",
-                                                "left": "",
-                                                "top": "",
-                                                "width": "",
-                                                "height": ""
-                                            },
                                             "type": "button",
                                             "custom": "const submissionId = form._submission._id;\r\nconst formId = form._submission.form;\r\nconst formDataReqUrl = form.formio?form.formio.formUrl:(localStorage.getItem('customSubmissionUrl')+'/form/'+formId)+'/submission/'+submissionId;\r\nconst filteredData = _.pick(data, data.cssaUtilKeys);\r\nconst formDataReqObj1 =  {  \"_id\": submissionId,  \"data\": filteredData};\r\nconst formio = new Formio(formDataReqUrl);\r\nformio.saveSubmission(formDataReqObj1).then( result => {\r\nform.emit('customEvent', {\r\n          type: \"actionComplete\",   \r\n          component: component,\r\n          actionType: 'Rejected'\r\n    }); \r\n}).catch((error)=>{\r\n//Error callback on not Save\r\nform.emit('customEvent', {\r\n          type: \"actionError\",   \r\n          component: component,\r\n          actionType:'Rejected'\r\n    }); \r\n});\r\n",
                                             "input": true,
                                             "placeholder": "",
                                             "prefix": "",
+                                            "customClass": "",
                                             "suffix": "",
                                             "multiple": false,
                                             "defaultValue": null,
                                             "protected": false,
                                             "unique": false,
                                             "persistent": false,
+                                            "hidden": false,
                                             "clearOnHide": true,
                                             "refreshOn": "",
                                             "redrawOn": "",
+                                            "modalEdit": false,
                                             "dataGridLabel": true,
                                             "labelPosition": "top",
+                                            "description": "",
                                             "errorLabel": "",
+                                            "tooltip": "",
                                             "hideLabel": false,
+                                            "tabindex": "",
+                                            "disabled": false,
+                                            "autofocus": false,
                                             "dbIndex": false,
                                             "customDefaultValue": "",
                                             "calculateValue": "",
@@ -841,6 +812,7 @@
                                             "widget": {
                                                 "type": "input"
                                             },
+                                            "attributes": {},
                                             "validateOn": "change",
                                             "validate": {
                                                 "required": false,
@@ -850,13 +822,31 @@
                                                 "multiple": false,
                                                 "unique": false
                                             },
+                                            "conditional": {
+                                                "show": null,
+                                                "when": null,
+                                                "eq": ""
+                                            },
+                                            "overlay": {
+                                                "style": "",
+                                                "left": "",
+                                                "top": "",
+                                                "width": "",
+                                                "height": ""
+                                            },
                                             "allowCalculateOverride": false,
                                             "encrypted": false,
                                             "showCharCount": false,
                                             "showWordCount": false,
+                                            "properties": {},
                                             "allowMultipleMasks": false,
                                             "addons": [],
-                                            "id": "erq1ruj"
+                                            "size": "md",
+                                            "leftIcon": "",
+                                            "rightIcon": "",
+                                            "block": false,
+                                            "disableOnInvalid": false,
+                                            "id": "eniurmr"
                                         }
                                     ],
                                     "size": "md",
@@ -931,7 +921,7 @@
                             "tree": false,
                             "lazyLoad": false,
                             "autoAdjust": false,
-                            "id": "ez67wbo"
+                            "id": "eq45su3q"
                         }
                     ],
                     "keyModified": true,
@@ -973,7 +963,7 @@
                     "addons": [],
                     "tree": false,
                     "lazyLoad": false,
-                    "id": "e1wzf3p"
+                    "id": "eiocmc"
                 },
                 {
                     "title": "Site Owner Actions",
@@ -988,7 +978,7 @@
                     "key": "cssaSiteOwnerActions",
                     "tags": [],
                     "properties": {},
-                    "customConditional": "const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"));\r\nconst roles = UserDetails[\"role\"];\r\n\r\nif (data.riskclassification === \"exempt\") {\r\n  if(roles.includes(\"formsflow-reviewer/formsflow-client-reviewer\") && data.applicationStatus !== undefined && data.applicationStatus !== '') {\r\n    show = true;\r\n  }\r\n  else\r\n  {\r\n    show = false;\r\n  }\r\n} else {\r\n show = false;\r\n}",
+                    "customConditional": "const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"));\r\nconst roles = UserDetails?UserDetails[\"role\"]:[];\r\nif(!UserDetails){\r\n  show = false;\r\n} else {\r\n\r\nif (data.riskclassification === \"exempt\") {\r\n  if(roles.includes(\"formsflow-reviewer/formsflow-client-reviewer\") && data.applicationStatus !== undefined && data.applicationStatus !== '') {\r\n    show = true;\r\n  }\r\n  else\r\n  {\r\n    show = false;\r\n  }\r\n} else {\r\n show = false;\r\n}\r\n}",
                     "conditional": {
                         "json": "",
                         "show": null,
@@ -1091,7 +1081,7 @@
                                             "block": false,
                                             "disableOnInvalid": false,
                                             "theme": "primary",
-                                            "id": "evkup66c"
+                                            "id": "e47xnhm"
                                         }
                                     ],
                                     "width": 3,
@@ -1193,7 +1183,7 @@
                             "tree": false,
                             "lazyLoad": false,
                             "autoAdjust": false,
-                            "id": "e6pk3ur"
+                            "id": "e1n5a6l"
                         }
                     ],
                     "keyModified": true,
@@ -1235,7 +1225,7 @@
                     "addons": [],
                     "tree": false,
                     "lazyLoad": false,
-                    "id": "edm36dr"
+                    "id": "evic2ni"
                 },
                 {
                     "title": "Reviewer Actions",
@@ -1250,7 +1240,7 @@
                     "key": "cssaBundleActions",
                     "tags": [],
                     "properties": {},
-                    "customConditional": "const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))\r\nconst roles = UserDetails[\"role\"];\r\n\r\nconst isSoscAvailable = data.SoSC || (data.certificationdocumentradioGroup ? data.certificationdocumentradioGroup.determinationOfContaminatedSite \r\n|| data.certificationdocumentradioGroup.approvalInPrinciple || data.certificationdocumentradioGroup.certificateOfCompliance : false) ? true : false;\r\n\r\n\r\nif(roles.includes(\"formsflow-reviewer/cssa-team\") || \r\nroles.includes(\"formsflow-reviewer/cssa-manager\") ||\r\nroles.includes(\"formsflow-reviewer/csap\") || \r\nroles.includes(\"formsflow-reviewer/csap-society\")|| \r\nroles.includes(\"formsflow-reviewer/caseworker\")|| \r\nroles.includes(\"formsflow-reviewer/sdm\")) {\r\n    if (data.riskclassification === \"exempt\" && !isSoscAvailable){\r\n    \tshow = true;\r\n    } else {\r\n\t    show = false;\r\n    }\r\n}\r\nelse\r\n{\r\n  show = false;\r\n}",
+                    "customConditional": "\r\nconst UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))\r\nconst roles = UserDetails?UserDetails[\"role\"]:[];\r\nif(!UserDetails){\r\n  show = false;\r\n} else {\r\n\r\nconst isSoscAvailable = data.SoSC || (data.certificationdocumentradioGroup ? data.certificationdocumentradioGroup.determinationOfContaminatedSite \r\n|| data.certificationdocumentradioGroup.approvalInPrinciple || data.certificationdocumentradioGroup.certificateOfCompliance : false) ? true : false;\r\n\r\n\r\nif(roles.includes(\"formsflow-reviewer/cssa-team\") || \r\nroles.includes(\"formsflow-reviewer/cssa-manager\") ||\r\nroles.includes(\"formsflow-reviewer/csap\") || \r\nroles.includes(\"formsflow-reviewer/csap-society\")|| \r\nroles.includes(\"formsflow-reviewer/caseworker\")|| \r\nroles.includes(\"formsflow-reviewer/sdm\")) {\r\n    if (data.riskclassification === \"exempt\" && !isSoscAvailable){\r\n    \tshow = true;\r\n    } else {\r\n\t    show = false;\r\n    }\r\n}\r\nelse\r\n{\r\n  show = false;\r\n}\r\n}",
                     "conditional": {
                         "json": "",
                         "show": null,
@@ -1354,7 +1344,7 @@
                                             "block": false,
                                             "disableOnInvalid": false,
                                             "theme": "primary",
-                                            "id": "eig5rj"
+                                            "id": "exl5thn"
                                         }
                                     ],
                                     "width": 3,
@@ -1370,61 +1360,36 @@
                                             "label": "Next Reviewer",
                                             "action": "custom",
                                             "showValidations": false,
-                                            "theme": "primary",
-                                            "size": "md",
-                                            "block": false,
-                                            "leftIcon": "",
-                                            "rightIcon": "",
-                                            "shortcut": "",
-                                            "description": "",
-                                            "tooltip": "",
-                                            "customClass": "",
-                                            "tabindex": "",
-                                            "disableOnInvalid": false,
-                                            "hidden": false,
-                                            "autofocus": false,
-                                            "disabled": false,
                                             "tableView": false,
-                                            "modalEdit": false,
                                             "key": "sendBundleToNextReviewer",
-                                            "tags": [],
-                                            "properties": {},
-                                            "conditional": {
-                                                "show": null,
-                                                "when": null,
-                                                "eq": "",
-                                                "json": ""
-                                            },
                                             "customConditional": "const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))\r\nconst roles = UserDetails[\"role\"];\r\nif(roles.includes(\"formsflow-reviewer/cssa-team\") || \r\nroles.includes(\"formsflow-reviewer/cssa-manager\") || \r\nroles.includes(\"formsflow-reviewer/csap\") || \r\nroles.includes(\"formsflow-reviewer/csap-society\") || \r\nroles.includes(\"formsflow-reviewer/caseworker\") || \r\nroles.includes(\"formsflow-reviewer/sdm\")) \r\n{\r\n   if(data.bundleStatus === 'Caseworker Accepted CSSA Form' ||\r\n   (data.bundleStatus === 'CSSA Manager Accepted' && \r\n   data.typeOfReview === 'applicationViaTheSocietyOfContaminatedSitesApprovedProfessionalsOfBc'))\r\n    show = false;\r\n   else\r\n    show = true;\r\n}\r\nelse\r\n{\r\n  if(data.bundleStatus === 'CSSA Manager Accepted')\r\n    show = true;\r\n  else\r\n    show = false;\r\n}",
-                                            "logic": [],
-                                            "attributes": {},
-                                            "overlay": {
-                                                "style": "",
-                                                "page": "",
-                                                "left": "",
-                                                "top": "",
-                                                "width": "",
-                                                "height": ""
-                                            },
                                             "type": "button",
                                             "custom": "form.emit('customEvent', {\n          type: \"actionComplete\",  \n          component: component,\n          actionType:'Accepted'\n    });",
                                             "input": true,
                                             "keyModified": true,
                                             "placeholder": "",
                                             "prefix": "",
+                                            "customClass": "",
                                             "suffix": "",
                                             "multiple": false,
                                             "defaultValue": null,
                                             "protected": false,
                                             "unique": false,
                                             "persistent": false,
+                                            "hidden": false,
                                             "clearOnHide": true,
                                             "refreshOn": "",
                                             "redrawOn": "",
+                                            "modalEdit": false,
                                             "dataGridLabel": true,
                                             "labelPosition": "top",
+                                            "description": "",
                                             "errorLabel": "",
+                                            "tooltip": "",
                                             "hideLabel": false,
+                                            "tabindex": "",
+                                            "disabled": false,
+                                            "autofocus": false,
                                             "dbIndex": false,
                                             "customDefaultValue": "",
                                             "calculateValue": "",
@@ -1432,6 +1397,7 @@
                                             "widget": {
                                                 "type": "input"
                                             },
+                                            "attributes": {},
                                             "validateOn": "change",
                                             "validate": {
                                                 "required": false,
@@ -1441,13 +1407,32 @@
                                                 "multiple": false,
                                                 "unique": false
                                             },
+                                            "conditional": {
+                                                "show": null,
+                                                "when": null,
+                                                "eq": ""
+                                            },
+                                            "overlay": {
+                                                "style": "",
+                                                "left": "",
+                                                "top": "",
+                                                "width": "",
+                                                "height": ""
+                                            },
                                             "allowCalculateOverride": false,
                                             "encrypted": false,
                                             "showCharCount": false,
                                             "showWordCount": false,
+                                            "properties": {},
                                             "allowMultipleMasks": false,
                                             "addons": [],
-                                            "id": "evggeg8"
+                                            "size": "md",
+                                            "leftIcon": "",
+                                            "rightIcon": "",
+                                            "block": false,
+                                            "disableOnInvalid": false,
+                                            "theme": "primary",
+                                            "id": "e4s03z7"
                                         },
                                         {
                                             "label": "Approved",
@@ -1524,7 +1509,7 @@
                                             "block": false,
                                             "disableOnInvalid": false,
                                             "theme": "primary",
-                                            "id": "es0z0ho"
+                                            "id": "ebckz4"
                                         }
                                     ],
                                     "width": 3,
@@ -1611,7 +1596,7 @@
                                             "rightIcon": "",
                                             "block": false,
                                             "disableOnInvalid": false,
-                                            "id": "e9t69r"
+                                            "id": "eiwuczi"
                                         }
                                     ],
                                     "size": "md",
@@ -1628,59 +1613,35 @@
                                             "action": "custom",
                                             "showValidations": false,
                                             "theme": "danger",
-                                            "size": "md",
-                                            "block": false,
-                                            "leftIcon": "",
-                                            "rightIcon": "",
-                                            "shortcut": "",
-                                            "description": "",
-                                            "tooltip": "",
-                                            "customClass": "",
-                                            "tabindex": "",
-                                            "disableOnInvalid": false,
-                                            "hidden": false,
-                                            "autofocus": false,
-                                            "disabled": false,
                                             "tableView": false,
-                                            "modalEdit": false,
                                             "key": "rejectBundle",
-                                            "tags": [],
-                                            "properties": {},
-                                            "conditional": {
-                                                "show": null,
-                                                "when": null,
-                                                "eq": "",
-                                                "json": ""
-                                            },
                                             "customConditional": "const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))\r\n\r\nconst roles = UserDetails[\"role\"];\r\n\r\nif(roles.includes(\"formsflow-reviewer\") && \r\n!(roles.includes(\"formsflow-reviewer/cssa-manager\") || \r\nroles.includes(\"formsflow-reviewer/csap\") ||\r\nroles.includes(\"formsflow-reviewer/csap-society\"))) {\r\n  show = true;\r\n}\r\nelse\r\n{\r\n  show = false;\r\n}",
-                                            "logic": [],
-                                            "attributes": {},
-                                            "overlay": {
-                                                "style": "",
-                                                "page": "",
-                                                "left": "",
-                                                "top": "",
-                                                "width": "",
-                                                "height": ""
-                                            },
                                             "type": "button",
                                             "custom": "\r\nform.emit('customEvent', {\r\n          type: \"actionComplete\",   \r\n          component: component,\r\n          actionType: 'Rejected'\r\n}); ",
                                             "input": true,
                                             "placeholder": "",
                                             "prefix": "",
+                                            "customClass": "",
                                             "suffix": "",
                                             "multiple": false,
                                             "defaultValue": null,
                                             "protected": false,
                                             "unique": false,
                                             "persistent": false,
+                                            "hidden": false,
                                             "clearOnHide": true,
                                             "refreshOn": "",
                                             "redrawOn": "",
+                                            "modalEdit": false,
                                             "dataGridLabel": true,
                                             "labelPosition": "top",
+                                            "description": "",
                                             "errorLabel": "",
+                                            "tooltip": "",
                                             "hideLabel": false,
+                                            "tabindex": "",
+                                            "disabled": false,
+                                            "autofocus": false,
                                             "dbIndex": false,
                                             "customDefaultValue": "",
                                             "calculateValue": "",
@@ -1688,6 +1649,7 @@
                                             "widget": {
                                                 "type": "input"
                                             },
+                                            "attributes": {},
                                             "validateOn": "change",
                                             "validate": {
                                                 "required": false,
@@ -1697,13 +1659,31 @@
                                                 "multiple": false,
                                                 "unique": false
                                             },
+                                            "conditional": {
+                                                "show": null,
+                                                "when": null,
+                                                "eq": ""
+                                            },
+                                            "overlay": {
+                                                "style": "",
+                                                "left": "",
+                                                "top": "",
+                                                "width": "",
+                                                "height": ""
+                                            },
                                             "allowCalculateOverride": false,
                                             "encrypted": false,
                                             "showCharCount": false,
                                             "showWordCount": false,
+                                            "properties": {},
                                             "allowMultipleMasks": false,
                                             "addons": [],
-                                            "id": "e5bvwze"
+                                            "size": "md",
+                                            "leftIcon": "",
+                                            "rightIcon": "",
+                                            "block": false,
+                                            "disableOnInvalid": false,
+                                            "id": "ex6uwha"
                                         }
                                     ],
                                     "size": "md",
@@ -1778,7 +1758,7 @@
                             "tree": false,
                             "lazyLoad": false,
                             "autoAdjust": false,
-                            "id": "eug3kcu"
+                            "id": "ecbs4ia"
                         }
                     ],
                     "keyModified": true,
@@ -1820,7 +1800,7 @@
                     "addons": [],
                     "tree": false,
                     "lazyLoad": false,
-                    "id": "e4m2qxa"
+                    "id": "ebkv4lm"
                 },
                 {
                     "title": "Assign Reviewers",
@@ -1835,7 +1815,7 @@
                     "key": "cssaReviewerAssignment",
                     "tags": [],
                     "properties": {},
-                    "customConditional": "const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))\r\nconst roles = UserDetails[\"role\"];\r\nconst isSoscAvailable = data.SoSC || (data.certificationdocumentradioGroup ? data.certificationdocumentradioGroup.determinationOfContaminatedSite \r\n|| data.certificationdocumentradioGroup.approvalInPrinciple || data.certificationdocumentradioGroup.certificateOfCompliance : false) ? true : false;\r\n\r\nif(roles.includes(\"formsflow-reviewer/cssa-manager\")) {\r\n\tif (data.riskclassification === \"exempt\" && !isSoscAvailable) {\r\n\t\tshow = true;\r\n\t} else {\r\n\t\tshow = false;\r\n\t}\r\n      \r\n}\r\nelse\r\n{\r\n      show = false;\r\n}",
+                    "customConditional": "const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))\r\nconst roles = UserDetails?UserDetails[\"role\"]:[];\r\nif(!UserDetails){\r\n  show = false;\r\n} else {\r\n\r\nconst isSoscAvailable = data.SoSC || (data.certificationdocumentradioGroup ? data.certificationdocumentradioGroup.determinationOfContaminatedSite \r\n|| data.certificationdocumentradioGroup.approvalInPrinciple || data.certificationdocumentradioGroup.certificateOfCompliance : false) ? true : false;\r\n\r\nif(roles.includes(\"formsflow-reviewer/cssa-manager\")) {\r\n\tif (data.riskclassification === \"exempt\" && !isSoscAvailable) {\r\n\t\tshow = true;\r\n\t} else {\r\n\t\tshow = false;\r\n\t}\r\n      \r\n}\r\nelse\r\n{\r\n      show = false;\r\n}\r\n}",
                     "conditional": {
                         "json": "",
                         "show": null,
@@ -1867,31 +1847,10 @@
                                     "components": [
                                         {
                                             "label": "Select SDM",
-                                            "labelPosition": "top",
                                             "widget": "choicesjs",
-                                            "placeholder": "",
-                                            "description": "",
-                                            "tooltip": "",
-                                            "customClass": "",
-                                            "tabindex": "",
-                                            "hidden": false,
-                                            "hideLabel": false,
-                                            "uniqueOptions": false,
-                                            "autofocus": false,
-                                            "disabled": false,
                                             "tableView": true,
-                                            "modalEdit": false,
-                                            "multiple": false,
                                             "dataSrc": "url",
                                             "data": {
-                                                "values": [
-                                                    {
-                                                        "label": "",
-                                                        "value": ""
-                                                    }
-                                                ],
-                                                "resource": "",
-                                                "json": "",
                                                 "url": "{{localStorage.getItem('formsflow.ai.api.url')}}/user?memberOfGroup=formsflow/formsflow-reviewer/sdm",
                                                 "headers": [
                                                     {
@@ -1907,96 +1866,107 @@
                                                         "value": "application/json"
                                                     }
                                                 ],
+                                                "values": [
+                                                    {
+                                                        "label": "",
+                                                        "value": ""
+                                                    }
+                                                ],
+                                                "json": "",
+                                                "resource": "",
                                                 "custom": ""
                                             },
                                             "dataType": "string",
-                                            "idPath": "id",
                                             "valueProperty": "username",
                                             "template": "<span>{{ item.lastName }}, {{ item.firstName }}</span>",
-                                            "refreshOn": "",
-                                            "refreshOnBlur": "",
-                                            "clearOnRefresh": false,
-                                            "searchEnabled": true,
-                                            "selectThreshold": 0.3,
-                                            "readOnlyValue": false,
-                                            "customOptions": {},
-                                            "useExactSearch": false,
-                                            "persistent": true,
+                                            "key": "selectCssaSdm",
+                                            "type": "select",
+                                            "selectValues": "data",
+                                            "disableLimit": false,
+                                            "input": true,
+                                            "keyModified": true,
+                                            "placeholder": "",
+                                            "prefix": "",
+                                            "customClass": "",
+                                            "suffix": "",
+                                            "multiple": false,
+                                            "defaultValue": null,
                                             "protected": false,
-                                            "dbIndex": false,
-                                            "encrypted": 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,
-                                            "allowCalculateOverride": false,
+                                            "attributes": {},
                                             "validateOn": "change",
                                             "validate": {
                                                 "required": false,
-                                                "onlyAvailableItems": false,
-                                                "customMessage": "",
                                                 "custom": "",
                                                 "customPrivate": false,
-                                                "json": "",
                                                 "strictDateValidation": false,
                                                 "multiple": false,
-                                                "unique": false
+                                                "unique": false,
+                                                "onlyAvailableItems": false
                                             },
-                                            "unique": false,
-                                            "errorLabel": "",
-                                            "errors": "",
-                                            "key": "selectCssaSdm",
-                                            "tags": [],
-                                            "properties": {},
                                             "conditional": {
                                                 "show": null,
                                                 "when": null,
-                                                "eq": "",
-                                                "json": ""
+                                                "eq": ""
                                             },
-                                            "customConditional": "",
-                                            "logic": [],
-                                            "attributes": {},
                                             "overlay": {
                                                 "style": "",
-                                                "page": "",
                                                 "left": "",
                                                 "top": "",
                                                 "width": "",
                                                 "height": ""
                                             },
-                                            "type": "select",
-                                            "indexeddb": {
-                                                "filter": {}
-                                            },
+                                            "allowCalculateOverride": false,
+                                            "encrypted": false,
+                                            "showCharCount": false,
+                                            "showWordCount": false,
+                                            "properties": {},
+                                            "allowMultipleMasks": false,
+                                            "addons": [],
+                                            "idPath": "id",
+                                            "clearOnRefresh": false,
+                                            "limit": 100,
                                             "lazyLoad": true,
-                                            "selectValues": "data",
-                                            "selectFields": "",
-                                            "disableLimit": false,
-                                            "searchField": "",
+                                            "filter": "",
+                                            "searchEnabled": true,
                                             "searchDebounce": 0.3,
+                                            "searchField": "",
                                             "minSearch": 0,
-                                            "filter": "",
-                                            "limit": 100,
+                                            "readOnlyValue": false,
                                             "authenticate": false,
                                             "ignoreCache": false,
-                                            "redrawOn": "",
-                                            "input": true,
-                                            "keyModified": true,
-                                            "prefix": "",
-                                            "suffix": "",
-                                            "dataGridLabel": false,
-                                            "showCharCount": false,
-                                            "showWordCount": false,
-                                            "allowMultipleMasks": false,
-                                            "addons": [],
+                                            "selectFields": "",
+                                            "selectThreshold": 0.3,
+                                            "uniqueOptions": false,
                                             "fuseOptions": {
                                                 "include": "score",
                                                 "threshold": 0.3
                                             },
-                                            "id": "ei5a6p",
-                                            "defaultValue": "",
-                                            "sort": ""
+                                            "indexeddb": {
+                                                "filter": {}
+                                            },
+                                            "customOptions": {},
+                                            "useExactSearch": false,
+                                            "id": "ebm3zr"
                                         }
                                     ],
                                     "width": 4,
@@ -2010,31 +1980,10 @@
                                     "components": [
                                         {
                                             "label": "Select Caseworker",
-                                            "labelPosition": "top",
                                             "widget": "choicesjs",
-                                            "placeholder": "",
-                                            "description": "",
-                                            "tooltip": "",
-                                            "customClass": "",
-                                            "tabindex": "",
-                                            "hidden": false,
-                                            "hideLabel": false,
-                                            "uniqueOptions": false,
-                                            "autofocus": false,
-                                            "disabled": false,
                                             "tableView": true,
-                                            "modalEdit": false,
-                                            "multiple": false,
                                             "dataSrc": "url",
                                             "data": {
-                                                "values": [
-                                                    {
-                                                        "label": "",
-                                                        "value": ""
-                                                    }
-                                                ],
-                                                "resource": "",
-                                                "json": "",
                                                 "url": "{{localStorage.getItem('formsflow.ai.api.url')}}/user?memberOfGroup=formsflow/formsflow-reviewer/caseworker",
                                                 "headers": [
                                                     {
@@ -2050,96 +1999,108 @@
                                                         "value": "application/json"
                                                     }
                                                 ],
+                                                "values": [
+                                                    {
+                                                        "label": "",
+                                                        "value": ""
+                                                    }
+                                                ],
+                                                "json": "",
+                                                "resource": "",
                                                 "custom": ""
                                             },
                                             "dataType": "string",
-                                            "idPath": "id",
                                             "valueProperty": "username",
                                             "template": "<span>{{ item.lastName }}, {{ item.firstName }}</span>",
-                                            "refreshOn": "",
-                                            "refreshOnBlur": "",
-                                            "clearOnRefresh": false,
-                                            "searchEnabled": true,
-                                            "selectThreshold": 0.3,
-                                            "readOnlyValue": false,
-                                            "customOptions": {},
-                                            "useExactSearch": false,
-                                            "persistent": true,
+                                            "key": "selectCssaCaseworker",
+                                            "customConditional": "if (data.typeOfReview==='applicationViaTheSocietyOfContaminatedSitesApprovedProfessionalsOfBc')\n{\n  show = false;\n}\nelse {\n  show = true;\n}",
+                                            "type": "select",
+                                            "selectValues": "data",
+                                            "disableLimit": false,
+                                            "input": true,
+                                            "keyModified": true,
+                                            "placeholder": "",
+                                            "prefix": "",
+                                            "customClass": "",
+                                            "suffix": "",
+                                            "multiple": false,
+                                            "defaultValue": null,
                                             "protected": false,
-                                            "dbIndex": false,
-                                            "encrypted": 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,
-                                            "allowCalculateOverride": false,
+                                            "attributes": {},
                                             "validateOn": "change",
                                             "validate": {
                                                 "required": false,
-                                                "onlyAvailableItems": false,
-                                                "customMessage": "",
                                                 "custom": "",
                                                 "customPrivate": false,
-                                                "json": "",
                                                 "strictDateValidation": false,
                                                 "multiple": false,
-                                                "unique": false
+                                                "unique": false,
+                                                "onlyAvailableItems": false
                                             },
-                                            "unique": false,
-                                            "errorLabel": "",
-                                            "errors": "",
-                                            "key": "selectCssaCaseworker",
-                                            "tags": [],
-                                            "properties": {},
                                             "conditional": {
                                                 "show": null,
                                                 "when": null,
-                                                "eq": "",
-                                                "json": ""
+                                                "eq": ""
                                             },
-                                            "customConditional": "if (data.typeOfReview==='applicationViaTheSocietyOfContaminatedSitesApprovedProfessionalsOfBc')\n{\n  show = false;\n}\nelse {\n  show = true;\n}",
-                                            "logic": [],
-                                            "attributes": {},
                                             "overlay": {
                                                 "style": "",
-                                                "page": "",
                                                 "left": "",
                                                 "top": "",
                                                 "width": "",
                                                 "height": ""
                                             },
-                                            "type": "select",
-                                            "indexeddb": {
-                                                "filter": {}
-                                            },
+                                            "allowCalculateOverride": false,
+                                            "encrypted": false,
+                                            "showCharCount": false,
+                                            "showWordCount": false,
+                                            "properties": {},
+                                            "allowMultipleMasks": false,
+                                            "addons": [],
+                                            "idPath": "id",
+                                            "clearOnRefresh": false,
+                                            "limit": 100,
                                             "lazyLoad": true,
-                                            "selectValues": "data",
-                                            "selectFields": "",
-                                            "disableLimit": false,
-                                            "searchField": "",
+                                            "filter": "",
+                                            "searchEnabled": true,
                                             "searchDebounce": 0.3,
+                                            "searchField": "",
                                             "minSearch": 0,
-                                            "filter": "",
-                                            "limit": 100,
+                                            "readOnlyValue": false,
                                             "authenticate": false,
                                             "ignoreCache": false,
-                                            "redrawOn": "",
-                                            "input": true,
-                                            "keyModified": true,
-                                            "prefix": "",
-                                            "suffix": "",
-                                            "dataGridLabel": false,
-                                            "showCharCount": false,
-                                            "showWordCount": false,
-                                            "allowMultipleMasks": false,
-                                            "addons": [],
+                                            "selectFields": "",
+                                            "selectThreshold": 0.3,
+                                            "uniqueOptions": false,
                                             "fuseOptions": {
                                                 "include": "score",
                                                 "threshold": 0.3
                                             },
-                                            "id": "ebv5h7",
-                                            "defaultValue": "",
-                                            "sort": ""
+                                            "indexeddb": {
+                                                "filter": {}
+                                            },
+                                            "customOptions": {},
+                                            "useExactSearch": false,
+                                            "id": "e5gg3k"
                                         }
                                     ],
                                     "width": 4,
@@ -2223,7 +2184,7 @@
                             "tree": false,
                             "lazyLoad": false,
                             "autoAdjust": false,
-                            "id": "eunccow"
+                            "id": "eg7mzgs"
                         }
                     ],
                     "keyModified": true,
@@ -2265,7 +2226,7 @@
                     "addons": [],
                     "tree": false,
                     "lazyLoad": false,
-                    "id": "eleuwbv"
+                    "id": "ejing8o"
                 },
                 {
                     "label": "Notes",
@@ -2329,7 +2290,7 @@
                         "eq": "",
                         "json": ""
                     },
-                    "customConditional": "\r\n\r\nshow = false;\r\n\r\nconst UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))\r\nconst groups = UserDetails[\"groups\"];\r\nif((groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\")))\r\n{\r\n   if(data.cssaNotes && data.cssaNotes.filter((x)=>x.commentFor==='external').length > 0)\r\n      show = true;\r\n   else\r\n      show = false;\r\n}\r\nelse\r\n{\r\n  show = true;\r\n}\r\n\r\n\r\nvar addButton = document.querySelector(\"button[ref=editgrid-cssaNotes-addRow]\");\r\nif(addButton!==null && addButton !== undefined)\r\n{\r\naddButton.addEventListener('click',\r\n(e)=>{\r\n\t\tif( groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\"))\r\n\t\t{\r\n\t\t  var internalRadio = document.querySelectorAll(\"input[value='internal'][type='radio']\");\r\n\t\t  for (let i = 0; i < internalRadio.length; i++) {\r\n\t\t\tinternalRadio[i].parentElement.remove();\r\n\t\t  }\r\n\t\t}\r\n})\r\n}\r\nconst emptyElements = [];\r\nconst elements = document.getElementsByClassName(\"list-group-item\");\r\nfor (let i = 0; i < elements.length; i++) {\r\nconst element = elements[i];\r\n\r\nif(element.querySelectorAll('div.row').length===0){(element).remove() }\r\n \r\n}\r\n",
+                    "customConditional": "show = false;\r\n\r\nconst UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))\r\nconst groups = UserDetails?UserDetails[\"groups\"]:[];\r\nif(!UserDetails){\r\n  show = false;\r\n} else {\r\n\r\nif((groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\")))\r\n{\r\n   if(data.cssaNotes && data.cssaNotes.filter((x)=>x.commentFor==='external').length > 0)\r\n      show = true;\r\n   else\r\n      show = false;\r\n}\r\nelse\r\n{\r\n  show = true;\r\n}\r\n\r\n\r\nvar addButton = document.querySelector(\"button[ref=editgrid-cssaNotes-addRow]\");\r\nif(addButton!==null && addButton !== undefined)\r\n{\r\naddButton.addEventListener('click',\r\n(e)=>{\r\n\t\tif( groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\"))\r\n\t\t{\r\n\t\t  var internalRadio = document.querySelectorAll(\"input[value='internal'][type='radio']\");\r\n\t\t  for (let i = 0; i < internalRadio.length; i++) {\r\n\t\t\tinternalRadio[i].parentElement.remove();\r\n\t\t  }\r\n\t\t}\r\n})\r\n}\r\nconst emptyElements = [];\r\nconst elements = document.getElementsByClassName(\"list-group-item\");\r\nfor (let i = 0; i < elements.length; i++) {\r\nconst element = elements[i];\r\n\r\nif(element.querySelectorAll('div.row').length===0){(element).remove() }\r\n \r\n}\r\n}\r\n",
                     "logic": [],
                     "attributes": {},
                     "overlay": {
@@ -2431,7 +2392,7 @@
                                             "wysiwyg": false,
                                             "editor": "",
                                             "fixedSize": true,
-                                            "id": "euj4rql"
+                                            "id": "e6rlpnr"
                                         }
                                     ],
                                     "width": 4,
@@ -2523,7 +2484,7 @@
                                             "addons": [],
                                             "inputType": "radio",
                                             "fieldSet": false,
-                                            "id": "exknv9t"
+                                            "id": "en6j2yd"
                                         }
                                     ],
                                     "offset": 0,
@@ -2610,7 +2571,7 @@
                                             "displayMask": "",
                                             "spellcheck": true,
                                             "truncateMultipleSpaces": false,
-                                            "id": "e15ftkj"
+                                            "id": "ex2ofqc"
                                         }
                                     ],
                                     "size": "md",
@@ -2697,7 +2658,7 @@
                                             "displayMask": "",
                                             "spellcheck": true,
                                             "truncateMultipleSpaces": false,
-                                            "id": "e9p7n7j"
+                                            "id": "eugrrs1"
                                         }
                                     ],
                                     "size": "md",
@@ -2784,7 +2745,7 @@
                                             "displayMask": "",
                                             "spellcheck": true,
                                             "truncateMultipleSpaces": false,
-                                            "id": "ebw3t6a"
+                                            "id": "euiy12d"
                                         }
                                     ],
                                     "size": "md",
@@ -2859,7 +2820,7 @@
                             "tree": false,
                             "lazyLoad": false,
                             "autoAdjust": false,
-                            "id": "eqm161n"
+                            "id": "ezesnva"
                         }
                     ],
                     "placeholder": "",
@@ -2878,7 +2839,7 @@
                     "tree": true,
                     "lazyLoad": false,
                     "defaultOpen": false,
-                    "id": "eej9hob"
+                    "id": "ec5d43c"
                 },
                 {
                     "title": "Collection Notice",
@@ -7898,7 +7859,7 @@
                                     "addons": [],
                                     "tree": false,
                                     "lazyLoad": false,
-                                    "id": "ehmz9lv000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+                                    "id": "ehmz9lv00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
                                 }
                             ],
                             "placeholder": "",
@@ -9551,7 +9512,7 @@
                                         }
                                     ],
                                     "collapsible": false,
-                                    "id": "ewhx8sm000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                                    "id": "ewhx8sm00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                                     "placeholder": "",
                                     "prefix": "",
                                     "customClass": "",
@@ -18746,7 +18707,7 @@
                                             },
                                             "inputMask": "999-999-999",
                                             "tableView": true,
-                                            "id": "elva880000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                                            "id": "elva88000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                                             "placeholder": "",
                                             "prefix": "",
                                             "customClass": "",
@@ -18826,7 +18787,7 @@
                                             "tableView": true,
                                             "autoExpand": true,
                                             "inputFormat": "plain",
-                                            "id": "ey48nu0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                                            "id": "ey48nu000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                                             "placeholder": "",
                                             "prefix": "",
                                             "customClass": "",
@@ -19201,7 +19162,7 @@
                                                     "input": true,
                                                     "label": "PIN",
                                                     "tableView": true,
-                                                    "id": "eyxe45n0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                                                    "id": "eyxe45n000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                                                     "placeholder": "",
                                                     "prefix": "",
                                                     "customClass": "",
@@ -19294,7 +19255,7 @@
                                                     "autoExpand": true,
                                                     "inputFormat": "plain",
                                                     "placeholder": "example, metes and bounds",
-                                                    "id": "efdcvf0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                                                    "id": "efdcvf000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                                                     "prefix": "",
                                                     "customClass": "",
                                                     "suffix": "",
@@ -19508,7 +19469,7 @@
                                                     "input": true,
                                                     "label": "Crown Land File Numbers",
                                                     "tableView": true,
-                                                    "id": "emf4u7g0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                                                    "id": "emf4u7g000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                                                     "placeholder": "",
                                                     "prefix": "",
                                                     "customClass": "",
@@ -20570,7 +20531,7 @@
                                                     },
                                                     "inputMask": "999-999-999",
                                                     "tableView": true,
-                                                    "id": "ev43oe90000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                                                    "id": "ev43oe9000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                                                     "placeholder": "",
                                                     "prefix": "",
                                                     "customClass": "",
@@ -20650,7 +20611,7 @@
                                                     "tableView": true,
                                                     "autoExpand": true,
                                                     "inputFormat": "plain",
-                                                    "id": "eb3d0l0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                                                    "id": "eb3d0l000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                                                     "placeholder": "",
                                                     "prefix": "",
                                                     "customClass": "",
@@ -21025,7 +20986,7 @@
                                                             "input": true,
                                                             "label": "PIN",
                                                             "tableView": true,
-                                                            "id": "eyv4fcu0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                                                            "id": "eyv4fcu000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                                                             "placeholder": "",
                                                             "prefix": "",
                                                             "customClass": "",
@@ -21118,7 +21079,7 @@
                                                             "autoExpand": true,
                                                             "inputFormat": "plain",
                                                             "placeholder": "example, metes and bounds",
-                                                            "id": "ecgeub0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                                                            "id": "ecgeub000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                                                             "prefix": "",
                                                             "customClass": "",
                                                             "suffix": "",
@@ -21332,7 +21293,7 @@
                                                             "input": true,
                                                             "label": "Crown Land File Numbers",
                                                             "tableView": true,
-                                                            "id": "eguyyh0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                                                            "id": "eguyyh000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                                                             "placeholder": "",
                                                             "prefix": "",
                                                             "customClass": "",
diff --git a/forms-flow-ai/epd-forms/bundling/Detailed Ecological Risk Assessment Checklist.json b/forms-flow-ai/epd-forms/bundling/Detailed Ecological Risk Assessment Checklist.json
index 8fbc4f99..89f73cc7 100644
--- a/forms-flow-ai/epd-forms/bundling/Detailed Ecological Risk Assessment Checklist.json	
+++ b/forms-flow-ai/epd-forms/bundling/Detailed Ecological Risk Assessment Checklist.json	
@@ -1972,7 +1972,7 @@
                         "eq": "",
                         "json": ""
                     },
-                    "customConditional": "\n\nshow = false;\n\nconst UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))\nconst groups = UserDetails[\"groups\"];\nif((groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\")))\n{\n   if(data.deraNotes && data.deraNotes.filter((x)=>x.commentFor==='external').length > 0)\n      show = true;\n   else\n      show = false;\n}\nelse\n{\n  show = true;\n}\n\n\nvar addButton = document.querySelector(\"button[ref=editgrid-deraNotes-addRow]\");\nif(addButton!==null && addButton !== undefined)\n{\naddButton.addEventListener('click',\n(e)=>{\n\t\tif( groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\"))\n\t\t{\n\t\t  var internalRadio = document.querySelectorAll(\"input[value='internal'][type='radio']\");\n\t\t  for (let i = 0; i < internalRadio.length; i++) {\n\t\t\tinternalRadio[i].parentElement.remove();\n\t\t  }\n\t\t}\n})\n}\nconst emptyElements = [];\nconst elements = document.getElementsByClassName(\"list-group-item\");\nfor (let i = 0; i < elements.length; i++) {\nconst element = elements[i];\n\nif(element.querySelectorAll('div.row').length===0){(element).remove() }\n \n}\n\n\nvar b =JSON.parse(localStorage.getItem('UserDetails'))\n\nif(b.groups.includes(\"/formsflow/formsflow-client\"))\n{\n  console.log('client here');\n\tif(document.querySelector(\"[ref='editgrid-deraNotes-addRow']\") != null)\n\t{\n\t\tdocument.querySelector(\"[ref='editgrid-deraNotes-addRow']\").remove();\n\t}\n\nvar editButtons = document.querySelectorAll('button.btn.btn-default.btn-light.btn-sm.editRow');\nif(editButtons!=null)\n{\n\tfor(i=0;i<editButtons.length;i++)\t\n\t{\n\t\teditButtons[i].remove();\n\t}\n}\nvar removeButtons = document.querySelectorAll('button.btn.btn-danger.btn-sm.removeRow');\nif(removeButtons !=null)\n{\n\tfor(i=0;i<removeButtons.length;i++){\n\t\tremoveButtons[i].remove();\n\t}\n}\n\n}",
+                    "customConditional": "show = false;\r\n\r\nconst UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"));\r\nconst groups = UserDetails?UserDetails[\"groups\"]:[];\r\nif(!UserDetails){\r\n  show = false;\r\n}\r\nelse \r\n{\r\nif((groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\")))\r\n{\r\n   if(data.deraNotes && data.deraNotes.filter((x)=>x.commentFor==='external').length > 0)\r\n      show = true;\r\n   else\r\n      show = false;\r\n}\r\nelse\r\n{\r\n  show = true;\r\n}\r\n\r\n\r\nvar addButton = document.querySelector(\"button[ref=editgrid-deraNotes-addRow]\");\r\nif(addButton!==null && addButton !== undefined)\r\n{\r\naddButton.addEventListener('click',\r\n(e)=>{\r\n\t\tif( groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\"))\r\n\t\t{\r\n\t\t  var internalRadio = document.querySelectorAll(\"input[value='internal'][type='radio']\");\r\n\t\t  for (let i = 0; i < internalRadio.length; i++) {\r\n\t\t\tinternalRadio[i].parentElement.remove();\r\n\t\t  }\r\n\t\t}\r\n})\r\n}\r\nconst emptyElements = [];\r\nconst elements = document.getElementsByClassName(\"list-group-item\");\r\nfor (let i = 0; i < elements.length; i++) {\r\nconst element = elements[i];\r\n\r\nif(element.querySelectorAll('div.row').length===0){(element).remove() }\r\n \r\n}\r\n\r\n\r\nvar b =JSON.parse(localStorage.getItem('UserDetails'))\r\n\r\nif(b.groups.includes(\"/formsflow/formsflow-client\"))\r\n{\r\n  console.log('client here');\r\n\tif(document.querySelector(\"[ref='editgrid-deraNotes-addRow']\") != null)\r\n\t{\r\n\t\tdocument.querySelector(\"[ref='editgrid-deraNotes-addRow']\").remove();\r\n\t}\r\n\r\nvar editButtons = document.querySelectorAll('button.btn.btn-default.btn-light.btn-sm.editRow');\r\nif(editButtons!=null)\r\n{\r\n\tfor(i=0;i<editButtons.length;i++)\t\r\n\t{\r\n\t\teditButtons[i].remove();\r\n\t}\r\n}\r\nvar removeButtons = document.querySelectorAll('button.btn.btn-danger.btn-sm.removeRow');\r\nif(removeButtons !=null)\r\n{\r\n\tfor(i=0;i<removeButtons.length;i++){\r\n\t\tremoveButtons[i].remove();\r\n\t}\r\n}\r\n\r\n}\r\n}",
                     "logic": [],
                     "attributes": {},
                     "overlay": {
@@ -2074,7 +2074,7 @@
                                             "wysiwyg": false,
                                             "editor": "",
                                             "fixedSize": true,
-                                            "id": "edmt22r"
+                                            "id": "e995mk"
                                         }
                                     ],
                                     "width": 4,
@@ -2166,7 +2166,7 @@
                                             "addons": [],
                                             "inputType": "radio",
                                             "fieldSet": false,
-                                            "id": "e0eb0iv"
+                                            "id": "eivzgui"
                                         }
                                     ],
                                     "offset": 0,
@@ -2253,7 +2253,7 @@
                                             "displayMask": "",
                                             "spellcheck": true,
                                             "truncateMultipleSpaces": false,
-                                            "id": "e1hnrn"
+                                            "id": "e4t3cab"
                                         }
                                     ],
                                     "size": "md",
@@ -2340,7 +2340,7 @@
                                             "displayMask": "",
                                             "spellcheck": true,
                                             "truncateMultipleSpaces": false,
-                                            "id": "enl2x3k"
+                                            "id": "ecfnum"
                                         }
                                     ],
                                     "size": "md",
@@ -2427,7 +2427,7 @@
                                             "displayMask": "",
                                             "spellcheck": true,
                                             "truncateMultipleSpaces": false,
-                                            "id": "equorg9"
+                                            "id": "elf9nya"
                                         }
                                     ],
                                     "size": "md",
@@ -2502,7 +2502,7 @@
                             "tree": false,
                             "lazyLoad": false,
                             "autoAdjust": false,
-                            "id": "ezf9zqu"
+                            "id": "em2iwekk"
                         }
                     ],
                     "placeholder": "",
@@ -2521,7 +2521,7 @@
                     "tree": true,
                     "lazyLoad": false,
                     "defaultOpen": false,
-                    "id": "ejclam"
+                    "id": "elztzm"
                 },
                 {
                     "id": "ecmxmh",
@@ -5701,7 +5701,7 @@
                             "attributes": {},
                             "components": [
                                 {
-                                    "id": "eh8z2bfa00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                                    "id": "eh8z2bfa00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                                     "key": "panel",
                                     "tags": [],
                                     "tree": false,
@@ -36551,7 +36551,7 @@
                                         }
                                     ],
                                     "collapsible": false,
-                                    "id": "eof79400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                                    "id": "eof79400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                                     "placeholder": "",
                                     "prefix": "",
                                     "customClass": "",
diff --git a/forms-flow-ai/epd-forms/bundling/Notification of Independent Remediation.json b/forms-flow-ai/epd-forms/bundling/Notification of Independent Remediation.json
index ed45fa86..ade6eb02 100644
--- a/forms-flow-ai/epd-forms/bundling/Notification of Independent Remediation.json	
+++ b/forms-flow-ai/epd-forms/bundling/Notification of Independent Remediation.json	
@@ -23,7 +23,7 @@
                     "key": "applicationDocuments",
                     "tags": [],
                     "properties": {},
-                    "customConditional": "if( data.applicationStatus!=\"New\" && data.applicationStatus!=\"\" && data.applicationStatus!=null)\r\n{\r\n\tconst UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))\r\n\tconst groups = UserDetails[\"groups\"];\r\n\tif((groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\")))\r\n\t{\r\n\t\tshow = true;\r\n\t}\r\n\telse\r\n\t{\r\n\t\tshow= false;\r\n\t}\t\r\n}\r\nelse\r\n{\r\n  \tshow= false;\r\n}",
+                    "customConditional": "const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"));\r\nconst groups = UserDetails?UserDetails[\"groups\"]:[];\r\nif(!UserDetails){\r\n  show = false;\r\n}\r\nelse if( data.applicationStatus!=\"New\" && data.applicationStatus!=\"\" && data.applicationStatus!=null)\r\n{\r\n\r\n\tif((groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\")))\r\n\t{\r\n\t\tshow = true;\r\n\t}\r\n\telse\r\n\t{\r\n\t\tshow= false;\r\n\t}\t\r\n}\r\nelse\r\n{\r\n  \tshow= false;\r\n}",
                     "conditional": {
                         "json": "",
                         "show": null,
@@ -111,7 +111,7 @@
                             "properties": {},
                             "allowMultipleMasks": false,
                             "addons": [],
-                            "id": "eoo7gud"
+                            "id": "ep6l3c4"
                         }
                     ],
                     "placeholder": "",
@@ -152,100 +152,136 @@
                     "addons": [],
                     "tree": false,
                     "lazyLoad": false,
-                    "id": "ex533bv"
+                    "id": "e3khpe"
                 },
                 {
                     "label": "Text Area",
-                    "autoExpand": false,
-                    "tableView": true,
-                    "key": "textArea",
-                    "customConditional": "var userData =JSON.parse(localStorage.getItem('UserDetails'))\n\n\nif(!(userData.groups.includes(\"/formsflow/formsflow-client\") || userData.groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\")))\n{\n\n    utils.eachComponent(form.components, (x)=>{\n\n   \n  \n          if(x.type==='select' && (x.key === 'selectCssaSdm' || x.key === 'selectCssaCaseworker' || x.key === 'selectCaseworker' || x.key === 'selectSrco' || x.key === 'selectSdm'  ))\n          {\n            //do nothing\n          }\n          else if ((x.type==='editgrid' && (x.key === 'notes' || x.key === 'srcrNotes' || x.key === 'deraNotes' || x.key === 'cssaNotes') ) ||x.key === 'comments' || x.key === 'commentFor')\n          {\n            //do nothing\n          }\n          else if(x.type === 'button')\n          {\n          //do nothing\n          }\n          else if(x.type === 'approvingAuthorityContactInformation')\n          { \n            if(userData.groups.includes(\"/formsflow/formsflow-reviewer/csap\") || userData.groups.includes(\"/formsflow/formsflow-reviewer/csap-society\"))\n            {\n               x.disabled = false;\n            }\n          }\n          else if(x.properties.apField === \"true\")\n          {\n            if(userData.groups.includes(\"/formsflow/formsflow-reviewer/csap\") || userData.groups.includes(\"/formsflow/formsflow-reviewer/csap-society\"))\n            {\n               x.disabled = false;\n            }\n            else\n            {\n\n            }\n          }\n          else\n          {\n          x.disabled = true;\n          }\n\n        \n\n    })\n\n}\n\nshow = false",
-                    "type": "textarea",
-                    "input": true,
+                    "labelPosition": "top",
                     "placeholder": "",
+                    "description": "",
+                    "tooltip": "",
                     "prefix": "",
-                    "customClass": "",
                     "suffix": "",
-                    "multiple": false,
-                    "defaultValue": null,
-                    "protected": false,
-                    "unique": false,
-                    "persistent": true,
+                    "widget": {
+                        "type": "input"
+                    },
+                    "displayMask": "",
+                    "editor": "",
+                    "autoExpand": false,
+                    "customClass": "",
+                    "tabindex": "",
+                    "autocomplete": "",
                     "hidden": false,
-                    "clearOnHide": true,
-                    "refreshOn": "",
-                    "redrawOn": "",
-                    "modalEdit": false,
-                    "dataGridLabel": false,
-                    "labelPosition": "top",
-                    "description": "",
-                    "errorLabel": "",
-                    "tooltip": "",
                     "hideLabel": false,
-                    "tabindex": "",
-                    "disabled": false,
+                    "showWordCount": false,
+                    "showCharCount": false,
                     "autofocus": false,
+                    "spellcheck": true,
+                    "disabled": false,
+                    "tableView": true,
+                    "modalEdit": false,
+                    "multiple": false,
+                    "persistent": true,
+                    "inputFormat": "html",
+                    "protected": false,
                     "dbIndex": false,
+                    "case": "",
+                    "truncateMultipleSpaces": false,
+                    "encrypted": false,
+                    "redrawOn": "",
+                    "clearOnHide": true,
                     "customDefaultValue": "",
                     "calculateValue": "",
                     "calculateServer": false,
-                    "widget": {
-                        "type": "input"
-                    },
-                    "attributes": {},
+                    "allowCalculateOverride": false,
                     "validateOn": "change",
                     "validate": {
                         "required": false,
+                        "pattern": "",
+                        "customMessage": "",
                         "custom": "",
                         "customPrivate": false,
-                        "strictDateValidation": false,
-                        "multiple": false,
-                        "unique": false,
+                        "json": "",
                         "minLength": "",
                         "maxLength": "",
-                        "pattern": "",
                         "minWords": "",
-                        "maxWords": ""
+                        "maxWords": "",
+                        "strictDateValidation": false,
+                        "multiple": false,
+                        "unique": false
                     },
+                    "unique": false,
+                    "errorLabel": "",
+                    "errors": "",
+                    "key": "textArea",
+                    "tags": [],
+                    "properties": {},
                     "conditional": {
                         "show": null,
                         "when": null,
-                        "eq": ""
+                        "eq": "",
+                        "json": ""
                     },
+                    "customConditional": "var userData =JSON.parse(localStorage.getItem('UserDetails'));\r\n\r\nconst roles = userData?userData[\"role\"]:[];\r\nif(!userData){\r\n  show = false;\r\n}\r\nelse if(!(userData.groups.includes(\"/formsflow/formsflow-client\") || userData.groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\")))\r\n{\r\n\r\n    utils.eachComponent(form.components, (x)=>{\r\n\r\n   \r\n  \r\n          if(x.type==='select' && (x.key === 'selectCssaSdm' || x.key === 'selectCssaCaseworker' || x.key === 'selectCaseworker' || x.key === 'selectSrco' || x.key === 'selectSdm'  ))\r\n          {\r\n            //do nothing\r\n          }\r\n          else if ((x.type==='editgrid' && (x.key === 'notes' || x.key === 'srcrNotes' || x.key === 'deraNotes' || x.key === 'cssaNotes') ) ||x.key === 'comments' || x.key === 'commentFor')\r\n          {\r\n            //do nothing\r\n          }\r\n          else if(x.type === 'button')\r\n          {\r\n          //do nothing\r\n          }\r\n          else if(x.type === 'approvingAuthorityContactInformation')\r\n          { \r\n            if(userData.groups.includes(\"/formsflow/formsflow-reviewer/csap\") || userData.groups.includes(\"/formsflow/formsflow-reviewer/csap-society\"))\r\n            {\r\n               x.disabled = false;\r\n            }\r\n          }\r\n          else if(x.properties.apField === \"true\")\r\n          {\r\n            if(userData.groups.includes(\"/formsflow/formsflow-reviewer/csap\") || userData.groups.includes(\"/formsflow/formsflow-reviewer/csap-society\"))\r\n            {\r\n               x.disabled = false;\r\n            }\r\n            else\r\n            {\r\n\r\n            }\r\n          }\r\n          else\r\n          {\r\n          x.disabled = true;\r\n          }\r\n\r\n        \r\n\r\n    })\r\n\r\n}\r\n\r\nshow = false;",
+                    "logic": [],
+                    "attributes": {},
                     "overlay": {
                         "style": "",
+                        "page": "",
                         "left": "",
                         "top": "",
                         "width": "",
                         "height": ""
                     },
-                    "allowCalculateOverride": false,
-                    "encrypted": false,
-                    "showCharCount": false,
-                    "showWordCount": false,
-                    "properties": {},
+                    "type": "textarea",
+                    "rows": 3,
+                    "wysiwyg": false,
+                    "input": true,
+                    "refreshOn": "",
+                    "dataGridLabel": false,
                     "allowMultipleMasks": false,
                     "addons": [],
                     "mask": false,
                     "inputType": "text",
-                    "inputFormat": "html",
                     "inputMask": "",
-                    "displayMask": "",
-                    "spellcheck": true,
-                    "truncateMultipleSpaces": false,
-                    "rows": 3,
-                    "wysiwyg": false,
-                    "editor": "",
                     "fixedSize": true,
-                    "id": "ei2jjr6"
+                    "id": "e7qtiun",
+                    "defaultValue": ""
                 },
                 {
                     "title": "Reviewer Actions",
+                    "theme": "default",
+                    "tooltip": "",
+                    "customClass": "",
                     "collapsible": false,
+                    "hidden": false,
+                    "hideLabel": false,
+                    "disabled": false,
+                    "modalEdit": false,
                     "key": "nirBundleActions",
-                    "customConditional": "\r\nconst UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))\r\nconst roles = UserDetails[\"role\"];\r\n\r\nif(roles.includes(\"formsflow-reviewer/cssa-team\") || \r\nroles.includes(\"formsflow-reviewer/csap\") || \r\nroles.includes(\"formsflow-reviewer/csap-society\")|| \r\nroles.includes(\"formsflow-reviewer/caseworker\")|| \r\nroles.includes(\"formsflow-reviewer/sdm\") || \r\nroles.includes(\"formsflow-reviewer/site-information-advisor\")) \r\n {\r\n  if (data.riskclassification === \"exempt\"){\r\n    show = true;\r\n  } else {\r\n    show = false;\r\n  }\r\n}\r\nelse\r\n{\r\n  show = false;\r\n}",
+                    "tags": [],
+                    "properties": {},
+                    "customConditional": "const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))\r\nconst roles = UserDetails?UserDetails[\"role\"]:[];\r\nif(!UserDetails){\r\n  show = false;\r\n}\r\nelse if(roles.includes(\"formsflow-reviewer/cssa-team\") || \r\nroles.includes(\"formsflow-reviewer/csap\") || \r\nroles.includes(\"formsflow-reviewer/csap-society\")|| \r\nroles.includes(\"formsflow-reviewer/caseworker\")|| \r\nroles.includes(\"formsflow-reviewer/sdm\") || \r\nroles.includes(\"formsflow-reviewer/site-information-advisor\")) \r\n {\r\n  if (data.riskclassification === \"exempt\"){\r\n    show = true;\r\n  } else {\r\n    show = false;\r\n  }\r\n}\r\nelse\r\n{\r\n  show = false;\r\n}",
+                    "conditional": {
+                        "json": "",
+                        "show": null,
+                        "when": null,
+                        "eq": ""
+                    },
+                    "logic": [],
+                    "attributes": {},
+                    "overlay": {
+                        "style": "",
+                        "page": "",
+                        "left": "",
+                        "top": "",
+                        "width": "",
+                        "height": ""
+                    },
                     "type": "panel",
                     "label": "Panel",
+                    "breadcrumb": "default",
+                    "tabindex": "",
                     "input": false,
                     "tableView": false,
                     "components": [
@@ -338,7 +374,7 @@
                                             "block": false,
                                             "disableOnInvalid": false,
                                             "theme": "primary",
-                                            "id": "e2k2kmf"
+                                            "id": "eheyk7j"
                                         }
                                     ],
                                     "width": 3,
@@ -424,7 +460,7 @@
                                             "rightIcon": "",
                                             "block": false,
                                             "disableOnInvalid": false,
-                                            "id": "e339e7x"
+                                            "id": "e5i3cpi"
                                         }
                                     ],
                                     "size": "md",
@@ -441,59 +477,35 @@
                                             "action": "custom",
                                             "showValidations": false,
                                             "theme": "danger",
-                                            "size": "md",
-                                            "block": false,
-                                            "leftIcon": "",
-                                            "rightIcon": "",
-                                            "shortcut": "",
-                                            "description": "",
-                                            "tooltip": "",
-                                            "customClass": "",
-                                            "tabindex": "",
-                                            "disableOnInvalid": false,
-                                            "hidden": false,
-                                            "autofocus": false,
-                                            "disabled": false,
                                             "tableView": false,
-                                            "modalEdit": false,
                                             "key": "rejectBundle",
-                                            "tags": [],
-                                            "properties": {},
-                                            "conditional": {
-                                                "show": null,
-                                                "when": null,
-                                                "eq": "",
-                                                "json": ""
-                                            },
                                             "customConditional": "const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))\r\n\r\nconst roles = UserDetails[\"role\"];\r\n\r\nif(roles.includes(\"formsflow-reviewer\") && \r\n!(roles.includes(\"formsflow-reviewer/csap\") ||\r\nroles.includes(\"formsflow-reviewer/csap-society\"))) {\r\n  show = true;\r\n}\r\nelse\r\n{\r\n  show = false;\r\n}",
-                                            "logic": [],
-                                            "attributes": {},
-                                            "overlay": {
-                                                "style": "",
-                                                "page": "",
-                                                "left": "",
-                                                "top": "",
-                                                "width": "",
-                                                "height": ""
-                                            },
                                             "type": "button",
                                             "custom": "\r\nform.emit('customEvent', {\r\n          type: \"actionComplete\",   \r\n          component: component,\r\n          actionType: 'Rejected'\r\n}); ",
                                             "input": true,
                                             "placeholder": "",
                                             "prefix": "",
+                                            "customClass": "",
                                             "suffix": "",
                                             "multiple": false,
                                             "defaultValue": null,
                                             "protected": false,
                                             "unique": false,
                                             "persistent": false,
+                                            "hidden": false,
                                             "clearOnHide": true,
                                             "refreshOn": "",
                                             "redrawOn": "",
+                                            "modalEdit": false,
                                             "dataGridLabel": true,
                                             "labelPosition": "top",
+                                            "description": "",
                                             "errorLabel": "",
+                                            "tooltip": "",
                                             "hideLabel": false,
+                                            "tabindex": "",
+                                            "disabled": false,
+                                            "autofocus": false,
                                             "dbIndex": false,
                                             "customDefaultValue": "",
                                             "calculateValue": "",
@@ -501,6 +513,7 @@
                                             "widget": {
                                                 "type": "input"
                                             },
+                                            "attributes": {},
                                             "validateOn": "change",
                                             "validate": {
                                                 "required": false,
@@ -510,13 +523,31 @@
                                                 "multiple": false,
                                                 "unique": false
                                             },
+                                            "conditional": {
+                                                "show": null,
+                                                "when": null,
+                                                "eq": ""
+                                            },
+                                            "overlay": {
+                                                "style": "",
+                                                "left": "",
+                                                "top": "",
+                                                "width": "",
+                                                "height": ""
+                                            },
                                             "allowCalculateOverride": false,
                                             "encrypted": false,
                                             "showCharCount": false,
                                             "showWordCount": false,
+                                            "properties": {},
                                             "allowMultipleMasks": false,
                                             "addons": [],
-                                            "id": "ekuxrkn"
+                                            "size": "md",
+                                            "leftIcon": "",
+                                            "rightIcon": "",
+                                            "block": false,
+                                            "disableOnInvalid": false,
+                                            "id": "eaoirnd"
                                         }
                                     ],
                                     "size": "md",
@@ -591,39 +622,31 @@
                             "tree": false,
                             "lazyLoad": false,
                             "autoAdjust": false,
-                            "id": "eg6163g"
+                            "id": "eblx2zg"
                         }
                     ],
                     "keyModified": true,
                     "placeholder": "",
                     "prefix": "",
-                    "customClass": "",
                     "suffix": "",
                     "multiple": false,
                     "defaultValue": null,
                     "protected": false,
                     "unique": false,
                     "persistent": false,
-                    "hidden": false,
                     "clearOnHide": false,
                     "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": null,
-                    "attributes": {},
                     "validateOn": "change",
                     "validate": {
                         "required": false,
@@ -633,30 +656,15 @@
                         "multiple": false,
                         "unique": false
                     },
-                    "conditional": {
-                        "show": null,
-                        "when": null,
-                        "eq": ""
-                    },
-                    "overlay": {
-                        "style": "",
-                        "left": "",
-                        "top": "",
-                        "width": "",
-                        "height": ""
-                    },
                     "allowCalculateOverride": false,
                     "encrypted": false,
                     "showCharCount": false,
                     "showWordCount": false,
-                    "properties": {},
                     "allowMultipleMasks": false,
                     "addons": [],
                     "tree": false,
                     "lazyLoad": false,
-                    "theme": "default",
-                    "breadcrumb": "default",
-                    "id": "en59dzr"
+                    "id": "exh125q"
                 },
                 {
                     "label": "Notes",
@@ -9334,7 +9342,7 @@
                             "attributes": {},
                             "components": [
                                 {
-                                    "id": "epivnsp000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                                    "id": "epivnsp00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                                     "key": "contaminant",
                                     "mask": false,
                                     "type": "textfield",
@@ -9411,7 +9419,7 @@
                                     "truncateMultipleSpaces": false
                                 },
                                 {
-                                    "id": "el3hlvr000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                                    "id": "el3hlvr00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                                     "key": "maximumConcentration",
                                     "mask": false,
                                     "type": "number",
@@ -10157,7 +10165,7 @@
                             "attributes": {},
                             "components": [
                                 {
-                                    "id": "esedw4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                                    "id": "esedw400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                                     "key": "contaminant",
                                     "mask": false,
                                     "type": "textfield",
@@ -10234,7 +10242,7 @@
                                     "truncateMultipleSpaces": false
                                 },
                                 {
-                                    "id": "esor906000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                                    "id": "esor90600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                                     "key": "maximumConcentration",
                                     "mask": false,
                                     "type": "number",
@@ -10977,7 +10985,7 @@
                             "attributes": {},
                             "components": [
                                 {
-                                    "id": "ej0y41000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                                    "id": "ej0y4100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                                     "key": "contaminant",
                                     "mask": false,
                                     "type": "textfield",
@@ -11054,7 +11062,7 @@
                                     "truncateMultipleSpaces": false
                                 },
                                 {
-                                    "id": "e8qg9fh000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                                    "id": "e8qg9fh00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                                     "key": "maximumConcentration",
                                     "mask": false,
                                     "type": "number",
@@ -11803,7 +11811,7 @@
                             "attributes": {},
                             "components": [
                                 {
-                                    "id": "eevqmo900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                                    "id": "eevqmo90000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                                     "key": "contaminant",
                                     "mask": false,
                                     "type": "textfield",
@@ -11880,7 +11888,7 @@
                                     "truncateMultipleSpaces": false
                                 },
                                 {
-                                    "id": "et223l300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                                    "id": "et223l30000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                                     "key": "maximumConcentration",
                                     "mask": false,
                                     "type": "number",
diff --git a/forms-flow-ai/epd-forms/bundling/Notification of Likely or Actual Migration.json b/forms-flow-ai/epd-forms/bundling/Notification of Likely or Actual Migration.json
index cd9a1075..dcaf54bb 100644
--- a/forms-flow-ai/epd-forms/bundling/Notification of Likely or Actual Migration.json	
+++ b/forms-flow-ai/epd-forms/bundling/Notification of Likely or Actual Migration.json	
@@ -23,7 +23,7 @@
                     "key": "applicationDocuments",
                     "tags": [],
                     "properties": {},
-                    "customConditional": "if( data.applicationStatus!=\"New\" && data.applicationStatus!=\"\" && data.applicationStatus!=null)\r\n{\r\n\tconst UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))\r\n\tconst groups = UserDetails[\"groups\"];\r\n\tif((groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\")))\r\n\t{\r\n\t\tshow = true;\r\n\t}\r\n\telse\r\n\t{\r\n\t\tshow= false;\r\n\t}\t\r\n}\r\nelse\r\n{\r\n  \tshow= false;\r\n}\r\n",
+                    "customConditional": "\r\nconst UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"));\r\nconst groups = UserDetails?UserDetails[\"groups\"]:[];\r\nif(!UserDetails){\r\n  show = false;\r\n}\r\nelse if( data.applicationStatus!=\"New\" && data.applicationStatus!=\"\" && data.applicationStatus!=null)\r\n{\r\n\tif((groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\")))\r\n\t{\r\n\t\tshow = true;\r\n\t}\r\n\telse\r\n\t{\r\n\t\tshow= false;\r\n\t}\t\r\n}\r\nelse\r\n{\r\n  \tshow= false;\r\n}",
                     "conditional": {
                         "json": "",
                         "show": null,
@@ -111,7 +111,7 @@
                             "properties": {},
                             "allowMultipleMasks": false,
                             "addons": [],
-                            "id": "eg49r0v"
+                            "id": "e8sh11w"
                         }
                     ],
                     "placeholder": "",
@@ -152,7 +152,7 @@
                     "addons": [],
                     "tree": false,
                     "lazyLoad": false,
-                    "id": "elclee8"
+                    "id": "edykuse"
                 },
                 {
                     "label": "Text Area",
@@ -222,7 +222,7 @@
                         "eq": "",
                         "json": ""
                     },
-                    "customConditional": "var userData =JSON.parse(localStorage.getItem('UserDetails'))\n\n\nif(!(userData.groups.includes(\"/formsflow/formsflow-client\") || userData.groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\")))\n{\n\n    utils.eachComponent(form.components, (x)=>{\n\n   \n  \n          if(x.type==='select' && (x.key === 'selectCssaSdm' || x.key === 'selectCssaCaseworker' || x.key === 'selectCaseworker' || x.key === 'selectSrco' || x.key === 'selectSdm'  ))\n          {\n            //do nothing\n          }\n          else if ((x.type==='editgrid' && (x.key === 'notes' || x.key === 'srcrNotes' || x.key === 'deraNotes' || x.key === 'cssaNotes') ) ||x.key === 'comments' || x.key === 'commentFor')\n          {\n            //do nothing\n          }\n          else if(x.type === 'button')\n          {\n          //do nothing\n          }\n          else if(x.type === 'approvingAuthorityContactInformation')\n          { \n            if(userData.groups.includes(\"/formsflow/formsflow-reviewer/csap\") || userData.groups.includes(\"/formsflow/formsflow-reviewer/csap-society\"))\n            {\n               x.disabled = false;\n            }\n          }\n          else if(x.properties.apField === \"true\")\n          {\n            if(userData.groups.includes(\"/formsflow/formsflow-reviewer/csap\") || userData.groups.includes(\"/formsflow/formsflow-reviewer/csap-society\"))\n            {\n               x.disabled = false;\n            }\n            else\n            {\n\n            }\n          }\n          else\n          {\n          x.disabled = true;\n          }\n\n        \n\n    })\n\n}\n\nshow = false",
+                    "customConditional": "var userData =JSON.parse(localStorage.getItem('UserDetails'));\r\nconst roles = userData?userData[\"role\"]:[];\r\nif(!userData){\r\n  show = false;\r\n}\r\nelse if(!(userData.groups.includes(\"/formsflow/formsflow-client\") || userData.groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\")))\r\n{\r\n\r\n    utils.eachComponent(form.components, (x)=>{\r\n\r\n   \r\n  \r\n          if(x.type==='select' && (x.key === 'selectCssaSdm' || x.key === 'selectCssaCaseworker' || x.key === 'selectCaseworker' || x.key === 'selectSrco' || x.key === 'selectSdm'  ))\r\n          {\r\n            //do nothing\r\n          }\r\n          else if ((x.type==='editgrid' && (x.key === 'notes' || x.key === 'srcrNotes' || x.key === 'deraNotes' || x.key === 'cssaNotes') ) ||x.key === 'comments' || x.key === 'commentFor')\r\n          {\r\n            //do nothing\r\n          }\r\n          else if(x.type === 'button')\r\n          {\r\n          //do nothing\r\n          }\r\n          else if(x.type === 'approvingAuthorityContactInformation')\r\n          { \r\n            if(userData.groups.includes(\"/formsflow/formsflow-reviewer/csap\") || userData.groups.includes(\"/formsflow/formsflow-reviewer/csap-society\"))\r\n            {\r\n               x.disabled = false;\r\n            }\r\n          }\r\n          else if(x.properties.apField === \"true\")\r\n          {\r\n            if(userData.groups.includes(\"/formsflow/formsflow-reviewer/csap\") || userData.groups.includes(\"/formsflow/formsflow-reviewer/csap-society\"))\r\n            {\r\n               x.disabled = false;\r\n            }\r\n            else\r\n            {\r\n\r\n            }\r\n          }\r\n          else\r\n          {\r\n          x.disabled = true;\r\n          }\r\n\r\n        \r\n\r\n    })\r\n\r\n}\r\n\r\nshow = false;",
                     "logic": [],
                     "attributes": {},
                     "overlay": {
@@ -245,8 +245,8 @@
                     "inputType": "text",
                     "inputMask": "",
                     "fixedSize": true,
-                    "id": "eu9w7fa",
-                    "defaultValue": null
+                    "id": "e715aa8",
+                    "defaultValue": ""
                 },
                 {
                     "title": "Reviewer Actions",
@@ -261,7 +261,7 @@
                     "key": "nomBundleActions",
                     "tags": [],
                     "properties": {},
-                    "customConditional": "\r\nconst UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))\r\nconst roles = UserDetails[\"role\"];\r\n\r\nif(roles.includes(\"formsflow-reviewer/cssa-team\") || \r\nroles.includes(\"formsflow-reviewer/csap\") || \r\nroles.includes(\"formsflow-reviewer/csap-society\")|| \r\nroles.includes(\"formsflow-reviewer/caseworker\")|| \r\nroles.includes(\"formsflow-reviewer/sdm\") || \r\nroles.includes(\"formsflow-reviewer/site-information-advisor\")) \r\n {\r\n  if (data.riskclassification === \"exempt\"){\r\n    show = true;\r\n  } else {\r\n    show = false;\r\n  }\r\n}\r\nelse\r\n{\r\n  show = false;\r\n}",
+                    "customConditional": "const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"));\r\nconst roles = UserDetails?UserDetails[\"role\"]:[];\r\nif(!UserDetails){\r\n  show = false;\r\n}\r\nelse {\r\nif(roles.includes(\"formsflow-reviewer/cssa-team\") || \r\nroles.includes(\"formsflow-reviewer/csap\") || \r\nroles.includes(\"formsflow-reviewer/csap-society\")|| \r\nroles.includes(\"formsflow-reviewer/caseworker\")|| \r\nroles.includes(\"formsflow-reviewer/sdm\") || \r\nroles.includes(\"formsflow-reviewer/site-information-advisor\")) \r\n {\r\n  if (data.riskclassification === \"exempt\"){\r\n    show = true;\r\n  } else {\r\n    show = false;\r\n  }\r\n}\r\nelse\r\n{\r\n  show = false;\r\n}\r\n}",
                     "conditional": {
                         "json": "",
                         "show": null,
@@ -303,60 +303,35 @@
                                             "label": "Approved",
                                             "action": "custom",
                                             "showValidations": false,
-                                            "theme": "primary",
-                                            "size": "md",
-                                            "block": false,
-                                            "leftIcon": "",
-                                            "rightIcon": "",
-                                            "shortcut": "",
-                                            "description": "",
-                                            "tooltip": "",
-                                            "customClass": "",
-                                            "tabindex": "",
-                                            "disableOnInvalid": false,
-                                            "hidden": false,
-                                            "autofocus": false,
-                                            "disabled": false,
                                             "tableView": false,
-                                            "modalEdit": false,
                                             "key": "approveBundle",
-                                            "tags": [],
-                                            "properties": {},
-                                            "conditional": {
-                                                "show": null,
-                                                "when": null,
-                                                "eq": "",
-                                                "json": ""
-                                            },
                                             "customConditional": "const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))\r\n\r\n\r\n\r\nconst roles = UserDetails[\"role\"];\r\n\r\n\r\nif(roles.includes(\"formsflow-reviewer/site-information-advisor\")) {\r\n  show = true;\r\n}\r\nelse\r\n{\r\n  show = false;\r\n}",
-                                            "logic": [],
-                                            "attributes": {},
-                                            "overlay": {
-                                                "style": "",
-                                                "page": "",
-                                                "left": "",
-                                                "top": "",
-                                                "width": "",
-                                                "height": ""
-                                            },
                                             "type": "button",
                                             "custom": "\r\nform.emit('customEvent', {\r\n          type: \"actionComplete\",   \r\n          component: component,\r\n          actionType: 'Approved'\r\n})",
                                             "input": true,
                                             "placeholder": "",
                                             "prefix": "",
+                                            "customClass": "",
                                             "suffix": "",
                                             "multiple": false,
                                             "defaultValue": null,
                                             "protected": false,
                                             "unique": false,
                                             "persistent": false,
+                                            "hidden": false,
                                             "clearOnHide": true,
                                             "refreshOn": "",
                                             "redrawOn": "",
+                                            "modalEdit": false,
                                             "dataGridLabel": true,
                                             "labelPosition": "top",
+                                            "description": "",
                                             "errorLabel": "",
+                                            "tooltip": "",
                                             "hideLabel": false,
+                                            "tabindex": "",
+                                            "disabled": false,
+                                            "autofocus": false,
                                             "dbIndex": false,
                                             "customDefaultValue": "",
                                             "calculateValue": "",
@@ -364,6 +339,7 @@
                                             "widget": {
                                                 "type": "input"
                                             },
+                                            "attributes": {},
                                             "validateOn": "change",
                                             "validate": {
                                                 "required": false,
@@ -373,13 +349,32 @@
                                                 "multiple": false,
                                                 "unique": false
                                             },
+                                            "conditional": {
+                                                "show": null,
+                                                "when": null,
+                                                "eq": ""
+                                            },
+                                            "overlay": {
+                                                "style": "",
+                                                "left": "",
+                                                "top": "",
+                                                "width": "",
+                                                "height": ""
+                                            },
                                             "allowCalculateOverride": false,
                                             "encrypted": false,
                                             "showCharCount": false,
                                             "showWordCount": false,
+                                            "properties": {},
                                             "allowMultipleMasks": false,
                                             "addons": [],
-                                            "id": "eul4n0k"
+                                            "size": "md",
+                                            "leftIcon": "",
+                                            "rightIcon": "",
+                                            "block": false,
+                                            "disableOnInvalid": false,
+                                            "theme": "primary",
+                                            "id": "enz3tg"
                                         }
                                     ],
                                     "width": 3,
@@ -396,59 +391,34 @@
                                             "action": "custom",
                                             "showValidations": false,
                                             "theme": "warning",
-                                            "size": "md",
-                                            "block": false,
-                                            "leftIcon": "",
-                                            "rightIcon": "",
-                                            "shortcut": "",
-                                            "description": "",
-                                            "tooltip": "",
-                                            "customClass": "",
-                                            "tabindex": "",
-                                            "disableOnInvalid": false,
-                                            "hidden": false,
-                                            "autofocus": false,
-                                            "disabled": false,
                                             "tableView": false,
-                                            "modalEdit": false,
                                             "key": "sendBundleToApplicant",
-                                            "tags": [],
-                                            "properties": {},
-                                            "conditional": {
-                                                "show": null,
-                                                "when": null,
-                                                "eq": "",
-                                                "json": ""
-                                            },
-                                            "customConditional": "",
-                                            "logic": [],
-                                            "attributes": {},
-                                            "overlay": {
-                                                "style": "",
-                                                "page": "",
-                                                "left": "",
-                                                "top": "",
-                                                "width": "",
-                                                "height": ""
-                                            },
                                             "type": "button",
                                             "custom": "form.emit('customEvent', {\r\n          type: \"actionComplete\",  \r\n          component: component,\r\n          actionType:'Returned'\r\n    });",
                                             "input": true,
                                             "placeholder": "",
                                             "prefix": "",
+                                            "customClass": "",
                                             "suffix": "",
                                             "multiple": false,
                                             "defaultValue": null,
                                             "protected": false,
                                             "unique": false,
                                             "persistent": false,
+                                            "hidden": false,
                                             "clearOnHide": true,
                                             "refreshOn": "",
                                             "redrawOn": "",
+                                            "modalEdit": false,
                                             "dataGridLabel": true,
                                             "labelPosition": "top",
+                                            "description": "",
                                             "errorLabel": "",
+                                            "tooltip": "",
                                             "hideLabel": false,
+                                            "tabindex": "",
+                                            "disabled": false,
+                                            "autofocus": false,
                                             "dbIndex": false,
                                             "customDefaultValue": "",
                                             "calculateValue": "",
@@ -456,6 +426,7 @@
                                             "widget": {
                                                 "type": "input"
                                             },
+                                            "attributes": {},
                                             "validateOn": "change",
                                             "validate": {
                                                 "required": false,
@@ -465,13 +436,31 @@
                                                 "multiple": false,
                                                 "unique": false
                                             },
+                                            "conditional": {
+                                                "show": null,
+                                                "when": null,
+                                                "eq": ""
+                                            },
+                                            "overlay": {
+                                                "style": "",
+                                                "left": "",
+                                                "top": "",
+                                                "width": "",
+                                                "height": ""
+                                            },
                                             "allowCalculateOverride": false,
                                             "encrypted": false,
                                             "showCharCount": false,
                                             "showWordCount": false,
+                                            "properties": {},
                                             "allowMultipleMasks": false,
                                             "addons": [],
-                                            "id": "e2hisoww"
+                                            "size": "md",
+                                            "leftIcon": "",
+                                            "rightIcon": "",
+                                            "block": false,
+                                            "disableOnInvalid": false,
+                                            "id": "e9qcds"
                                         }
                                     ],
                                     "size": "md",
@@ -488,59 +477,35 @@
                                             "action": "custom",
                                             "showValidations": false,
                                             "theme": "danger",
-                                            "size": "md",
-                                            "block": false,
-                                            "leftIcon": "",
-                                            "rightIcon": "",
-                                            "shortcut": "",
-                                            "description": "",
-                                            "tooltip": "",
-                                            "customClass": "",
-                                            "tabindex": "",
-                                            "disableOnInvalid": false,
-                                            "hidden": false,
-                                            "autofocus": false,
-                                            "disabled": false,
                                             "tableView": false,
-                                            "modalEdit": false,
                                             "key": "rejectBundle",
-                                            "tags": [],
-                                            "properties": {},
-                                            "conditional": {
-                                                "show": null,
-                                                "when": null,
-                                                "eq": "",
-                                                "json": ""
-                                            },
                                             "customConditional": "const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))\r\n\r\nconst roles = UserDetails[\"role\"];\r\n\r\nif(roles.includes(\"formsflow-reviewer\") && \r\n!(roles.includes(\"formsflow-reviewer/csap\") ||\r\nroles.includes(\"formsflow-reviewer/csap-society\"))) {\r\n  show = true;\r\n}\r\nelse\r\n{\r\n  show = false;\r\n}",
-                                            "logic": [],
-                                            "attributes": {},
-                                            "overlay": {
-                                                "style": "",
-                                                "page": "",
-                                                "left": "",
-                                                "top": "",
-                                                "width": "",
-                                                "height": ""
-                                            },
                                             "type": "button",
                                             "custom": "\r\nform.emit('customEvent', {\r\n          type: \"actionComplete\",   \r\n          component: component,\r\n          actionType: 'Rejected'\r\n}); ",
                                             "input": true,
                                             "placeholder": "",
                                             "prefix": "",
+                                            "customClass": "",
                                             "suffix": "",
                                             "multiple": false,
                                             "defaultValue": null,
                                             "protected": false,
                                             "unique": false,
                                             "persistent": false,
+                                            "hidden": false,
                                             "clearOnHide": true,
                                             "refreshOn": "",
                                             "redrawOn": "",
+                                            "modalEdit": false,
                                             "dataGridLabel": true,
                                             "labelPosition": "top",
+                                            "description": "",
                                             "errorLabel": "",
+                                            "tooltip": "",
                                             "hideLabel": false,
+                                            "tabindex": "",
+                                            "disabled": false,
+                                            "autofocus": false,
                                             "dbIndex": false,
                                             "customDefaultValue": "",
                                             "calculateValue": "",
@@ -548,6 +513,7 @@
                                             "widget": {
                                                 "type": "input"
                                             },
+                                            "attributes": {},
                                             "validateOn": "change",
                                             "validate": {
                                                 "required": false,
@@ -557,13 +523,31 @@
                                                 "multiple": false,
                                                 "unique": false
                                             },
+                                            "conditional": {
+                                                "show": null,
+                                                "when": null,
+                                                "eq": ""
+                                            },
+                                            "overlay": {
+                                                "style": "",
+                                                "left": "",
+                                                "top": "",
+                                                "width": "",
+                                                "height": ""
+                                            },
                                             "allowCalculateOverride": false,
                                             "encrypted": false,
                                             "showCharCount": false,
                                             "showWordCount": false,
+                                            "properties": {},
                                             "allowMultipleMasks": false,
                                             "addons": [],
-                                            "id": "ex8f3sk"
+                                            "size": "md",
+                                            "leftIcon": "",
+                                            "rightIcon": "",
+                                            "block": false,
+                                            "disableOnInvalid": false,
+                                            "id": "elb9tse"
                                         }
                                     ],
                                     "size": "md",
@@ -638,7 +622,7 @@
                             "tree": false,
                             "lazyLoad": false,
                             "autoAdjust": false,
-                            "id": "et69lr0c"
+                            "id": "ecqud4c"
                         }
                     ],
                     "keyModified": true,
@@ -680,7 +664,7 @@
                     "addons": [],
                     "tree": false,
                     "lazyLoad": false,
-                    "id": "eafq2hp"
+                    "id": "e3x3vdu"
                 },
                 {
                     "label": "Notes",
@@ -1528,7 +1512,7 @@
                             "attributes": {},
                             "components": [
                                 {
-                                    "id": "ea2btv0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                                    "id": "ea2btv00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                                     "key": "Panel-InformationForAffectedAndLikelyAffectedParcels",
                                     "tree": false,
                                     "type": "panel",
@@ -9444,7 +9428,7 @@
                                     "addons": [],
                                     "tree": false,
                                     "lazyLoad": false,
-                                    "id": "emrk44b000000000000000000000000000000000000000000000000000000000000000000000000"
+                                    "id": "emrk44b0000000000000000000000000000000000000000000000000000000000000000000000000000000000"
                                 }
                             ],
                             "errorLabel": "",