From 884617ac3c8c7492b5f6d6cd9d5ef5338b5efebc Mon Sep 17 00:00:00 2001
From: Raja Oktafrianto <rajaoktafrianto3.com>
Date: Mon, 24 Mar 2025 16:04:52 +0700
Subject: [PATCH] scroll bar add data postu, sucos, aldeias active. hide icon
 filter manage user & menu. message error in manage user done

---
 src/pages/master/aldeias/AldeiasMaster.tsx                | 2 +-
 src/pages/master/aldeias/blocks/AddDialog.tsx             | 5 ++++-
 src/pages/master/postoadms/blocks/AddDialog.tsx           | 7 +++++--
 src/pages/master/postoadms/blocks/ListToolbar.tsx         | 4 +---
 .../master/postoadms/hooks/ManagePostoAdmsContext.tsx     | 2 +-
 src/pages/master/products/blocks/AddDialog.tsx            | 8 +++++---
 src/pages/master/sucos/SucosMaster.tsx                    | 2 +-
 src/pages/master/sucos/blocks/AddDialog.tsx               | 5 ++++-
 src/pages/master/sucos/blocks/ListToolbar.tsx             | 8 --------
 src/pages/menu/manage-menu/blocks/ListToolbar.tsx         | 6 +++---
 .../settings/user/manage-user/blocks/ListToolBar.tsx      | 6 +++---
 src/partials/dropdowns/user/DropdownUser.tsx              | 6 +++++-
 12 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/src/pages/master/aldeias/AldeiasMaster.tsx b/src/pages/master/aldeias/AldeiasMaster.tsx
index a3d0ad7..3ebb197 100644
--- a/src/pages/master/aldeias/AldeiasMaster.tsx
+++ b/src/pages/master/aldeias/AldeiasMaster.tsx
@@ -9,7 +9,7 @@ const AldeiasMaster = () => {
   return (
     <ManageAldeiasContextProvider>
       <Container>
-        <h1 className="text-xl font-medium leading-none text-gray-900 mb-5">Aldeias</h1>
+        <h1 className="text-xl font-medium leading-none text-gray-900 mb-3">Aldeias</h1>
         <Breadcrumbs sx={{ mb: 2 }}>
           <Link underline="none" color="inherit" href="/">
             <span className="text-sm hover:underline">Dashboard</span>
diff --git a/src/pages/master/aldeias/blocks/AddDialog.tsx b/src/pages/master/aldeias/blocks/AddDialog.tsx
index af089ef..731ceba 100644
--- a/src/pages/master/aldeias/blocks/AddDialog.tsx
+++ b/src/pages/master/aldeias/blocks/AddDialog.tsx
@@ -172,7 +172,10 @@ const AddDialog = () => {
                             'Select Sucos'}
                         </button>
                       </PopoverTrigger>
-                      <PopoverContent className="w-[400px] p-0">
+                      <PopoverContent
+                        className="w-[400px] p-0"
+                        onWheel={(e) => e.stopPropagation()}
+                      >
                         <Command>
                           <CommandInput placeholder="Search Sucos..." />
                           <CommandList>
diff --git a/src/pages/master/postoadms/blocks/AddDialog.tsx b/src/pages/master/postoadms/blocks/AddDialog.tsx
index fa7c7dd..eaa8b1e 100644
--- a/src/pages/master/postoadms/blocks/AddDialog.tsx
+++ b/src/pages/master/postoadms/blocks/AddDialog.tsx
@@ -174,10 +174,13 @@ const AddDialog = () => {
                             ?.name || 'Select Municipios'}
                         </button>
                       </PopoverTrigger>
-                      <PopoverContent className="w-[400px] p-0">
+                      <PopoverContent
+                        className="w-[400px] p-0"
+                        onWheel={(e) => e.stopPropagation()}
+                      >
                         <Command>
                           <CommandInput placeholder="Search Municipios..." />
-                          <CommandList>
+                          <CommandList className="max-h-[300px] overflow-y-auto pointer-events-auto">
                             <CommandEmpty>No Municipio found.</CommandEmpty>
                             <CommandGroup>
                               {municipios.map((municipio) => (
diff --git a/src/pages/master/postoadms/blocks/ListToolbar.tsx b/src/pages/master/postoadms/blocks/ListToolbar.tsx
index 60ab7d2..04742a3 100644
--- a/src/pages/master/postoadms/blocks/ListToolbar.tsx
+++ b/src/pages/master/postoadms/blocks/ListToolbar.tsx
@@ -18,9 +18,7 @@ const ListToolbar = () => {
                 type="text"
                 placeholder="Search Postu"
                 value={(table.getColumn('name')?.getFilterValue() as string) ?? ''}
-                onChange={(event) =>
-                  table.getColumn('name')?.setFilterValue(event.target.value)
-                }
+                onChange={(event) => table.getColumn('name')?.setFilterValue(event.target.value)}
               />
             </label>
             {/* <DefaultTooltip title={'Filter'} placement={'top'}>
diff --git a/src/pages/master/postoadms/hooks/ManagePostoAdmsContext.tsx b/src/pages/master/postoadms/hooks/ManagePostoAdmsContext.tsx
index ec68ee0..ef6f7b5 100644
--- a/src/pages/master/postoadms/hooks/ManagePostoAdmsContext.tsx
+++ b/src/pages/master/postoadms/hooks/ManagePostoAdmsContext.tsx
@@ -99,7 +99,7 @@ const ManagePostoAdmsContextProvider = ({ children }: { children: React.ReactNod
       {
         accessorFn: (row) => row.municipios_name,
         id: 'municipios_name',
-        header: ({ column }) => <DataGridColumnHeader title="Municipio Name" column={column} />,
+        header: ({ column }) => <DataGridColumnHeader title="Municipios Name" column={column} />,
         enableSorting: false,
         enableHiding: false,
         meta: {
diff --git a/src/pages/master/products/blocks/AddDialog.tsx b/src/pages/master/products/blocks/AddDialog.tsx
index 343e076..dc53b39 100644
--- a/src/pages/master/products/blocks/AddDialog.tsx
+++ b/src/pages/master/products/blocks/AddDialog.tsx
@@ -155,9 +155,11 @@ const AddDialog = () => {
         <DialogBody ref={parentRef} className="overflow-y-auto">
           <div className="flex flex-col">
             {alert.show && (
-              <Alert variant="danger">
-                <h3>{alert.message}</h3>
-              </Alert>
+              <div className="fixed top-[70px] left-1/2 -translate-x-1/2 -translate-y-1/2 z-50">
+                <Alert variant="danger">
+                  <h3>{alert.message}</h3>
+                </Alert>
+              </div>
             )}
 
             <form onSubmit={handleSubmit}>
diff --git a/src/pages/master/sucos/SucosMaster.tsx b/src/pages/master/sucos/SucosMaster.tsx
index c698cfa..ac7b7e5 100644
--- a/src/pages/master/sucos/SucosMaster.tsx
+++ b/src/pages/master/sucos/SucosMaster.tsx
@@ -10,7 +10,7 @@ const SucosMaster = () => {
   return (
     <ManageSucosContextProvider>
       <Container>
-        <h1 className="text-xl font-medium leading-none text-gray-900 mb-5">Sucos</h1>
+        <h1 className="text-xl font-medium leading-none text-gray-900 mb-3">Sucos</h1>
         <Breadcrumbs sx={{ mb: 2 }}>
           <Link underline="none" color="inherit" href="/">
             <span className="text-sm hover:underline">Dashboard</span>
diff --git a/src/pages/master/sucos/blocks/AddDialog.tsx b/src/pages/master/sucos/blocks/AddDialog.tsx
index ea31fe8..822fe24 100644
--- a/src/pages/master/sucos/blocks/AddDialog.tsx
+++ b/src/pages/master/sucos/blocks/AddDialog.tsx
@@ -170,7 +170,10 @@ const AddDialog = () => {
                             ?.PostoAdms_name || 'Select Posto Administrativo'}
                         </button>
                       </PopoverTrigger>
-                      <PopoverContent className="w-[400px] p-0">
+                      <PopoverContent
+                        className="w-[400px] p-0"
+                        onWheel={(e) => e.stopPropagation()}
+                      >
                         <Command>
                           <CommandInput placeholder="Search Posto Adms..." />
                           <CommandList>
diff --git a/src/pages/master/sucos/blocks/ListToolbar.tsx b/src/pages/master/sucos/blocks/ListToolbar.tsx
index 9e822bb..dcdf109 100644
--- a/src/pages/master/sucos/blocks/ListToolbar.tsx
+++ b/src/pages/master/sucos/blocks/ListToolbar.tsx
@@ -21,14 +21,6 @@ const ListToolbar = () => {
                   table.getColumn('sucos_name')?.setFilterValue(event.target.value)
                 }
               />
-              <input
-                type="text"
-                placeholder="Search Posto Administrativo"
-                value={String(table.getColumn(`posto_name`)?.getFilterValue() ?? '')}
-                onChange={(event) =>
-                  table.getColumn('posto_name')?.setFilterValue(event.target.value)
-                }
-              />
             </label>
             {/* <DefaultTooltip title={'Filter'} placement={'top'}>
               <Button
diff --git a/src/pages/menu/manage-menu/blocks/ListToolbar.tsx b/src/pages/menu/manage-menu/blocks/ListToolbar.tsx
index 784c705..c6993af 100644
--- a/src/pages/menu/manage-menu/blocks/ListToolbar.tsx
+++ b/src/pages/menu/manage-menu/blocks/ListToolbar.tsx
@@ -20,7 +20,7 @@ const ListToolbar = () => {
                 onChange={(event) => table.getColumn('subMenu')?.setFilterValue(event.target.value)}
               />
             </label>
-            <DefaultTooltip title={'Filter'} placement={'top'}>
+            {/* <DefaultTooltip title={'Filter'} placement={'top'}>
               <Button
                 variant="outline"
                 className="h-7.5 disabled:bg-gray-400"
@@ -28,9 +28,9 @@ const ListToolbar = () => {
                 // onClick={handleFilterData}
               >
                 {/* {loadingButton === 'filter' ? <ContentLoader /> : <KeenIcon icon="filter" />} */}
-                <KeenIcon icon="filter" />
+            {/* <KeenIcon icon="filter" />
               </Button>
-            </DefaultTooltip>
+            </DefaultTooltip> */}
           </div>
           <div className="flex gap-3 items-center">
             <Button
diff --git a/src/pages/settings/user/manage-user/blocks/ListToolBar.tsx b/src/pages/settings/user/manage-user/blocks/ListToolBar.tsx
index 2528400..70eb5be 100644
--- a/src/pages/settings/user/manage-user/blocks/ListToolBar.tsx
+++ b/src/pages/settings/user/manage-user/blocks/ListToolBar.tsx
@@ -22,7 +22,7 @@ const ListToolBar = () => {
                 }
               />
             </label>
-            <DefaultTooltip title={'Filter'} placement={'top'}>
+            {/* <DefaultTooltip title={'Filter'} placement={'top'}>
               <Button
                 variant="outline"
                 className="h-7.5 disabled:bg-gray-400"
@@ -30,9 +30,9 @@ const ListToolBar = () => {
                 // onClick={handleFilterData}
               >
                 {/* {loadingButton === 'filter' ? <ContentLoader /> : <KeenIcon icon="filter" />} */}
-                <KeenIcon icon="filter" />
+            {/* <KeenIcon icon="filter" />
               </Button>
-            </DefaultTooltip>
+            </DefaultTooltip> */}
           </div>
           <div className="flex gap-3 items-center">
             <Button
diff --git a/src/partials/dropdowns/user/DropdownUser.tsx b/src/partials/dropdowns/user/DropdownUser.tsx
index 0ccf0eb..c272635 100644
--- a/src/partials/dropdowns/user/DropdownUser.tsx
+++ b/src/partials/dropdowns/user/DropdownUser.tsx
@@ -110,7 +110,11 @@ const DropdownUser = ({ menuItemRef }: IDropdownUserProps) => {
             </Alert>
           </DialogHeader>
           <DialogFooter className="flex justify-end items-center gap-4 mt-3">
-            <Button variant={'outlined'} onClick={() => setShowLogoutDialog(false)}>
+            <Button
+              variant={'outlined'}
+              onClick={() => setShowLogoutDialog(false)}
+              style={{ color: 'grey', borderColor: 'grey' }}
+            >
               Cancel
             </Button>
             <Button variant="outlined" color="error" onClick={handleLogout}>