Merge changes from release26.3-SNAPSHOT through v7.21.3 (#1956)

### version 7.23.2
*Released*: 18 March 2026
- Merge from release26.3-SNAPSHOT to develop
    - includes changes from 7.21.2 #1949
    - includes changes from 7.21.3 #1947

Author: cnathe

packages/components/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.23.1",
+  "version": "7.23.2",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

packages/components/package.json

@@ -1,6 +1,12 @@
 # @labkey/components
 Components, models, actions, and utility functions for LabKey applications and pages
 
+### version 7.23.2
+*Released*: 18 March 2026
+- Merge from release26.3-SNAPSHOT to develop
+    - includes changes from 7.21.2 #1949
+    - includes changes from 7.21.3 #1947
+
 ### version 7.23.1
 *Released*: 11 March 2026
 - Merge from release26.3-SNAPSHOT to develop
@@ -23,6 +29,18 @@ Components, models, actions, and utility functions for LabKey applications and p
 - Add UnidentifiedPill
 - Add EMPTY_SEQUENCE_WARNING constant
 
+### version 7.21.3
+*Released*: 12 March 2026
+- GitHub Issue #790: Sample check-in and discard should not allow amount/unit input for differing units
+  - Update areUnitsCompatible to account for different "Count" unit labels
+  - getMetricUnitOptions() to allow optional filterFn parameter for the "Count" unit case
+
+### version 7.21.2
+*Released*: 11 March 2026
+- GitHub Issue 710: Include columns set as Identifying Fields within the 'Search for Samples' grid when adding samples to a storage location
+  - update saveGridView() to take hidden prop (default false)
+  - saveSettingsToLocalStorage() fix for checking model.useSavedSettings === SavedSettings.none
+
 ### version 7.21.1
 *Released*: 4 March 2026
 - GitHub Issue 829: Sample type with lookup to list with text primary key where the value contains a comma doesn't map to lookup

packages/components/releaseNotes/components.md

@@ -865,6 +865,7 @@ import {
     getMetricUnitOptions,
     MEASUREMENT_UNITS,
     UnitModel,
+    UNITS_KIND,
 } from './internal/util/measurement';
 import { DELIMITER, DETAIL_TABLE_CLASSES } from './internal/components/forms/constants';
 import {
@@ -1536,6 +1537,7 @@ export {
     MAX_EDITABLE_GRID_ROWS,
     MAX_SELECTION_ACTION_ROWS,
     MEASUREMENT_UNITS,
+    UNITS_KIND,
     MemberType,
     MenuDivider,
     MenuHeader,

packages/components/src/index.ts

@@ -97,6 +97,7 @@ export class ViewInfo {
     static UPDATE_NAME = '~~UPDATE~~';
     static SAMPLE_FINDER_VIEW_NAME = '~~samplefinder~~';
     static IDENTIFYING_FIELDS_VIEW_NAME = '~~identifyingfields~~';
+    static UNASSIGNED_SAMPLES_VIEW_NAME = '~~unassignedsamples~~';
     // TODO seems like this should not be in the generic model, but we'll need a good way
     //  to define the override detail name.
     static BIO_DETAIL_NAME = 'BiologicsDetails';

packages/components/src/internal/ViewInfo.ts

@@ -613,14 +613,15 @@ export function saveGridView(
     replace: boolean,
     session: boolean,
     inherit: boolean,
-    shared: boolean
+    shared: boolean,
+    hidden = false
 ): Promise<void> {
     return new Promise((resolve, reject) => {
         Query.saveQueryViews({
             schemaName: schemaQuery.schemaName,
             queryName: schemaQuery.queryName,
             containerPath,
-            views: [{ ...ViewInfo.serialize(viewInfo), replace, session, inherit, shared, hidden: false }],
+            views: [{ ...ViewInfo.serialize(viewInfo), replace, session, inherit, shared, hidden }],
             success: () => {
                 invalidateQueryDetailsCache(schemaQuery, containerPath);
                 resolve();

packages/components/src/internal/actions.ts

@@ -16,16 +16,25 @@ interface Props {
     className?: string;
     inputName?: string;
     label: string;
+    metricUnitsFilterFn?: (option: { label: string; value: string }) => boolean;
     model: UnitModel;
     preferredUnit: string;
     tipText?: string;
     unitsChangedHandler?: (units: string) => void;
 }
 
 export const StorageAmountInput: FC<Props> = memo(props => {
-    const { className, model, preferredUnit, inputName, label, tipText, amountChangedHandler, unitsChangedHandler } =
-        props;
-
+    const {
+        className,
+        model,
+        preferredUnit,
+        inputName,
+        label,
+        tipText,
+        amountChangedHandler,
+        unitsChangedHandler,
+        metricUnitsFilterFn,
+    } = props;
     const [amountInput, setAmountInput] = useState<string>(model?.value?.toString() || '');
 
     const unitText = model?.unit?.label || model.unitStr;
@@ -49,6 +58,8 @@ export const StorageAmountInput: FC<Props> = memo(props => {
         );
     } else {
         // IFF preferred units nor provided or are a supported type, then show possible conversions
+
+        const options = getMetricUnitOptions(preferredUnit, false, metricUnitsFilterFn);
         unitDisplay = (
             <SelectInput
                 containerClass="checkin-unit-select-container"
@@ -57,7 +68,7 @@ export const StorageAmountInput: FC<Props> = memo(props => {
                 onChange={(name, formValue, option: SelectInputOption) => {
                     unitsChangedHandler(formValue === undefined && option ? option.id : formValue);
                 }}
-                options={getMetricUnitOptions(preferredUnit)}
+                options={options}
                 value={model.unit?.label}
             />
         );

packages/components/src/internal/components/samples/StorageAmountInput.tsx

@@ -125,7 +125,8 @@ export interface QueryAPIWrapper {
         replace: boolean,
         session: boolean,
         inherit: boolean,
-        shared: boolean
+        shared: boolean,
+        hidden?: boolean
     ) => Promise<void>;
     saveRows: (options: SaveRowsOptions) => Promise<Query.SaveRowsResponse>;
     saveRowsByContainer: (options: SaveRowsOptions, containerField?: string) => Promise<Query.SaveRowsResponse>;

packages/components/src/internal/query/APIWrapper.ts

@@ -139,6 +139,49 @@ describe('MetricUnit utils', () => {
         expect(getMetricUnitOptions('bad').length).toBe(18);
     });
 
+    test('getMetricUnitOptions with filterFn', () => {
+        let options = getMetricUnitOptions('kg', false);
+        expect(options).toEqual([
+            { label: 'g', value: 'g' },
+            { label: 'mg', value: 'mg' },
+            { label: 'kg', value: 'kg' },
+            { label: 'ug', value: 'ug' },
+            { label: 'ng', value: 'ng' },
+        ]);
+
+        let filterFn = option => option.value !== 'mg';
+        options = getMetricUnitOptions('kg', false, filterFn);
+        expect(options).toEqual([
+            { label: 'g', value: 'g' },
+            { label: 'kg', value: 'kg' },
+            { label: 'ug', value: 'ug' },
+            { label: 'ng', value: 'ng' },
+        ]);
+
+        filterFn = option => option.value === 'mg';
+        options = getMetricUnitOptions('kg', false, filterFn);
+        expect(options).toEqual([{ label: 'mg', value: 'mg' }]);
+
+        filterFn = option => option.value === 'mg';
+        options = getMetricUnitOptions('mg', false, filterFn);
+        expect(options).toEqual([{ label: 'mg', value: 'mg' }]);
+
+        // incompatible units
+        filterFn = option => option.value === 'mg';
+        options = getMetricUnitOptions('mL', false, filterFn);
+        expect(options).toEqual([]);
+
+        // no unit
+        filterFn = option => option.value === 'mg';
+        options = getMetricUnitOptions(undefined, false, filterFn);
+        expect(options).toEqual([{ label: 'mg', value: 'mg' }]);
+
+        // bogus unit will be treated as no unit
+        filterFn = option => option.value === 'mg';
+        options = getMetricUnitOptions('bogus', false, filterFn);
+        expect(options).toEqual([{ label: 'mg', value: 'mg' }]);
+    });
+
     test('getAltUnitKeys', () => {
         const expectedUlOptions = ['mL', 'uL', 'L'];
         expect(getAltUnitKeys('uL')).toEqual(expectedUlOptions);
@@ -234,4 +277,20 @@ describe('areUnitsCompatible', () => {
         expect(areUnitsCompatible('mL', 'bogus')).toBeFalsy();
         expect(areUnitsCompatible('kg', 'bogus')).toBeFalsy();
     });
+
+    test('comparison of Count units with different labels but same kind', () => {
+        expect(areUnitsCompatible('count', 'count')).toBeTruthy();
+        expect(areUnitsCompatible('blocks', 'blocks')).toBeTruthy();
+        expect(areUnitsCompatible('boxes', 'cells')).toBeTruthy();
+        expect(areUnitsCompatible('kits', 'packs')).toBeTruthy();
+        expect(areUnitsCompatible('pieces', 'unit')).toBeTruthy();
+        expect(areUnitsCompatible('unit', 'unit')).toBeTruthy();
+
+        expect(areUnitsCompatible('count', 'count', true)).toBeTruthy();
+        expect(areUnitsCompatible('blocks', 'blocks', true)).toBeTruthy();
+        expect(areUnitsCompatible('boxes', 'cells', true)).toBeFalsy();
+        expect(areUnitsCompatible('kits', 'packs', true)).toBeFalsy();
+        expect(areUnitsCompatible('pieces', 'unit', true)).toBeFalsy();
+        expect(areUnitsCompatible('unit', 'unit', true)).toBeTruthy();
+    });
 });

packages/components/src/internal/util/measurement.test.ts

@@ -204,7 +204,7 @@ export function getMeasurementUnit(unitStr: string): MeasurementUnit | null {
     return null;
 }
 
-export function areUnitsCompatible(unitAStr: string, unitBStr: string): boolean {
+export function areUnitsCompatible(unitAStr: string, unitBStr: string, compareCountUnitLabels = false): boolean {
     if (unitAStr == unitBStr) {
         return true;
     }
@@ -222,10 +222,21 @@ export function areUnitsCompatible(unitAStr: string, unitBStr: string): boolean
     if (!unitA || !unitB) {
         return false;
     }
-    return unitA.kind === unitB.kind;
+
+    // GitHub Issue #790: for "Count" kind, the specific label must also match
+    const matchingKinds = unitA.kind === unitB.kind;
+    if (compareCountUnitLabels && matchingKinds && unitA.kind === UNITS_KIND.COUNT) {
+        return unitA.label === unitB.label;
+    }
+
+    return matchingKinds;
 }
 
-export function getMetricUnitOptions(metricUnit?: string, showLongLabel?: boolean): { label: string; value: string }[] {
+export function getMetricUnitOptions(
+    metricUnit?: string,
+    showLongLabel?: boolean,
+    filterFn?: (option: { label: string; value: string }) => boolean
+): { label: string; value: string }[] {
     const unit = getMeasurementUnit(metricUnit);
 
     const options = [];
@@ -248,6 +259,12 @@ export function getMetricUnitOptions(metricUnit?: string, showLongLabel?: boolea
             }
         }
     }
+
+    // apply additional filter if provided
+    if (filterFn) {
+        return options.filter(filterFn);
+    }
+
     return options;
 }