refactor: folders FTA

packages/app-aco/package.json

@@ -21,6 +21,7 @@
     "@webiny/app-admin": "0.0.0",
     "@webiny/app-headless-cms-common": "0.0.0",
     "@webiny/app-security": "0.0.0",
+    "@webiny/app-utils": "0.0.0",
     "@webiny/app-wcp": "0.0.0",
     "@webiny/form": "0.0.0",
     "@webiny/plugins": "0.0.0",

packages/app-aco/src/components/FolderTree/List/index.tsx

@@ -56,6 +56,8 @@ export const List = ({
         newTree: NodeModel<DndFolderItemData>[],
         { dragSourceId, dropTargetId }: DropOptions
     ) => {
+        // Store the current state of the tree before the drop action
+        const oldTree = [...treeData];
         try {
             const item = folders.find(folder => folder.id === dragSourceId);
 
@@ -65,14 +67,13 @@ export const List = ({
 
             setTreeData(newTree);
 
-            await updateFolder(
-                {
-                    ...item,
-                    parentId: dropTargetId !== ROOT_FOLDER ? (dropTargetId as string) : null
-                },
-                { refetchFoldersList: true }
-            );
+            await updateFolder({
+                ...item,
+                parentId: dropTargetId !== ROOT_FOLDER ? (dropTargetId as string) : null
+            });
         } catch (error) {
+            // If an error occurs, revert the tree back to its original state
+            setTreeData(oldTree);
             return showSnackbar(error.message);
         }
     };

packages/app-aco/src/components/FolderTree/index.tsx

@@ -29,7 +29,7 @@ export const FolderTree = ({
     onFolderClick,
     rootFolderLabel
 }: FolderTreeProps) => {
-    const { folders, folderLevelPermissions: flp } = useFolders();
+    const { folders, folderLevelPermissions: flp, loading } = useFolders();
     const localFolders = useMemo(() => {
         if (!folders) {
             return [];
@@ -44,7 +44,7 @@ export const FolderTree = ({
     }, [folders]);
 
     const renderList = () => {
-        if (!folders) {
+        if (loading.INIT || loading.LIST) {
             return <Loader />;
         }