Merge pull request #1047 from bcgov/Feature-ALR-1246

feature-ALR-1246
bcgov · Dec 16, 2024 · 767eedd · 767eedd
2 parents b7926ed + 6b538c8
commit 767eedd
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 11 deletions.
diff --git a/src-ui/main/default/flexipages/Registrant_Record_Page.flexipage-meta.xml b/src-ui/main/default/flexipages/Registrant_Record_Page.flexipage-meta.xml
@@ -270,6 +270,19 @@
                 </componentInstanceProperties>
                 <componentName>flexipage:fieldSection</componentName>
                 <identifier>flexipage_fieldSection</identifier>
+                <visibilityRule>
+                    <booleanFilter>1 OR 2</booleanFilter>
+                    <criteria>
+                        <leftValue>{!$Permission.CustomPermission.EHIS_MMHA_User}</leftValue>
+                        <operator>EQUAL</operator>
+                        <rightValue>false</rightValue>
+                    </criteria>
+                    <criteria>
+                        <leftValue>{!$Permission.CustomPermission.EHIS_SDPR_User}</leftValue>
+                        <operator>EQUAL</operator>
+                        <rightValue>false</rightValue>
+                    </criteria>
+                </visibilityRule>
             </componentInstance>
         </itemInstances>
         <itemInstances>
@@ -517,6 +530,19 @@
                 </componentInstanceProperties>
                 <componentName>runtime_sales_activities:activityPanel</componentName>
                 <identifier>runtime_sales_activities_activityPanel</identifier>
+                <visibilityRule>
+                    <booleanFilter>1 OR 2</booleanFilter>
+                    <criteria>
+                        <leftValue>{!$Permission.CustomPermission.EHIS_MMHA_User}</leftValue>
+                        <operator>EQUAL</operator>
+                        <rightValue>false</rightValue>
+                    </criteria>
+                    <criteria>
+                        <leftValue>{!$Permission.CustomPermission.EHIS_SDPR_User}</leftValue>
+                        <operator>EQUAL</operator>
+                        <rightValue>false</rightValue>
+                    </criteria>
+                </visibilityRule>
             </componentInstance>
         </itemInstances>
         <name>main</name>

diff --git a/src-ui/main/default/flexipages/Residence_Record_Page.flexipage-meta.xml b/src-ui/main/default/flexipages/Residence_Record_Page.flexipage-meta.xml
@@ -705,6 +705,19 @@
                 </componentInstanceProperties>
                 <componentName>flexipage:fieldSection</componentName>
                 <identifier>flexipage_fieldSection3</identifier>
+                <visibilityRule>
+                    <booleanFilter>1 OR 2</booleanFilter>
+                    <criteria>
+                        <leftValue>{!$Permission.CustomPermission.EHIS_MMHA_User}</leftValue>
+                        <operator>EQUAL</operator>
+                        <rightValue>false</rightValue>
+                    </criteria>
+                    <criteria>
+                        <leftValue>{!$Permission.CustomPermission.EHIS_SDPR_User}</leftValue>
+                        <operator>EQUAL</operator>
+                        <rightValue>false</rightValue>
+                    </criteria>
+                </visibilityRule>
             </componentInstance>
         </itemInstances>
         <itemInstances>
@@ -1583,7 +1596,7 @@
                 <componentName>runtime_sales_activities:activityPanel</componentName>
                 <identifier>runtime_sales_activities_activityPanel</identifier>
                 <visibilityRule>
-                    <booleanFilter>1 OR 2 OR (3 AND 4)</booleanFilter>
+                    <booleanFilter>1 OR 2</booleanFilter>
                     <criteria>
                         <leftValue>{!$Permission.CustomPermission.EHIS_MMHA_User}</leftValue>
                         <operator>EQUAL</operator>
@@ -1594,16 +1607,6 @@
                         <operator>EQUAL</operator>
                         <rightValue>false</rightValue>
                     </criteria>
-                    <criteria>
-                        <leftValue>{!$Permission.CustomPermission.EHIS_SDPR_User}</leftValue>
-                        <operator>EQUAL</operator>
-                        <rightValue>true</rightValue>
-                    </criteria>
-                    <criteria>
-                        <leftValue>{!Record.LicenseType__r.Name}</leftValue>
-                        <operator>NE</operator>
-                        <rightValue>Seniors and Persons with Disabilities</rightValue>
-                    </criteria>
                 </visibilityRule>
             </componentInstance>
         </itemInstances>