Fixed Search functions.

Imiss-U1025 · Imiss-U1025 · commit b3329801f078 · 2024-12-02T16:20:04.000-05:00
diff --git a/client/packages/lowcoder/src/pages/ApplicationV2/HomeView.tsx b/client/packages/lowcoder/src/pages/ApplicationV2/HomeView.tsx
@@ -43,12 +43,19 @@ export function HomeView() {
           }, [currentPage, pageSize, searchValues, typeFilter, modify]
       );
 
-      useEffect(()=> {
-          setTimeout(() => {
-              if (searchValue.length > 2 || searchValue === "")
-                  setSearchValues(searchValue)
-          }, 500);
-      }, [searchValue])
+    useEffect( () => {
+            if (searchValues !== "")
+                setCurrentPage(1);
+        }, [searchValues]
+    );
+
+    useEffect(()=> {
+        const timer = setTimeout(() => {
+            if (searchValue.length > 2 || searchValue === "")
+                setSearchValues(searchValue)
+        }, 500);
+        return () => clearTimeout(timer);
+    }, [searchValue])
 
   const user = useSelector(getUser);
 
diff --git a/client/packages/lowcoder/src/pages/ApplicationV2/TrashView.tsx b/client/packages/lowcoder/src/pages/ApplicationV2/TrashView.tsx
@@ -42,12 +42,19 @@ export function TrashView() {
             }
         }, [currentPage, pageSize, searchValues, typeFilter, modify]
     );
+    useEffect( () => {
+        if (searchValues !== "")
+            setCurrentPage(1);
+        }, [searchValues]
+    );
 
+    //debouncing
     useEffect(()=> {
-        setTimeout(() => {
+        const timer = setTimeout(() => {
             if (searchValue.length > 2 || searchValue === "")
                 setSearchValues(searchValue)
         }, 500);
+        return () => clearTimeout(timer);
     }, [searchValue])
 
   return (
diff --git a/client/packages/lowcoder/src/pages/datasource/datasourceList.tsx b/client/packages/lowcoder/src/pages/datasource/datasourceList.tsx
@@ -126,10 +126,11 @@ export const DatasourceList = () => {
   const [pageSize, setPageSize] = useState(10);
 
   useEffect(()=> {
-    setTimeout(() => {
+    const timer = setTimeout(() => {
       if (searchValue.length > 2 || searchValue === "")
         setSearchValues(searchValue)
     }, 500);
+    return () => clearTimeout(timer);
   }, [searchValue])
 
   useEffect( () => {
@@ -150,6 +151,12 @@ export const DatasourceList = () => {
   }, [currentPage, pageSize, searchValues, modify]
   )
 
+  useEffect( () => {
+        if (searchValues !== "")
+          setCurrentPage(1);
+      }, [searchValues]
+  );
+
   return (
     <>
       <Helmet>{<title>{trans("home.datasource")}</title>}</Helmet>
diff --git a/client/packages/lowcoder/src/pages/queryLibrary/LeftNav.tsx b/client/packages/lowcoder/src/pages/queryLibrary/LeftNav.tsx
@@ -175,12 +175,15 @@ export const LeftNav = (props: {
   const datasourceTypes = useSelector(getDataSourceTypesMap);
 
   useEffect(()=> {
-    setTimeout(() => {
+    const timer = setTimeout(() => {
       if (searchValue.length > 2 || searchValue === "")
         setSearchValues(searchValue)
     }, 500);
+    return () => clearTimeout(timer);
   }, [searchValue])
 
+
+
   return (
     <ReadOnlyMask readOnly={!!props.readOnly}>
       <Wrapper $readOnly={props.readOnly}>
diff --git a/client/packages/lowcoder/src/pages/queryLibrary/QueryLibraryEditor.tsx b/client/packages/lowcoder/src/pages/queryLibrary/QueryLibraryEditor.tsx
@@ -134,7 +134,13 @@ export const QueryLibraryEditor = () => {
         } catch (error) {
             console.error(error)
         }
-    }, [currentPage, pageSize, searchValues, modify])
+  }, [currentPage, pageSize, searchValues, modify])
+
+    useEffect( () => {
+            if (searchValues !== "")
+                setCurrentPage(1);
+        }, [searchValues]
+    );
 
   useEffect(() => {
     if (orgId) {
