From 1ee813550833fec4e56604940fe8176c800e4df0 Mon Sep 17 00:00:00 2001
From: admin <fakc445@gmail.com>
Date: Sat, 9 Nov 2024 02:33:17 +0300
Subject: [PATCH] feat: deal group and stuff

---
 src/pages/DealPage/ui/DealPage.tsx            |  8 +++----
 .../components/DealsTable/columns.tsx         |  8 +++----
 src/pages/DealsPage/ui/DealsPage.tsx          |  4 +++-
 .../modals/ShippingWarehouseForm.tsx          | 22 +++++++++----------
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/pages/DealPage/ui/DealPage.tsx b/src/pages/DealPage/ui/DealPage.tsx
index 8b0fede..e6689c8 100644
--- a/src/pages/DealPage/ui/DealPage.tsx
+++ b/src/pages/DealPage/ui/DealPage.tsx
@@ -1,8 +1,5 @@
 import { useParams } from "@tanstack/react-router";
-import {
-    DealPageContextProvider,
-    useDealPageContext,
-} from "../../LeadsPage/contexts/DealPageContext.tsx";
+import { DealPageContextProvider, useDealPageContext } from "../../LeadsPage/contexts/DealPageContext.tsx";
 import ProductAndServiceTab from "../../LeadsPage/tabs/ProductAndServiceTab/ProductAndServiceTab.tsx";
 import { FC, useEffect } from "react";
 import { DealService } from "../../../client";
@@ -20,7 +17,8 @@ const DealPageContent: FC<Props> = ({ dealId }) => {
     return <ProductAndServiceTab />;
 };
 const DealPageWrapper: FC<{ children: React.ReactNode }> = ({ children }) => {
-    return <DealPageContextProvider>{children}</DealPageContextProvider>;
+    return <DealPageContextProvider refetchDeals={async () => {
+    }}>{children}</DealPageContextProvider>;
 };
 export const DealPage = () => {
     const { dealId } = useParams({ strict: false });
diff --git a/src/pages/DealsPage/components/DealsTable/columns.tsx b/src/pages/DealsPage/components/DealsTable/columns.tsx
index cfed912..8c41a79 100644
--- a/src/pages/DealsPage/components/DealsTable/columns.tsx
+++ b/src/pages/DealsPage/components/DealsTable/columns.tsx
@@ -44,12 +44,12 @@ const useDealsTableColumns = () => {
             },
             {
                 Cell: ({ row }) =>
-                    new Date(row.original.deadline).toLocaleString("ru-RU"),
+                    new Date(row.original.deadline || 0).toLocaleString("ru-RU"),
                 accessorKey: "deadline",
                 header: "Дедлайн",
                 sortingFn: (rowA, rowB) =>
-                    new Date(rowB.original.deadline).getTime() -
-                    new Date(rowA.original.deadline).getTime(),
+                    new Date(rowB.original.deadline || 0).getTime() -
+                    new Date(rowA.original.deadline || 0).getTime(),
             },
             {
                 header: "Общая стоимость",
@@ -58,7 +58,7 @@ const useDealsTableColumns = () => {
                 accessorKey: "totalPrice",
             },
         ],
-        []
+        [],
     );
 };
 
diff --git a/src/pages/DealsPage/ui/DealsPage.tsx b/src/pages/DealsPage/ui/DealsPage.tsx
index bd2626c..71d9f32 100644
--- a/src/pages/DealsPage/ui/DealsPage.tsx
+++ b/src/pages/DealsPage/ui/DealsPage.tsx
@@ -13,7 +13,9 @@ export const DealsPage: FC = () => {
     const { data, form } = useDealsPageState();
     return (
         <>
-            <DealPageContextProvider>
+            <DealPageContextProvider refetchDeals={async () => {
+
+            }}>
                 <div className={styles["container"]}>
                     <PageBlock>
                         <div className={styles["top-panel"]}>
diff --git a/src/pages/ShippingWarehousesPage/modals/ShippingWarehouseForm.tsx b/src/pages/ShippingWarehousesPage/modals/ShippingWarehouseForm.tsx
index 77ffe30..9553c3f 100644
--- a/src/pages/ShippingWarehousesPage/modals/ShippingWarehouseForm.tsx
+++ b/src/pages/ShippingWarehousesPage/modals/ShippingWarehouseForm.tsx
@@ -1,6 +1,4 @@
-import BaseFormModal, {
-    CreateEditFormProps,
-} from "../../ClientsPage/modals/BaseFormModal/BaseFormModal.tsx";
+import BaseFormModal, { CreateEditFormProps } from "../../ClientsPage/modals/BaseFormModal/BaseFormModal.tsx";
 import { DealSummary, ShippingWarehouseSchema } from "../../../client";
 import { ContextModalProps } from "@mantine/modals";
 import { useForm } from "@mantine/form";
@@ -14,22 +12,24 @@ type RestProps = {
 };
 type Props = CreateEditFormProps<ShippingWarehouseSchema> & RestProps;
 const ShippingWarehouseForm = ({
-    context,
-    innerProps,
-    id,
-}: ContextModalProps<Props>) => {
+                                   context,
+                                   innerProps,
+                                   id,
+                               }: ContextModalProps<Props>) => {
     const isEditing = "onChange" in innerProps;
 
     const form = useForm<ShippingWarehouseSchema>({
         initialValues: isEditing
             ? innerProps.element
             : {
-                  id: -1,
-                  name: "",
-              },
+                id: -1,
+                name: "",
+            },
     });
     return (
-        <DealPageContextProvider>
+        <DealPageContextProvider refetchDeals={async () => {
+
+        }}>
             <BaseFormModal
                 {...innerProps}
                 closeOnSubmit