Merge remote-tracking branch 'origin/develop' into urlTargetWindow503

Author: cnathe

packages/components/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.7.1-fb-urlTargetWindow503.3",
+  "version": "7.7.3",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

packages/components/package.json

@@ -5,6 +5,17 @@ Components, models, actions, and utility functions for LabKey applications and p
 *Released*: TBD
 - GitHub Issue 503: Field editor URL option to set target window (i.e. _blank)
 
+### version 7.7.3
+*Released*: 31 December 2025
+- [GitHub Issue #495](https://github.com/LabKey/internal-issues/issues/495)
+ - Remove some gratuitous capitalization of field names in audit event details
+ - When generating a column label for an added parent column in the editable grid, don't capitalize the query name
+
+### version 7.7.2
+*Released*: 30 December 2025
+- Remove unused `getVolumeMinStep` method
+- Improve typings, test checks
+
 ### version 7.7.1
 *Released*: 29 December 2025
 - [GitHub Issue 734](https://github.com/LabKey/internal-issues/issues/734) Update sizing of comment input box for better display in narrow screens

packages/components/releaseNotes/components.md

@@ -95,7 +95,7 @@ export class AuditDetails extends Component<Props> {
             <div className="row margin-bottom" key={field}>
                 <div className="left-padding right-padding">
                     <span className="audit-detail-row-label right-padding">
-                        {capitalizeFirstChar(field)}
+                        {field}
                         {!!providedVals.length && (
                             <LabelHelpTip
                                 iconComponent={<i className="original-value-icon fa fa-info-circle left-padding" />}

packages/components/src/internal/components/auditlog/AuditDetails.tsx

@@ -27,19 +27,19 @@ describe('EntityParentType', () => {
             'Display Column',
             SCHEMAS.DATA_CLASSES.SCHEMA
         );
-        expect(col.caption).toBe('Dataclass Parents');
+        expect(col.caption).toBe('dataclass Parents');
 
         col = EntityParentType.create({ schema: SCHEMAS.DATA_CLASSES.SCHEMA, query: 'dataclass' }).generateColumn(
             'Display Column',
             SCHEMAS.SAMPLE_SETS.SCHEMA
         );
-        expect(col.caption).toBe('Dataclass');
+        expect(col.caption).toBe('dataclass');
 
         col = EntityParentType.create({ schema: SCHEMAS.SAMPLE_SETS.SCHEMA, query: 'sampletype' }).generateColumn(
             'Display Column',
             SCHEMAS.SAMPLE_SETS.SCHEMA
         );
-        expect(col.caption).toBe('Sampletype Parents');
+        expect(col.caption).toBe('sampletype Parents');
 
         col = EntityParentType.create({
             schema: SCHEMAS.SAMPLE_SETS.SCHEMA,

packages/components/src/internal/components/entities/models.test.ts

@@ -23,7 +23,7 @@ import { ExtendedMap } from '../../../public/ExtendedMap';
 import { decodePart, encodePart, SchemaQuery } from '../../../public/SchemaQuery';
 import { IEntityDetails } from '../domainproperties/entities/models';
 import { SelectInputOption } from '../forms/input/SelectInput';
-import { capitalizeFirstChar, caseInsensitive, generateId } from '../../util/utils';
+import { caseInsensitive, generateId } from '../../util/utils';
 import { QueryColumn, QueryLookup } from '../../../public/QueryColumn';
 import { SCHEMAS } from '../../schemas';
 import { EntityCreationType } from '../samples/models';
@@ -107,7 +107,7 @@ export class EntityParentType extends Record({
     }
 
     generateColumn(displayColumn: string, targetSchema: string): QueryColumn {
-        const label_ = this.label ?? capitalizeFirstChar(this.query);
+        const label_ = this.label ?? this.query;
         const parentColName = this.generateFieldKey();
 
         // Issue 40233: SM app allows for two types of parents, sources and samples, and its confusing if both use

packages/components/src/internal/components/entities/models.ts

@@ -84,13 +84,8 @@ describe('getGroupedSampleDomainFields', () => {
 
     test('field split by derivationDataScope', () => {
         const result = _getGroupedSampleDomainFields(sampleTypeDomain, queryInfo);
-        expect(result.aliquotFields.length).toBe(1);
-        expect(result.aliquotFields[0]).toBe('aliq$c$d$s');
-        expect(result.independentFields.length).toBe(1);
-        expect(result.independentFields[0]).toBe('all$c$d$s');
-        expect(result.metaFields.length).toBe(3);
-        expect(result.metaFields[0]).toBe('name');
-        expect(result.metaFields[1]).toBe('spec char$c$d$s');
-        expect(result.metaFields[2]).toBe('parent$c$d$s');
+        expect(result.aliquotFields).toEqual(['aliq$c$d$s']);
+        expect(result.independentFields).toEqual(['all$c$d$s']);
+        expect(result.metaFields).toEqual(['name', 'spec char$c$d$s', 'parent$c$d$s']);
     });
 });

packages/components/src/internal/components/samples/actions.test.ts

@@ -153,9 +153,9 @@ export function _getGroupedSampleDomainFields(
     sampleTypeDomain: DomainDetails,
     queryInfo: QueryInfo
 ): GroupedSampleFields {
-    const metaFields = [];
-    const independentFields = [];
-    const aliquotFields = [];
+    const aliquotFields: string[] = [];
+    const independentFields: string[] = [];
+    const metaFields: string[] = [];
 
     sampleTypeDomain.domainDesign.fields.forEach(field => {
         const col = queryInfo.getColumnFromName(field.name);

packages/components/src/internal/components/samples/actions.ts

@@ -185,14 +185,14 @@ export const MEASUREMENT_UNITS: Record<string, MeasurementUnit> = {
     },
 };
 
-export function getMeasurementUnit(unitStr: string): MeasurementUnit {
+export function getMeasurementUnit(unitStr: string): MeasurementUnit | null {
     if (!unitStr) return null;
+    const unitStrLc = unitStr.toLowerCase();
 
-    const unit = MEASUREMENT_UNITS[unitStr?.toLowerCase()];
+    const unit = MEASUREMENT_UNITS[unitStrLc];
     if (unit) return unit;
 
-    const unitStrLc = unitStr.toLowerCase();
-    if (MEASUREMENT_UNITS.unit.altLabels.indexOf(unitStrLc) > -1) {
+    if (MEASUREMENT_UNITS.unit.altLabels?.indexOf(unitStrLc) > -1) {
         return {
             ...MEASUREMENT_UNITS.unit,
             label: unitStrLc,
@@ -204,11 +204,7 @@ export function getMeasurementUnit(unitStr: string): MeasurementUnit {
     return null;
 }
 
-/**
- * @param unitAStr
- * @param unitBStr
- */
-export function areUnitsCompatible(unitAStr: string, unitBStr: string) {
+export function areUnitsCompatible(unitAStr: string, unitBStr: string): boolean {
     if (unitAStr == unitBStr) {
         return true;
     }
@@ -221,19 +217,19 @@ export function areUnitsCompatible(unitAStr: string, unitBStr: string) {
     if (!unitAStr && unitBStr) {
         return false;
     }
-    const unitA: MeasurementUnit = getMeasurementUnit(unitAStr);
-    const unitB: MeasurementUnit = getMeasurementUnit(unitBStr);
+    const unitA = getMeasurementUnit(unitAStr);
+    const unitB = getMeasurementUnit(unitBStr);
     if (!unitA || !unitB) {
         return false;
     }
     return unitA.kind === unitB.kind;
 }
 
 export function getMetricUnitOptions(metricUnit?: string, showLongLabel?: boolean): { label: string; value: string }[] {
-    const unit: MeasurementUnit = getMeasurementUnit(metricUnit);
+    const unit = getMeasurementUnit(metricUnit);
 
     const options = [];
-    for (const [key, value] of Object.entries(MEASUREMENT_UNITS)) {
+    for (const value of Object.values(MEASUREMENT_UNITS)) {
         if (!unit || value.kind === unit.kind) {
             if (value.kind === UNITS_KIND.COUNT) {
                 if (showLongLabel)
@@ -274,36 +270,20 @@ export function getMetricUnitOptionsFromKind(
     return getMetricUnitOptions(metricUnit, showLongLabel);
 }
 
-export function getAltUnitKeys(unitTypeStr): string[] {
-    const unit: MeasurementUnit = getMeasurementUnit(unitTypeStr);
+export function getAltUnitKeys(unitTypeStr: string): string[] {
+    const unit = getMeasurementUnit(unitTypeStr);
     const options = [];
-    Object.values(MEASUREMENT_UNITS).forEach(value => {
+    for (const value of Object.values(MEASUREMENT_UNITS)) {
         if (!unit || value.kind === unit.kind) {
             if (value.altLabels) {
                 options.push(...value.altLabels);
             } else options.push(value.label);
         }
-    });
-
-    return options;
-}
-
-export function getVolumeMinStep(sampleTypeUnit?: MeasurementUnit | string) {
-    const step = 0.01;
-    if (!sampleTypeUnit) {
-        return step;
     }
 
-    const unit = typeof sampleTypeUnit === 'string' ? getMeasurementUnit(sampleTypeUnit) : sampleTypeUnit;
-
-    // If we don't know the units, or it is 'unit' then use the default
-    if (!unit || unit.baseUnit === MEASUREMENT_UNITS.unit.baseUnit) {
-        return step;
-    }
-
-    return Math.pow(10, -unit.displayPrecision); // Track uL and mg to a single unit
+    return options;
 }
 
-export function isMeasurementUnitIgnoreCase(expected: MeasurementUnit, val: string) {
+export function isMeasurementUnitIgnoreCase(expected: MeasurementUnit, val: string): boolean {
     return expected.label.localeCompare(val, 'en-US', { sensitivity: 'base' }) === 0;
 }