From babb619924a3becd897279809fa5d4865fb46747 Mon Sep 17 00:00:00 2001 From: XingY Date: Mon, 25 May 2026 18:08:10 -0700 Subject: [PATCH] GitHub Issue 903: Remove Cross-Container Sample and Data Class Import Feature --- packages/components/package-lock.json | 4 ++-- packages/components/package.json | 2 +- packages/components/releaseNotes/components.md | 4 ++++ .../src/internal/components/entities/models.ts | 1 - packages/test/package-lock.json | 15 +++++++++++++-- packages/test/package.json | 2 +- packages/test/src/ExperimentCrudUtils.ts | 4 ++-- 7 files changed, 23 insertions(+), 9 deletions(-) diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json index 416931ae6e..b4d5ec9098 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "7.38.0", + "version": "7.38.1-fb-dropCrossFolder.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "7.38.0", + "version": "7.38.1-fb-dropCrossFolder.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 23faf43b45..e31cab2996 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@labkey/components", - "version": "7.38.0", + "version": "7.38.1-fb-dropCrossFolder.0", "description": "Components, models, actions, and utility functions for LabKey applications and pages", "sideEffects": false, "files": [ diff --git a/packages/components/releaseNotes/components.md b/packages/components/releaseNotes/components.md index 1c04d7cf6f..df9e520754 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 7.X +*Released*: X May 2026 +- GitHub Issue 903: Remove Cross-Container Sample and Data Class Import Feature + ### version 7.38.0 *Released*: 21 May 2026 - Accessibility improvements for app pages: Keyboard Interactions diff --git a/packages/components/src/internal/components/entities/models.ts b/packages/components/src/internal/components/entities/models.ts index fc52e63d17..9907edd40d 100644 --- a/packages/components/src/internal/components/entities/models.ts +++ b/packages/components/src/internal/components/entities/models.ts @@ -479,7 +479,6 @@ export interface EntityDataType { ancestorColumnName?: string; appUrlPrefixParts?: string[]; containerFilter?: Query.ContainerFilter; - crossFolderImportForbidden?: boolean; deleteHelpLinkTopic: string; dependencyText: Function | string; descriptionPlural: string; diff --git a/packages/test/package-lock.json b/packages/test/package-lock.json index fc687e48d6..7fada0252a 100644 --- a/packages/test/package-lock.json +++ b/packages/test/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/test", - "version": "1.13.1", + "version": "1.13.2-fb-dropCrossFolder.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/test", - "version": "1.13.1", + "version": "1.13.2-fb-dropCrossFolder.1", "license": "SEE LICENSE IN LICENSE.txt", "dependencies": { "properties-reader": "3.0.1", @@ -86,6 +86,7 @@ "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@babel/code-frame": "^7.29.0", "@babel/generator": "^7.29.0", @@ -639,6 +640,7 @@ } ], "license": "MIT", + "peer": true, "engines": { "node": ">=18" }, @@ -662,6 +664,7 @@ } ], "license": "MIT", + "peer": true, "engines": { "node": ">=18" } @@ -1971,6 +1974,7 @@ "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==", "dev": true, "license": "MIT", + "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -2007,6 +2011,7 @@ "integrity": "sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -2305,6 +2310,7 @@ } ], "license": "MIT", + "peer": true, "dependencies": { "baseline-browser-mapping": "^2.10.12", "caniuse-lite": "^1.0.30001782", @@ -3897,6 +3903,7 @@ "integrity": "sha512-Yi1jqNC/Oq0N4hBgNH/YvBpP1P57QqundgytzYqy3yqAa7NZPNjSoi4SGbRAXDMdBzNE6xBCi5U7RgfrvMEUVQ==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@jest/core": "30.4.2", "@jest/types": "30.4.1", @@ -4541,6 +4548,7 @@ "integrity": "sha512-Cvc9WUhxSMEo4McES3P7oK3QaXldCfNWp7pl2NNeiIFlCoLr3kfq9kb1fxftiwk1FLV7CvpvDfonxtzUDeSOPg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "cssstyle": "^4.2.1", "data-urls": "^5.0.0", @@ -5163,6 +5171,7 @@ "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=12" }, @@ -6415,6 +6424,7 @@ "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", "dev": true, "license": "Apache-2.0", + "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -6578,6 +6588,7 @@ "integrity": "sha512-wGN3qcrBQIFmQ/c0AiOAQBvrZ5lmY8vbbMv4Mxfgzqd/B6+9pXtLo73WuS1dSGXM5QYY3hZnIbvx+K1xxe6FyA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@types/eslint-scope": "^3.7.7", "@types/estree": "^1.0.8", diff --git a/packages/test/package.json b/packages/test/package.json index d79ed21d8c..bdd19d310a 100644 --- a/packages/test/package.json +++ b/packages/test/package.json @@ -1,6 +1,6 @@ { "name": "@labkey/test", - "version": "1.13.1", + "version": "1.13.2-fb-dropCrossFolder.1", "description": "Configurations and utilities for JavaScript-based testing", "main": "dist/test.js", "module": "dist/test.js", diff --git a/packages/test/src/ExperimentCrudUtils.ts b/packages/test/src/ExperimentCrudUtils.ts index 900f5fb2a5..2512905c63 100644 --- a/packages/test/src/ExperimentCrudUtils.ts +++ b/packages/test/src/ExperimentCrudUtils.ts @@ -107,7 +107,7 @@ export async function importData(server, importText: string, queryName: string, let errorResp = null; const response = await server.request('experiment', isSamples ? 'importSamples' : 'importData', (agent, url) => { return agent - .post(url + '?auditBehavior=DETAILED&crossFolderImport=true') + .post(url + '?auditBehavior=DETAILED') .type('form') .send({ schemaName: isSamples ? 'samples' : 'exp.data', @@ -210,7 +210,7 @@ export async function importCrossTypeData( isSamples ? 'importSamples' : 'importData', (agent, url) => { return agent - .post(url + '?auditBehavior=DETAILED&crossFolderImport=true&crossTypeImport=true') + .post(url + '?auditBehavior=DETAILED&crossTypeImport=true') .type('form') .send({ schemaName: undefined,