From c9102819c556ebb4fa1e9e8c5d20412ca0165d65 Mon Sep 17 00:00:00 2001 From: XingY Date: Thu, 7 Aug 2025 21:38:49 -0700 Subject: [PATCH 1/5] Adding new parent alias on designer doesn't always add the bottom of the list --- packages/components/package-lock.json | 4 ++-- packages/components/package.json | 2 +- packages/components/releaseNotes/components.md | 4 ++++ .../components/src/internal/components/entities/actions.ts | 7 ++++--- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json index f83441fe74..f6aa19544b 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "6.58.2", + "version": "6.58.3-fb-requiredLineageTest.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "6.58.2", + "version": "6.58.3-fb-requiredLineageTest.1", "license": "SEE LICENSE IN LICENSE.txt", "dependencies": { "@hello-pangea/dnd": "18.0.1", diff --git a/packages/components/package.json b/packages/components/package.json index 3062016c7f..fbb8355d30 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@labkey/components", - "version": "6.58.2", + "version": "6.58.3-fb-requiredLineageTest.1", "description": "Components, models, actions, and utility functions for LabKey applications and pages", "sideEffects": false, "files": [ diff --git a/packages/components/releaseNotes/components.md b/packages/components/releaseNotes/components.md index b8ab230c3b..b072581199 100644 --- a/packages/components/releaseNotes/components.md +++ b/packages/components/releaseNotes/components.md @@ -1,6 +1,10 @@ # @labkey/components Components, models, actions, and utility functions for LabKey applications and pages +### version 6.X +*Released*: X August 2025 +- Adding new parent alias on designer doesn't always add the bottom of the list + ### version 6.58.2 *Released*: 6 August 2025 - GitHub Issue 788: LKSM Default sample lookup for assay design should default to lookupIsValid diff --git a/packages/components/src/internal/components/entities/actions.ts b/packages/components/src/internal/components/entities/actions.ts index 63ff41442b..3a8dcf45ca 100644 --- a/packages/components/src/internal/components/entities/actions.ts +++ b/packages/components/src/internal/components/entities/actions.ts @@ -1,5 +1,5 @@ import { ActionURL, Ajax, Filter, getServerContext, PermissionTypes, Query, Security, Utils } from '@labkey/api'; -import { List, Map } from 'immutable'; +import { List, Map, OrderedMap } from 'immutable'; import { getSelected, getSelectedDataDeprecated, setSnapshotSelections } from '../../actions'; @@ -1032,7 +1032,7 @@ export const initParentOptionsSelects = ( idPrefix?: string, formatLabel?: (name: string, prefix: string, isDataClass?: boolean, containerPath?: string) => string ): Promise<{ - parentAliases: Map; + parentAliases: OrderedMap; parentOptions: IParentOption[]; }> => { const promises: Promise[] = []; @@ -1097,7 +1097,8 @@ export const initParentOptionsSelects = ( const parentOptions = allOptions.sort(naturalSortByProperty('label')); - let parentAliases = Map(); + // used ordered map so new import aliases are added after existing aliases on the UI + let parentAliases = OrderedMap(); if (importAliases) { Object.keys(importAliases).forEach(key => { From 65fa57e660e3e9ac758e3bc16a72f4f96c9fc750 Mon Sep 17 00:00:00 2001 From: XingY Date: Fri, 8 Aug 2025 20:28:02 -0700 Subject: [PATCH 2/5] merge from develop --- packages/components/releaseNotes/components.md | 2 +- .../components/src/internal/components/samples/constants.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/components/releaseNotes/components.md b/packages/components/releaseNotes/components.md index d1cdabc15c..9c9042f0d2 100644 --- a/packages/components/releaseNotes/components.md +++ b/packages/components/releaseNotes/components.md @@ -5,7 +5,7 @@ Components, models, actions, and utility functions for LabKey applications and p *Released*: X August 2025 - Adding new parent alias on designer doesn't always add the bottom of the list -### version 6.58.2 +### version 6.58.3 *Released*: 7 August 2025 - Add `StoragePositionNumber` as a sample storage column diff --git a/packages/components/src/internal/components/samples/constants.ts b/packages/components/src/internal/components/samples/constants.ts index 5874e5c2e4..e638699432 100644 --- a/packages/components/src/internal/components/samples/constants.ts +++ b/packages/components/src/internal/components/samples/constants.ts @@ -173,6 +173,7 @@ export const AMOUNT_AND_UNITS_COLUMNS_LC = AMOUNT_AND_UNITS_COLUMNS.map(col => c export const SAMPLE_STORAGE_COLUMNS = [ 'StorageLocation', + 'StoragePositionNumber', 'StorageRow', 'StorageCol', 'StorageUnit', From 00573bde7a5226cdf80b7ee7c87f0e2145f8d04c Mon Sep 17 00:00:00 2001 From: XingY Date: Fri, 8 Aug 2025 20:31:50 -0700 Subject: [PATCH 3/5] Selenium tests : Required Lineage Relationships --- packages/components/package-lock.json | 4 ++-- packages/components/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json index f6aa19544b..50367d57ba 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "6.58.3-fb-requiredLineageTest.1", + "version": "6.58.4-fb-requiredLineageTest.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "6.58.3-fb-requiredLineageTest.1", + "version": "6.58.4-fb-requiredLineageTest.2", "license": "SEE LICENSE IN LICENSE.txt", "dependencies": { "@hello-pangea/dnd": "18.0.1", diff --git a/packages/components/package.json b/packages/components/package.json index fbb8355d30..19a9754624 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@labkey/components", - "version": "6.58.3-fb-requiredLineageTest.1", + "version": "6.58.4-fb-requiredLineageTest.2", "description": "Components, models, actions, and utility functions for LabKey applications and pages", "sideEffects": false, "files": [ From 81ccabf4da218fa8d328fa8999b2c2fcb0cdf97d Mon Sep 17 00:00:00 2001 From: XingY Date: Mon, 11 Aug 2025 13:06:16 -0700 Subject: [PATCH 4/5] code review changes --- packages/components/releaseNotes/components.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/components/releaseNotes/components.md b/packages/components/releaseNotes/components.md index 9c9042f0d2..fa8cd910b9 100644 --- a/packages/components/releaseNotes/components.md +++ b/packages/components/releaseNotes/components.md @@ -3,7 +3,7 @@ Components, models, actions, and utility functions for LabKey applications and p ### version 6.X *Released*: X August 2025 -- Adding new parent alias on designer doesn't always add the bottom of the list +- Adding new parent alias on designer doesn't always add to the bottom of the list ### version 6.58.3 *Released*: 7 August 2025 From 54090614aac56782ff9a93b11a952d4caf9f7461 Mon Sep 17 00:00:00 2001 From: XingY Date: Tue, 12 Aug 2025 17:49:30 -0700 Subject: [PATCH 5/5] publish --- packages/components/package-lock.json | 4 ++-- packages/components/package.json | 2 +- packages/components/releaseNotes/components.md | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json index 50367d57ba..00d155d54e 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "6.58.4-fb-requiredLineageTest.2", + "version": "6.58.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "6.58.4-fb-requiredLineageTest.2", + "version": "6.58.4", "license": "SEE LICENSE IN LICENSE.txt", "dependencies": { "@hello-pangea/dnd": "18.0.1", diff --git a/packages/components/package.json b/packages/components/package.json index 19a9754624..d2a3b1e744 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@labkey/components", - "version": "6.58.4-fb-requiredLineageTest.2", + "version": "6.58.4", "description": "Components, models, actions, and utility functions for LabKey applications and pages", "sideEffects": false, "files": [ diff --git a/packages/components/releaseNotes/components.md b/packages/components/releaseNotes/components.md index fa8cd910b9..51d924f25f 100644 --- a/packages/components/releaseNotes/components.md +++ b/packages/components/releaseNotes/components.md @@ -1,8 +1,8 @@ # @labkey/components Components, models, actions, and utility functions for LabKey applications and pages -### version 6.X -*Released*: X August 2025 +### version 6.58.4 +*Released*: 12 August 2025 - Adding new parent alias on designer doesn't always add to the bottom of the list ### version 6.58.3