From e80b97405ce9997c6d0b0cf4af93dd4ead4991ff Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Mon, 20 Apr 2026 14:33:46 -0700 Subject: [PATCH 1/2] Issue 1035: Add terminal storage location name column to sample grids --- api/src/org/labkey/api/inventory/InventoryService.java | 1 + .../src/org/labkey/experiment/api/ExpMaterialTableImpl.java | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/api/src/org/labkey/api/inventory/InventoryService.java b/api/src/org/labkey/api/inventory/InventoryService.java index 7690e2c8993..4ce70bafb33 100644 --- a/api/src/org/labkey/api/inventory/InventoryService.java +++ b/api/src/org/labkey/api/inventory/InventoryService.java @@ -52,6 +52,7 @@ enum InventoryStatusColumn StorageColSort, StorageComment, StorageLocation, + StorageTerminalLocation, StorageRow, StorageRowSort, StoragePositionNumber, diff --git a/experiment/src/org/labkey/experiment/api/ExpMaterialTableImpl.java b/experiment/src/org/labkey/experiment/api/ExpMaterialTableImpl.java index 33b412786e1..55ba7021d05 100644 --- a/experiment/src/org/labkey/experiment/api/ExpMaterialTableImpl.java +++ b/experiment/src/org/labkey/experiment/api/ExpMaterialTableImpl.java @@ -875,7 +875,10 @@ protected void populateColumns() addColumn(RawAliquotUnit).getRenderer().addQueryFieldKeys(new HashSet<>(Set.of(AliquotUnit.fieldKey()))); if (InventoryService.get() != null && (st == null || !st.isMedia())) - defaultCols.addAll(InventoryService.get().addInventoryStatusColumns(st == null ? null : st.getMetricUnit(), this, getContainer(), _userSchema.getUser())); + { + List inventoryCols = InventoryService.get().addInventoryStatusColumns(st == null ? null : st.getMetricUnit(), this, getContainer(), _userSchema.getUser()); + defaultCols.addAll(inventoryCols.stream().filter(fk -> !fk.equals(InventoryService.InventoryStatusColumn.StorageTerminalLocation.fieldKey())).toList()); + } SQLFragment sql; UserSchema plateUserSchema; From 2f1280d0a5f0ac8df4fac3c1a0d5e01652cfed33 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Tue, 21 Apr 2026 10:14:33 -0700 Subject: [PATCH 2/2] Add GH Issue numbers in comments --- .../src/org/labkey/experiment/api/ExpMaterialTableImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/experiment/src/org/labkey/experiment/api/ExpMaterialTableImpl.java b/experiment/src/org/labkey/experiment/api/ExpMaterialTableImpl.java index 55ba7021d05..f403d9e31d0 100644 --- a/experiment/src/org/labkey/experiment/api/ExpMaterialTableImpl.java +++ b/experiment/src/org/labkey/experiment/api/ExpMaterialTableImpl.java @@ -877,6 +877,7 @@ protected void populateColumns() if (InventoryService.get() != null && (st == null || !st.isMedia())) { List inventoryCols = InventoryService.get().addInventoryStatusColumns(st == null ? null : st.getMetricUnit(), this, getContainer(), _userSchema.getUser()); + // GH Issue 1035: Don't include StorageTerminalLocation in the default view defaultCols.addAll(inventoryCols.stream().filter(fk -> !fk.equals(InventoryService.InventoryStatusColumn.StorageTerminalLocation.fieldKey())).toList()); }