diff --git a/src/pages/master/sucos/blocks/AddDialog.tsx b/src/pages/master/sucos/blocks/AddDialog.tsx
index e9e0ad0..1eae604 100644
--- a/src/pages/master/sucos/blocks/AddDialog.tsx
+++ b/src/pages/master/sucos/blocks/AddDialog.tsx
@@ -15,15 +15,30 @@ import {
 } from '@/components/ui/dialog';
 import { Input } from '@/components/ui/input';
 import { Button } from '@/components/ui/button';
+import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover';
+import {
+  Command,
+  CommandEmpty,
+  CommandGroup,
+  CommandInput,
+  CommandItem,
+  CommandList
+} from '@/components/ui/command';
 
+interface PostoAdmsProps {
+  PostoAdms_id: number;
+  PostoAdms_name: string;
+}
 const API_URL = apiConfig.service_master_data;
 
 const AddDialog = () => {
   const parentRef = useRef<any | null>(null);
   const { showAddDialog, handleAddDialog } = useManageSucosContext();
   const { reload } = useDataGrid();
-  const { PostData } = useCallApi();
+  const { PostData, GetData } = useCallApi();
   const parsedUser = getAuth()?.user;
+  const [posto_adms, setPostoadms] = useState<PostoAdmsProps[]>([]);
+  const [open, setOpen] = useState(false);
   const [alert, setAlert] = useState({
     show: false,
     message: ''
@@ -44,20 +59,23 @@ const AddDialog = () => {
     setAlert({ show: false, message: '' });
   };
 
-  const doCreateSucos = useCallback(async (e: React.FormEvent<HTMLFormElement>) => {
-    e.preventDefault();
-    const response = await PostData(`${API_URL}/sucos/create`, formField);
+  const doCreateSucos = useCallback(
+    async (e: React.FormEvent<HTMLFormElement>) => {
+      e.preventDefault();
+      const response = await PostData(`${API_URL}/sucos/create`, formField);
 
-    if (response?.status) {
-      resetForm();
-      handleAddDialog(false);
-      reload();
-      toast.success('Success Create Sucos');
-    } else {
-      toast.error('Failed Create Sucos');
-      setAlert({ show: true, message: response?.message });
-    }
-  }, []);
+      if (response?.status) {
+        resetForm();
+        handleAddDialog(false);
+        reload();
+        toast.success('Sucos created successfully!');
+      } else {
+        toast.error('Failed to create Sucos Please try again.');
+        setAlert({ show: true, message: 'Failed to create Sucos Please try again.' });
+      }
+    },
+    [formField]
+  );
 
   const handleSubmit = (e: React.FormEvent<HTMLFormElement>) => {
     e.preventDefault();
@@ -76,7 +94,7 @@ const AddDialog = () => {
     if (showAddDialog) {
       setFormField({
         ...formField,
-        created_by: parsedUser.username,
+        created_by: parsedUser?.username,
         created_at: formattedTime
       });
     }
@@ -88,9 +106,30 @@ const AddDialog = () => {
     }
   }, [showAddDialog]);
 
+  useEffect(() => {
+    const fetchPostoAdms = async (sorting: any) => {
+      try {
+        sorting = sorting.length == 0 ? [{ id: 'name', desc: false }] : sorting;
+        const response = await GetData(`${API_URL}/postoadms/list`, {
+          limit: 100,
+          page: 1,
+          with_deleted: false,
+          order_field: sorting[0].id,
+          order_direction: sorting[0].desc == false ? 'ASC' : 'DESC'
+        });
+        console.log('ini data posto :', response?.data);
+        setPostoadms(response?.data.list || []);
+      } catch (error) {
+        console.log('Error fetching posto', error);
+      }
+    };
+
+    fetchPostoAdms([{ id: 'name', desc: false }]);
+  }, []);
+
   return (
     <Dialog open={showAddDialog} onOpenChange={(open) => handleAddDialog(open)}>
-      <DialogContent className="container-fixed max-w-[768px] flex flex-col p-5 overflow-hidden">
+      <DialogContent className="container-fixed max-w-[768px] flex flex-col p-5">
         <DialogHeader>
           <DialogTitle>Sucos - Create</DialogTitle>
           <DialogDescription></DialogDescription>
@@ -124,7 +163,40 @@ const AddDialog = () => {
                     <label className="form-label flex items-center gap-1 max-w-56">
                       Posto Adm ID<span className="text-red-500">*</span>
                     </label>
-                    <Input
+                    <Popover open={open} onOpenChange={setOpen}>
+                      <PopoverTrigger asChild>
+                        <button type="button" className="input col-span-5 text-left">
+                          {posto_adms.find((posto) => posto.PostoAdms_id === formField.posto_adm_id)
+                            ?.PostoAdms_name || 'Select Posto Administrativo'}
+                        </button>
+                      </PopoverTrigger>
+                      <PopoverContent className="w-[400px] p-0">
+                        <Command>
+                          <CommandInput placeholder="Search Posto Adms..." />
+                          <CommandList>
+                            <CommandEmpty>No Posto Adms Found.</CommandEmpty>
+                            <CommandGroup>
+                              {posto_adms.map((posto) => (
+                                <CommandItem
+                                  key={posto.PostoAdms_id}
+                                  value={posto.PostoAdms_name}
+                                  onSelect={() => {
+                                    setFormField({
+                                      ...formField,
+                                      posto_adm_id: posto.PostoAdms_id
+                                    });
+                                    setOpen(false);
+                                  }}
+                                >
+                                  {posto.PostoAdms_name}
+                                </CommandItem>
+                              ))}
+                            </CommandGroup>
+                          </CommandList>
+                        </Command>
+                      </PopoverContent>
+                    </Popover>
+                    {/* <Input
                       className="input"
                       type="number"
                       min={0}
@@ -133,7 +205,7 @@ const AddDialog = () => {
                         const value = parseInt(e.target.value, 10);
                         setFormField({ ...formField, posto_adm_id: isNaN(value) ? 0 : value });
                       }}
-                    />
+                    /> */}
                   </div>
                 </div>
 
diff --git a/src/pages/master/sucos/blocks/ListToolbar.tsx b/src/pages/master/sucos/blocks/ListToolbar.tsx
index 8779cad..f5cd607 100644
--- a/src/pages/master/sucos/blocks/ListToolbar.tsx
+++ b/src/pages/master/sucos/blocks/ListToolbar.tsx
@@ -1,23 +1,10 @@
 import { DefaultTooltip, KeenIcon, useDataGrid } from '@/components';
 import { Button } from '@/components/ui/button';
-import { useCallback, useState } from 'react';
-import { toast } from 'sonner';
 import { useManageSucosContext } from '../hooks/useManageSucosContext';
 
 const ListToolbar = () => {
   const { table, reload } = useDataGrid();
   const { handleAddDialog, handleSearchDialog } = useManageSucosContext();
-  const [searchName, setSearchName] = useState('');
-  const [isLoading, setIsLoading] = useState(false);
-
-  const handleFilterData = useCallback(() => {
-    try {
-      table.getColumn('name')?.setFilterValue(searchName);
-    } catch (error) {
-      toast.error('Error applying filter');
-      console.error('Error applying filter:', error);
-    }
-  }, [searchName, table]);
 
   return (
     <div className="card-header flex-wrap gap-2 border-b-0 px-5">
@@ -29,8 +16,10 @@ const ListToolbar = () => {
               <input
                 type="text"
                 placeholder="Search Sucos"
-                value={searchName}
-                onChange={(event) => setSearchName(event.target.value)}
+                value={table.getColumn(`sucos_id`)?.getFilterValue() as string}
+                onChange={(event) =>
+                  table.getColumn('sucos_name')?.setFilterValue(event.target.value)
+                }
               />
             </label>
             <DefaultTooltip title={'Filter'} placement={'top'}>
@@ -38,7 +27,7 @@ const ListToolbar = () => {
                 variant="outline"
                 className="h-7.5 disabled:bg-gray-400"
                 // disabled={isLoading}
-                onClick={handleFilterData}
+                // onClick={handleFilterData}
               >
                 {/* {loadingButton === 'filter' ? <ContentLoader /> : <KeenIcon icon="filter" />} */}
                 <KeenIcon icon="filter" />
diff --git a/src/pages/master/sucos/blocks/SearchDialog.tsx b/src/pages/master/sucos/blocks/SearchDialog.tsx
index 22ef4c9..e744347 100644
--- a/src/pages/master/sucos/blocks/SearchDialog.tsx
+++ b/src/pages/master/sucos/blocks/SearchDialog.tsx
@@ -1,4 +1,4 @@
-import { useContext, useEffect, useRef, useState } from 'react';
+import { useRef, useState } from 'react';
 import {
   Dialog,
   DialogBody,
@@ -8,18 +8,19 @@ import {
   DialogTitle
 } from '@/components/ui/dialog';
 import { Alert, KeenIcon } from '@/components';
-import { Input } from '@/components/ui/input';
 import { Button } from '@/components/ui/button';
 import { apiConfig } from '@/config/api.config';
 import axios from 'axios';
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue
-} from '@/components/ui/select';
 import { useManageSucosContext } from '../hooks/useManageSucosContext';
+import {
+  Command,
+  CommandEmpty,
+  CommandGroup,
+  CommandInput,
+  CommandItem,
+  CommandList
+} from '@/components/ui/command';
+import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover';
 
 interface AldeiasProps {
   id: number;
@@ -30,14 +31,8 @@ const API_URL = apiConfig.service_master_data;
 
 const SearchDialog = () => {
   const parentRef = useRef<any | null>(null);
+  const [open, setOpen] = useState(false);
   const { showSearchDialog, handleSearchDialog, sucos } = useManageSucosContext();
-  console.log('Sucos:', sucos);
-  // const { sucos, getSucosLists } = useContext(ManageSucosContext);
-
-  // useEffect(() => {
-  //   getSucosLists(1, 1000, [], []); // Memuat semua sucos
-  // }, []);
-
   const [alert, setAlert] = useState({
     show: false,
     message: ''
@@ -51,7 +46,7 @@ const SearchDialog = () => {
   const resetForm = () => {
     setFormField(initialState);
   };
-  const [aldeias, setAldeias] = useState<AldeiasProps[]>([]);
+  const [aldeia, setAldeia] = useState<AldeiasProps[]>([]);
   const [isFound, setIsFound] = useState(false);
 
   const handleSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
@@ -64,23 +59,21 @@ const SearchDialog = () => {
     }
 
     try {
-      const response = await axios.get(`${API_URL}/sucos/aldeias/${id}`);
-      console.log('API Response Data:', response.data.data);
-      console.log('aldeias data:', aldeias);
-      console.log('isFound:', isFound);
+      const response = await axios.get(`${API_URL}/postoadms/sucos/${id}`);
 
       if (response.data.status) {
-        setAldeias(response.data.data);
+        setAldeia(response.data.data);
+        console.log(aldeia);
         setIsFound(true);
-        console.log('Found aldeias: ', response.data.data);
+        console.log('Found Sucos: ', response.data.data);
       } else {
-        setAldeias([]);
+        setAldeia([]);
         setIsFound(false);
-        setAlert({ show: true, message: 'No aldeias found.' });
+        setAlert({ show: true, message: 'No sucos found.' });
       }
     } catch (error) {
-      console.error('Error fetching aldeias', error);
-      setAlert({ show: true, message: 'Failed to fetch aldeias. Please try again.' });
+      console.error('Error fetching sucos', error);
+      setAlert({ show: true, message: 'Failed to fetch sucos. Please try again.' });
     }
     setAlert({ show: false, message: '' });
   };
@@ -88,101 +81,93 @@ const SearchDialog = () => {
   const handleReset = () => {
     setFormField(initialState);
     setIsFound(false);
-    setAldeias([]);
+    setAldeia([]);
   };
-  // console.log(aldeias);
+
   return (
-    <Dialog open={showSearchDialog} onOpenChange={(open) => handleSearchDialog(open)}>
+    <Dialog open={showSearchDialog} onOpenChange={handleSearchDialog}>
       <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">
+          <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 Aldeias</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();
+                handleReset();
               }}
             >
               <KeenIcon icon="cross" className="text-1.5xl" />
             </div>
           </div>
         </DialogHeader>
-        <DialogBody className="scrollable-x 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">
-                    Sucos Name<span className="text-red-500">*</span>
-                  </label>
+        <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>}
 
-                  <Select
-                    value={formField.id?.toString() ?? ''}
-                    onValueChange={(target) => {
-                      const selectedSuco = sucos.find((m) => m.sucos_id.toString() === target);
-                      if (selectedSuco) {
-                        setFormField({
-                          ...formField,
-                          id: selectedSuco.sucos_id,
-                          name: selectedSuco.sucos_name
-                        });
-                      }
-                    }}
-                  >
-                    <SelectTrigger className="col-span-6">
-                      <SelectValue placeholder="Select Sucos" />
-                    </SelectTrigger>
+            <div className="grid grid-cols-8 gap-1 w-full items-center">
+              <label className="form-label flex items-center col-span-3">
+                Sucos Name<span className="text-red-500">*</span>
+              </label>
 
-                    <SelectContent>
-                      {sucos?.map((suco) => {
-                        if (!suco.sucos_id) {
-                          console.error('suco.id is undefined or null', suco);
-                          return null; // Skip rendering this item if id is not valid
-                        }
-                        return (
-                          <SelectItem key={suco.sucos_id} value={suco.sucos_id.toString()}>
+              <Popover open={open} onOpenChange={setOpen}>
+                <PopoverTrigger asChild>
+                  <button type="button" className="input col-span-5 text-left">
+                    {formField.name || 'Select Sucos'}
+                  </button>
+                </PopoverTrigger>
+                <PopoverContent className="w-[400px] p-0">
+                  <Command>
+                    <CommandInput placeholder="Search Sucos..." />
+                    <CommandList>
+                      <CommandEmpty>No PostoAdms found.</CommandEmpty>
+                      <CommandGroup>
+                        {sucos.map((suco) => (
+                          <CommandItem
+                            key={suco.sucos_id}
+                            value={suco.sucos_name}
+                            onSelect={() => {
+                              setFormField({
+                                id: suco.sucos_id,
+                                name: suco.sucos_name
+                              });
+                              setOpen(false);
+                            }}
+                          >
                             {suco.sucos_name}
-                          </SelectItem>
-                        );
-                      })}
-                    </SelectContent>
-                  </Select>
-                </div>
+                          </CommandItem>
+                        ))}
+                      </CommandGroup>
+                    </CommandList>
+                  </Command>
+                </PopoverContent>
+              </Popover>
+            </div>
 
-                {isFound && aldeias.length > 0 && (
-                  <div className="mt-4 border-t pt-4">
-                    <h2 className="text-md font-semibold">Aldeias: </h2>
-                    <br />
-                    <div className="flex flex-col">
-                      <span className="text-sm form-hint">
-                        {aldeias.map((aldeia) => aldeia.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>
+            {isFound && sucos.length > 0 && (
+              <div className="mt-4 border-t pt-4">
+                <h2 className="text-md font-semibold">Aldeias: </h2>
+                <div className="flex flex-col">
+                  <span className="text-sm form-hint">
+                    {aldeia.map((aldeias) => aldeias.name).join(', ')}
+                  </span>
                 </div>
               </div>
-            </form>
-          </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>
diff --git a/src/pages/master/sucos/hooks/ManageSucosContext.tsx b/src/pages/master/sucos/hooks/ManageSucosContext.tsx
index d1ae6ac..212be5a 100644
--- a/src/pages/master/sucos/hooks/ManageSucosContext.tsx
+++ b/src/pages/master/sucos/hooks/ManageSucosContext.tsx
@@ -11,6 +11,7 @@ import axios from 'axios';
 interface SucosProps {
   sucos_id: number;
   sucos_name: string;
+  posto_name: string;
 }
 
 interface ContextProps {
@@ -159,7 +160,7 @@ const ManageSucosContextProvider = ({ children }: { children: React.ReactNode })
         order_direction: sorting[0].desc == false ? 'ASC' : 'DESC',
         filter: JSON.stringify(filter)
       });
-      console.log('Sucos List Response:', response?.data);
+      // console.log('Sucos List Response:', response?.data);
       setSucos(response?.data.list || []); // Pastikan default value adalah array kosong
       return { data: response?.data.list, totalCount: response?.data.total_count };
     } catch (error) {