From bfc7c31b8a040e2b04f6c23b1892f818492e4011 Mon Sep 17 00:00:00 2001 From: cnathe Date: Thu, 22 May 2025 16:02:28 -0500 Subject: [PATCH 01/17] FileInput: drop the "-fileUpload" suffix from inputId --- packages/components/releaseNotes/components.md | 5 +++++ .../src/internal/components/forms/input/FileInput.tsx | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/components/releaseNotes/components.md b/packages/components/releaseNotes/components.md index 04e2c1c741..ce99a86698 100644 --- a/packages/components/releaseNotes/components.md +++ b/packages/components/releaseNotes/components.md @@ -1,6 +1,11 @@ # @labkey/components Components, models, actions, and utility functions for LabKey applications and pages +### version TBD +*Released*: TBD +- Issue 52556: Add data-fieldkey attribute to grid header elements and input elements (part 2) + - FileInput: drop the "-fileUpload" suffix from inputId + ### version 6.43.0 *Released*: 22 May 2025 - AppURL diff --git a/packages/components/src/internal/components/forms/input/FileInput.tsx b/packages/components/src/internal/components/forms/input/FileInput.tsx index 22dccc0830..ec4e1cde5d 100644 --- a/packages/components/src/internal/components/forms/input/FileInput.tsx +++ b/packages/components/src/internal/components/forms/input/FileInput.tsx @@ -190,8 +190,7 @@ class FileInputImpl extends DisableableInput { } = this.props; const { data, file, isDisabled, isHover } = this.state; - const name = this.getInputName(); - const inputId = `${name}-fileUpload`; + const inputId = this.getInputName(); let body; if (file) { @@ -227,7 +226,7 @@ class FileInputImpl extends DisableableInput { disabled={this.state.isDisabled} type="file" className="file-upload__input" // This class makes the file input hidden - name={name} + name={inputId} id={inputId} multiple={false} onChange={this.onChange} From 9263d7b98b71156b07349e4b221b5a8e9dc7ad1c Mon Sep 17 00:00:00 2001 From: cnathe Date: Thu, 22 May 2025 16:02:40 -0500 Subject: [PATCH 02/17] 6.43.0-testFieldKey52556.0 --- 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 2e5094b18a..4c2b3ea83f 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "6.43.0", + "version": "6.43.0-testFieldKey52556.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "6.43.0", + "version": "6.43.0-testFieldKey52556.0", "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 8fbe6880a6..de258dd1e5 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@labkey/components", - "version": "6.43.0", + "version": "6.43.0-testFieldKey52556.0", "description": "Components, models, actions, and utility functions for LabKey applications and pages", "sideEffects": false, "files": [ From c83925deb5e0ec0bc6bd4c102de8fe910c294e4b Mon Sep 17 00:00:00 2001 From: cnathe Date: Fri, 23 May 2025 10:59:53 -0500 Subject: [PATCH 03/17] EntityParentType model to set fieldKeyPath in generateColumn() --- packages/components/releaseNotes/components.md | 1 + .../components/src/internal/components/entities/models.ts | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/components/releaseNotes/components.md b/packages/components/releaseNotes/components.md index ce99a86698..d74ea4bcc2 100644 --- a/packages/components/releaseNotes/components.md +++ b/packages/components/releaseNotes/components.md @@ -5,6 +5,7 @@ Components, models, actions, and utility functions for LabKey applications and p *Released*: TBD - Issue 52556: Add data-fieldkey attribute to grid header elements and input elements (part 2) - FileInput: drop the "-fileUpload" suffix from inputId + - EntityParentType model to set fieldKeyPath in generateColumn() ### version 6.43.0 *Released*: 22 May 2025 diff --git a/packages/components/src/internal/components/entities/models.ts b/packages/components/src/internal/components/entities/models.ts index bbaccb71ef..a653247950 100644 --- a/packages/components/src/internal/components/entities/models.ts +++ b/packages/components/src/internal/components/entities/models.ts @@ -100,7 +100,7 @@ export class EntityParentType extends Record({ generateFieldKey(): string { const parentInputType = this.getInputType(); - const formattedQueryName = capitalizeFirstChar(this.query); + const formattedQueryName = this.label ?? capitalizeFirstChar(this.query); // Issue 33653: query name is case-sensitive for some data inputs (sample parents), so leave it // capitalized here and we lower it where needed @@ -109,7 +109,6 @@ export class EntityParentType extends Record({ : [encodePart(parentInputType), encodePart(formattedQueryName)].join('/'); } - // TODO: We should stop generating this on the client and retrieve the actual ColumnInfo from the server generateColumn(displayColumn: string, targetSchema: string): QueryColumn { const formattedQueryName = this.label ?? capitalizeFirstChar(this.query); const parentColName = this.generateFieldKey(); @@ -136,6 +135,7 @@ export class EntityParentType extends Record({ : 'Contains ' + formattedQueryName + ' parent entities.', fieldKeyArray: [parentColName], fieldKey: parentColName, + fieldKeyPath: parentColName, // Issue 52556 lookup: new QueryLookup({ displayColumn, isPublic: true, From eb27cb2d8c4a48ce14521cbd37a7585284b851e9 Mon Sep 17 00:00:00 2001 From: cnathe Date: Fri, 23 May 2025 11:00:17 -0500 Subject: [PATCH 04/17] 6.43.0-testFieldKey52556.1 --- 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 4c2b3ea83f..a151425839 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "6.43.0-testFieldKey52556.0", + "version": "6.43.0-testFieldKey52556.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "6.43.0-testFieldKey52556.0", + "version": "6.43.0-testFieldKey52556.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 de258dd1e5..32232abc21 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@labkey/components", - "version": "6.43.0-testFieldKey52556.0", + "version": "6.43.0-testFieldKey52556.1", "description": "Components, models, actions, and utility functions for LabKey applications and pages", "sideEffects": false, "files": [ From 994b22cb1e6a8e560666c6b9e863e93f054e0cc6 Mon Sep 17 00:00:00 2001 From: cnathe Date: Mon, 26 May 2025 09:28:31 -0500 Subject: [PATCH 05/17] 6.43.2-testFieldKey52556.0 --- 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 02704005b4..6c1d5d94c0 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "6.43.2", + "version": "6.43.2-testFieldKey52556.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "6.43.2", + "version": "6.43.2-testFieldKey52556.0", "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 60bce62482..e9e53fd2c4 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@labkey/components", - "version": "6.43.2", + "version": "6.43.2-testFieldKey52556.0", "description": "Components, models, actions, and utility functions for LabKey applications and pages", "sideEffects": false, "files": [ From 956d12b928def674165fe3a69467001008ed7cdb Mon Sep 17 00:00:00 2001 From: cnathe Date: Tue, 27 May 2025 09:42:51 -0500 Subject: [PATCH 06/17] 6.43.3-testFieldKey52556.0 --- 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 4aa12aec52..fdc64d1e30 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "6.43.3", + "version": "6.43.3-testFieldKey52556.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "6.43.3", + "version": "6.43.3-testFieldKey52556.0", "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 8bfddea719..c37f3cae3a 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@labkey/components", - "version": "6.43.3", + "version": "6.43.3-testFieldKey52556.0", "description": "Components, models, actions, and utility functions for LabKey applications and pages", "sideEffects": false, "files": [ From 1e0ab270d44254902276f586a0e2b8c653d206d7 Mon Sep 17 00:00:00 2001 From: cnathe Date: Mon, 2 Jun 2025 15:21:08 -0500 Subject: [PATCH 07/17] 6.45.0-testFieldKey52556.0 --- 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 22936add2a..1cf1de437f 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "6.45.0", + "version": "6.45.0-testFieldKey52556.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "6.45.0", + "version": "6.45.0-testFieldKey52556.0", "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 a81c7e1613..abf8cc94ca 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@labkey/components", - "version": "6.45.0", + "version": "6.45.0-testFieldKey52556.0", "description": "Components, models, actions, and utility functions for LabKey applications and pages", "sideEffects": false, "files": [ From a9cb672ee87b2f5c25ed4ff5617b0fc697b77694 Mon Sep 17 00:00:00 2001 From: cnathe Date: Mon, 2 Jun 2025 15:54:58 -0500 Subject: [PATCH 08/17] EntityParentType.generateFieldKey() to use this.query directly instead of this.label or capitalizeFirstChar() --- .../src/internal/components/entities/models.test.ts | 10 ++++++---- .../src/internal/components/entities/models.ts | 11 ++++------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/packages/components/src/internal/components/entities/models.test.ts b/packages/components/src/internal/components/entities/models.test.ts index 7fd09eb2b7..e872a843ba 100644 --- a/packages/components/src/internal/components/entities/models.test.ts +++ b/packages/components/src/internal/components/entities/models.test.ts @@ -70,7 +70,7 @@ describe('EntityParentType', () => { }); test('generateColumn parentColName', () => { - let col = EntityParentType.create({ query: 'sampletype' }).generateColumn( + let col = EntityParentType.create({ query: 'Sampletype' }).generateColumn( 'Display Column', SCHEMAS.SAMPLE_SETS.SCHEMA ); @@ -102,17 +102,19 @@ describe('EntityParentType', () => { }); test('generateFieldKey', () => { - expect(EntityParentType.create({ query: 'test' }).generateFieldKey()).toBe('MaterialInputs/Test'); + expect(EntityParentType.create({ query: 'test' }).generateFieldKey()).toBe('MaterialInputs/test'); + expect(EntityParentType.create({ query: 'test,./' }).generateFieldKey()).toBe('MaterialInputs/test$C$P$S'); + expect(EntityParentType.create({ query: 'Test', label: 'TEST' }).generateFieldKey()).toBe('MaterialInputs/Test'); expect(EntityParentType.create({ query: 'test', isAliquotParent: true }).generateFieldKey()).toBe( 'AliquotedFrom' ); - expect(EntityParentType.create({ schema: SCHEMAS.DATA_CLASSES.SCHEMA, query: 'test' }).generateFieldKey()).toBe( + expect(EntityParentType.create({ schema: SCHEMAS.DATA_CLASSES.SCHEMA, query: 'Test' }).generateFieldKey()).toBe( 'DataInputs/Test' ); expect( EntityParentType.create({ schema: SCHEMAS.DATA_CLASSES.SCHEMA, - query: 'test', + query: 'Test', isAliquotParent: true, }).generateFieldKey() ).toBe('AliquotedFrom'); diff --git a/packages/components/src/internal/components/entities/models.ts b/packages/components/src/internal/components/entities/models.ts index a653247950..2a82ae69d1 100644 --- a/packages/components/src/internal/components/entities/models.ts +++ b/packages/components/src/internal/components/entities/models.ts @@ -99,18 +99,15 @@ export class EntityParentType extends Record({ } generateFieldKey(): string { - const parentInputType = this.getInputType(); - const formattedQueryName = this.label ?? capitalizeFirstChar(this.query); - // Issue 33653: query name is case-sensitive for some data inputs (sample parents), so leave it // capitalized here and we lower it where needed return this.isAliquotParent ? QueryColumn.ALIQUOTED_FROM - : [encodePart(parentInputType), encodePart(formattedQueryName)].join('/'); + : [encodePart(this.getInputType()), encodePart(this.query)].join('/'); } generateColumn(displayColumn: string, targetSchema: string): QueryColumn { - const formattedQueryName = this.label ?? capitalizeFirstChar(this.query); + const label_ = this.label ?? capitalizeFirstChar(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 @@ -129,10 +126,10 @@ export class EntityParentType extends Record({ } return new QueryColumn({ - caption: this.isAliquotParent ? QueryColumn.ALIQUOTED_FROM_CAPTION : formattedQueryName + captionSuffix, + caption: this.isAliquotParent ? QueryColumn.ALIQUOTED_FROM_CAPTION : label_ + captionSuffix, description: this.isAliquotParent ? 'The parent sample of the aliquot' - : 'Contains ' + formattedQueryName + ' parent entities.', + : 'Contains ' + label_ + ' parent entities.', fieldKeyArray: [parentColName], fieldKey: parentColName, fieldKeyPath: parentColName, // Issue 52556 From 71c982ed79d07cb9fa1e126efaf7a8df3b704f41 Mon Sep 17 00:00:00 2001 From: cnathe Date: Mon, 2 Jun 2025 15:55:53 -0500 Subject: [PATCH 09/17] 6.45.0-testFieldKey52556.1 --- 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 1cf1de437f..e1f4dde816 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "6.45.0-testFieldKey52556.0", + "version": "6.45.0-testFieldKey52556.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "6.45.0-testFieldKey52556.0", + "version": "6.45.0-testFieldKey52556.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 abf8cc94ca..bddc75b799 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@labkey/components", - "version": "6.45.0-testFieldKey52556.0", + "version": "6.45.0-testFieldKey52556.1", "description": "Components, models, actions, and utility functions for LabKey applications and pages", "sideEffects": false, "files": [ From f96b15ddb8e6febaedf568b6fe7b4e277ddb1655 Mon Sep 17 00:00:00 2001 From: cnathe Date: Mon, 2 Jun 2025 15:59:40 -0500 Subject: [PATCH 10/17] update release note --- packages/components/releaseNotes/components.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/components/releaseNotes/components.md b/packages/components/releaseNotes/components.md index cc0c2ed647..cea34e62f6 100644 --- a/packages/components/releaseNotes/components.md +++ b/packages/components/releaseNotes/components.md @@ -5,6 +5,7 @@ Components, models, actions, and utility functions for LabKey applications and p *Released*: TBD - Issue 52556: Add data-fieldkey attribute to grid header elements and input elements (part 2) - FileInput: drop the "-fileUpload" suffix from inputId + - EntityParentType model not to use capitalizeFirstChar() in generateFieldKey() - EntityParentType model to set fieldKeyPath in generateColumn() ### version 6.45.0 From ae02d10cec586f985117448e6dc953a50622335e Mon Sep 17 00:00:00 2001 From: cnathe Date: Wed, 4 Jun 2025 13:20:34 -0500 Subject: [PATCH 11/17] 6.46.0-testFieldKey52556.0 --- 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 bb00ba1497..fd85f51306 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "6.46.0", + "version": "6.46.0-testFieldKey52556.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "6.46.0", + "version": "6.46.0-testFieldKey52556.0", "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 0394d7041d..c6be6f5881 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@labkey/components", - "version": "6.46.0", + "version": "6.46.0-testFieldKey52556.0", "description": "Components, models, actions, and utility functions for LabKey applications and pages", "sideEffects": false, "files": [ From 86fab3503198fd90bf7951963512e8540c2b3864 Mon Sep 17 00:00:00 2001 From: cnathe Date: Wed, 4 Jun 2025 14:30:55 -0500 Subject: [PATCH 12/17] Remove more calls toLowerCase() when setting up EntityParentTypes - only do the toLowerCase at time of comparison --- .../src/internal/components/entities/actions.ts | 6 +++--- .../src/internal/components/entities/models.ts | 12 ++++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/packages/components/src/internal/components/entities/actions.ts b/packages/components/src/internal/components/entities/actions.ts index 88f95d943a..3bd3c1e710 100644 --- a/packages/components/src/internal/components/entities/actions.ts +++ b/packages/components/src/internal/components/entities/actions.ts @@ -300,7 +300,7 @@ function resolveSampleParentTypes( EntityParentType.create({ index, schema: 'samples', - query: sampleType?.toLowerCase(), + query: sampleType, label: sampleType, value: orderedRowIds ? List(data.sort(_getEntitySort(orderedRowIds))) @@ -364,7 +364,7 @@ async function initParents( return getSelectedParents(schemaQuery, filterArray, isAliquotParent, selectionResponse.selected); } else if (initialParents?.length > 0) { const [parent] = initialParents; - const [schema, query, value] = parseEntityParentKey(parent.toLowerCase()); + const [schema, query, value] = parseEntityParentKey(parent); // if the parent key doesn't have a value, we don't need to make the request to getSelectedParents if (value === undefined) { @@ -431,7 +431,7 @@ function resolveEntityParentTypeFromIds( EntityParentType.create({ index: 1, schema: schemaQuery.schemaName, - query: schemaQuery.queryName, + query: dataClass ?? schemaQuery.queryName, label: dataClass, value: List(data), isAliquotParent, diff --git a/packages/components/src/internal/components/entities/models.ts b/packages/components/src/internal/components/entities/models.ts index 2a82ae69d1..7167658821 100644 --- a/packages/components/src/internal/components/entities/models.ts +++ b/packages/components/src/internal/components/entities/models.ts @@ -227,12 +227,12 @@ export class EntityIdCreationModel extends Record({ static revertParentInputSchema(inputColumn: QueryColumn): SchemaQuery { if (inputColumn.isExpInput()) { - const fieldKey = inputColumn.fieldKey.toLowerCase().split('/'); + const fieldKey = inputColumn.fieldKey.split('/'); if (fieldKey.length === 2) { let schemaName: string; - if (fieldKey[0] === QueryColumn.DATA_INPUTS.toLowerCase()) { + if (fieldKey[0] === QueryColumn.DATA_INPUTS) { schemaName = SCHEMAS.DATA_CLASSES.SCHEMA; - } else if (fieldKey[0] === QueryColumn.MATERIAL_INPUTS.toLowerCase()) { + } else if (fieldKey[0] === QueryColumn.MATERIAL_INPUTS) { schemaName = SCHEMAS.SAMPLE_SETS.SCHEMA; } else { throw new Error('Invalid inputColumn fieldKey. "' + fieldKey[0] + '"'); @@ -382,7 +382,11 @@ export class EntityIdCreationModel extends Record({ selected = this.entityParents.reduce((found, parentList) => { return ( found || - parentList.find(parent => parent.schema === sq.schemaName && parent.query === sq.queryName) + parentList.find( + parent => + parent.schema === sq.schemaName && + parent.query.toLowerCase() === sq.queryName.toLowerCase() + ) ); }, undefined); } else if (col.isAliquotParent() && this.creationType === EntityCreationType.Aliquots) { From cd3ccc0ef3f89f7b2bd4e6e22c71055eaba71097 Mon Sep 17 00:00:00 2001 From: cnathe Date: Wed, 4 Jun 2025 14:31:21 -0500 Subject: [PATCH 13/17] 6.46.0-testFieldKey52556.1 --- 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 fd85f51306..1f1c2470d6 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "6.46.0-testFieldKey52556.0", + "version": "6.46.0-testFieldKey52556.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "6.46.0-testFieldKey52556.0", + "version": "6.46.0-testFieldKey52556.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 c6be6f5881..f8a3119e8b 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@labkey/components", - "version": "6.46.0-testFieldKey52556.0", + "version": "6.46.0-testFieldKey52556.1", "description": "Components, models, actions, and utility functions for LabKey applications and pages", "sideEffects": false, "files": [ From 252f963a1be1b0bd5473b5ceed2dbceb1d3f5df6 Mon Sep 17 00:00:00 2001 From: cnathe Date: Fri, 6 Jun 2025 15:36:55 -0500 Subject: [PATCH 14/17] 6.47.0-testFieldKey52556.0 --- 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 380226a46e..bcb82b60f4 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "6.47.0", + "version": "6.47.0-testFieldKey52556.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "6.47.0", + "version": "6.47.0-testFieldKey52556.0", "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 1fe3adc843..4f7131ab34 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@labkey/components", - "version": "6.47.0", + "version": "6.47.0-testFieldKey52556.0", "description": "Components, models, actions, and utility functions for LabKey applications and pages", "sideEffects": false, "files": [ From 13e7ac5dd322a4c29a30b7465ab49ebe761c55c3 Mon Sep 17 00:00:00 2001 From: cnathe Date: Mon, 9 Jun 2025 08:45:40 -0500 Subject: [PATCH 15/17] npm run lint-branch-fix --- .../src/internal/components/entities/actions.ts | 9 ++++----- .../src/internal/components/entities/models.test.ts | 4 +++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/components/src/internal/components/entities/actions.ts b/packages/components/src/internal/components/entities/actions.ts index 3bd3c1e710..85ab08f28f 100644 --- a/packages/components/src/internal/components/entities/actions.ts +++ b/packages/components/src/internal/components/entities/actions.ts @@ -945,16 +945,15 @@ export const getOriginalParentsFromLineage = async ( // filter out additional parent alias columns that's already added const additionalParentTypeSchemaQueryKeys = []; additionalParentTypes?.forEach(parentType => { - additionalParentTypeSchemaQueryKeys.push( - parentType.toString().toLowerCase() - ); + additionalParentTypeSchemaQueryKeys.push(parentType.toString().toLowerCase()); }); parentTypeOptions = parentTypeOptions.set( dataType.typeListingSchemaQuery.queryName, validParentTypeOptions .filter(option => { - const schemaQueryKey = - new SchemaQuery(option.entityDataType.instanceSchemaName, option.query).toString().toLowerCase(); + const schemaQueryKey = new SchemaQuery(option.entityDataType.instanceSchemaName, option.query) + .toString() + .toLowerCase(); return ( originalParentTypeLsids.indexOf(option.lsid) === -1 && additionalParentTypeSchemaQueryKeys.indexOf(schemaQueryKey) === -1 diff --git a/packages/components/src/internal/components/entities/models.test.ts b/packages/components/src/internal/components/entities/models.test.ts index e872a843ba..4edd0f503c 100644 --- a/packages/components/src/internal/components/entities/models.test.ts +++ b/packages/components/src/internal/components/entities/models.test.ts @@ -104,7 +104,9 @@ describe('EntityParentType', () => { test('generateFieldKey', () => { expect(EntityParentType.create({ query: 'test' }).generateFieldKey()).toBe('MaterialInputs/test'); expect(EntityParentType.create({ query: 'test,./' }).generateFieldKey()).toBe('MaterialInputs/test$C$P$S'); - expect(EntityParentType.create({ query: 'Test', label: 'TEST' }).generateFieldKey()).toBe('MaterialInputs/Test'); + expect(EntityParentType.create({ query: 'Test', label: 'TEST' }).generateFieldKey()).toBe( + 'MaterialInputs/Test' + ); expect(EntityParentType.create({ query: 'test', isAliquotParent: true }).generateFieldKey()).toBe( 'AliquotedFrom' ); From 1a9ada741f0cd5b373958da0c279ae5ae396a43c Mon Sep 17 00:00:00 2001 From: cnathe Date: Mon, 9 Jun 2025 08:46:09 -0500 Subject: [PATCH 16/17] Update release notes with version number and release date --- packages/components/releaseNotes/components.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/components/releaseNotes/components.md b/packages/components/releaseNotes/components.md index 051bbe036d..cc061bcb08 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 TBD -*Released*: TBD +### version 6.48.0 +*Released*: 9 June 2025 - Issue 52556: Add data-fieldkey attribute to grid header elements and input elements (part 2) - FileInput: drop the "-fileUpload" suffix from inputId - EntityParentType model not to use capitalizeFirstChar() in generateFieldKey() From cce5dd413e5c9b6ee64c21e1009da94251ec9087 Mon Sep 17 00:00:00 2001 From: cnathe Date: Mon, 9 Jun 2025 08:47:03 -0500 Subject: [PATCH 17/17] 6.48.0 --- 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 bcb82b60f4..27e4b39fd0 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "6.47.0-testFieldKey52556.0", + "version": "6.48.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "6.47.0-testFieldKey52556.0", + "version": "6.48.0", "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 4f7131ab34..6278ab06f5 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@labkey/components", - "version": "6.47.0-testFieldKey52556.0", + "version": "6.48.0", "description": "Components, models, actions, and utility functions for LabKey applications and pages", "sideEffects": false, "files": [