Merge remote-tracking branch 'origin/develop' into fb_entityCreateTyp…

…eChoice
LabKey · Nov 14, 2024 · fc6b55e · fc6b55e
2 parents 5b60867 + 474a459
commit fc6b55e
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 31 deletions.
diff --git a/assay/package-lock.json b/assay/package-lock.json
diff --git a/assay/package.json b/assay/package.json
@@ -12,7 +12,7 @@
     "clean": "rimraf resources/web/assay/gen && rimraf resources/views/gen && rimraf resources/web/gen"
   },
   "dependencies": {
-    "@labkey/components": "5.22.0"
+    "@labkey/components": "5.22.9"
   },
   "devDependencies": {
     "@labkey/build": "8.3.0",

diff --git a/assay/src/org/labkey/assay/plate/PlateManager.java b/assay/src/org/labkey/assay/plate/PlateManager.java
@@ -682,9 +682,10 @@ else if (matchingPlates.isEmpty())
      */
     public ContainerFilter getPlateContainerFilter(@Nullable ExpProtocol protocol, Container container, User user)
     {
-        ContainerFilter lookupCf = QueryService.get().getContainerFilterForLookups(container, user);
-        ContainerFilter currentCf = ContainerFilter.Type.Current.create(protocol != null ? protocol.getContainer() : container, user);
-        return lookupCf != null ? lookupCf : currentCf;
+        ContainerFilter containerFilter = QueryService.get().getContainerFilterForLookups(container, user);
+        if (containerFilter == null)
+            containerFilter = ContainerFilter.Type.Current.create(protocol != null ? protocol.getContainer() : container, user);
+        return containerFilter;
     }
 
     @Override
@@ -1531,14 +1532,19 @@ public TableInfo getPlateTableInfo()
         return getPlateTable(container, user, null);
     }
 
-    public @NotNull TableInfo getPlateTable(Container container, User user, @Nullable ContainerFilter cf)
+    private @NotNull TableInfo getPlateTable(Container container, User user, @Nullable ContainerFilter cf)
     {
         return getPlateUserSchema(container, user).getTableOrThrow(PlateTable.NAME, cf);
     }
 
     private @NotNull TableInfo getWellTable(Container container, User user)
     {
-        return getPlateUserSchema(container, user).getTableOrThrow(WellTable.NAME);
+        return getWellTable(container, user, null);
+    }
+
+    private @NotNull TableInfo getWellTable(Container container, User user, @Nullable ContainerFilter cf)
+    {
+        return getPlateUserSchema(container, user).getTableOrThrow(WellTable.NAME, cf);
     }
 
     private @NotNull QueryUpdateService requiredUpdateService(@NotNull TableInfo table)
@@ -3497,7 +3503,7 @@ public List<WellData> getWellData(Container container, User user, int plateRowId
         if (includeSamples)
             columns.add(WellTable.Column.SampleID.name());
 
-        var wellTable = getWellTable(container, user);
+        var wellTable = getWellTable(container, user, getPlateLookupContainerFilter(container, user));
         var filter = new SimpleFilter(FieldKey.fromParts(WellTable.Column.PlateId.name()), plateRowId);
         var wellDatas = new TableSelector(wellTable, columns, filter, new Sort(WellTable.Column.RowId.name())).getArrayList(WellData.class);
 

diff --git a/core/package-lock.json b/core/package-lock.json
diff --git a/core/package.json b/core/package.json
@@ -54,7 +54,7 @@
     }
   },
   "dependencies": {
-    "@labkey/components": "5.22.2",
+    "@labkey/components": "5.22.9",
     "@labkey/themes": "1.4.0"
   },
   "devDependencies": {

diff --git a/experiment/package-lock.json b/experiment/package-lock.json
diff --git a/experiment/package.json b/experiment/package.json
@@ -13,11 +13,11 @@
     "test-integration": "cross-env NODE_ENV=test jest --ci --runInBand -c test/js/jest.config.integration.js"
   },
   "dependencies": {
-    "@labkey/components": "5.22.2"
+    "@labkey/components": "5.22.9"
   },
   "devDependencies": {
     "@labkey/build": "8.3.0",
-    "@labkey/test": "1.7.0",
+    "@labkey/test": "1.7.1",
     "@types/jest": "29.5.14",
     "@types/react": "18.3.12",
     "@types/react-dom": "18.3.1",

diff --git a/pipeline/package-lock.json b/pipeline/package-lock.json
diff --git a/pipeline/package.json b/pipeline/package.json
@@ -14,7 +14,7 @@
     "build-prod": "npm run clean && cross-env NODE_ENV=production PROD_SOURCE_MAP=source-map webpack --config node_modules/@labkey/build/webpack/prod.config.js --color --progress --profile"
   },
   "dependencies": {
-    "@labkey/components": "5.22.0"
+    "@labkey/components": "5.22.9"
   },
   "devDependencies": {
     "@labkey/build": "8.3.0",