From 4dba3f445f24821070adc4f7f45e155f77d4f542 Mon Sep 17 00:00:00 2001
From: Mohammad Jalali <muhammad.art79@gmail.com>
Date: Sat, 13 Jul 2024 14:42:27 +0330
Subject: [PATCH] resolve toast bug and complete request part and sorting data

---
 src/app/template.js                             | 17 ++++++++++++++++-
 .../dashboard/inquiryPrivacyFencing/Toolbar.jsx |  6 ++++++
 .../dashboard/inquiryPrivacyFencing/index.jsx   |  4 ++--
 src/core/components/DataTable/Main.js           |  2 +-
 src/lib/contexts/DataTable.js                   |  8 ++++----
 5 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/app/template.js b/src/app/template.js
index 3ffc656..8db5145 100644
--- a/src/app/template.js
+++ b/src/app/template.js
@@ -1,5 +1,5 @@
 import cacheProviderRtl from "@/core/utils/cacheRtl";
-import { CssBaseline, ThemeProvider } from "@mui/material";
+import { CssBaseline, GlobalStyles, ThemeProvider } from "@mui/material";
 import theme from "@/core/utils/theme";
 import { AppRouterCacheProvider } from "@mui/material-nextjs/v14-appRouter";
 import "^/global.scss";
@@ -9,6 +9,21 @@ const Template = ({ children }) => {
     return (
         <AppRouterCacheProvider CacheProvider={cacheProviderRtl} options={{ enableCssLayer: true }}>
             <ThemeProvider theme={theme}>
+                <GlobalStyles
+                    styles={{
+                        "&::-webkit-scrollbar": {
+                            width: "5px",
+                        },
+                        "&::-webkit-scrollbar-track": {
+                            boxShadow: "inset 0 0 5px #fff",
+                            borderRadius: "5px",
+                        },
+                        "&::-webkit-scrollbar-thumb": {
+                            background: "#155175",
+                            borderRadius: "5px",
+                        },
+                    }}
+                />
                 <CssBaseline />
                 {children}
                 <ToastContainer rtl containerId="filtering" closeButton={false} />
diff --git a/src/components/dashboard/inquiryPrivacyFencing/Toolbar.jsx b/src/components/dashboard/inquiryPrivacyFencing/Toolbar.jsx
index 8a1dc41..9646db4 100644
--- a/src/components/dashboard/inquiryPrivacyFencing/Toolbar.jsx
+++ b/src/components/dashboard/inquiryPrivacyFencing/Toolbar.jsx
@@ -1,6 +1,7 @@
 import { Button } from "@mui/material";
 import AddCircleIcon from "@mui/icons-material/AddCircle";
 import { useState } from "react";
+import InquiryPrivacyFencingCreate from "@/components/dashboard/inquiryPrivacyFencing/Create";
 
 const Toolbar = ({ mutate }) => {
     const [open, setOpen] = useState(false);
@@ -9,11 +10,16 @@ const Toolbar = ({ mutate }) => {
         setOpen(true);
     };
 
+    const handleClose = () => {
+        setOpen(false);
+    };
+
     return (
         <>
             <Button variant="contained" color="primary2" startIcon={<AddCircleIcon />} onClick={handleOpen}>
                 ایجاد پاسخ به استعلام
             </Button>
+            <InquiryPrivacyFencingCreate open={open} handleClose={handleClose} mutate={mutate} />
         </>
     );
 };
diff --git a/src/components/dashboard/inquiryPrivacyFencing/index.jsx b/src/components/dashboard/inquiryPrivacyFencing/index.jsx
index 4d4b77f..afc2a32 100644
--- a/src/components/dashboard/inquiryPrivacyFencing/index.jsx
+++ b/src/components/dashboard/inquiryPrivacyFencing/index.jsx
@@ -352,8 +352,8 @@ const InquiryPrivacyFencingPage = () => {
                 columns={columns}
                 table_url={GET_INQUIRY_PRIVACY_FENCING_ROUTE}
                 user_id={0}
-                page_name={"testPage"}
-                table_name={"testTable"}
+                page_name={"inquiryPrivacyFencing"}
+                table_name={"inquiryPrivacyFencingList"}
                 TableToolbar={Toolbar}
             />
         </Box>
diff --git a/src/core/components/DataTable/Main.js b/src/core/components/DataTable/Main.js
index 414d477..cf74d80 100644
--- a/src/core/components/DataTable/Main.js
+++ b/src/core/components/DataTable/Main.js
@@ -33,7 +33,7 @@ const DataTable_Main = (props) => {
         params.set("filters", JSON.stringify(isEmptyObject(filterData) ? [] : [filterData]));
         params.set("sorting", JSON.stringify(sortData));
         return `${table_url}?${params}`;
-    }, [table_url, filterData, pagination, columns]);
+    }, [table_url, filterData, pagination, columns, sortData]);
 
     const fetcher = async (url) => {
         try {
diff --git a/src/lib/contexts/DataTable.js b/src/lib/contexts/DataTable.js
index 32b2a7c..42fa4b9 100644
--- a/src/lib/contexts/DataTable.js
+++ b/src/lib/contexts/DataTable.js
@@ -1,8 +1,8 @@
 import { createContext, useEffect, useState } from "react";
 import { toast } from "react-toastify";
-import AskForKeepData from "@/core/components/NotificationDesign/AskForKeepData";
 import useTableSetting from "@/lib/hooks/useTableSetting";
 import { flattenArrayOfObjects } from "@/core/utils/flattenArrayOfObjects";
+import AskForKeepData from "@/core/components/NotificationDesign/AskForKeepData";
 
 export const DataTableContext = createContext();
 
@@ -58,7 +58,7 @@ const DataTableProvider = ({ children, user_id, page_name, table_name, columns }
             JSON.stringify(initFilter) !== JSON.stringify(filterData) ||
             JSON.stringify(initSort) !== JSON.stringify(sortData)
         ) {
-            if (!toast.isActive("keep_data", "datatable")) {
+            if (!toast.isActive("keep_data", "filtering")) {
                 toast(
                     <AskForKeepData
                         filterData={filterData}
@@ -69,7 +69,7 @@ const DataTableProvider = ({ children, user_id, page_name, table_name, columns }
                         columns={flatColumns}
                     />,
                     {
-                        containerId: "datatable",
+                        containerId: "filtering",
                         toastId: "keep_data",
                         className: "filter-toast",
                         position: "bottom-left",
@@ -79,7 +79,7 @@ const DataTableProvider = ({ children, user_id, page_name, table_name, columns }
                 );
             } else {
                 toast.update("keep_data", {
-                    containerId: "datatable",
+                    containerId: "filtering",
                     toastId: "keep_data",
                     render: (
                         <AskForKeepData