Added Movefolder in redux.

Imiss-U1025 · Imiss-U1025 · commit 69c741568e53 · 2024-11-22T14:53:13.000-05:00
diff --git a/client/packages/lowcoder/src/constants/reduxActionConstants.ts b/client/packages/lowcoder/src/constants/reduxActionConstants.ts
@@ -9,7 +9,7 @@ export const ReduxActionTypes = {
   FETCH_RAW_CURRENT_USER_SUCCESS: "FETCH_RAW_CURRENT_USER_SUCCESS",
   FETCH_API_KEYS: "FETCH_API_KEYS",
   FETCH_API_KEYS_SUCCESS: "FETCH_API_KEYS_SUCCESS",
-
+  MOVE_TO_FOLDER2_SUCCESS: "MOVE_TO_FOLDER2_SUCCESS",
 
   /* plugin RELATED */
   FETCH_DATA_SOURCE_TYPES: "FETCH_DATA_SOURCE_TYPES",
diff --git a/client/packages/lowcoder/src/redux/reducers/uiReducers/folderReducer.ts b/client/packages/lowcoder/src/redux/reducers/uiReducers/folderReducer.ts
@@ -107,7 +107,7 @@ export const folderReducer = createReducer(initialState, {
     state: FolderReduxState,
     action: ReduxAction<MoveToFolderPayload>
   ): FolderReduxState => {
-    const elements = { ...state.folderElements };
+    let elements = { ...state.folderElements };
     elements[action.payload.sourceFolderId ?? ""] = elements[
       action.payload.sourceFolderId ?? ""
     ]?.filter(
@@ -120,6 +120,44 @@ export const folderReducer = createReducer(initialState, {
       folderElements: elements,
     };
   },
+  [ReduxActionTypes.MOVE_TO_FOLDER2_SUCCESS]: (
+      state: FolderReduxState,
+      action: ReduxAction<MoveToFolderPayload>
+  ): FolderReduxState => {
+    let elements = { ...state.folderElements };
+    let tempIndex: number | undefined;
+    let tempNode: any;
+    let temp = elements[""].map((item, index) => {
+      if (item.folderId === action.payload.sourceFolderId && item.folder) {
+
+        const tempSubApplications = item.subApplications?.filter(e =>
+            (e.folder && e.folderId !== action.payload.sourceId) ||
+            (!e.folder && e.applicationId !== action.payload.sourceId)
+        );
+        tempNode = item.subApplications?.filter(e =>
+            (e.folder && e.folderId === action.payload.sourceId) ||
+            (!e.folder && e.applicationId === action.payload.sourceId)
+        );
+        return { ...item, subApplications: tempSubApplications };
+      }
+      if (item.folderId === action.payload.folderId && item.folder) {
+        tempIndex = index;
+        return item;
+      }
+      return item;
+    });
+    if (tempIndex !== undefined) {
+      const targetItem = temp[tempIndex];
+      if (targetItem.folder && Array.isArray(targetItem.subApplications)) {
+        targetItem.subApplications.push(tempNode[0]);
+      }
+    }
+    elements[""] = temp;
+    return {
+      ...state,
+      folderElements: elements,
+    };
+  },
   [ReduxActionTypes.DELETE_FOLDER_SUCCESS]: (
     state: FolderReduxState,
     action: ReduxAction<DeleteFolderPayload>
diff --git a/client/packages/lowcoder/src/redux/reduxActions/folderActions.ts b/client/packages/lowcoder/src/redux/reduxActions/folderActions.ts
@@ -58,6 +58,7 @@ export interface MoveToFolderPayload {
   sourceFolderId: string;
   sourceId: string;
   folderId: string;
+  moveFlag?: boolean;
 }
 
 export const moveToFolder = (
diff --git a/client/packages/lowcoder/src/redux/sagas/folderSagas.ts b/client/packages/lowcoder/src/redux/sagas/folderSagas.ts
@@ -84,14 +84,16 @@ export function* deleteFolderSaga(action: ReduxActionWithCallbacks<DeleteFolderP
 
 export function* moveToFolderSaga(action: ReduxActionWithCallbacks<MoveToFolderPayload, any, any>) {
   try {
+    const { moveFlag } = action.payload;
+    delete action.payload.moveFlag;
     const response: AxiosResponse<GenericApiResponse<void>> = yield FolderApi.moveToFolder(
       action.payload
     );
     const isValidResponse: boolean = validateResponse(response);
-
+    const type = moveFlag ? ReduxActionTypes.MOVE_TO_FOLDER2_SUCCESS : ReduxActionTypes.MOVE_TO_FOLDER_SUCCESS;
     if (isValidResponse) {
       yield put({
-        type: ReduxActionTypes.MOVE_TO_FOLDER_SUCCESS,
+        type,
         payload: action.payload,
       });
       action.onSuccessCallback && action.onSuccessCallback(response);

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ export interface MoveToFolderPayload {`
`58`	`58`	`sourceFolderId: string;`
`59`	`59`	`sourceId: string;`
`60`	`60`	`folderId: string;`
	`61`	`+ moveFlag?: boolean;`
`61`	`62`	`}`
`62`	`63`
`63`	`64`	`export const moveToFolder = (`