From e69bf248d97552770be26e4e58ff9dbe7998cbfe Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Fri, 2 Aug 2024 07:06:46 -0700 Subject: [PATCH] Backport view fixes (#212) --- .../resources/views/manageReferenceItems.view.xml | 8 ++++---- LabPurchasing/resources/views/order.view.xml | 6 +++--- LabPurchasing/resources/views/placeOrders.view.xml | 8 ++++---- LabPurchasing/resources/views/populateData.view.xml | 6 +++--- PMR/resources/views/pmrAdmin.view.xml | 6 +++--- PMR/resources/views/pmrAnimalHistory.view.xml | 6 +++--- PMR/resources/views/pmrOverview.view.xml | 6 +++--- PMR/resources/views/pmrSearch.view.xml | 6 +++--- mGAP/resources/views/about.view.xml | 6 +++--- mGAP/resources/views/admin.view.xml | 6 +++--- mGAP/resources/views/annotation.view.xml | 6 +++--- mGAP/resources/views/contact.view.xml | 4 +--- mGAP/resources/views/data.view.xml | 6 +++--- mGAP/resources/views/dataProcessing.view.xml | 6 +++--- mGAP/resources/views/demographics.view.xml | 6 +++--- mGAP/resources/views/externalData.view.xml | 6 +++--- mGAP/resources/views/geneSearch.view.xml | 6 +++--- mGAP/resources/views/helpMenu.view.xml | 6 +++--- mGAP/resources/views/login.view.xml | 4 +--- mGAP/resources/views/overview.view.xml | 6 +++--- mGAP/resources/views/phenotypeList.view.xml | 7 +++---- mGAP/resources/views/phenotypes.view.xml | 6 +++--- mGAP/resources/views/quickLinks.view.xml | 6 +++--- mGAP/resources/views/releaseNotes.view.xml | 6 +++--- mGAP/resources/views/requestLogin.view.xml | 4 +--- mGAP/resources/views/tutorials.view.xml | 6 +++--- mGAP/resources/views/variantList.view.xml | 6 +++--- mGAP/resources/views/variants.view.xml | 6 +++--- mGAP/resources/views/welcome.view.xml | 4 +--- mcc/resources/views/contact.view.xml | 4 +--- mcc/resources/views/dashboardWebpart.view.xml | 6 +++--- mcc/resources/views/geneticsPlotWebpart.view.xml | 6 +++--- mcc/resources/views/helpMenu.view.xml | 6 +++--- mcc/resources/views/login.view.xml | 4 +--- mcc/resources/views/mccColonies.view.xml | 6 +++--- mcc/resources/views/mccColony.view.xml | 6 +++--- mcc/resources/views/mccFolderInit.view.xml | 6 +++--- mcc/resources/views/requestLogin.view.xml | 4 +--- mcc/src/client/entryPoints.js | 11 +++++------ 39 files changed, 107 insertions(+), 123 deletions(-) diff --git a/LabPurchasing/resources/views/manageReferenceItems.view.xml b/LabPurchasing/resources/views/manageReferenceItems.view.xml index 99e41622..786ec518 100644 --- a/LabPurchasing/resources/views/manageReferenceItems.view.xml +++ b/LabPurchasing/resources/views/manageReferenceItems.view.xml @@ -1,8 +1,8 @@ - - - - + + + + diff --git a/LabPurchasing/resources/views/order.view.xml b/LabPurchasing/resources/views/order.view.xml index 00f90941..5eb029e4 100644 --- a/LabPurchasing/resources/views/order.view.xml +++ b/LabPurchasing/resources/views/order.view.xml @@ -1,7 +1,7 @@ - - - + + + diff --git a/LabPurchasing/resources/views/placeOrders.view.xml b/LabPurchasing/resources/views/placeOrders.view.xml index e484bb6a..68844cec 100644 --- a/LabPurchasing/resources/views/placeOrders.view.xml +++ b/LabPurchasing/resources/views/placeOrders.view.xml @@ -1,8 +1,8 @@ - - - - + + + + diff --git a/LabPurchasing/resources/views/populateData.view.xml b/LabPurchasing/resources/views/populateData.view.xml index 522009e8..34c47b29 100644 --- a/LabPurchasing/resources/views/populateData.view.xml +++ b/LabPurchasing/resources/views/populateData.view.xml @@ -1,7 +1,7 @@ - - - + + + diff --git a/PMR/resources/views/pmrAdmin.view.xml b/PMR/resources/views/pmrAdmin.view.xml index bf9c06a3..df3a8886 100644 --- a/PMR/resources/views/pmrAdmin.view.xml +++ b/PMR/resources/views/pmrAdmin.view.xml @@ -1,7 +1,7 @@ - - - + + + diff --git a/PMR/resources/views/pmrAnimalHistory.view.xml b/PMR/resources/views/pmrAnimalHistory.view.xml index ee84dcf0..91524c95 100644 --- a/PMR/resources/views/pmrAnimalHistory.view.xml +++ b/PMR/resources/views/pmrAnimalHistory.view.xml @@ -1,7 +1,7 @@ - - - + + + diff --git a/PMR/resources/views/pmrOverview.view.xml b/PMR/resources/views/pmrOverview.view.xml index a45f86ba..d21df9bb 100644 --- a/PMR/resources/views/pmrOverview.view.xml +++ b/PMR/resources/views/pmrOverview.view.xml @@ -1,7 +1,7 @@ - - - + + + diff --git a/PMR/resources/views/pmrSearch.view.xml b/PMR/resources/views/pmrSearch.view.xml index 8dbe9ed3..c37f676a 100644 --- a/PMR/resources/views/pmrSearch.view.xml +++ b/PMR/resources/views/pmrSearch.view.xml @@ -1,7 +1,7 @@ - - - + + + diff --git a/mGAP/resources/views/about.view.xml b/mGAP/resources/views/about.view.xml index 791fe346..ba1ecf6a 100644 --- a/mGAP/resources/views/about.view.xml +++ b/mGAP/resources/views/about.view.xml @@ -1,7 +1,7 @@ - - - + + + diff --git a/mGAP/resources/views/admin.view.xml b/mGAP/resources/views/admin.view.xml index 74af023c..51c64bfe 100644 --- a/mGAP/resources/views/admin.view.xml +++ b/mGAP/resources/views/admin.view.xml @@ -1,7 +1,7 @@ - - - + + + diff --git a/mGAP/resources/views/annotation.view.xml b/mGAP/resources/views/annotation.view.xml index db45c4b8..22e9f62c 100644 --- a/mGAP/resources/views/annotation.view.xml +++ b/mGAP/resources/views/annotation.view.xml @@ -1,7 +1,7 @@ - - - + + + diff --git a/mGAP/resources/views/contact.view.xml b/mGAP/resources/views/contact.view.xml index 0963a4c1..06a3575d 100644 --- a/mGAP/resources/views/contact.view.xml +++ b/mGAP/resources/views/contact.view.xml @@ -1,7 +1,5 @@ - - - + diff --git a/mGAP/resources/views/data.view.xml b/mGAP/resources/views/data.view.xml index 671d75d8..d0f21acf 100644 --- a/mGAP/resources/views/data.view.xml +++ b/mGAP/resources/views/data.view.xml @@ -1,7 +1,7 @@ - - - + + + diff --git a/mGAP/resources/views/dataProcessing.view.xml b/mGAP/resources/views/dataProcessing.view.xml index 5f59c301..c01848f4 100644 --- a/mGAP/resources/views/dataProcessing.view.xml +++ b/mGAP/resources/views/dataProcessing.view.xml @@ -1,7 +1,7 @@ - - - + + + diff --git a/mGAP/resources/views/demographics.view.xml b/mGAP/resources/views/demographics.view.xml index a0d9051b..a31c8d8b 100644 --- a/mGAP/resources/views/demographics.view.xml +++ b/mGAP/resources/views/demographics.view.xml @@ -1,7 +1,7 @@ - - - + + + diff --git a/mGAP/resources/views/externalData.view.xml b/mGAP/resources/views/externalData.view.xml index 6f3de811..38846333 100644 --- a/mGAP/resources/views/externalData.view.xml +++ b/mGAP/resources/views/externalData.view.xml @@ -1,7 +1,7 @@ - - - + + + diff --git a/mGAP/resources/views/geneSearch.view.xml b/mGAP/resources/views/geneSearch.view.xml index 9543c7b4..0e53250b 100644 --- a/mGAP/resources/views/geneSearch.view.xml +++ b/mGAP/resources/views/geneSearch.view.xml @@ -1,7 +1,7 @@ - - - + + + diff --git a/mGAP/resources/views/helpMenu.view.xml b/mGAP/resources/views/helpMenu.view.xml index 3960a69c..00134e81 100644 --- a/mGAP/resources/views/helpMenu.view.xml +++ b/mGAP/resources/views/helpMenu.view.xml @@ -1,7 +1,7 @@ - - - + + + diff --git a/mGAP/resources/views/login.view.xml b/mGAP/resources/views/login.view.xml index eae9be6e..238b2931 100644 --- a/mGAP/resources/views/login.view.xml +++ b/mGAP/resources/views/login.view.xml @@ -1,7 +1,5 @@ - - - + diff --git a/mGAP/resources/views/overview.view.xml b/mGAP/resources/views/overview.view.xml index 4a5d8e91..3605f05a 100644 --- a/mGAP/resources/views/overview.view.xml +++ b/mGAP/resources/views/overview.view.xml @@ -1,7 +1,7 @@ - - - + + + diff --git a/mGAP/resources/views/phenotypeList.view.xml b/mGAP/resources/views/phenotypeList.view.xml index 8a7e0218..3ee45e24 100644 --- a/mGAP/resources/views/phenotypeList.view.xml +++ b/mGAP/resources/views/phenotypeList.view.xml @@ -1,10 +1,9 @@ - - - + + + - \ No newline at end of file diff --git a/mGAP/resources/views/phenotypes.view.xml b/mGAP/resources/views/phenotypes.view.xml index c4f8cbdb..8c345e61 100644 --- a/mGAP/resources/views/phenotypes.view.xml +++ b/mGAP/resources/views/phenotypes.view.xml @@ -1,7 +1,7 @@ - - - + + + diff --git a/mGAP/resources/views/quickLinks.view.xml b/mGAP/resources/views/quickLinks.view.xml index 3e2c4a4c..387d7beb 100644 --- a/mGAP/resources/views/quickLinks.view.xml +++ b/mGAP/resources/views/quickLinks.view.xml @@ -1,7 +1,7 @@ - - - + + + diff --git a/mGAP/resources/views/releaseNotes.view.xml b/mGAP/resources/views/releaseNotes.view.xml index c9a2b3e3..88b45f3b 100644 --- a/mGAP/resources/views/releaseNotes.view.xml +++ b/mGAP/resources/views/releaseNotes.view.xml @@ -1,7 +1,7 @@ - - - + + + diff --git a/mGAP/resources/views/requestLogin.view.xml b/mGAP/resources/views/requestLogin.view.xml index 0a82cbcd..b61c1f71 100644 --- a/mGAP/resources/views/requestLogin.view.xml +++ b/mGAP/resources/views/requestLogin.view.xml @@ -1,7 +1,5 @@ - - - + diff --git a/mGAP/resources/views/tutorials.view.xml b/mGAP/resources/views/tutorials.view.xml index c5f4cdb9..bc82fd25 100644 --- a/mGAP/resources/views/tutorials.view.xml +++ b/mGAP/resources/views/tutorials.view.xml @@ -1,7 +1,7 @@ - - - + + + diff --git a/mGAP/resources/views/variantList.view.xml b/mGAP/resources/views/variantList.view.xml index 07830de5..dd8000b8 100644 --- a/mGAP/resources/views/variantList.view.xml +++ b/mGAP/resources/views/variantList.view.xml @@ -1,7 +1,7 @@ - - - + + + diff --git a/mGAP/resources/views/variants.view.xml b/mGAP/resources/views/variants.view.xml index a8b0b6a5..069247af 100644 --- a/mGAP/resources/views/variants.view.xml +++ b/mGAP/resources/views/variants.view.xml @@ -1,7 +1,7 @@ - - - + + + diff --git a/mGAP/resources/views/welcome.view.xml b/mGAP/resources/views/welcome.view.xml index 92b403ed..3eb79143 100644 --- a/mGAP/resources/views/welcome.view.xml +++ b/mGAP/resources/views/welcome.view.xml @@ -1,7 +1,5 @@ - - - + diff --git a/mcc/resources/views/contact.view.xml b/mcc/resources/views/contact.view.xml index 0fc3bfa3..6addbee6 100644 --- a/mcc/resources/views/contact.view.xml +++ b/mcc/resources/views/contact.view.xml @@ -1,7 +1,5 @@ - - - + diff --git a/mcc/resources/views/dashboardWebpart.view.xml b/mcc/resources/views/dashboardWebpart.view.xml index 08164ec8..1cc8d3ba 100644 --- a/mcc/resources/views/dashboardWebpart.view.xml +++ b/mcc/resources/views/dashboardWebpart.view.xml @@ -1,7 +1,7 @@ - - - + + + diff --git a/mcc/resources/views/geneticsPlotWebpart.view.xml b/mcc/resources/views/geneticsPlotWebpart.view.xml index 0d807840..8b44d9d8 100644 --- a/mcc/resources/views/geneticsPlotWebpart.view.xml +++ b/mcc/resources/views/geneticsPlotWebpart.view.xml @@ -1,7 +1,7 @@ - - - + + + diff --git a/mcc/resources/views/helpMenu.view.xml b/mcc/resources/views/helpMenu.view.xml index 3960a69c..00134e81 100644 --- a/mcc/resources/views/helpMenu.view.xml +++ b/mcc/resources/views/helpMenu.view.xml @@ -1,7 +1,7 @@ - - - + + + diff --git a/mcc/resources/views/login.view.xml b/mcc/resources/views/login.view.xml index 7ce47abe..afe2aa0d 100644 --- a/mcc/resources/views/login.view.xml +++ b/mcc/resources/views/login.view.xml @@ -1,7 +1,5 @@ - - - + diff --git a/mcc/resources/views/mccColonies.view.xml b/mcc/resources/views/mccColonies.view.xml index e55aaf56..9519cdca 100644 --- a/mcc/resources/views/mccColonies.view.xml +++ b/mcc/resources/views/mccColonies.view.xml @@ -1,7 +1,7 @@ - - - + + + diff --git a/mcc/resources/views/mccColony.view.xml b/mcc/resources/views/mccColony.view.xml index 43b1015e..658303ce 100644 --- a/mcc/resources/views/mccColony.view.xml +++ b/mcc/resources/views/mccColony.view.xml @@ -1,7 +1,7 @@ - - - + + + diff --git a/mcc/resources/views/mccFolderInit.view.xml b/mcc/resources/views/mccFolderInit.view.xml index c421b1d0..3664eed1 100644 --- a/mcc/resources/views/mccFolderInit.view.xml +++ b/mcc/resources/views/mccFolderInit.view.xml @@ -1,7 +1,7 @@ - - - + + + diff --git a/mcc/resources/views/requestLogin.view.xml b/mcc/resources/views/requestLogin.view.xml index 13c485f9..8927f2fe 100644 --- a/mcc/resources/views/requestLogin.view.xml +++ b/mcc/resources/views/requestLogin.view.xml @@ -1,7 +1,5 @@ - - - + diff --git a/mcc/src/client/entryPoints.js b/mcc/src/client/entryPoints.js index ad3dcfb9..2960976f 100644 --- a/mcc/src/client/entryPoints.js +++ b/mcc/src/client/entryPoints.js @@ -2,34 +2,33 @@ module.exports = { apps: [{ name: 'dashboard', title: 'MCC Data', - permission: 'read', + permissionClasses: ['org.labkey.api.security.permissions.ReadPermission'], path: './src/client/Dashboard' },{ name: 'dashboardWebpart', title: 'MCC Data', - permission: 'read', path: './src/client/Dashboard/webpart', generateLib: true },{ name: 'animalRequest', title: 'Animal Requests', - permission: 'read', + permissionClasses: ['org.labkey.api.security.permissions.ReadPermission'], path: './src/client/AnimalRequest' }, { name: 'requestReview', title: 'Animal Request Review', - permission: 'read', + permissionClasses: ['org.labkey.api.security.permissions.ReadPermission'], template: 'home', path: './src/client/RequestReview' },{ name: 'geneticsPlot', title: 'Marmoset Genetics', - permission: 'read', + permissionClasses: ['org.labkey.api.security.permissions.ReadPermission'], path: './src/client/GeneticsPlot' },{ name: 'geneticsPlotWebpart', title: 'Marmoset Genetics', - permission: 'read', + permissionClasses: ['org.labkey.api.security.permissions.ReadPermission'], path: './src/client/GeneticsPlot/webpart' }] };