[Fix]: #1848 delete/recycled and movetofolder

iamfaran · iamfaran · commit 2df0a8fed373 · 2025-07-18T23:08:33.000+05:00
diff --git a/client/packages/lowcoder/src/pages/ApplicationV2/HomeResOptions.tsx b/client/packages/lowcoder/src/pages/ApplicationV2/HomeResOptions.tsx
@@ -3,8 +3,6 @@ import { HomeResTypeEnum } from "../../types/homeRes";
 import { exportApplicationAsJSONFile } from "./components/AppImport";
 import { CustomModal, EditPopover, EditPopoverItemType, PointIcon } from "lowcoder-design";
 import { HomeResInfo } from "../../util/homeResUtils";
-import { recycleApplication } from "../../redux/reduxActions/applicationActions";
-import { deleteFolder } from "../../redux/reduxActions/folderActions";
 import { useDispatch } from "react-redux";
 import React, { useState } from "react";
 import styled from "styled-components";
@@ -13,6 +11,9 @@ import { useParams } from "react-router-dom";
 import { AppTypeEnum } from "constants/applicationConstants";
 import { CopyModal } from "pages/common/copyModal";
 import { messageInstance } from "lowcoder-design/src/components/GlobalInstances";
+import ApplicationApi from "../../api/applicationApi";
+import { FolderApi } from "../../api/folderApi";
+import { ReduxActionTypes } from "constants/reduxActionConstants";
 
 const PopoverIcon = styled(PointIcon)`
   cursor: pointer;
@@ -80,23 +81,20 @@ export const HomeResOptions = (props: {
                 type: HomeResInfo[res.type].name,
                 name: <b>{res.name}</b>,
               }),
-              onConfirm: () =>{
-                new Promise((resolve, reject) => {
-                  dispatch(
-                      recycleApplication(
-                          { applicationId: res.id, folderId: folderId },
-                          () => {
-                            messageInstance.success(trans("success"));
-                            resolve(true);
-                          },
-                          () => reject()
-                      )
-                  );
+              onConfirm: async () => {
+                try {
+                  await ApplicationApi.recycleApplication({ 
+                    applicationId: res.id, 
+                    folderId: folderId || "" 
+                  });
+                  messageInstance.success(trans("success"));
                   setTimeout(() => {
                     setModify(!modify);
                   }, 200);
-                })
-
+                } catch (error) {
+                  console.error("Failed to recycle application:", error);
+                  messageInstance.error("Failed to delete application");
+                }
               },
               confirmBtnType: "delete",
               okText: trans("home.moveToTrash"),
@@ -122,22 +120,27 @@ export const HomeResOptions = (props: {
                 type: HomeResInfo[res.type].name.toLowerCase(),
                 name: <b>{res.name}</b>,
               }),
-              onConfirm: () =>{
-                new Promise((resolve, reject) => {
-                dispatch(
-                    deleteFolder(
-                        { folderId: res.id, parentFolderId: folderId },
-                        () => {
-                          messageInstance.success(trans("home.deleteSuccessMsg"));
-                          resolve(true);
-                        },
-                        () => reject()
-                    )
-                );
-              })
-                setTimeout(() => {
-                  setModify(!modify);
-                }, 200);
+              onConfirm: async () => {
+                try {
+                  await FolderApi.deleteFolder({ 
+                    folderId: res.id, 
+                    parentFolderId: folderId || "" 
+                  });
+                  
+                  // Update Redux state to remove deleted folder from dropdown
+                  dispatch({
+                    type: ReduxActionTypes.DELETE_FOLDER_SUCCESS,
+                    payload: { folderId: res.id, parentFolderId: folderId || "" }
+                  });
+                  
+                  messageInstance.success(trans("home.deleteSuccessMsg"));
+                  setTimeout(() => {
+                    setModify(!modify);
+                  }, 200);
+                } catch (error) {
+                  console.error("Failed to delete folder:", error);
+                  messageInstance.error("Failed to delete folder");
+                }
               },
               confirmBtnType: "delete",
               okText: trans("delete"),
diff --git a/client/packages/lowcoder/src/pages/ApplicationV2/TrashTableView.tsx b/client/packages/lowcoder/src/pages/ApplicationV2/TrashTableView.tsx
@@ -5,11 +5,11 @@ import styled from "styled-components";
 import { useDispatch } from "react-redux";
 import { HomeResInfo } from "../../util/homeResUtils";
 import { HomeResTypeEnum } from "../../types/homeRes";
-import { deleteApplication, restoreApplication } from "../../redux/reduxActions/applicationActions";
 import { HomeRes } from "./HomeLayout";
 import { trans, transToNode } from "../../i18n";
 import { messageInstance } from "lowcoder-design/src/components/GlobalInstances";
 import { BrandedIcon } from "@lowcoder-ee/components/BrandedIcon";
+import ApplicationApi from "../../api/applicationApi";
 
 const OperationWrapper = styled.div`
   display: flex;
@@ -123,17 +123,18 @@ export const TrashTableView = (props: { resources: HomeRes[] , setModify: any, m
                     style={{ padding: "0 8px", width: "fit-content", minWidth: "52px" }}
                     buttonType={"blue"}
                     className={"home-datasource-edit-button"}
-                    onClick={() =>{
-                        dispatch(
-                            restoreApplication({ applicationId: item.id }, () => {
-                                messageInstance.success(trans("home.recoverSuccessMsg"));
-                            })
-                        )
+                    onClick={async () => {
+                      try {
+                        await ApplicationApi.restoreApplication({ applicationId: item.id });
+                        messageInstance.success(trans("home.recoverSuccessMsg"));
                         setTimeout(() => {
-                            setModify(!modify);
+                          setModify(!modify);
                         }, 200);
-                    }
-                  }
+                      } catch (error) {
+                        console.error("Failed to restore application:", error);
+                        messageInstance.error("Failed to restore application");
+                      }
+                    }}
                   >
                     {trans("recover")}
                   </EditBtn>
@@ -148,27 +149,21 @@ export const TrashTableView = (props: { resources: HomeRes[] , setModify: any, m
                         type: HomeResInfo[item.type].name.toLowerCase(),
                         name: <b>{item.name}</b>,
                       }),
-                      onConfirm: () =>{
-                        new Promise((resolve, reject) => {
-                          dispatch(
-                            deleteApplication(
-                              { applicationId: item.id },
-                              () => {
-                                messageInstance.success(trans("home.deleteSuccessMsg"));
-                                resolve(true);
-                              },
-                              () => reject()
-                            )
-                          );
-                        })
+                      onConfirm: async () => {
+                        try {
+                          await ApplicationApi.deleteApplication({ applicationId: item.id });
+                          messageInstance.success(trans("home.deleteSuccessMsg"));
                           setTimeout(() => {
-                              setModify(!modify);
+                            setModify(!modify);
                           }, 200);
+                        } catch (error) {
+                          console.error("Failed to delete application:", error);
+                          messageInstance.error("Failed to delete application permanently");
+                        }
                       },
                       confirmBtnType: "delete",
                       okText: trans("delete"),
                     })
-
                   }
                   style={{ marginLeft: "12px", width: "76px" }}
                 >
