Ensure request details uses correct containerpath

Author: bbimber

mcc/src/client/components/RequestUtils.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Filter, Query } from '@labkey/api';
+import { Filter, getServerContext, Query } from '@labkey/api';
 import { v4 as uuidv4 } from 'uuid';
 
 export class AnimalRequestModel {
@@ -78,6 +78,18 @@ export class AnimalCohort {
     uuid: string = uuidv4().toUpperCase();
 }
 
+function hasAnimalDataReadPermission() {
+    const ctx = getServerContext().getModuleContext('mcc') || {};
+
+    return !!ctx.hasAnimalDataReadPermission
+}
+
+function getMccDataContainerPath() {
+    const ctx = getServerContext().getModuleContext('mcc') || {};
+
+    return ctx.hasAnimalDataReadPermission ? ctx.MCCContainer : null
+}
+
 export async function queryRequestInformation(requestId, handleFailure) {
     const requestData = new AnimalRequestModel()
 
@@ -200,38 +212,45 @@ export async function queryRequestInformation(requestId, handleFailure) {
             },
             failure: handleFailure
         })
-    }),
-    new Promise<any>((resolve, reject) => {
-        Query.selectRows({
-            schemaName: "study",
-            queryName: "departure",
-            columns: [
-                "Id",
-                "date",
-                "source",
-                "objectid"
-            ],
-            filterArray: [
-                Filter.create('mccRequestId/objectId', requestId)
-            ],
-            success: function (resp) {
-                // NOTE: abort so that we preserve the default value of one empty row
-                if (!resp.rows.length) {
-                    requestData.shipments = []
-                } else {
-                    requestData.shipments = resp.rows
-                }
-
-                resolve(requestData.shipments)
-            },
-            failure: handleFailure
-        })
     })]
 
+    if (hasAnimalDataReadPermission()) {
+      promises.push(new Promise<any>((resolve, reject) => {
+          Query.selectRows({
+              containerPath: getMccDataContainerPath(),
+              schemaName: "study",
+              queryName: "departure",
+              columns: [
+                  "Id",
+                  "date",
+                  "source",
+                  "objectid"
+              ],
+              filterArray: [
+                  Filter.create('mccRequestId/objectId', requestId)
+              ],
+              success: function (resp) {
+                  // NOTE: abort so that we preserve the default value of one empty row
+                  if (!resp.rows.length) {
+                      requestData.shipments = []
+                  } else {
+                      requestData.shipments = resp.rows
+                  }
+
+                  resolve(requestData.shipments)
+              },
+              failure: handleFailure
+          })
+      }))
+    }
+
     return await Promise.all(promises).then(values => {
         requestData.request = values[0]
         requestData.coinvestigators = values[1]
         requestData.cohorts = values[2]
+        if (promises.length > 3) {
+            requestData.shipments = values[3]
+        }
         requestData.dataLoaded = true
 
         return(requestData)

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

@@ -29,6 +29,7 @@
 import org.labkey.api.module.ModuleContext;
 import org.labkey.api.query.DefaultSchema;
 import org.labkey.api.query.QuerySchema;
+import org.labkey.api.security.permissions.ReadPermission;
 import org.labkey.api.security.roles.RoleManager;
 import org.labkey.api.util.SystemMaintenance;
 import org.labkey.api.view.WebPartFactory;
@@ -109,6 +110,9 @@ public JSONObject getPageContextJson(ContainerUser context)
         ret.put("hasRabPermission", requestContainer != null && requestContainer.hasPermission(context.getUser(), MccRabReviewPermission.class));
         ret.put("hasFinalDecisionPermission", requestContainer != null && requestContainer.hasPermission(context.getUser(), MccFinalReviewPermission.class));
 
+        Container dataContainer = MccManager.get().getMCCContainer(context.getContainer());
+        ret.put("hasAnimalDataReadPermission", dataContainer != null && dataContainer.hasPermission(context.getUser(), ReadPermission.class));
+
         return ret;
     }
 

mcc/src/org/labkey/mcc/query/MccRequestCustomizer.java

@@ -92,7 +92,7 @@ public boolean isSortable()
 
                 ExprColumn newCol = new ExprColumn(ti, "transferIds", sql, JdbcType.VARCHAR, ti.getColumn("requestId"));
                 newCol.setLabel("Animal ID(s)");
-                newCol.setWidth("150");
+                newCol.setWidth("100");
                 ti.addColumn(newCol);
             }
         }