Merge branch 'hotfixdev' into PRD-SP9

bcgov · May 31, 2024 · 330d19d · 330d19d
2 parents 352d8b1 + 77d2cdb
commit 330d19d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 31 deletions.
diff --git a/...access-mgmt/main/default/permissionsets/CAT_assessment_question_PS.permissionset-meta.xml b/...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
@@ -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>

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