From 6d4f363808e946393da78d2686311fca0a39135a Mon Sep 17 00:00:00 2001 From: cnathe Date: Fri, 26 Dec 2025 09:14:02 -0600 Subject: [PATCH 1/7] Copy folder access settings when copying freezers and assay designs --- packages/components/releaseNotes/components.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/components/releaseNotes/components.md b/packages/components/releaseNotes/components.md index ed811ff4de..fa74a66b24 100644 --- a/packages/components/releaseNotes/components.md +++ b/packages/components/releaseNotes/components.md @@ -1,6 +1,12 @@ # @labkey/components Components, models, actions, and utility functions for LabKey applications and pages +### version TBD +*Released*: TBD +- Copy folder access settings when copying freezers and assay designs + - GitHub Issue #284: Freezer copy + - GitHub Issue #305: Assay design copy + ### version 7.5.1 *Released*: 24 December 2025 - Add `displaySelectedOptions` prop and respect setting when passing `selectedOptions` to the underlying `SelectInput` From dd14274b9eda895dd4a76a350de6207489319dbc Mon Sep 17 00:00:00 2001 From: cnathe Date: Fri, 26 Dec 2025 09:14:36 -0600 Subject: [PATCH 2/7] GitHub Issue #305: Assay design initProtocolId prop to track the assay design protocolId being copied --- .../components/domainproperties/assay/AssayDesignerPanels.tsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/components/src/internal/components/domainproperties/assay/AssayDesignerPanels.tsx b/packages/components/src/internal/components/domainproperties/assay/AssayDesignerPanels.tsx index 1d4ebdf723..6868ad5e86 100644 --- a/packages/components/src/internal/components/domainproperties/assay/AssayDesignerPanels.tsx +++ b/packages/components/src/internal/components/domainproperties/assay/AssayDesignerPanels.tsx @@ -163,6 +163,7 @@ export interface AssayDesignerPanelsProps { hideAdvancedProperties?: boolean; hideEmptyBatchDomain?: boolean; initModel: AssayProtocolModel; + initProtocolId?: number; // used for copy assay design since initModel will not have the protocolId in that case onCancel: () => void; onChange?: (model: AssayProtocolModel) => void; onComplete: (model: AssayProtocolModel) => void; @@ -392,6 +393,7 @@ export class AssayDesignerPanelsImpl extends React.PureComponent { appPropertiesOnly, hideAdvancedProperties, initModel, + initProtocolId, domainFormDisplayOptions, currentPanelIndex, validatePanel, @@ -475,6 +477,7 @@ export class AssayDesignerPanelsImpl extends React.PureComponent { {appPropertiesOnly && allowFolderExclusion && ( Date: Fri, 26 Dec 2025 09:15:04 -0600 Subject: [PATCH 3/7] DataTypeFoldersPanel dataTypeCopyId prop --- .../domainproperties/DataTypeFoldersPanel.tsx | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/packages/components/src/internal/components/domainproperties/DataTypeFoldersPanel.tsx b/packages/components/src/internal/components/domainproperties/DataTypeFoldersPanel.tsx index 34c65f8832..a0d652c677 100644 --- a/packages/components/src/internal/components/domainproperties/DataTypeFoldersPanel.tsx +++ b/packages/components/src/internal/components/domainproperties/DataTypeFoldersPanel.tsx @@ -21,6 +21,7 @@ import { } from './DomainPropertiesPanelCollapse'; interface OwnProps { + dataTypeCopyId?: number; // RowId for the data type being copied, if applicable dataTypeName?: string; dataTypeRowId?: number; entityDataType: EntityDataType; @@ -35,6 +36,7 @@ export const DataTypeFoldersPanelImpl: FC(); const [excludedContainerIds, setExcludedContainerIds] = useState(); const [relatedExcludedContainerIdsDB, setRelatedExcludedContainerIdsDB] = useState(); + const copy = !!dataTypeCopyId && !dataTypeRowId; + const isNewEntity = !dataTypeRowId && !copy; useEffect( () => { @@ -62,6 +66,7 @@ export const DataTypeFoldersPanelImpl: FC { return { @@ -77,10 +82,13 @@ export const DataTypeFoldersPanelImpl: FC @@ -194,7 +202,7 @@ export const DataTypeFoldersPanelImpl: FC @@ -208,7 +216,7 @@ export const DataTypeFoldersPanelImpl: FC From ee84ebae0170a48d647f9135b1cd1c24da1749c6 Mon Sep 17 00:00:00 2001 From: cnathe Date: Fri, 26 Dec 2025 09:16:16 -0600 Subject: [PATCH 4/7] 7.5.2-fb-copyFolderSettings.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 26bd5b2471..dbb0b4acda 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "7.5.1", + "version": "7.5.2-fb-copyFolderSettings.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "7.5.1", + "version": "7.5.2-fb-copyFolderSettings.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 292f9e7eba..865521367b 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@labkey/components", - "version": "7.5.1", + "version": "7.5.2-fb-copyFolderSettings.0", "description": "Components, models, actions, and utility functions for LabKey applications and pages", "sideEffects": false, "files": [ From a95d80e5e1c6eb9f012cdda771562478a766a7e2 Mon Sep 17 00:00:00 2001 From: cnathe Date: Mon, 29 Dec 2025 09:10:17 -0600 Subject: [PATCH 5/7] npm run lint-branch-fix --- .../domainproperties/DataTypeFoldersPanel.tsx | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/components/src/internal/components/domainproperties/DataTypeFoldersPanel.tsx b/packages/components/src/internal/components/domainproperties/DataTypeFoldersPanel.tsx index a0d652c677..97f60deb34 100644 --- a/packages/components/src/internal/components/domainproperties/DataTypeFoldersPanel.tsx +++ b/packages/components/src/internal/components/domainproperties/DataTypeFoldersPanel.tsx @@ -31,7 +31,7 @@ interface OwnProps { } // export for jest testing -export const DataTypeFoldersPanelImpl: FC = memo(props => { +export const DataTypeFoldersPanelImpl: FC = memo(props => { const { collapsed, togglePanel, @@ -146,19 +146,19 @@ export const DataTypeFoldersPanelImpl: FC
Select which folders can use this {entityDataType.typeNounSingular.toLowerCase()}. @@ -177,17 +177,17 @@ export const DataTypeFoldersPanelImpl: FC
)} @@ -195,29 +195,29 @@ export const DataTypeFoldersPanelImpl: FC
From dc15c3ba9c52cdcdebbe94d973b67c7b6a21f7d9 Mon Sep 17 00:00:00 2001 From: cnathe Date: Mon, 29 Dec 2025 09:11:10 -0600 Subject: [PATCH 6/7] 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 fa74a66b24..1fa4dd8131 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 7.6.0 +*Released*: 29 December 2025 - Copy folder access settings when copying freezers and assay designs - GitHub Issue #284: Freezer copy - GitHub Issue #305: Assay design copy From 8de73440c2bc5e2df07a6db8b3f52b4885dfc9b4 Mon Sep 17 00:00:00 2001 From: cnathe Date: Mon, 29 Dec 2025 09:12:06 -0600 Subject: [PATCH 7/7] 7.6.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 dbb0b4acda..f097a92582 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "7.5.2-fb-copyFolderSettings.0", + "version": "7.6.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "7.5.2-fb-copyFolderSettings.0", + "version": "7.6.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 865521367b..13dff1eef2 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@labkey/components", - "version": "7.5.2-fb-copyFolderSettings.0", + "version": "7.6.0", "description": "Components, models, actions, and utility functions for LabKey applications and pages", "sideEffects": false, "files": [