From 40ebdcc37fb7b74c4e1a67d7420691b2ff3a1716 Mon Sep 17 00:00:00 2001
From: Wikzyy <alwi.erdi4@gmail.com>
Date: Wed, 16 Apr 2025 22:26:21 +0700
Subject: [PATCH] update search filter - add debounce - set default value page
 to 1 each time search

---
 .../master/aldeias/blocks/ListToolbar.tsx     |  22 ++-
 src/pages/master/municipios/Municipios.tsx    |   2 -
 .../master/municipios/blocks/ListToolbar.tsx  |  29 ++-
 .../master/municipios/blocks/SearchDialog.tsx | 177 ------------------
 .../master/postoadms/PostoAdmsMaster.tsx      |   2 -
 .../master/postoadms/blocks/ListToolbar.tsx   |  42 ++---
 .../master/postoadms/blocks/SearchDialog.tsx  | 177 ------------------
 .../master/products/blocks/ListToolbar.tsx    |  31 ++-
 .../master/profession/blocks/ListToolbar.tsx  |  34 ++--
 .../master/provider/blocks/ListToolbar.tsx    |  33 ++--
 .../master/reward/blocks/ListToolbar.tsx      |  21 ++-
 src/pages/master/sucos/blocks/EditDialog.tsx  | 144 +++++++-------
 src/pages/master/sucos/blocks/ListToolbar.tsx |  36 ++--
 .../master/wallet/blocks/ListToolbar.tsx      |  29 ++-
 .../menu/manage-menu/blocks/ListToolbar.tsx   |  30 ++-
 15 files changed, 211 insertions(+), 598 deletions(-)
 delete mode 100644 src/pages/master/municipios/blocks/SearchDialog.tsx
 delete mode 100644 src/pages/master/postoadms/blocks/SearchDialog.tsx

diff --git a/src/pages/master/aldeias/blocks/ListToolbar.tsx b/src/pages/master/aldeias/blocks/ListToolbar.tsx
index f627d3f..26401b0 100644
--- a/src/pages/master/aldeias/blocks/ListToolbar.tsx
+++ b/src/pages/master/aldeias/blocks/ListToolbar.tsx
@@ -6,7 +6,9 @@ import React, { useEffect, useState } from 'react';
 const ListToolbar = () => {
   const { table, reload } = useDataGrid();
   const { handleAddDialog, handleSearchDialog } = useManageAldeiasContext();
-  const [searchValue, setSearchValue] = useState<string>((table.getColumn('name')?.getFilterValue() as string) ?? '');
+  const [searchValue, setSearchValue] = useState<string>(
+    (table.getColumn('name')?.getFilterValue() as string) ?? ''
+  );
 
   const handleKeyDown = (event: React.KeyboardEvent) => {
     if (event.key === 'Enter') {
@@ -14,18 +16,20 @@ const ListToolbar = () => {
     }
   };
 
-    useEffect(() => {
-      const timer = setTimeout(() => {
-        table.getColumn('name')?.setFilterValue(searchValue);
-      }, 200);
-  
-      return () => clearTimeout(timer);
-    }, [searchValue, table]);
   const handleSearch = () => {
     table.getColumn('name')?.setFilterValue(searchValue);
     table.setPageIndex(0);
   };
 
+  useEffect(() => {
+    const timer = setTimeout(() => {
+      table.getColumn('name')?.setFilterValue(searchValue);
+      table.setPageIndex(0);
+    }, 200);
+
+    return () => clearTimeout(timer);
+  }, [searchValue, table]);
+
   return (
     <div className="card-header flex-wrap gap-2 border-b-0 px-5">
       <div className="flex flex-wrap gap-2 lg:gap-5 w-full">
@@ -35,7 +39,7 @@ const ListToolbar = () => {
               <KeenIcon icon="magnifier" />
               <input
                 type="text"
-                placeholder="Search Transaction Type"
+                placeholder="Search"
                 value={searchValue}
                 onChange={(event) => setSearchValue(event.target.value)}
               />
diff --git a/src/pages/master/municipios/Municipios.tsx b/src/pages/master/municipios/Municipios.tsx
index 253ff86..9d548e6 100644
--- a/src/pages/master/municipios/Municipios.tsx
+++ b/src/pages/master/municipios/Municipios.tsx
@@ -1,7 +1,6 @@
 import { Container, DataGridInner } from '@/components';
 import { ManageMunicipiosProvider } from './hooks/ManageMunicipiosContext';
 import AddDialog from './blocks/AddDialog';
-import SearchDialog from './blocks/SearchDialog';
 import EditDialog from './blocks/EditDialog';
 import DeleteDialog from './blocks/DeleteDialog';
 import { Breadcrumbs, Link } from '@mui/material';
@@ -35,7 +34,6 @@ const Municipios = () => {
           <AddDialog />
           <EditDialog />
           <DeleteDialog />
-          <SearchDialog />
         </Container>
       </ManageMunicipiosProvider>
     </>
diff --git a/src/pages/master/municipios/blocks/ListToolbar.tsx b/src/pages/master/municipios/blocks/ListToolbar.tsx
index f5f046d..62092ea 100644
--- a/src/pages/master/municipios/blocks/ListToolbar.tsx
+++ b/src/pages/master/municipios/blocks/ListToolbar.tsx
@@ -9,23 +9,18 @@ const ListToolbar = () => {
   const { handleAddDialog, handleSearchDialog } = useManageMunicipiosContext();
   const [searchName, setSearchName] = useState('');
   const [isLoading, setIsLoading] = useState(false);
-  const [searchValue, setSearchValue] = useState<string>((table.getColumn('name')?.getFilterValue() as string) ?? '');
+  const [searchValue, setSearchValue] = useState<string>(
+    (table.getColumn('name')?.getFilterValue() as string) ?? ''
+  );
 
-    useEffect(() => {
-      const timer = setTimeout(() => {
-        table.getColumn('name')?.setFilterValue(searchValue);
-      }, 200);
-  
-      return () => clearTimeout(timer);
-    }, [searchValue, table]);
-  const handleFilterData = useCallback(() => {
-    try {
-      table.getColumn('name')?.setFilterValue(searchName);
-    } catch (error) {
-      toast.error('Error applying filter');
-      console.error('Error applying filter:', error);
-    }
-  }, [searchName, table]);
+  useEffect(() => {
+    const timer = setTimeout(() => {
+      table.getColumn('name')?.setFilterValue(searchValue);
+      table.setPageIndex(0);
+    }, 200);
+
+    return () => clearTimeout(timer);
+  }, [searchValue, table]);
 
   return (
     <div className="card-header flex-wrap gap-2 border-b-0 px-5">
@@ -36,7 +31,7 @@ const ListToolbar = () => {
               <KeenIcon icon="magnifier" />
               <input
                 type="text"
-                placeholder="Search Transaction Type"
+                placeholder="Search"
                 value={searchValue}
                 onChange={(event) => setSearchValue(event.target.value)}
               />
diff --git a/src/pages/master/municipios/blocks/SearchDialog.tsx b/src/pages/master/municipios/blocks/SearchDialog.tsx
deleted file mode 100644
index 1b0142f..0000000
--- a/src/pages/master/municipios/blocks/SearchDialog.tsx
+++ /dev/null
@@ -1,177 +0,0 @@
-import { useRef, useState } from 'react';
-import {
-  Dialog,
-  DialogBody,
-  DialogContent,
-  DialogDescription,
-  DialogHeader,
-  DialogTitle
-} from '@/components/ui/dialog';
-import { Alert, KeenIcon } from '@/components';
-import { Input } from '@/components/ui/input';
-import { Button } from '@/components/ui/button';
-import { useManageMunicipiosContext } from '../hooks/useManageMunicipiosContext';
-import { apiConfig } from '@/config/api.config';
-import axios from 'axios';
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue
-} from '@/components/ui/select';
-
-interface PostoAdmsProps {
-  id: number;
-  name: string;
-}
-
-const API_URL = apiConfig.service_master_data;
-
-const SearchDialog = () => {
-  const parentRef = useRef<any | null>(null);
-  const { showSearchDialog, handleSearchDialog, municipios } = useManageMunicipiosContext();
-  const [alert, setAlert] = useState({
-    show: false,
-    message: ''
-  });
-  const initialState = {
-    id: 0,
-    name: ''
-  };
-
-  const [formField, setFormField] = useState(initialState);
-  const resetForm = () => {
-    setFormField(initialState);
-  };
-  const [postoadms, setPostoadms] = useState<PostoAdmsProps[]>([]);
-  const [isFound, setIsFound] = useState(false);
-
-  const handleSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
-    e.preventDefault();
-    const id = Number(formField.id);
-
-    if (formField.id === 0) {
-      setAlert({ show: true, message: 'Please fill name field.' });
-      return;
-    }
-
-    try {
-      const response = await axios.get(`${API_URL}/municipios/postoadms/${id}`);
-
-      if (response.data.status) {
-        setPostoadms(response.data.data);
-        setIsFound(true);
-        // console.log('Found postoadms: ', response.data.data);
-      } else {
-        setPostoadms([]);
-        setIsFound(false);
-        setAlert({ show: true, message: 'No postoadms found.' });
-      }
-    } catch (error) {
-      console.error('Error fetching postoadms', error);
-      setAlert({ show: true, message: 'Failed to fetch postoadms. Please try again.' });
-    }
-    setAlert({ show: false, message: '' });
-  };
-
-  const handleReset = () => {
-    setFormField(initialState);
-    setIsFound(false);
-    setPostoadms([]);
-  };
-  // console.log(municipios);
-  return (
-    <Dialog open={showSearchDialog} onOpenChange={(open) => handleSearchDialog(open)}>
-      <DialogContent className="container-fixed max-w-[700px] flex flex-col p-5 overflow-hidden [&>button]:hidden">
-        <DialogTitle></DialogTitle>
-        <DialogDescription></DialogDescription>
-        <DialogHeader className="p-2 border-0">
-          <div className="flex items-center justify-between flex-wrap grow">
-            <div className="flex flex-col justify-center">
-              <h1 className="text-xl font-semibold leading-none text-gray-900">
-                Search Postoadms
-              </h1>
-              <div className="flex items-center gap-2 text-sm font-normal text-gray-700"></div>
-            </div>
-            <div
-              className="cursor-pointer hover:opacity-100 opacity-50"
-              onClick={() => {
-                handleSearchDialog(false);
-                resetForm();
-              }}
-            >
-              <KeenIcon icon="cross" className="text-1.5xl" />
-            </div>
-          </div>
-        </DialogHeader>
-        <DialogBody className="scrollable-y px-0 pb-0" ref={parentRef}>
-          <div className="flex flex-col px-0">
-            {alert.show && (
-              <Alert variant="danger" className="mb-5">
-                {alert.message}
-              </Alert>
-            )}
-            <form action="" onSubmit={handleSubmit}>
-              <div className="card-body grid-cols-6 gap-5 p-0">
-                <div className="grid grid-cols-8 gap-2 w-full items-center">
-                  <label className="form-label flex items-center gap-1 col-span-2">
-                    Municipio Name<span className="text-red-500">*</span>
-                  </label>
-
-                  <Select
-                    value={formField.id.toString()}
-                    onValueChange={(target) => {
-                      const selectedMunicipio = municipios.find((m) => m.id.toString() === target);
-                      if (selectedMunicipio) {
-                        setFormField({
-                          ...formField,
-                          id: selectedMunicipio.id,
-                          name: selectedMunicipio.name
-                        });
-                      }
-                    }}
-                  >
-                    <SelectTrigger className="col-span-6">
-                      <SelectValue placeholder="Select Municipios" />
-                    </SelectTrigger>
-                    <SelectContent>
-                      {municipios.map((municipio) => (
-                        <SelectItem key={municipio.id} value={municipio.id.toString()}>
-                          {municipio.name}
-                        </SelectItem>
-                      ))}
-                    </SelectContent>
-                  </Select>
-                </div>
-
-                {isFound && postoadms.length > 0 && (
-                  <div className="mt-4 border-t pt-4">
-                    <h2 className="text-md font-semibold">Postu Administravo: </h2>
-                    <br />
-                    <div className="flex flex-col">
-                      <span className="text-sm form-hint">
-                        {postoadms.map((posto) => posto.name).join(', ')}
-                      </span>
-                    </div>
-                  </div>
-                )}
-
-                <div className="flex justify-end pt-2.5 gap-5 col-span-6">
-                  <Button variant={'outline'} type="reset" onClick={handleReset}>
-                    Reset
-                  </Button>
-                  <Button variant={'default'} type="submit">
-                    Search
-                  </Button>
-                </div>
-              </div>
-            </form>
-          </div>
-        </DialogBody>
-      </DialogContent>
-    </Dialog>
-  );
-};
-
-export default SearchDialog;
diff --git a/src/pages/master/postoadms/PostoAdmsMaster.tsx b/src/pages/master/postoadms/PostoAdmsMaster.tsx
index 90823ab..275760a 100644
--- a/src/pages/master/postoadms/PostoAdmsMaster.tsx
+++ b/src/pages/master/postoadms/PostoAdmsMaster.tsx
@@ -1,7 +1,6 @@
 import AddDialog from './blocks/AddDialog';
 import DeleteDialog from './blocks/DeleteDialog';
 import EditDialog from './blocks/EditDialog';
-import SearchDialog from './blocks/SearchDialog';
 import { ManagePostoAdmsContextProvider } from './hooks/ManagePostoAdmsContext';
 import { Container, DataGridInner } from '@/components';
 import { Breadcrumbs, Link } from '@mui/material';
@@ -37,7 +36,6 @@ const PostoAdmsMaster = () => {
           <AddDialog />
           <EditDialog />
           <DeleteDialog />
-          <SearchDialog />
         </Container>
       </ManagePostoAdmsContextProvider>
     </>
diff --git a/src/pages/master/postoadms/blocks/ListToolbar.tsx b/src/pages/master/postoadms/blocks/ListToolbar.tsx
index 6d2e7ca..e181848 100644
--- a/src/pages/master/postoadms/blocks/ListToolbar.tsx
+++ b/src/pages/master/postoadms/blocks/ListToolbar.tsx
@@ -2,12 +2,14 @@ import { DefaultTooltip, KeenIcon, useDataGrid } from '@/components';
 
 import { Button } from '@/components/ui/button';
 import { useManagePostoAdmsContext } from '../hooks/useManagePostoAdmsContext';
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 
 const ListToolbar = () => {
   const { table, reload } = useDataGrid();
   const { handleAddDialog, handleSearchDialog } = useManagePostoAdmsContext();
-  const [searchPosto, setSearchPosto] = useState('');
+  const [searchValue, setSearchValue] = useState<string>(
+    (table.getColumn('name')?.getFilterValue() as string) ?? ''
+  );
 
   const handleKeyDown = (event: React.KeyboardEvent) => {
     if (event.key === 'Enter') {
@@ -16,10 +18,19 @@ const ListToolbar = () => {
   };
 
   const handleSearch = () => {
-    table.getColumn('name')?.setFilterValue(searchPosto);
+    table.getColumn('name')?.setFilterValue(searchValue);
     table.setPageIndex(0);
   };
 
+  useEffect(() => {
+    const timer = setTimeout(() => {
+      table.getColumn('name')?.setFilterValue(searchValue);
+      table.setPageIndex(0);
+    }, 200);
+
+    return () => clearTimeout(timer);
+  }, [searchValue, table]);
+
   return (
     <div className="card-header flex-wrap gap-2 border-b-0 px-5">
       <div className="flex flex-wrap gap-2 lg:gap-5 w-full">
@@ -30,34 +41,15 @@ const ListToolbar = () => {
               <input
                 type="text"
                 placeholder="Search"
-                value={searchPosto}
-                onChange={(event) => setSearchPosto(event.target.value)}
-                onKeyDown={handleKeyDown}
+                value={searchValue}
+                onChange={(event) => setSearchValue(event.target.value)}
               />
             </label>
-            <DefaultTooltip title={'Search'} placement={'top'}>
+            {/* <DefaultTooltip title={'Search'} placement={'top'}>
               <Button variant="outline" className="h-7.5" onClick={handleSearch}>
                 <KeenIcon icon="magnifier" />
               </Button>
-            </DefaultTooltip>
-            {/* <DefaultTooltip title={'Filter'} placement={'top'}>
-              <Button
-                variant="outline"
-                className="h-7.5 disabled:bg-gray-400"
-                // disabled={isLoading}
-                // onClick={handleFilterData}
-              >
-                {loadingButton === 'filter' ? <ContentLoader /> : <KeenIcon icon="filter" />}
-                <KeenIcon icon="filter" />
-              </Button>
             </DefaultTooltip> */}
-            {/* <Button
-              variant="outline"
-              className="h-7.5 text-[0.8rem]"
-              onClick={() => handleSearchDialog(true)}
-            >
-              Search Sucos
-            </Button> */}
           </div>
           <div className="flex gap-3 items-center">
             <Button
diff --git a/src/pages/master/postoadms/blocks/SearchDialog.tsx b/src/pages/master/postoadms/blocks/SearchDialog.tsx
deleted file mode 100644
index 6b83e74..0000000
--- a/src/pages/master/postoadms/blocks/SearchDialog.tsx
+++ /dev/null
@@ -1,177 +0,0 @@
-import { useRef, useState } from 'react';
-import {
-  Dialog,
-  DialogBody,
-  DialogContent,
-  DialogDescription,
-  DialogHeader,
-  DialogTitle
-} from '@/components/ui/dialog';
-import { Alert, KeenIcon } from '@/components';
-import { Button } from '@/components/ui/button';
-import { apiConfig } from '@/config/api.config';
-import axios from 'axios';
-import { useManagePostoAdmsContext } from '../hooks/useManagePostoAdmsContext';
-import {
-  Command,
-  CommandEmpty,
-  CommandGroup,
-  CommandInput,
-  CommandItem,
-  CommandList
-} from '@/components/ui/command';
-import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover';
-
-interface SucosProps {
-  id: number;
-  name: string;
-}
-
-const API_URL = apiConfig.service_master_data;
-
-const SearchDialog = () => {
-  const parentRef = useRef<any | null>(null);
-  const [open, setOpen] = useState(false);
-  const { showSearchDialog, handleSearchDialog, postoAdms } = useManagePostoAdmsContext();
-  const [alert, setAlert] = useState({
-    show: false,
-    message: ''
-  });
-  const initialState = {
-    id: 0,
-    name: ''
-  };
-
-  const [formField, setFormField] = useState(initialState);
-  const resetForm = () => {
-    setFormField(initialState);
-  };
-  const [sucos, setSucos] = useState<SucosProps[]>([]);
-  const [isFound, setIsFound] = useState(false);
-
-  const handleSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
-    e.preventDefault();
-    const id = Number(formField.id);
-
-    if (formField.id === 0) {
-      setAlert({ show: true, message: 'Please fill name field.' });
-      return;
-    }
-
-    try {
-      const response = await axios.get(`${API_URL}/postoadms/sucos/${id}`);
-
-      if (response.data.status) {
-        setSucos(response.data.data);
-        console.log(sucos);
-        setIsFound(true);
-        console.log('Found postoadms: ', response.data.data);
-      } else {
-        setSucos([]);
-        setIsFound(false);
-        setAlert({ show: true, message: 'No postoadms found.' });
-      }
-    } catch (error) {
-      console.error('Error fetching postoadms', error);
-      setAlert({ show: true, message: 'Failed to fetch postoadms. Please try again.' });
-    }
-    setAlert({ show: false, message: '' });
-  };
-
-  const handleReset = () => {
-    setFormField(initialState);
-    setIsFound(false);
-    setSucos([]);
-  };
-
-  return (
-    <Dialog open={showSearchDialog} onOpenChange={handleSearchDialog}>
-      <DialogContent className="container-fixed max-w-[700px] flex flex-col p-5 overflow-hidden [&>button]:hidden">
-        <DialogHeader className="p-2 border-0">
-          <DialogTitle></DialogTitle>
-          <DialogDescription></DialogDescription>
-          <div className="flex items-center justify-between flex-wrap grow">
-            <div className="flex flex-col justify-center">
-              <h1 className="text-xl font-semibold leading-none text-gray-900">Search Sucos</h1>
-            </div>
-            <div
-              className="cursor-pointer hover:opacity-100 opacity-50"
-              onClick={() => {
-                handleSearchDialog(false);
-                handleReset();
-              }}
-            >
-              <KeenIcon icon="cross" className="text-1.5xl" />
-            </div>
-          </div>
-        </DialogHeader>
-        <DialogBody className="scrollable-y px-0 pb-0" ref={parentRef}>
-          <form onSubmit={handleSubmit} className="flex flex-col px-5 gap-5">
-            {alert.show && <Alert variant="danger">{alert.message}</Alert>}
-
-            <div className="grid grid-cols-8 gap-1 w-full items-center">
-              <label className="form-label flex items-center col-span-3">
-                Postu Administrativo Name<span className="text-red-500">*</span>
-              </label>
-
-              <Popover open={open} onOpenChange={setOpen}>
-                <PopoverTrigger asChild>
-                  <button type="button" className="input col-span-5 text-left">
-                    {formField.name || 'Select PostoAdms'}
-                  </button>
-                </PopoverTrigger>
-                <PopoverContent className="w-[400px] p-0">
-                  <Command>
-                    <CommandInput placeholder="Search PostoAdms..." />
-                    <CommandList>
-                      <CommandEmpty>No PostoAdms found.</CommandEmpty>
-                      <CommandGroup>
-                        {postoAdms.map((postoAdm) => (
-                          <CommandItem
-                            key={postoAdm.PostoAdms_id}
-                            value={postoAdm.PostoAdms_name}
-                            onSelect={() => {
-                              setFormField({
-                                id: postoAdm.PostoAdms_id,
-                                name: postoAdm.PostoAdms_name
-                              });
-                              setOpen(false);
-                            }}
-                          >
-                            {postoAdm.PostoAdms_name}
-                          </CommandItem>
-                        ))}
-                      </CommandGroup>
-                    </CommandList>
-                  </Command>
-                </PopoverContent>
-              </Popover>
-            </div>
-
-            {isFound && sucos.length > 0 && (
-              <div className="mt-4 border-t pt-4">
-                <h2 className="text-md font-semibold">Sucos: </h2>
-                <div className="flex flex-col">
-                  <span className="text-sm form-hint">
-                    {sucos.map((suco) => suco.name).join(', ')}
-                  </span>
-                </div>
-              </div>
-            )}
-
-            <div className="flex justify-end gap-4">
-              <Button type="reset" variant="outline" onClick={handleReset}>
-                Reset
-              </Button>
-              <Button type="submit" variant="default">
-                Search
-              </Button>
-            </div>
-          </form>
-        </DialogBody>
-      </DialogContent>
-    </Dialog>
-  );
-};
-
-export default SearchDialog;
diff --git a/src/pages/master/products/blocks/ListToolbar.tsx b/src/pages/master/products/blocks/ListToolbar.tsx
index a56506f..c8620f6 100644
--- a/src/pages/master/products/blocks/ListToolbar.tsx
+++ b/src/pages/master/products/blocks/ListToolbar.tsx
@@ -6,16 +6,18 @@ import { useEffect, useState } from 'react';
 const ListToolbar = () => {
   const { table, reload } = useDataGrid();
   const { handleAddDialog } = useManageProductsContext();
-  const [searchValue, setSearchValue] = useState<string>((table.getColumn('name')?.getFilterValue() as string) ?? '');
+  const [searchValue, setSearchValue] = useState<string>(
+    (table.getColumn('name')?.getFilterValue() as string) ?? ''
+  );
 
-    useEffect(() => {
-      const timer = setTimeout(() => {
-        table.getColumn('name')?.setFilterValue(searchValue);
-      }, 200);
-  
-      return () => clearTimeout(timer);
-    }, [searchValue, table]);
+  useEffect(() => {
+    const timer = setTimeout(() => {
+      table.getColumn('name')?.setFilterValue(searchValue);
+      table.setPageIndex(0);
+    }, 200);
 
+    return () => clearTimeout(timer);
+  }, [searchValue, table]);
 
   return (
     <div className="card-header flex-wrap gap-2 border-b-0 px-5">
@@ -26,22 +28,11 @@ const ListToolbar = () => {
               <KeenIcon icon="magnifier" />
               <input
                 type="text"
-                placeholder="Search Transaction Type"
+                placeholder="Search"
                 value={searchValue}
                 onChange={(event) => setSearchValue(event.target.value)}
               />
             </label>
-            {/* <DefaultTooltip title={'Filter'} placement={'top'}>
-              <Button
-                variant="outline"
-                className="h-7.5 disabled:bg-gray-400"
-                // disabled={isLoading}
-                // onClick={handleFilterData}
-              >
-                {loadingButton === 'filter' ? <ContentLoader /> : <KeenIcon icon="filter" />}
-                <KeenIcon icon="filter" />
-              </Button>
-            </DefaultTooltip> */}
           </div>
           <div className="flex gap-3 items-center">
             <Button
diff --git a/src/pages/master/profession/blocks/ListToolbar.tsx b/src/pages/master/profession/blocks/ListToolbar.tsx
index 442b4d1..4d5e55c 100644
--- a/src/pages/master/profession/blocks/ListToolbar.tsx
+++ b/src/pages/master/profession/blocks/ListToolbar.tsx
@@ -7,18 +7,18 @@ import { set } from 'date-fns';
 const ListToolbar = () => {
   const { reload, table } = useDataGrid();
   const { handleAddDialog } = useManageProfessionContext();
-  const [searchValue, setSearchValue] = useState<string>((table.getColumn('name')?.getFilterValue() as string) ?? '');
-
-    useEffect(() => {
-      const timer = setTimeout(() => {
-        table.getColumn('name')?.setFilterValue(searchValue);
-      }, 200);
-  
-      return () => clearTimeout(timer);
-    }, [searchValue, table]);
-
+  const [searchValue, setSearchValue] = useState<string>(
+    (table.getColumn('name')?.getFilterValue() as string) ?? ''
+  );
 
+  useEffect(() => {
+    const timer = setTimeout(() => {
+      table.getColumn('name')?.setFilterValue(searchValue);
+      table.setPageIndex(0);
+    }, 200);
 
+    return () => clearTimeout(timer);
+  }, [searchValue, table]);
 
   return (
     <div className="card-header flex-wrap gap-2 border-b-0 px-5">
@@ -29,23 +29,11 @@ const ListToolbar = () => {
               <KeenIcon icon="magnifier" />
               <input
                 type="text"
-                placeholder="Search Transaction Type"
+                placeholder="Search"
                 value={searchValue}
                 onChange={(event) => setSearchValue(event.target.value)}
               />
             </label>
-
-            {/* <DefaultTooltip title={'Filter'} placement={'top'}>
-              <Button
-                variant="outline"
-                className="h-7.5 disabled:bg-gray-400"
-                // disabled={isLoading}
-                // onClick={handleFilterData}
-              >
-                {loadingButton === 'filter' ? <ContentLoader /> : <KeenIcon icon="filter" />}
-                <KeenIcon icon="filter" />
-              </Button>
-            </DefaultTooltip> */}
           </div>
           <div className="flex gap-3 items-center">
             <Button
diff --git a/src/pages/master/provider/blocks/ListToolbar.tsx b/src/pages/master/provider/blocks/ListToolbar.tsx
index 5743dcc..7960b83 100644
--- a/src/pages/master/provider/blocks/ListToolbar.tsx
+++ b/src/pages/master/provider/blocks/ListToolbar.tsx
@@ -6,15 +6,18 @@ import { useEffect, useState } from 'react';
 const ListToolbar = () => {
   const { reload, table } = useDataGrid();
   const { handleAddDialog } = useManageProviderContext();
- const [searchValue, setSearchValue] = useState<string>((table.getColumn('name')?.getFilterValue() as string) ?? '');
+  const [searchValue, setSearchValue] = useState<string>(
+    (table.getColumn('name')?.getFilterValue() as string) ?? ''
+  );
 
-    useEffect(() => {
-      const timer = setTimeout(() => {
-        table.getColumn('name')?.setFilterValue(searchValue);
-      }, 200);
-  
-      return () => clearTimeout(timer);
-    }, [searchValue, table]);
+  useEffect(() => {
+    const timer = setTimeout(() => {
+      table.getColumn('name')?.setFilterValue(searchValue);
+      table.setPageIndex(0);
+    }, 200);
+
+    return () => clearTimeout(timer);
+  }, [searchValue, table]);
 
   return (
     <div className="card-header flex-wrap gap-2 border-b-0 px-5">
@@ -25,23 +28,11 @@ const ListToolbar = () => {
               <KeenIcon icon="magnifier" />
               <input
                 type="text"
-                placeholder="Search Transaction Type"
+                placeholder="Search"
                 value={searchValue}
                 onChange={(event) => setSearchValue(event.target.value)}
               />
             </label>
-
-            {/* <DefaultTooltip title={'Filter'} placement={'top'}>
-              <Button
-                variant="outline"
-                className="h-7.5 disabled:bg-gray-400"
-                // disabled={isLoading}
-                // onClick={handleFilterData}
-              >
-                {loadingButton === 'filter' ? <ContentLoader /> : <KeenIcon icon="filter" />}
-                <KeenIcon icon="filter" />
-              </Button>
-            </DefaultTooltip> */}
           </div>
           <div className="flex gap-3 items-center">
             <Button
diff --git a/src/pages/master/reward/blocks/ListToolbar.tsx b/src/pages/master/reward/blocks/ListToolbar.tsx
index 8e5fa85..665245f 100644
--- a/src/pages/master/reward/blocks/ListToolbar.tsx
+++ b/src/pages/master/reward/blocks/ListToolbar.tsx
@@ -6,15 +6,18 @@ import { useEffect, useState } from 'react';
 const ListToolbar = () => {
   const { table, reload } = useDataGrid();
   const { handleAddDialog } = useManageRewardContext();
-  const [searchValue, setSearchValue] = useState<string>((table.getColumn('name')?.getFilterValue() as string) ?? '');
+  const [searchValue, setSearchValue] = useState<string>(
+    (table.getColumn('name')?.getFilterValue() as string) ?? ''
+  );
 
-    useEffect(() => {
-      const timer = setTimeout(() => {
-        table.getColumn('name')?.setFilterValue(searchValue);
-      }, 200);
-  
-      return () => clearTimeout(timer);
-    }, [searchValue, table]);
+  useEffect(() => {
+    const timer = setTimeout(() => {
+      table.getColumn('name')?.setFilterValue(searchValue);
+      table.setPageIndex(0);
+    }, 200);
+
+    return () => clearTimeout(timer);
+  }, [searchValue, table]);
 
   return (
     <div className="card-header flex-wrap gap-2 border-b-0 px-5">
@@ -25,7 +28,7 @@ const ListToolbar = () => {
               <KeenIcon icon="magnifier" />
               <input
                 type="text"
-                placeholder="Search Transaction Type"
+                placeholder="Search"
                 value={searchValue}
                 onChange={(event) => setSearchValue(event.target.value)}
               />
diff --git a/src/pages/master/sucos/blocks/EditDialog.tsx b/src/pages/master/sucos/blocks/EditDialog.tsx
index 50156f3..fabdbf2 100644
--- a/src/pages/master/sucos/blocks/EditDialog.tsx
+++ b/src/pages/master/sucos/blocks/EditDialog.tsx
@@ -39,6 +39,7 @@ const EditDialog = () => {
   const { PutData, GetData } = useCallApi();
   const parsedUser = getAuth()?.user;
   const [open, setOpen] = useState(false);
+  const [isLoading, setIsLoading] = useState(false);
   const [postoadms, setPostoadms] = useState<PostoAdmsProps[]>([]);
 
   const [alert, setAlert] = useState({
@@ -111,6 +112,7 @@ const EditDialog = () => {
   }, []);
 
   const doFetchData = useCallback(async (id: string) => {
+    setIsLoading(true);
     const response = await GetData(`${API_URL}/sucos/getdata/${id}`, { id });
     // console.log('Data Sucos:', response?.data);
 
@@ -126,6 +128,7 @@ const EditDialog = () => {
         name: ''
       }));
     }
+    setIsLoading(false);
   }, []);
 
   const handleUpdate = (e: React.FormEvent<HTMLFormElement>) => {
@@ -182,72 +185,87 @@ const EditDialog = () => {
               </Alert>
             )}
 
-            <form onSubmit={handleUpdate}>
-              <div className="card-body grid gap-5">
-                <div className="w-full">
-                  <div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                    <label className="form-label flex items-center gap-1 max-w-56">
-                      Sucos Name<span className="text-red-500">*</span>
-                    </label>
-                    <Input
-                      className="input"
-                      type="text"
-                      value={formField.name}
-                      onChange={(e) => setFormField({ ...formField, name: e.target.value })}
-                    />
+            {isLoading ? (
+              <div className="flex flex-col items-center justify-center p-8">
+                <div className="animate-pulse flex space-x-4 w-full">
+                  <div className="flex-1 space-y-4 py-1">
+                    <div className="h-4 bg-gray-200 rounded w-3/4"></div>
+                    <div className="space-y-2">
+                      <div className="h-4 bg-gray-200 rounded"></div>
+                      <div className="h-4 bg-gray-200 rounded w-5/6"></div>
+                    </div>
                   </div>
                 </div>
-
-                <div className="w-full">
-                  <div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                    <label className="form-label flex items-center gap-1 max-w-56">
-                      Postu Administrativo Name
-                      <span className="text-red-500">*</span>
-                    </label>
-                    <Popover open={open} onOpenChange={setOpen}>
-                      <PopoverTrigger asChild>
-                        <button type="button" className="input col-span-5 text-left">
-                          {postoadms.find((posto) => posto.PostoAdms_id === formField.postoId)
-                            ?.PostoAdms_name || 'Select Postu Administrativo'}
-                        </button>
-                      </PopoverTrigger>
-                      <PopoverContent className="w-[400px] p-0">
-                        <Command>
-                          <CommandInput placeholder="Search Postu Administrativo..." />
-                          <CommandList>
-                            <CommandEmpty>No Postu Administrativo Found.</CommandEmpty>
-                            <CommandGroup>
-                              {postoadms.map((posto) => (
-                                <CommandItem
-                                  key={posto.PostoAdms_id}
-                                  value={posto.PostoAdms_name}
-                                  onSelect={() => {
-                                    setFormField({
-                                      ...formField,
-                                      postoId: posto.PostoAdms_id
-                                    });
-                                    setOpen(false);
-                                  }}
-                                >
-                                  {posto.PostoAdms_name}
-                                </CommandItem>
-                              ))}
-                            </CommandGroup>
-                          </CommandList>
-                        </Command>
-                      </PopoverContent>
-                    </Popover>
-                  </div>
-                </div>
-
-                <div className="flex justify-end gap-5">
-                  <Button type="button" variant="outline" onClick={resetForm}>
-                    Reset
-                  </Button>
-                  <Button className="btn btn-primary">Save Changes</Button>
-                </div>
+                <p className="mt-4 text-gray-500">Loading Sucos Details...</p>
               </div>
-            </form>
+            ) : (
+              <form onSubmit={handleUpdate}>
+                <div className="card-body grid gap-5">
+                  <div className="w-full">
+                    <div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                      <label className="form-label flex items-center gap-1 max-w-56">
+                        Sucos Name<span className="text-red-500">*</span>
+                      </label>
+                      <Input
+                        className="input"
+                        type="text"
+                        value={formField.name}
+                        onChange={(e) => setFormField({ ...formField, name: e.target.value })}
+                      />
+                    </div>
+                  </div>
+
+                  <div className="w-full">
+                    <div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                      <label className="form-label flex items-center gap-1 max-w-56">
+                        Postu Administrativo Name
+                        <span className="text-red-500">*</span>
+                      </label>
+                      <Popover open={open} onOpenChange={setOpen}>
+                        <PopoverTrigger asChild>
+                          <button type="button" className="input col-span-5 text-left">
+                            {postoadms.find((posto) => posto.PostoAdms_id === formField.postoId)
+                              ?.PostoAdms_name || 'Select Postu Administrativo'}
+                          </button>
+                        </PopoverTrigger>
+                        <PopoverContent className="w-[400px] p-0">
+                          <Command>
+                            <CommandInput placeholder="Search Postu Administrativo..." />
+                            <CommandList>
+                              <CommandEmpty>No Postu Administrativo Found.</CommandEmpty>
+                              <CommandGroup>
+                                {postoadms.map((posto) => (
+                                  <CommandItem
+                                    key={posto.PostoAdms_id}
+                                    value={posto.PostoAdms_name}
+                                    onSelect={() => {
+                                      setFormField({
+                                        ...formField,
+                                        postoId: posto.PostoAdms_id
+                                      });
+                                      setOpen(false);
+                                    }}
+                                  >
+                                    {posto.PostoAdms_name}
+                                  </CommandItem>
+                                ))}
+                              </CommandGroup>
+                            </CommandList>
+                          </Command>
+                        </PopoverContent>
+                      </Popover>
+                    </div>
+                  </div>
+
+                  <div className="flex justify-end gap-5">
+                    <Button type="button" variant="outline" onClick={resetForm}>
+                      Reset
+                    </Button>
+                    <Button className="btn btn-primary">Save Changes</Button>
+                  </div>
+                </div>
+              </form>
+            )}
           </div>
         </DialogBody>
       </DialogContent>
diff --git a/src/pages/master/sucos/blocks/ListToolbar.tsx b/src/pages/master/sucos/blocks/ListToolbar.tsx
index 75e52e4..0ed4cab 100644
--- a/src/pages/master/sucos/blocks/ListToolbar.tsx
+++ b/src/pages/master/sucos/blocks/ListToolbar.tsx
@@ -1,12 +1,14 @@
 import { DefaultTooltip, KeenIcon, useDataGrid } from '@/components';
 import { Button } from '@/components/ui/button';
 import { useManageSucosContext } from '../hooks/useManageSucosContext';
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 
 const ListToolbar = () => {
   const { table, reload } = useDataGrid();
   const { handleAddDialog, handleSearchDialog } = useManageSucosContext();
-  const [searchValue, setSearchValue] = useState('');
+  const [searchValue, setSearchValue] = useState<string>(
+    (table.getColumn('sucos_name')?.getFilterValue() as string) ?? ''
+  );
 
   const handleKeyDown = (event: React.KeyboardEvent) => {
     if (event.key === 'Enter') {
@@ -19,6 +21,15 @@ const ListToolbar = () => {
     table.setPageIndex(0);
   };
 
+  useEffect(() => {
+    const timer = setTimeout(() => {
+      table.getColumn('sucos_name')?.setFilterValue(searchValue);
+      table.setPageIndex(0);
+    }, 200);
+
+    return () => clearTimeout(timer);
+  }, [searchValue, table]);
+
   return (
     <div className="card-header flex-wrap gap-2 border-b-0 px-5">
       <div className="flex flex-wrap gap-2 lg:gap-5 w-full">
@@ -31,32 +42,13 @@ const ListToolbar = () => {
                 placeholder="Search Sucos"
                 value={searchValue}
                 onChange={(event) => setSearchValue(event.target.value)}
-                onKeyDown={handleKeyDown}
               />
             </label>
-            <DefaultTooltip title={'Search'} placement={'top'}>
+            {/* <DefaultTooltip title={'Search'} placement={'top'}>
               <Button variant="outline" className="h-7.5" onClick={handleSearch}>
                 <KeenIcon icon="magnifier" />
               </Button>
-            </DefaultTooltip>
-            {/* <DefaultTooltip title={'Filter'} placement={'top'}>
-              <Button
-                variant="outline"
-                className="h-7.5 disabled:bg-gray-400"
-                // disabled={isLoading}
-                // onClick={handleFilterData}
-              >
-                {loadingButton === 'filter' ? <ContentLoader /> : <KeenIcon icon="filter" />}
-                <KeenIcon icon="filter" />
-              </Button>
             </DefaultTooltip> */}
-            {/* <Button
-              variant="outline"
-              className="h-7.5 text-[0.8rem]"
-              onClick={() => handleSearchDialog(true)}
-            >
-              Search Aldeias
-            </Button> */}
           </div>
           <div className="flex gap-3 items-center">
             <Button
diff --git a/src/pages/master/wallet/blocks/ListToolbar.tsx b/src/pages/master/wallet/blocks/ListToolbar.tsx
index 1e38aa5..ee39e30 100644
--- a/src/pages/master/wallet/blocks/ListToolbar.tsx
+++ b/src/pages/master/wallet/blocks/ListToolbar.tsx
@@ -1,12 +1,14 @@
 import { DefaultTooltip, KeenIcon, useDataGrid } from '@/components';
 import { Button } from '@/components/ui/button';
 import { useManageWalletContext } from '../hooks/useManageWalletContext';
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 
 const ListToolbar = () => {
   const { reload, table } = useDataGrid();
   const { handleAddDialog } = useManageWalletContext();
-  const [searchValue, setSearchValue] = useState('');
+  const [searchValue, setSearchValue] = useState<string>(
+    (table.getColumn('wallets.name')?.getFilterValue() as string) ?? ''
+  );
 
   const handleKeyDown = (event: React.KeyboardEvent) => {
     if (event.key === 'Enter') {
@@ -19,6 +21,15 @@ const ListToolbar = () => {
     table.setPageIndex(0);
   };
 
+  useEffect(() => {
+    const timer = setTimeout(() => {
+      table.getColumn('wallets.name')?.setFilterValue(searchValue);
+      table.setPageIndex(0);
+    }, 200);
+
+    return () => clearTimeout(timer);
+  }, [searchValue, table]);
+
   return (
     <div className="card-header flex-wrap gap-2 border-b-0 px-5">
       <div className="flex flex-wrap gap-2 lg:gap-5 w-full">
@@ -31,24 +42,12 @@ const ListToolbar = () => {
                 placeholder="Search Wallet"
                 value={searchValue}
                 onChange={(event) => setSearchValue(event.target.value)}
-                onKeyDown={handleKeyDown}
               />
             </label>
-            <DefaultTooltip title={'Search'} placement={'top'}>
+            {/* <DefaultTooltip title={'Search'} placement={'top'}>
               <Button variant="outline" className="h-7.5" onClick={handleSearch}>
                 <KeenIcon icon="magnifier" />
               </Button>
-            </DefaultTooltip>
-            {/* <DefaultTooltip title={'Filter'} placement={'top'}>
-              <Button
-                variant="outline"
-                className="h-7.5 disabled:bg-gray-400"
-                // disabled={isLoading}
-                // onClick={handleFilterData}
-              >
-                {loadingButton === 'filter' ? <ContentLoader /> : <KeenIcon icon="filter" />}
-                <KeenIcon icon="filter" />
-              </Button>
             </DefaultTooltip> */}
           </div>
           <div className="flex gap-3 items-center">
diff --git a/src/pages/menu/manage-menu/blocks/ListToolbar.tsx b/src/pages/menu/manage-menu/blocks/ListToolbar.tsx
index 0820e05..91425b8 100644
--- a/src/pages/menu/manage-menu/blocks/ListToolbar.tsx
+++ b/src/pages/menu/manage-menu/blocks/ListToolbar.tsx
@@ -1,12 +1,14 @@
 import { DefaultTooltip, KeenIcon, useDataGrid } from '@/components';
 import { useManageMenusContext } from '../hooks/useManageMenusContext';
 import { Button } from '@/components/ui/button';
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 
 const ListToolbar = () => {
   const { table, reload } = useDataGrid();
   const { handleAddDialog } = useManageMenusContext();
-  const [searchValue, setSearchValue] = useState('');
+  const [searchValue, setSearchValue] = useState<string>(
+    (table.getColumn('name')?.getFilterValue() as string) ?? ''
+  );
 
   const handleKeyDown = (event: React.KeyboardEvent) => {
     if (event.key === 'Enter') {
@@ -18,6 +20,15 @@ const ListToolbar = () => {
     table.getColumn('name')?.setFilterValue(searchValue);
   };
 
+  useEffect(() => {
+    const timer = setTimeout(() => {
+      table.getColumn('name')?.setFilterValue(searchValue);
+      table.setPageIndex(0);
+    }, 200);
+
+    return () => clearTimeout(timer);
+  }, [searchValue, table]);
+
   return (
     <div className="card-header flex-wrap gap-2 border-b-0 px-5">
       <div className="flex flex-wrap gap-2 lg:gap-5 w-full">
@@ -30,25 +41,12 @@ const ListToolbar = () => {
                 placeholder="Search Menu"
                 value={searchValue}
                 onChange={(event) => setSearchValue(event.target.value)}
-                onKeyDown={handleKeyDown}
               />
             </label>
-            <DefaultTooltip title={'Search'} placement={'top'}>
+            {/* <DefaultTooltip title={'Search'} placement={'top'}>
               <Button variant="outline" className="h-7.5" onClick={handleSearch}>
                 <KeenIcon icon="magnifier" />
               </Button>
-            </DefaultTooltip>
-            {/* <DefaultTooltip title={'Filter'} placement={'top'}>
-              <Button
-                variant="outline"
-                className="h-7.5 disabled:bg-gray-400"
-                // disabled={isLoading}
-                // onClick={handleFilterData}
-              >
-                {/* {loadingButton === 'filter' ? <ContentLoader /> : <KeenIcon icon="filter" />} */}
-            {/* <KeenIcon icon="filter" />
->>>>>>> raja
-              </Button>
             </DefaultTooltip> */}
           </div>
           <div className="flex gap-3 items-center">