Issue 1035: Add terminal storage location name column to sample grids

Author: labkey-susanh

api/src/org/labkey/api/inventory/InventoryService.java

@@ -52,6 +52,7 @@ enum InventoryStatusColumn
         StorageColSort,
         StorageComment,
         StorageLocation,
+        StorageTerminalLocation,
         StorageRow,
         StorageRowSort,
         StoragePositionNumber,

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<FieldKey> 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;