@webiny/app-aco 6.4.6 → 6.4.7-beta.0

package/components/FolderTree/List/List.js

@@ -73,13 +73,21 @@ const List = ({ folders, folderActions, onFolderClick, focusedFolderId, hiddenFo
             const { dragSourceId, dropTargetId } = options;
             const folder = folders.find((f)=>f.id === dragSourceId);
             const targetFolder = folders.find((f)=>f.id === dropTargetId);
-            if (!folder || !targetFolder) return;
-            showConfirmMoveFolderDialog({
-                folder,
-                targetFolder,
-                onAccept: runDrop
+            if (!folder || !targetFolder) throw new Error("Folder not found");
+            await new Promise((resolve, reject)=>{
+                showConfirmMoveFolderDialog({
+                    folder,
+                    targetFolder,
+                    onAccept: async ()=>{
+                        await runDrop();
+                        resolve();
+                    },
+                    onClose: ()=>{
+                        reject(new Error("cancelled"));
+                    }
+                });
             });
-        } else await runDrop();
+        } else runDrop();
     }, [
         folders,
         dropConfirmation,

package/components/FolderTree/List/List.js.map

@@ -1 +1 @@
-{"version":3,"file":"components/FolderTree/List/List.js","sources":["../../../../src/components/FolderTree/List/List.tsx"],"sourcesContent":["import React, { useCallback, useEffect, useMemo, useState } from \"react\";\nimport {\n    Tree,\n    type NodeDto,\n    type TreeProps,\n    type WithDefaultNodeData,\n    type DropOptions\n} from \"@webiny/admin-ui\";\nimport { useSnackbar } from \"@webiny/app-admin\";\nimport type { FolderDto } from \"~/domain/folder/FolderDto.js\";\nimport { useGetFolderLevelPermission } from \"~/features/folders/getFolderLevelPermission/index.js\";\nimport { useListFoldersByParentIds } from \"~/features/folders/listFoldersByParentIds/index.js\";\nimport { useGetFolderAncestors } from \"~/features/folders/getFolderAncestors/index.js\";\nimport { useUpdateFolder } from \"~/features/folders/updateFolder/index.js\";\nimport { Node } from \"../Node/index.js\";\nimport { createInitialOpenList, createTreeData } from \"./utils.js\";\nimport { ROOT_FOLDER } from \"~/constants.js\";\nimport { FolderProvider } from \"~/contexts/folder.js\";\nimport { useConfirmMoveFolderDialog } from \"~/dialogs/index.js\";\nimport type { FolderActionConfig } from \"~/config/AcoConfig.js\";\n\ninterface ListProps {\n    folders: FolderDto[];\n    folderActions: FolderActionConfig[];\n    dropConfirmation?: boolean;\n    focusedFolderId?: string;\n    hiddenFolderIds?: string[];\n    enableActions?: boolean;\n    onFolderClick: (data: FolderDto) => void;\n}\n\nexport const List = ({\n    folders,\n    folderActions,\n    onFolderClick,\n    focusedFolderId,\n    hiddenFolderIds,\n    enableActions,\n    dropConfirmation = false\n}: ListProps) => {\n    const { listFoldersByParentIds, loading } = useListFoldersByParentIds();\n    const { updateFolder } = useUpdateFolder();\n    const { getFolderLevelPermission: canManageStructure } =\n        useGetFolderLevelPermission(\"canManageStructure\");\n    const { getFolderAncestors } = useGetFolderAncestors();\n    const { showSnackbar } = useSnackbar();\n\n    const [treeData, setTreeData] = useState<NodeDto<FolderDto>[]>([]);\n    const [openFolderIds, setOpenFolderIds] = useState<string[]>([ROOT_FOLDER]);\n    const { showDialog: showConfirmMoveFolderDialog } = useConfirmMoveFolderDialog();\n\n    useEffect(() => {\n        setTreeData(createTreeData(folders, focusedFolderId, hiddenFolderIds));\n    }, [folders, focusedFolderId, hiddenFolderIds]);\n\n    useEffect(() => {\n        setOpenFolderIds(prev => {\n            const expanded = createInitialOpenList(folders, prev, focusedFolderId);\n            return [...new Set([ROOT_FOLDER, ...expanded])];\n        });\n    }, [focusedFolderId, folders, setOpenFolderIds]);\n\n    const handleChangeOpen: TreeProps[\"onChangeOpen\"] = async nodes => {\n        const folderIds = nodes.map(node => node.id);\n        const updatedOpenIds = [...new Set([ROOT_FOLDER, ...folderIds])];\n        setOpenFolderIds(updatedOpenIds);\n\n        const fetchableIds = folderIds.filter(id => id !== ROOT_FOLDER && id !== \"0\");\n        await listFoldersByParentIds(fetchableIds);\n    };\n\n    const handleDrop: TreeProps[\"onDrop\"] = async (_, { dragSourceId, dropTargetId }) => {\n        try {\n            const item = folders.find(folder => folder.id === dragSourceId);\n            if (!item) {\n                throw new Error(\"Folder not found!\");\n            }\n\n            await updateFolder({\n                ...item,\n                parentId: dropTargetId !== ROOT_FOLDER ? (dropTargetId as string) : null\n            });\n        } catch (error) {\n            showSnackbar(error.message);\n        }\n    };\n\n    const onDrop = useCallback<NonNullable<TreeProps[\"onDrop\"]>>(\n        async (newTree, options: DropOptions) => {\n            // Function to execute the drop logic\n            const runDrop = async () => handleDrop(newTree, options);\n\n            // If drop confirmation is enabled, show dialog before proceeding\n            if (dropConfirmation) {\n                const { dragSourceId, dropTargetId } = options;\n                const folder = folders.find(f => f.id === dragSourceId);\n                const targetFolder = folders.find(f => f.id === dropTargetId);\n\n                // Abort if either folder is not found\n                if (!folder || !targetFolder) {\n                    return;\n                }\n\n                showConfirmMoveFolderDialog({\n                    folder,\n                    targetFolder,\n                    onAccept: runDrop\n                });\n            } else {\n                // Otherwise, perform the drop immediately\n                await runDrop();\n            }\n        },\n        [folders, dropConfirmation, showConfirmMoveFolderDialog]\n    );\n\n    const sort = useMemo(\n        () => (a: NodeDto<any>, b: NodeDto<any>) => {\n            if (a.id === ROOT_FOLDER || b.id === ROOT_FOLDER) {\n                return 1;\n            }\n            return a.label.localeCompare(b.label, undefined, { numeric: true });\n        },\n        []\n    );\n\n    const canDrag: TreeProps<FolderDto>[\"canDrag\"] = useCallback(\n        (node: NodeDto<FolderDto>) => node.id !== ROOT_FOLDER && canManageStructure(node.id),\n        [canManageStructure]\n    );\n\n    const canDrop: TreeProps<FolderDto>[\"canDrop\"] = (_, options: DropOptions<FolderDto>) => {\n        const { dragSourceId, dropTargetId } = options;\n        const dropTagetAncestorIds = getFolderAncestors(dropTargetId).map(item => item.id);\n\n        // Prevent dropping a folder into itself or its descendants\n        return !(dragSourceId && dropTagetAncestorIds.includes(dragSourceId));\n    };\n\n    const nodeRenderer: TreeProps<FolderDto>[\"renderer\"] = node => {\n        const folder = folders.find(folder => folder.id === node.id);\n        return (\n            <FolderProvider folder={folder}>\n                <Node enableActions={enableActions} folderActions={folderActions} />\n            </FolderProvider>\n        );\n    };\n\n    const handleNodeClick = useCallback(\n        (node: WithDefaultNodeData<FolderDto>) => {\n            onFolderClick(node);\n        },\n        [onFolderClick]\n    );\n\n    return (\n        <Tree<FolderDto>\n            nodes={treeData}\n            rootId={\"0\"}\n            defaultOpenNodeIds={openFolderIds}\n            onChangeOpen={handleChangeOpen}\n            onDrop={onDrop}\n            onNodeClick={handleNodeClick}\n            sort={sort}\n            canDrag={canDrag}\n            canDrop={canDrop}\n            renderer={nodeRenderer}\n            defaultLockedOpenNodeIds={[ROOT_FOLDER]}\n            loadingNodeIds={loading}\n        />\n    );\n};\n"],"names":["List","folders","folderActions","onFolderClick","focusedFolderId","hiddenFolderIds","enableActions","dropConfirmation","listFoldersByParentIds","loading","useListFoldersByParentIds","updateFolder","useUpdateFolder","canManageStructure","useGetFolderLevelPermission","getFolderAncestors","useGetFolderAncestors","showSnackbar","useSnackbar","treeData","setTreeData","useState","openFolderIds","setOpenFolderIds","ROOT_FOLDER","showConfirmMoveFolderDialog","useConfirmMoveFolderDialog","useEffect","createTreeData","prev","expanded","createInitialOpenList","Set","handleChangeOpen","nodes","folderIds","node","updatedOpenIds","fetchableIds","id","handleDrop","_","dragSourceId","dropTargetId","item","folder","Error","error","onDrop","useCallback","newTree","options","runDrop","f","targetFolder","sort","useMemo","a","b","undefined","canDrag","canDrop","dropTagetAncestorIds","nodeRenderer","FolderProvider","Node","handleNodeClick","Tree"],"mappings":"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"}
+{"version":3,"file":"components/FolderTree/List/List.js","sources":["../../../../src/components/FolderTree/List/List.tsx"],"sourcesContent":["import React, { useCallback, useEffect, useMemo, useState } from \"react\";\nimport {\n    Tree,\n    type NodeDto,\n    type TreeProps,\n    type WithDefaultNodeData,\n    type DropOptions\n} from \"@webiny/admin-ui\";\nimport { useSnackbar } from \"@webiny/app-admin\";\nimport type { FolderDto } from \"~/domain/folder/FolderDto.js\";\nimport { useGetFolderLevelPermission } from \"~/features/folders/getFolderLevelPermission/index.js\";\nimport { useListFoldersByParentIds } from \"~/features/folders/listFoldersByParentIds/index.js\";\nimport { useGetFolderAncestors } from \"~/features/folders/getFolderAncestors/index.js\";\nimport { useUpdateFolder } from \"~/features/folders/updateFolder/index.js\";\nimport { Node } from \"../Node/index.js\";\nimport { createInitialOpenList, createTreeData } from \"./utils.js\";\nimport { ROOT_FOLDER } from \"~/constants.js\";\nimport { FolderProvider } from \"~/contexts/folder.js\";\nimport { useConfirmMoveFolderDialog } from \"~/dialogs/index.js\";\nimport type { FolderActionConfig } from \"~/config/AcoConfig.js\";\n\ninterface ListProps {\n    folders: FolderDto[];\n    folderActions: FolderActionConfig[];\n    dropConfirmation?: boolean;\n    focusedFolderId?: string;\n    hiddenFolderIds?: string[];\n    enableActions?: boolean;\n    onFolderClick: (data: FolderDto) => void;\n}\n\nexport const List = ({\n    folders,\n    folderActions,\n    onFolderClick,\n    focusedFolderId,\n    hiddenFolderIds,\n    enableActions,\n    dropConfirmation = false\n}: ListProps) => {\n    const { listFoldersByParentIds, loading } = useListFoldersByParentIds();\n    const { updateFolder } = useUpdateFolder();\n    const { getFolderLevelPermission: canManageStructure } =\n        useGetFolderLevelPermission(\"canManageStructure\");\n    const { getFolderAncestors } = useGetFolderAncestors();\n    const { showSnackbar } = useSnackbar();\n\n    const [treeData, setTreeData] = useState<NodeDto<FolderDto>[]>([]);\n    const [openFolderIds, setOpenFolderIds] = useState<string[]>([ROOT_FOLDER]);\n    const { showDialog: showConfirmMoveFolderDialog } = useConfirmMoveFolderDialog();\n\n    useEffect(() => {\n        setTreeData(createTreeData(folders, focusedFolderId, hiddenFolderIds));\n    }, [folders, focusedFolderId, hiddenFolderIds]);\n\n    useEffect(() => {\n        setOpenFolderIds(prev => {\n            const expanded = createInitialOpenList(folders, prev, focusedFolderId);\n            return [...new Set([ROOT_FOLDER, ...expanded])];\n        });\n    }, [focusedFolderId, folders, setOpenFolderIds]);\n\n    const handleChangeOpen: TreeProps[\"onChangeOpen\"] = async nodes => {\n        const folderIds = nodes.map(node => node.id);\n        const updatedOpenIds = [...new Set([ROOT_FOLDER, ...folderIds])];\n        setOpenFolderIds(updatedOpenIds);\n\n        const fetchableIds = folderIds.filter(id => id !== ROOT_FOLDER && id !== \"0\");\n        await listFoldersByParentIds(fetchableIds);\n    };\n\n    const handleDrop: TreeProps[\"onDrop\"] = async (_, { dragSourceId, dropTargetId }) => {\n        try {\n            const item = folders.find(folder => folder.id === dragSourceId);\n            if (!item) {\n                throw new Error(\"Folder not found!\");\n            }\n\n            await updateFolder({\n                ...item,\n                parentId: dropTargetId !== ROOT_FOLDER ? (dropTargetId as string) : null\n            });\n        } catch (error) {\n            showSnackbar(error.message);\n        }\n    };\n\n    const onDrop = useCallback<NonNullable<TreeProps[\"onDrop\"]>>(\n        async (newTree, options: DropOptions) => {\n            // Function to execute the drop logic\n            const runDrop = async () => handleDrop(newTree, options);\n\n            // If drop confirmation is enabled, show dialog before proceeding\n            if (dropConfirmation) {\n                const { dragSourceId, dropTargetId } = options;\n                const folder = folders.find(f => f.id === dragSourceId);\n                const targetFolder = folders.find(f => f.id === dropTargetId);\n\n                // Abort if either folder is not found\n                if (!folder || !targetFolder) {\n                    throw new Error(\"Folder not found\");\n                }\n\n                await new Promise<void>((resolve, reject) => {\n                    showConfirmMoveFolderDialog({\n                        folder,\n                        targetFolder,\n                        onAccept: async () => {\n                            await runDrop();\n                            resolve();\n                        },\n                        onClose: () => {\n                            reject(new Error(\"cancelled\"));\n                        }\n                    });\n                });\n            } else {\n                // Fire API call without awaiting — optimistic UI\n                runDrop();\n            }\n        },\n        [folders, dropConfirmation, showConfirmMoveFolderDialog]\n    );\n\n    const sort = useMemo(\n        () => (a: NodeDto<any>, b: NodeDto<any>) => {\n            if (a.id === ROOT_FOLDER || b.id === ROOT_FOLDER) {\n                return 1;\n            }\n            return a.label.localeCompare(b.label, undefined, { numeric: true });\n        },\n        []\n    );\n\n    const canDrag: TreeProps<FolderDto>[\"canDrag\"] = useCallback(\n        (node: NodeDto<FolderDto>) => node.id !== ROOT_FOLDER && canManageStructure(node.id),\n        [canManageStructure]\n    );\n\n    const canDrop: TreeProps<FolderDto>[\"canDrop\"] = (_, options: DropOptions<FolderDto>) => {\n        const { dragSourceId, dropTargetId } = options;\n        const dropTagetAncestorIds = getFolderAncestors(dropTargetId).map(item => item.id);\n\n        // Prevent dropping a folder into itself or its descendants\n        return !(dragSourceId && dropTagetAncestorIds.includes(dragSourceId));\n    };\n\n    const nodeRenderer: TreeProps<FolderDto>[\"renderer\"] = node => {\n        const folder = folders.find(folder => folder.id === node.id);\n        return (\n            <FolderProvider folder={folder}>\n                <Node enableActions={enableActions} folderActions={folderActions} />\n            </FolderProvider>\n        );\n    };\n\n    const handleNodeClick = useCallback(\n        (node: WithDefaultNodeData<FolderDto>) => {\n            onFolderClick(node);\n        },\n        [onFolderClick]\n    );\n\n    return (\n        <Tree<FolderDto>\n            nodes={treeData}\n            rootId={\"0\"}\n            defaultOpenNodeIds={openFolderIds}\n            onChangeOpen={handleChangeOpen}\n            onDrop={onDrop}\n            onNodeClick={handleNodeClick}\n            sort={sort}\n            canDrag={canDrag}\n            canDrop={canDrop}\n            renderer={nodeRenderer}\n            defaultLockedOpenNodeIds={[ROOT_FOLDER]}\n            loadingNodeIds={loading}\n        />\n    );\n};\n"],"names":["List","folders","folderActions","onFolderClick","focusedFolderId","hiddenFolderIds","enableActions","dropConfirmation","listFoldersByParentIds","loading","useListFoldersByParentIds","updateFolder","useUpdateFolder","canManageStructure","useGetFolderLevelPermission","getFolderAncestors","useGetFolderAncestors","showSnackbar","useSnackbar","treeData","setTreeData","useState","openFolderIds","setOpenFolderIds","ROOT_FOLDER","showConfirmMoveFolderDialog","useConfirmMoveFolderDialog","useEffect","createTreeData","prev","expanded","createInitialOpenList","Set","handleChangeOpen","nodes","folderIds","node","updatedOpenIds","fetchableIds","id","handleDrop","_","dragSourceId","dropTargetId","item","folder","Error","error","onDrop","useCallback","newTree","options","runDrop","f","targetFolder","Promise","resolve","reject","sort","useMemo","a","b","undefined","canDrag","canDrop","dropTagetAncestorIds","nodeRenderer","FolderProvider","Node","handleNodeClick","Tree"],"mappings":"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"}

package/dialogs/useConfirmMoveFolderDialog.d.ts

@@ -3,6 +3,7 @@ interface ShowDialogParams {
     folder: FolderDto;
     targetFolder: FolderDto;
     onAccept: (folder: FolderDto, targetFolder: FolderDto) => Promise<void>;
+    onClose?: () => void;
 }
 interface UseConfirmMoveFolderDialogResponse {
     showDialog: (params: ShowDialogParams) => void;

package/dialogs/useConfirmMoveFolderDialog.js

@@ -1,14 +1,15 @@
 import { useDialogs } from "@webiny/app-admin";
 const useConfirmMoveFolderDialog = ()=>{
     const dialogs = useDialogs();
-    const showDialog = ({ folder, targetFolder, onAccept })=>{
+    const showDialog = ({ folder, targetFolder, onAccept, onClose })=>{
         dialogs.showDialog({
             title: "Move folder",
             content: `You are about to move the folder "${folder.title}" into "${targetFolder.title}"! Are you sure you want to continue?`,
             acceptLabel: "Move folder",
             cancelLabel: "Cancel",
             loadingLabel: "Moving folder...",
-            onAccept: ()=>onAccept(folder, targetFolder)
+            onAccept: ()=>onAccept(folder, targetFolder),
+            onClose
         });
     };
     return {

package/dialogs/useConfirmMoveFolderDialog.js.map

@@ -1 +1 @@
-{"version":3,"file":"dialogs/useConfirmMoveFolderDialog.js","sources":["../../src/dialogs/useConfirmMoveFolderDialog.tsx"],"sourcesContent":["import { useDialogs } from \"@webiny/app-admin\";\nimport type { FolderDto } from \"~/domain/folder/FolderDto.js\";\n\ninterface ShowDialogParams {\n    folder: FolderDto;\n    targetFolder: FolderDto;\n    onAccept: (folder: FolderDto, targetFolder: FolderDto) => Promise<void>;\n}\n\ninterface UseConfirmMoveFolderDialogResponse {\n    showDialog: (params: ShowDialogParams) => void;\n}\n\nexport const useConfirmMoveFolderDialog = (): UseConfirmMoveFolderDialogResponse => {\n    const dialogs = useDialogs();\n\n    const showDialog = ({ folder, targetFolder, onAccept }: ShowDialogParams) => {\n        dialogs.showDialog({\n            title: \"Move folder\",\n            content: `You are about to move the folder \"${folder.title}\" into \"${targetFolder.title}\"! Are you sure you want to continue?`,\n            acceptLabel: \"Move folder\",\n            cancelLabel: \"Cancel\",\n            loadingLabel: \"Moving folder...\",\n            onAccept: () => onAccept(folder, targetFolder)\n        });\n    };\n\n    return {\n        showDialog\n    };\n};\n"],"names":["useConfirmMoveFolderDialog","dialogs","useDialogs","showDialog","folder","targetFolder","onAccept"],"mappings":";AAaO,MAAMA,6BAA6B;IACtC,MAAMC,UAAUC;IAEhB,MAAMC,aAAa,CAAC,EAAEC,MAAM,EAAEC,YAAY,EAAEC,QAAQ,EAAoB;QACpEL,QAAQ,UAAU,CAAC;YACf,OAAO;YACP,SAAS,CAAC,kCAAkC,EAAEG,OAAO,KAAK,CAAC,QAAQ,EAAEC,aAAa,KAAK,CAAC,qCAAqC,CAAC;YAC9H,aAAa;YACb,aAAa;YACb,cAAc;YACd,UAAU,IAAMC,SAASF,QAAQC;QACrC;IACJ;IAEA,OAAO;QACHF;IACJ;AACJ"}
+{"version":3,"file":"dialogs/useConfirmMoveFolderDialog.js","sources":["../../src/dialogs/useConfirmMoveFolderDialog.tsx"],"sourcesContent":["import { useDialogs } from \"@webiny/app-admin\";\nimport type { FolderDto } from \"~/domain/folder/FolderDto.js\";\n\ninterface ShowDialogParams {\n    folder: FolderDto;\n    targetFolder: FolderDto;\n    onAccept: (folder: FolderDto, targetFolder: FolderDto) => Promise<void>;\n    onClose?: () => void;\n}\n\ninterface UseConfirmMoveFolderDialogResponse {\n    showDialog: (params: ShowDialogParams) => void;\n}\n\nexport const useConfirmMoveFolderDialog = (): UseConfirmMoveFolderDialogResponse => {\n    const dialogs = useDialogs();\n\n    const showDialog = ({ folder, targetFolder, onAccept, onClose }: ShowDialogParams) => {\n        dialogs.showDialog({\n            title: \"Move folder\",\n            content: `You are about to move the folder \"${folder.title}\" into \"${targetFolder.title}\"! Are you sure you want to continue?`,\n            acceptLabel: \"Move folder\",\n            cancelLabel: \"Cancel\",\n            loadingLabel: \"Moving folder...\",\n            onAccept: () => onAccept(folder, targetFolder),\n            onClose\n        });\n    };\n\n    return {\n        showDialog\n    };\n};\n"],"names":["useConfirmMoveFolderDialog","dialogs","useDialogs","showDialog","folder","targetFolder","onAccept","onClose"],"mappings":";AAcO,MAAMA,6BAA6B;IACtC,MAAMC,UAAUC;IAEhB,MAAMC,aAAa,CAAC,EAAEC,MAAM,EAAEC,YAAY,EAAEC,QAAQ,EAAEC,OAAO,EAAoB;QAC7EN,QAAQ,UAAU,CAAC;YACf,OAAO;YACP,SAAS,CAAC,kCAAkC,EAAEG,OAAO,KAAK,CAAC,QAAQ,EAAEC,aAAa,KAAK,CAAC,qCAAqC,CAAC;YAC9H,aAAa;YACb,aAAa;YACb,cAAc;YACd,UAAU,IAAMC,SAASF,QAAQC;YACjCE;QACJ;IACJ;IAEA,OAAO;QACHJ;IACJ;AACJ"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/app-aco",
-	"version": "6.4.6",
+	"version": "6.4.7-beta.0",
 	"type": "module",
 	"exports": {
 		".": "./index.js",
@@ -16,19 +16,19 @@
 	"license": "MIT",
 	"dependencies": {
 		"@apollo/react-hooks": "3.1.5",
-		"@webiny/admin-ui": "6.4.6",
-		"@webiny/app": "6.4.6",
-		"@webiny/app-admin": "6.4.6",
-		"@webiny/app-headless-cms-common": "6.4.6",
-		"@webiny/app-utils": "6.4.6",
-		"@webiny/feature": "6.4.6",
-		"@webiny/form": "6.4.6",
-		"@webiny/icons": "6.4.6",
-		"@webiny/plugins": "6.4.6",
-		"@webiny/react-properties": "6.4.6",
-		"@webiny/shared-aco": "6.4.6",
-		"@webiny/utils": "6.4.6",
-		"@webiny/validation": "6.4.6",
+		"@webiny/admin-ui": "6.4.7-beta.0",
+		"@webiny/app": "6.4.7-beta.0",
+		"@webiny/app-admin": "6.4.7-beta.0",
+		"@webiny/app-headless-cms-common": "6.4.7-beta.0",
+		"@webiny/app-utils": "6.4.7-beta.0",
+		"@webiny/feature": "6.4.7-beta.0",
+		"@webiny/form": "6.4.7-beta.0",
+		"@webiny/icons": "6.4.7-beta.0",
+		"@webiny/plugins": "6.4.7-beta.0",
+		"@webiny/react-properties": "6.4.7-beta.0",
+		"@webiny/shared-aco": "6.4.7-beta.0",
+		"@webiny/utils": "6.4.7-beta.0",
+		"@webiny/validation": "6.4.7-beta.0",
 		"dot-prop-immutable": "2.1.1",
 		"graphql": "16.14.2",
 		"graphql-tag": "2.12.7",
@@ -42,9 +42,9 @@
 	},
 	"devDependencies": {
 		"@types/react": "18.3.31",
-		"@webiny/build-tools": "6.4.6",
+		"@webiny/build-tools": "6.4.7-beta.0",
 		"@webiny/di": "1.0.2",
-		"@webiny/wcp": "6.4.6",
+		"@webiny/wcp": "6.4.7-beta.0",
 		"apollo-client": "2.6.10",
 		"apollo-link": "1.2.14",
 		"rimraf": "6.1.3",