From 9c9cc390a4656289414eecbdf7e06ba6348639e5 Mon Sep 17 00:00:00 2001 From: cnathe Date: Fri, 13 Jun 2025 10:19:19 -0500 Subject: [PATCH 1/5] GitHub Issue 748: "View Assay Results for Selected" gives error when no rows have sample IDs --- packages/components/releaseNotes/components.md | 4 ++++ .../src/internal/components/samples/actions.ts | 10 +++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/packages/components/releaseNotes/components.md b/packages/components/releaseNotes/components.md index 5bafcde549..e47c245d5f 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 TBD +*Released*: TBD +- GitHub Issue 748: "View Assay Results for Selected" gives error when no rows have sample IDs + ### version 6.49.0 *Released*: 11 June 2025 - Remove SOURCE_TYPE_KEY constant diff --git a/packages/components/src/internal/components/samples/actions.ts b/packages/components/src/internal/components/samples/actions.ts index 3a75d82308..aac8abf8ff 100644 --- a/packages/components/src/internal/components/samples/actions.ts +++ b/packages/components/src/internal/components/samples/actions.ts @@ -445,6 +445,12 @@ export async function createSessionAssayRunSummaryQuery(sampleIds: number[]): Pr assayRunsQuery = 'AssayRunsPerSampleChildFolder'; } + // GitHub Issue 748: need to account for the case with no sampleIds + let whereClause = 'WHERE RowId IN (' + sampleIds.join(',') + ')\n'; + if (sampleIds.length === 0) { + whereClause = 'WHERE 1 = 0\n'; // add where clause that will always result in zero rows + } + return await selectRowsDeprecated({ saveInSession: true, schemaName: 'exp', @@ -453,9 +459,7 @@ export async function createSessionAssayRunSummaryQuery(sampleIds: number[]): Pr "FROM (SELECT RowId, SampleID, SampleType, Assay || ' Run Count' AS Assay FROM " + assayRunsQuery + ') X\n' + - 'WHERE RowId IN (' + - sampleIds.join(',') + - ')\n' + + whereClause + 'GROUP BY RowId, SampleID, SampleType, Assay\n' + 'PIVOT RunCount BY Assay', maxRows: 0, // we don't need any data back here, we just need to get the temp session schema/query From e0df6205be1e83095176489525280ddaf9009f32 Mon Sep 17 00:00:00 2001 From: cnathe Date: Fri, 13 Jun 2025 10:19:52 -0500 Subject: [PATCH 2/5] 6.49.0-cory257fixes.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 4022c0250a..cec5b121d8 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "6.49.0", + "version": "6.49.0-cory257fixes.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "6.49.0", + "version": "6.49.0-cory257fixes.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 abe9893552..cb6ba63153 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@labkey/components", - "version": "6.49.0", + "version": "6.49.0-cory257fixes.0", "description": "Components, models, actions, and utility functions for LabKey applications and pages", "sideEffects": false, "files": [ From 8a14dab233f409e307f6e578a0ff38b32025f143 Mon Sep 17 00:00:00 2001 From: cnathe Date: Mon, 16 Jun 2025 13:58:11 -0500 Subject: [PATCH 3/5] 6.49.1-cory257fixes.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 4227c7a3a6..8d7e63cbec 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "6.49.1", + "version": "6.49.1-cory257fixes.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "6.49.1", + "version": "6.49.1-cory257fixes.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 166545bde5..22bc88b5da 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@labkey/components", - "version": "6.49.1", + "version": "6.49.1-cory257fixes.0", "description": "Components, models, actions, and utility functions for LabKey applications and pages", "sideEffects": false, "files": [ From 1c75dd91aaf2277e26ced337df2df7dd8da6eed5 Mon Sep 17 00:00:00 2001 From: cnathe Date: Tue, 17 Jun 2025 12:03:08 -0500 Subject: [PATCH 4/5] 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 bfbbbbb3c7..54c727946f 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.49.2 +*Released*: 17 June 2025 - GitHub Issue 748: "View Assay Results for Selected" gives error when no rows have sample IDs ### version 6.49.1 From 805931ffc4ee90d5a37517b2b8963f88be91a137 Mon Sep 17 00:00:00 2001 From: cnathe Date: Tue, 17 Jun 2025 12:03:18 -0500 Subject: [PATCH 5/5] 6.49.2 --- 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 8d7e63cbec..a8dc6feba5 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "6.49.1-cory257fixes.0", + "version": "6.49.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "6.49.1-cory257fixes.0", + "version": "6.49.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 22bc88b5da..492aa0f364 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@labkey/components", - "version": "6.49.1-cory257fixes.0", + "version": "6.49.2", "description": "Components, models, actions, and utility functions for LabKey applications and pages", "sideEffects": false, "files": [