Bugfix to MCC RequestUtils.tsx, primarily exposed during testing when switching roles

Author: bbimber

mcc/src/client/components/RequestUtils.tsx

@@ -78,10 +78,10 @@ export class AnimalCohort {
     uuid: string = uuidv4().toUpperCase();
 }
 
-function hasAnimalDataReadPermission() {
+function canReadMccStudy() {
     const ctx = getServerContext().getModuleContext('mcc') || {};
 
-    return !!ctx.hasAnimalDataReadPermission
+    return !!ctx.hasAnimalDataReadPermission  && !!ctx.hasMccStudyReadPermission
 }
 
 function getMccDataContainerPath() {
@@ -214,7 +214,7 @@ export async function queryRequestInformation(requestId, handleFailure) {
         })
     })]
 
-    if (hasAnimalDataReadPermission()) {
+    if (canReadMccStudy()) {
       promises.push(new Promise<any>((resolve, reject) => {
           Query.selectRows({
               containerPath: getMccDataContainerPath(),

mcc/src/org/labkey/mcc/MccModule.java

@@ -31,6 +31,8 @@
 import org.labkey.api.query.QuerySchema;
 import org.labkey.api.security.permissions.ReadPermission;
 import org.labkey.api.security.roles.RoleManager;
+import org.labkey.api.study.Study;
+import org.labkey.api.study.StudyService;
 import org.labkey.api.util.SystemMaintenance;
 import org.labkey.api.view.WebPartFactory;
 import org.labkey.api.view.template.ClientDependency;
@@ -112,6 +114,14 @@ public JSONObject getPageContextJson(ContainerUser context)
 
         Container dataContainer = MccManager.get().getMCCContainer(context.getContainer());
         ret.put("hasAnimalDataReadPermission", dataContainer != null && dataContainer.hasPermission(context.getUser(), ReadPermission.class));
+        if (dataContainer != null)
+        {
+            Study s = StudyService.get().getStudy(dataContainer);
+            if (s != null)
+            {
+                ret.put("hasMccStudyReadPermission", s.hasPermission(context.getUser(), ReadPermission.class));
+            }
+        }
 
         return ret;
     }