diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json index 7c223a9bf4..09afb5d0c1 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.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "7.45.2", + "version": "7.45.3-fb-genBank.4", "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..5f09d2a835 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.4", "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..e5c68622a5 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,7 +738,7 @@ export function handleEntityFileImport( if (response.success) { resolve(response); } else { - reject({ msg: response.errors._form }); + reject({ msg: response.errors?._form ?? response.exception }); } }) .catch(error => { 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;