From 0de34f846344922a2bf01f0d46ae41283ecfdb26 Mon Sep 17 00:00:00 2001 From: alanv Date: Mon, 4 Nov 2024 14:18:28 -0600 Subject: [PATCH] extractEntityTypeOptionFromRow: remove lowerCaseValue arg - It was always true --- .../src/internal/components/entities/actions.test.ts | 11 +---------- .../src/internal/components/entities/actions.ts | 5 ++--- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/packages/components/src/internal/components/entities/actions.test.ts b/packages/components/src/internal/components/entities/actions.test.ts index 7cf4720e04..9d49d5c546 100644 --- a/packages/components/src/internal/components/entities/actions.test.ts +++ b/packages/components/src/internal/components/entities/actions.test.ts @@ -12,7 +12,7 @@ describe('extractEntityTypeOptionFromRow', () => { LSID: { value: 'ABC123' }, }; - test('lowerCaseValue = true', () => { + test('return value as expected', () => { const options = extractEntityTypeOptionFromRow(ROW); expect(options.label).toBe(NAME); expect(options.lsid).toBe('ABC123'); @@ -20,15 +20,6 @@ describe('extractEntityTypeOptionFromRow', () => { expect(options.value).toBe(NAME.toLowerCase()); expect(options.query).toBe(NAME); }); - - test('lowerCaseValue = false', () => { - const options = extractEntityTypeOptionFromRow(ROW, false); - expect(options.label).toBe(NAME); - expect(options.lsid).toBe('ABC123'); - expect(options.rowId).toBe(1); - expect(options.value).toBe(NAME); - expect(options.query).toBe(NAME); - }); }); describe('getChosenParentData', () => { diff --git a/packages/components/src/internal/components/entities/actions.ts b/packages/components/src/internal/components/entities/actions.ts index 650fa9221a..861633a678 100644 --- a/packages/components/src/internal/components/entities/actions.ts +++ b/packages/components/src/internal/components/entities/actions.ts @@ -434,7 +434,6 @@ function resolveEntityParentTypeFromIds( // export for jest export function extractEntityTypeOptionFromRow( row: Row, - lowerCaseValue = true, entityDataType?: EntityDataType, requiredParentTypes?: string[] ): IEntityTypeOption { @@ -447,7 +446,7 @@ export function extractEntityTypeOptionFromRow( label: name, lsid: caseInsensitive(row, 'LSID').value, rowId: caseInsensitive(row, 'RowId').value, - value: lowerCaseValue ? name.toLowerCase() : name, // we match values on lower case because (at least) when parsed from an id they are lower case + value: name.toLowerCase(), // we match values on lower case because (at least) when parsed from an id they are lower case query: name, entityDataType, isFromSharedContainer: caseInsensitive(row, 'Folder/Path')?.value === SHARED_CONTAINER_PATH, @@ -551,7 +550,7 @@ export async function getEntityTypeOptions( const options: IEntityTypeOption[] = result.rows .map(row => ({ - ...extractEntityTypeOptionFromRow(row, true, entityDataType, requiredParentTypes), + ...extractEntityTypeOptionFromRow(row, entityDataType, requiredParentTypes), schema: instanceSchemaName, // e.g. "samples" or "dataclasses" })) .sort(naturalSortByProperty('label'));