diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json index 7e34f8a3b8..4d175abe8e 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "6.10.0", + "version": "6.10.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "6.10.0", + "version": "6.10.1", "license": "SEE LICENSE IN LICENSE.txt", "dependencies": { "@hello-pangea/dnd": "17.0.0", diff --git a/packages/components/package.json b/packages/components/package.json index fb9982a827..d1fc93aab8 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@labkey/components", - "version": "6.10.0", + "version": "6.10.1", "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 79e07a259b..874b040597 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 6.10.1 +*Released*: 3 January 2025 +- Fix cross folder import templates + ### version 6.10.0 *Released*: 30 December 2024 - Customizable File Templates for Sources, Sample Types & Assay Designs diff --git a/packages/components/src/public/files/TemplateDownloadButton.tsx b/packages/components/src/public/files/TemplateDownloadButton.tsx index fa20382f17..1bb7264643 100644 --- a/packages/components/src/public/files/TemplateDownloadButton.tsx +++ b/packages/components/src/public/files/TemplateDownloadButton.tsx @@ -11,6 +11,8 @@ import { SchemaQuery } from '../SchemaQuery'; import { useAppContext } from '../../internal/AppContext'; import { downloadAttachment } from '../../internal/util/utils'; import { DisableableMenuItem } from '../../internal/components/samples/DisableableMenuItem'; +import { useServerContext } from '../../internal/components/base/ServerContext'; +import { getAppHomeFolderPath } from '../../internal/app/utils'; interface Props { className?: string; @@ -36,6 +38,9 @@ export const TemplateDownloadButton: FC = memo(props => { } = props; const [customTemplates, setCustomTemplates] = useState(); const [loadingTemplates, setLoadingTemplates] = useState(false); + const { container, moduleContext } = useServerContext(); + const homeFolderPath = getAppHomeFolderPath(container, moduleContext); + const { api } = useAppContext(); useEffect(() => { @@ -52,6 +57,7 @@ export const TemplateDownloadButton: FC = memo(props => { const queryInfo = await api.query.getQueryDetails({ schemaName: schemaQuery.schemaName, queryName: schemaQuery.queryName, + containerPath: homeFolderPath }); const customTemplates_ = queryInfo.getCustomTemplates(); setCustomTemplates(customTemplates_); @@ -61,7 +67,7 @@ export const TemplateDownloadButton: FC = memo(props => { } finally { setLoadingTemplates(false); } - }, [schemaQuery, setLoadingTemplates, setCustomTemplates]); + }, [schemaQuery, setLoadingTemplates, setCustomTemplates, homeFolderPath]); const showDropdown = useMemo(() => { return customTemplates?.length > 0 || (isGridRenderer && !customTemplates);