From 77d2cdbca32d22c528c65fd927ff09ebbac8d766 Mon Sep 17 00:00:00 2001
From: GandlojuVishwantha <Gandloju.Vishwantha@gov.bc.ca>
Date: Tue, 14 May 2024 20:49:30 +0530
Subject: [PATCH] Hotfix branch update

---
 ...essment_question_PS.permissionset-meta.xml |  4 ++
 .../Home_Page_Default.flexipage-meta.xml      | 43 +++----------------
 ... Home Page Default.homePageLayout-meta.xml | 11 -----
 3 files changed, 11 insertions(+), 47 deletions(-)
 delete mode 100644 src-ui/main/default/layouts/Dashboard Home Page Default.homePageLayout-meta.xml

diff --git a/src-access-mgmt/main/default/permissionsets/CAT_assessment_question_PS.permissionset-meta.xml b/src-access-mgmt/main/default/permissionsets/CAT_assessment_question_PS.permissionset-meta.xml
index cbf32043..1588b978 100644
--- a/src-access-mgmt/main/default/permissionsets/CAT_assessment_question_PS.permissionset-meta.xml
+++ b/src-access-mgmt/main/default/permissionsets/CAT_assessment_question_PS.permissionset-meta.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <PermissionSet xmlns="http://soap.sforce.com/2006/04/metadata">
+    <customPermissions>
+        <enabled>true</enabled>
+        <name>EHISInvestigator</name>
+    </customPermissions>
     <fieldPermissions>
         <editable>true</editable>
         <field>AssessmentTaskDefinition.Category__c</field>
diff --git a/src-ui/main/default/flexipages/Home_Page_Default.flexipage-meta.xml b/src-ui/main/default/flexipages/Home_Page_Default.flexipage-meta.xml
index 8600310c..091bb1a3 100644
--- a/src-ui/main/default/flexipages/Home_Page_Default.flexipage-meta.xml
+++ b/src-ui/main/default/flexipages/Home_Page_Default.flexipage-meta.xml
@@ -7,7 +7,12 @@
                 <componentName>runtime_approval_process:pendingApprovalCard</componentName>
                 <identifier>runtime_approval_process_pendingApprovalCard</identifier>
                 <visibilityRule>
-                    <booleanFilter>1 OR 2</booleanFilter>
+                    <booleanFilter>1 OR 2 OR 3</booleanFilter>
+                    <criteria>
+                        <leftValue>{!$Permission.CustomPermission.EHISAdminHomepage}</leftValue>
+                        <operator>EQUAL</operator>
+                        <rightValue>true</rightValue>
+                    </criteria>
                     <criteria>
                         <leftValue>{!$Permission.CustomPermission.EHISLeadership}</leftValue>
                         <operator>EQUAL</operator>
@@ -50,17 +55,11 @@
                 <componentName>flexipage:filterListCard</componentName>
                 <identifier>flexipage_filterListCard5</identifier>
                 <visibilityRule>
-                    <booleanFilter>1 OR 2</booleanFilter>
                     <criteria>
                         <leftValue>{!$Permission.CustomPermission.EHISAdminHomepage}</leftValue>
                         <operator>EQUAL</operator>
                         <rightValue>true</rightValue>
                     </criteria>
-                    <criteria>
-                        <leftValue>{!$Permission.CustomPermission.EHISDataAnalystUser}</leftValue>
-                        <operator>EQUAL</operator>
-                        <rightValue>true</rightValue>
-                    </criteria>
                 </visibilityRule>
             </componentInstance>
         </itemInstances>
@@ -270,8 +269,7 @@
                 <componentName>flexipage:filterListCard</componentName>
                 <identifier>flexipage_filterListCard9</identifier>
                 <visibilityRule>
-                    <booleanFilter>1 OR 2 OR 3</booleanFilter>
-                    <criteria>
+                    <booleanFilter>1 OR 2</booleanFilter>                    <criteria>
                         <leftValue>{!$Permission.CustomPermission.EHISInvestigator}</leftValue>
                         <operator>EQUAL</operator>
                         <rightValue>true</rightValue>
@@ -281,11 +279,6 @@
                         <operator>EQUAL</operator>
                         <rightValue>true</rightValue>
                     </criteria>
-                    <criteria>
-                        <leftValue>{!$Permission.CustomPermission.EHISDataAnalystUser}</leftValue>
-                        <operator>EQUAL</operator>
-                        <rightValue>true</rightValue>
-                    </criteria>
                 </visibilityRule>
             </componentInstance>
         </itemInstances>
@@ -490,17 +483,11 @@
                 <componentName>flexipage:reportChart</componentName>
                 <identifier>flexipage_reportChart2</identifier>
                 <visibilityRule>
-                    <booleanFilter>1 OR 2</booleanFilter>
                     <criteria>
                         <leftValue>{!$Permission.CustomPermission.EHISAdminHomepage}</leftValue>
                         <operator>EQUAL</operator>
                         <rightValue>true</rightValue>
                     </criteria>
-                    <criteria>
-                        <leftValue>{!$Permission.CustomPermission.EHISDataAnalystUser}</leftValue>
-                        <operator>EQUAL</operator>
-                        <rightValue>true</rightValue>
-                    </criteria>
                 </visibilityRule>
             </componentInstance>
         </itemInstances>
@@ -509,27 +496,11 @@
                 <componentName>generateCSV</componentName>
                 <identifier>c_generateCSV</identifier>
                 <visibilityRule>
-                    <booleanFilter>1 OR 2 OR 3 OR 4</booleanFilter>
                     <criteria>
                         <leftValue>{!$Permission.CustomPermission.EHISAdminHomepage}</leftValue>
                         <operator>EQUAL</operator>
                         <rightValue>true</rightValue>
                     </criteria>
-                    <criteria>
-                        <leftValue>{!$Permission.CustomPermission.EHISLeadership}</leftValue>
-                        <operator>EQUAL</operator>
-                        <rightValue>true</rightValue>
-                    </criteria>
-                    <criteria>
-                        <leftValue>{!$Permission.CustomPermission.EHISRegistrarUser}</leftValue>
-                        <operator>EQUAL</operator>
-                        <rightValue>true</rightValue>
-                    </criteria>
-                    <criteria>
-                        <leftValue>{!$Permission.CustomPermission.EHISDataAnalystUser}</leftValue>
-                        <operator>EQUAL</operator>
-                        <rightValue>true</rightValue>
-                    </criteria>
                 </visibilityRule>
             </componentInstance>
         </itemInstances>
diff --git a/src-ui/main/default/layouts/Dashboard Home Page Default.homePageLayout-meta.xml b/src-ui/main/default/layouts/Dashboard Home Page Default.homePageLayout-meta.xml
deleted file mode 100644
index 9ce6deec..00000000
--- a/src-ui/main/default/layouts/Dashboard Home Page Default.homePageLayout-meta.xml	
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<HomePageLayout xmlns="http://soap.sforce.com/2006/04/metadata">
-    <narrowComponents>standard-StandardSearch</narrowComponents>
-    <narrowComponents>standard-CreateNew</narrowComponents>
-    <narrowComponents>standard-RecentItems</narrowComponents>
-    <narrowComponents>standard-UsefulLinks</narrowComponents>
-    <narrowComponents>standard-MessagesAndAlerts</narrowComponents>
-    <wideComponents>standard-Dashboard</wideComponents>
-    <wideComponents>standard-Tasks</wideComponents>
-    <wideComponents>standard-Calendar</wideComponents>
-</HomePageLayout>