Processed immediate activity in TrashView.

Imiss-U1025 · Imiss-U1025 · commit 3a187e65ebdb · 2024-11-29T06:21:03.000-05:00
diff --git a/client/packages/lowcoder/src/pages/ApplicationV2/HomeLayout.tsx b/client/packages/lowcoder/src/pages/ApplicationV2/HomeLayout.tsx
@@ -586,7 +586,7 @@ export function HomeLayout(props: HomeLayoutProps) {
                   {resList.length > 0 ? (
                     <>
                       {mode === "trash" ? (
-                        <TrashTableView resources={resList} />
+                        <TrashTableView resources={resList} setModify={setModify} modify={modify!}/>
                       ) : (
                         <>
                           <LayoutSwitcher onClick={() => setLayout(layout === "list" ? "card" : "list")}>
diff --git a/client/packages/lowcoder/src/pages/ApplicationV2/HomeView.tsx b/client/packages/lowcoder/src/pages/ApplicationV2/HomeView.tsx
@@ -27,9 +27,9 @@ export function HomeView() {
                   pageNum:currentPage,
                   pageSize:pageSize,
                   applicationType: ApplicationPaginationType[typeFilter],
-                  name: searchValue,
+                  name: searchValues,
               }).then(
-                  data => {
+                  (data: any) => {
                       if (data.success) {
                           setElements({elements: data.data || [], total: data.total || 1})
                       }
@@ -48,7 +48,7 @@ export function HomeView() {
               if (searchValue.length > 2 || searchValue === "")
                   setSearchValues(searchValue)
           }, 500);
-      })
+      }, [searchValue])
 
   const user = useSelector(getUser);
 
diff --git a/client/packages/lowcoder/src/pages/ApplicationV2/TrashTableView.tsx b/client/packages/lowcoder/src/pages/ApplicationV2/TrashTableView.tsx
@@ -32,7 +32,8 @@ const EditBtn = styled(TacoButton)`
   height: 24px;
 `;
 
-export const TrashTableView = (props: { resources: HomeRes[] }) => {
+export const TrashTableView = (props: { resources: HomeRes[] , setModify: any, modify: boolean }) => {
+  const {resources, setModify, modify} = props;
   const dispatch = useDispatch();
 
   return (
@@ -119,13 +120,17 @@ export const TrashTableView = (props: { resources: HomeRes[] }) => {
                     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={() =>{
+                        dispatch(
+                            restoreApplication({ applicationId: item.id }, () => {
+                                messageInstance.success(trans("home.recoverSuccessMsg"));
+                            })
+                        )
+                        setTimeout(() => {
+                            setModify(!modify);
+                        }, 200);
                     }
+                  }
                   >
                     {trans("recover")}
                   </EditBtn>
@@ -140,7 +145,7 @@ export const TrashTableView = (props: { resources: HomeRes[] }) => {
                         type: HomeResInfo[item.type].name.toLowerCase(),
                         name: <b>{item.name}</b>,
                       }),
-                      onConfirm: () =>
+                      onConfirm: () =>{
                         new Promise((resolve, reject) => {
                           dispatch(
                             deleteApplication(
@@ -152,10 +157,15 @@ export const TrashTableView = (props: { resources: HomeRes[] }) => {
                               () => reject()
                             )
                           );
-                        }),
+                        })
+                          setTimeout(() => {
+                              setModify(!modify);
+                          }, 200);
+                      },
                       confirmBtnType: "delete",
                       okText: trans("delete"),
                     })
+
                   }
                   style={{ marginLeft: "12px", width: "76px" }}
                 >
@@ -166,7 +176,7 @@ export const TrashTableView = (props: { resources: HomeRes[] }) => {
           },
         },
       ]}
-      dataSource={props.resources}
+      dataSource={resources}
     />
   );
 };
diff --git a/client/packages/lowcoder/src/pages/ApplicationV2/TrashView.tsx b/client/packages/lowcoder/src/pages/ApplicationV2/TrashView.tsx
@@ -17,6 +17,7 @@ export function TrashView() {
     const [searchValues, setSearchValues] = useState("");
     const [searchValue, setSearchValue] = useState("");
     const [typeFilter, setTypeFilter] = useState<number>(0);
+    const [modify, setModify] = useState(false);
 
     useEffect( () => {
           if (typeFilter === 7) // Application of Navigation is 3 in API.
@@ -39,15 +40,15 @@ export function TrashView() {
             } catch (error) {
                 console.error('Failed to fetch data:', error);
             }
-        }, [currentPage, pageSize, searchValues, typeFilter]
+        }, [currentPage, pageSize, searchValues, typeFilter, modify]
     );
 
     useEffect(()=> {
         setTimeout(() => {
             if (searchValue.length > 2 || searchValue === "")
                 setSearchValues(searchValue)
         }, 500);
-    })
+    }, [searchValue])
 
   return (
     <>
@@ -64,6 +65,8 @@ export function TrashView() {
           setSearchValue={setSearchValue}
           searchValue={searchValue}
           setTypeFilterPagination={setTypeFilter}
+          setModify={setModify}
+          modify={modify}
       />
     </>
   );
diff --git a/client/packages/lowcoder/src/pages/datasource/datasourceList.tsx b/client/packages/lowcoder/src/pages/datasource/datasourceList.tsx
@@ -129,7 +129,7 @@ export const DatasourceList = () => {
       if (searchValue.length > 2 || searchValue === "")
         setSearchValues(searchValue)
     }, 500);
-  })
+  }, [searchValue])
 
   useEffect( () => {
     fetchDatasourcePagination(
@@ -139,7 +139,7 @@ export const DatasourceList = () => {
         pageSize: pageSize,
         name: searchValues
       }
-    ).then(result => {
+    ).then((result: any) => {
       if (result.success){
         setElements({elements: result.data || [], total: result.total || 1})
       }
diff --git a/client/packages/lowcoder/src/pages/queryLibrary/LeftNav.tsx b/client/packages/lowcoder/src/pages/queryLibrary/LeftNav.tsx
@@ -177,7 +177,7 @@ export const LeftNav = (props: {
       if (searchValue.length > 2 || searchValue === "")
         setSearchValues(searchValue)
     }, 500);
-  })
+  }, [searchValue])
 
   return (
     <ReadOnlyMask readOnly={!!props.readOnly}>
