From f49a76ad66ba34c952adb7e6ee2c615f5574a6df Mon Sep 17 00:00:00 2001 From: XingY Date: Tue, 30 Jun 2026 14:13:10 -0700 Subject: [PATCH 1/6] Multi genbank/fasta import --- packages/components/package-lock.json | 12 ++++++------ packages/components/package.json | 4 ++-- .../src/internal/components/entities/APIWrapper.ts | 2 +- .../src/internal/components/entities/actions.ts | 7 ++++--- packages/components/src/internal/query/api.ts | 2 +- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json index 7c223a9bf4..19bc398324 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,16 +1,16 @@ { "name": "@labkey/components", - "version": "7.45.2", + "version": "7.45.3-fb-genBank.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "7.45.2", + "version": "7.45.3-fb-genBank.0", "license": "SEE LICENSE IN LICENSE.txt", "dependencies": { "@hello-pangea/dnd": "18.0.1", - "@labkey/api": "1.51.5", + "@labkey/api": "1.51.6-fb-genBank.1", "@testing-library/dom": "~10.4.1", "@testing-library/jest-dom": "~6.9.1", "@testing-library/react": "~16.3.2", @@ -3775,9 +3775,9 @@ } }, "node_modules/@labkey/api": { - "version": "1.51.5", - "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/api/-/@labkey/api-1.51.5.tgz", - "integrity": "sha512-F7qo6roSBTqeh68Z4yWwel/AAWvt620SSVdCQauKBYjHRJao/Z29gOKWEQ7lWy0E66avDwBOVzpBZq8syhvP0g==", + "version": "1.51.6-fb-genBank.1", + "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/api/-/@labkey/api-1.51.6-fb-genBank.1.tgz", + "integrity": "sha512-xNOyseCilHQfo39k5PflztEgCddOsdNzp/HVAT6qrFN4nRA20ivGAfP7F7wVMi2O46AzeCjBAPfHmKRbC2D/pQ==", "license": "Apache-2.0" }, "node_modules/@labkey/build": { diff --git a/packages/components/package.json b/packages/components/package.json index 61c93c2765..e40e41f55e 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@labkey/components", - "version": "7.45.2", + "version": "7.45.3-fb-genBank.0", "description": "Components, models, actions, and utility functions for LabKey applications and pages", "sideEffects": false, "files": [ @@ -48,7 +48,7 @@ "homepage": "https://github.com/LabKey/labkey-ui-components#readme", "dependencies": { "@hello-pangea/dnd": "18.0.1", - "@labkey/api": "1.51.5", + "@labkey/api": "1.51.6-fb-genBank.1", "@testing-library/dom": "~10.4.1", "@testing-library/jest-dom": "~6.9.1", "@testing-library/react": "~16.3.2", diff --git a/packages/components/src/internal/components/entities/APIWrapper.ts b/packages/components/src/internal/components/entities/APIWrapper.ts index 72ca9c6fe7..8b1719165a 100644 --- a/packages/components/src/internal/components/entities/APIWrapper.ts +++ b/packages/components/src/internal/components/entities/APIWrapper.ts @@ -106,7 +106,7 @@ export interface EntityAPIWrapper { handleEntityFileImport: ( importAction: string, queryInfo: QueryInfo, - file: File, + file: File | File[], insertOption: InsertOptions, useAsync: boolean, importParameters?: Record, diff --git a/packages/components/src/internal/components/entities/actions.ts b/packages/components/src/internal/components/entities/actions.ts index df9edbcd90..20c2643a38 100644 --- a/packages/components/src/internal/components/entities/actions.ts +++ b/packages/components/src/internal/components/entities/actions.ts @@ -711,7 +711,7 @@ export async function deleteEntityType( export function handleEntityFileImport( importAction: string, queryInfo: QueryInfo, - file: File, + file: File | File[], insertOption: InsertOptions, useAsync: boolean, importParameters?: Record, @@ -738,12 +738,13 @@ export function handleEntityFileImport( if (response.success) { resolve(response); } else { - reject({ msg: response.errors._form }); + reject({ msg: response.errors?._form ?? response.exception, fileErrors: response.fileErrors }); } }) .catch(error => { console.error(error); - reject({ msg: error.exception }); + // Propagate per-file errors from the bulk sequence import so the UI can render them. + reject({ msg: error.exception, fileErrors: error.fileErrors }); }); }); } diff --git a/packages/components/src/internal/query/api.ts b/packages/components/src/internal/query/api.ts index d325671163..4106febd1d 100644 --- a/packages/components/src/internal/query/api.ts +++ b/packages/components/src/internal/query/api.ts @@ -1126,7 +1126,7 @@ export enum InsertFormats { export interface IImportData { auditUserComment?: string; - file?: File; + file?: File | File[]; // must contain file or text but not both format?: InsertFormats; importLookupByAlternateKey?: boolean; From a4f34ca6233cb53c4c9715a778e48d2d957b815b Mon Sep 17 00:00:00 2001 From: XingY Date: Wed, 1 Jul 2026 11:44:41 -0700 Subject: [PATCH 2/6] fix build --- 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 19bc398324..7c08798772 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "7.45.3-fb-genBank.0", + "version": "7.45.3-fb-genBank.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "7.45.3-fb-genBank.0", + "version": "7.45.3-fb-genBank.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 e40e41f55e..6dc49f1f77 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@labkey/components", - "version": "7.45.3-fb-genBank.0", + "version": "7.45.3-fb-genBank.1", "description": "Components, models, actions, and utility functions for LabKey applications and pages", "sideEffects": false, "files": [ From 45179a40babb857927a7673e6d44d929f0ebe694 Mon Sep 17 00:00:00 2001 From: XingY Date: Wed, 1 Jul 2026 16:53:48 -0700 Subject: [PATCH 3/6] merge from develop --- 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 7c08798772..0915bf043c 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "7.45.3-fb-genBank.1", + "version": "7.45.3-fb-genBank.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "7.45.3-fb-genBank.1", + "version": "7.45.3-fb-genBank.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 6dc49f1f77..d1f094773d 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@labkey/components", - "version": "7.45.3-fb-genBank.1", + "version": "7.45.3-fb-genBank.2", "description": "Components, models, actions, and utility functions for LabKey applications and pages", "sideEffects": false, "files": [ From af0c845be6a392500d0b117535aaac2d82214310 Mon Sep 17 00:00:00 2001 From: XingY Date: Mon, 6 Jul 2026 12:46:12 -0700 Subject: [PATCH 4/6] clean --- 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 0915bf043c..9cf4e02fbd 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "7.45.3-fb-genBank.2", + "version": "7.45.3-fb-genBank.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "7.45.3-fb-genBank.2", + "version": "7.45.3-fb-genBank.3", "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 d1f094773d..3c072aec93 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@labkey/components", - "version": "7.45.3-fb-genBank.2", + "version": "7.45.3-fb-genBank.3", "description": "Components, models, actions, and utility functions for LabKey applications and pages", "sideEffects": false, "files": [ From c7122da36b2d3a509b65ae1afe452c85039ce47b Mon Sep 17 00:00:00 2001 From: XingY Date: Tue, 7 Jul 2026 09:36:18 -0700 Subject: [PATCH 5/6] update package --- 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 9cf4e02fbd..09afb5d0c1 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "7.45.3-fb-genBank.3", + "version": "7.45.3-fb-genBank.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "7.45.3-fb-genBank.3", + "version": "7.45.3-fb-genBank.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 3c072aec93..5f09d2a835 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@labkey/components", - "version": "7.45.3-fb-genBank.3", + "version": "7.45.3-fb-genBank.4", "description": "Components, models, actions, and utility functions for LabKey applications and pages", "sideEffects": false, "files": [ From bd367f724586135d9c5d5d4b1de50b9a6ecac468 Mon Sep 17 00:00:00 2001 From: XingY Date: Tue, 7 Jul 2026 13:38:59 -0700 Subject: [PATCH 6/6] simplify import error --- .../components/src/internal/components/entities/actions.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/components/src/internal/components/entities/actions.ts b/packages/components/src/internal/components/entities/actions.ts index 20c2643a38..e5c68622a5 100644 --- a/packages/components/src/internal/components/entities/actions.ts +++ b/packages/components/src/internal/components/entities/actions.ts @@ -738,13 +738,12 @@ export function handleEntityFileImport( if (response.success) { resolve(response); } else { - reject({ msg: response.errors?._form ?? response.exception, fileErrors: response.fileErrors }); + reject({ msg: response.errors?._form ?? response.exception }); } }) .catch(error => { console.error(error); - // Propagate per-file errors from the bulk sequence import so the UI can render them. - reject({ msg: error.exception, fileErrors: error.fileErrors }); + reject({ msg: error.exception }); }); }); }