From 1209098941740ec0f7bb7c05dfe123d840a796b2 Mon Sep 17 00:00:00 2001
From: Adam Rauch <adam@labkey.com>
Date: Fri, 2 Aug 2024 07:11:38 -0700
Subject: [PATCH] Backport view fixes (#739)

---
 snprc_ehr/resources/views/ehrAdmin.view.xml         |  6 +++---
 snprc_ehr/resources/views/enterData.view.xml        |  6 +++---
 .../resources/views/sndEventsWidgetWebpart.view.xml |  6 +++---
 snprc_ehr/src/client/entryPoints.js                 | 13 ++++++-------
 snprc_r24/resources/views/welcome.view.xml          |  6 +++---
 snprc_scheduler/resources/views/app.view.xml        |  4 +---
 6 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/snprc_ehr/resources/views/ehrAdmin.view.xml b/snprc_ehr/resources/views/ehrAdmin.view.xml
index f45e90ae..c7337da4 100644
--- a/snprc_ehr/resources/views/ehrAdmin.view.xml
+++ b/snprc_ehr/resources/views/ehrAdmin.view.xml
@@ -1,7 +1,7 @@
 <view xmlns="http://labkey.org/data/xml/view" title="EHR Administration">
-    <permissions>
-        <permission name="admin"/>
-    </permissions>
+    <permissionClasses>
+        <permissionClass name="org.labkey.api.security.permissions.AdminPermission"/>
+    </permissionClasses>
     <dependencies>
         <dependency path="ehr.context" />
     </dependencies>
diff --git a/snprc_ehr/resources/views/enterData.view.xml b/snprc_ehr/resources/views/enterData.view.xml
index 5b9e6187..bb872670 100644
--- a/snprc_ehr/resources/views/enterData.view.xml
+++ b/snprc_ehr/resources/views/enterData.view.xml
@@ -1,7 +1,7 @@
 <view xmlns="http://labkey.org/data/xml/view" title="Enter Data" frame="none">
-    <permissions>
-        <permission name="insert"/>
-    </permissions>
+    <permissionClasses>
+        <permissionClass name="org.labkey.api.security.permissions.InsertPermission"/>
+    </permissionClasses>
     <dependencies>
         <dependency path="ehr.context" />
         <dependency path="snprc_ehr/panel/EnterDataPanel.js"/>
diff --git a/snprc_ehr/resources/views/sndEventsWidgetWebpart.view.xml b/snprc_ehr/resources/views/sndEventsWidgetWebpart.view.xml
index 616cbcf9..49d577c6 100644
--- a/snprc_ehr/resources/views/sndEventsWidgetWebpart.view.xml
+++ b/snprc_ehr/resources/views/sndEventsWidgetWebpart.view.xml
@@ -1,7 +1,7 @@
 <view xmlns="http://labkey.org/data/xml/view" title="SND Events Widget">
-    <permissions>
-        <permission name="read"/>
-    </permissions>
+    <permissionClasses>
+        <permissionClass name="org.labkey.api.security.permissions.ReadPermission"/>
+    </permissionClasses>
     <dependencies>
         <dependency path="gen/SndEventsWidgetWebpart"/>
     </dependencies>
diff --git a/snprc_ehr/src/client/entryPoints.js b/snprc_ehr/src/client/entryPoints.js
index 8ec8a9a8..80a38c37 100644
--- a/snprc_ehr/src/client/entryPoints.js
+++ b/snprc_ehr/src/client/entryPoints.js
@@ -7,41 +7,40 @@ module.exports = {
     apps: [{
         name: 'NewAnimalPage',
         title: 'New Animal Wizard',
-        permission: 'read',
+        permissionClasses: ['org.labkey.api.security.permissions.ReadPermission'],
         path: './src/client/NewAnimalPage'
     }, {
         name: 'BirthRecordReport',
         title: 'Birth Record Report',
-        permission: 'read',
+        permissionClasses: ['org.labkey.api.security.permissions.ReadPermission'],
         path: './src/client/BirthRecordReport'
     }, {
         name: 'ChipReader',
         title: 'Chip Reader',
-        permission: 'read',
+        permissionClasses: ['org.labkey.api.security.permissions.ReadPermission'],
         path: './src/client/ChipReader'
     },
         {
             name: 'SsrsReporting',
             title: 'PDF Reports',
-            permission: 'read',
+            permissionClasses: ['org.labkey.api.security.permissions.ReadPermission'],
             path: './src/client/SsrsReporting'
         },
         {
             name: 'SndLookupsManagement',
             title: 'SND Lookups Management',
-            permission: 'read',
+            permissionClasses: ['org.labkey.api.security.permissions.ReadPermission'],
             path: './src/client/SndLookupsManagement'
         },
         {
             name: 'SndEventsWidget',
             title: 'Animal Events',
-            permission: 'read',
+            permissionClasses: ['org.labkey.api.security.permissions.ReadPermission'],
             path: './src/client/SndEventsWidget'
         },
         {
             name: 'SndEventsWidgetWebpart',
             title: 'Animal Events Webpart',
-            permission: 'read',
             path: './src/client/SndEventsWidget/webpart',
             generateLib: true
         }
diff --git a/snprc_r24/resources/views/welcome.view.xml b/snprc_r24/resources/views/welcome.view.xml
index 82fd93e6..2e70afe4 100644
--- a/snprc_r24/resources/views/welcome.view.xml
+++ b/snprc_r24/resources/views/welcome.view.xml
@@ -1,5 +1,5 @@
 <view xmlns="http://labkey.org/data/xml/view" title="R24 ETL Module">
-    <permissions>
-        <permission name="read"/>
-    </permissions>
+    <permissionClasses>
+        <permissionClass name="org.labkey.api.security.permissions.ReadPermission"/>
+    </permissionClasses>
 </view>
\ No newline at end of file
diff --git a/snprc_scheduler/resources/views/app.view.xml b/snprc_scheduler/resources/views/app.view.xml
index 9e7b0fed..4f38aaeb 100644
--- a/snprc_scheduler/resources/views/app.view.xml
+++ b/snprc_scheduler/resources/views/app.view.xml
@@ -1,7 +1,5 @@
 <view xmlns="http://labkey.org/data/xml/view" frame="none" title="Procedure scheduling">
-    <permissions>
-        <permission name="login"/>
-    </permissions>
+    <requiresLogin/>
     <dependencies>
         <dependency path="snprc_scheduler/gen/app/app.css"/>
     </dependencies>