тарифы хранятся в объекте с ключами айдишниками

src/hooks/useGetTariffs.hook.ts

@@ -0,0 +1,71 @@
+import { useEffect, useState } from "react";
+import axios from "axios";
+import { authStore } from "@root/stores/auth";
+import { Tariff, Tariff_BACKEND } from "@root/model/tariff";
+import { resetTariffsStore } from "@root/stores/tariffsStore";
+
+
+type UseGetTariffs = {
+  requestTariffs: (page?: number, limit?: number) => Promise<void>;
+  isLoading: boolean;
+};
+
+type GetTariffsResponse = {
+  totalPages: number;
+  tariffs: Tariff_BACKEND[];
+};
+
+export const useGetTariffs = (): UseGetTariffs => {
+  console.log("ща запрошу список")
+  const token = authStore((state) => state.token);
+  const [allTariffs, setAllTariffs] = useState<Record<string, Tariff>>({});
+  const [isLoading, setIsLoading] = useState(false);
+
+    const requestTariffs = async (page: number = 1): Promise<void> => {
+      setIsLoading(true);
+  
+      let newSt:Record<string, Tariff>
+      try {
+        const { data } = await axios.get<GetTariffsResponse>(
+          "https://admin.pena.digital/strator/tariff/",
+          {
+            params: { page, limit: 100 },
+            headers: { Authorization: `Bearer ${token}` },
+          }
+        );
+  
+        if (!data.tariffs.length) {
+          setIsLoading(false);
+  
+          return;
+        }
+        const tariffsObj:Record<string, Tariff> = {}
+        data.tariffs.forEach((tariff) => {
+          tariffsObj[tariff._id] = {
+            id: tariff._id,
+            name: tariff.name,
+            amount: tariff.privilegies[0].amount,
+            isFront: false,
+            privilegeId: tariff.privilegies[0].privilegeId,
+            isDeleted: tariff.isDeleted,
+            customPricePerUnit: tariff.price
+          }
+        })
+        
+        newSt = {...allTariffs, ...tariffsObj}
+        
+  
+        if (page < data.totalPages) {
+          return requestTariffs(page + 1);
+        }
+        resetTariffsStore(newSt)
+        setIsLoading(false);
+      } catch {
+        setIsLoading(false);
+  
+        throw new Error("Ошибка при получении тарифов");
+      }
+  }
+
+  return { requestTariffs, isLoading };
+};

src/hooks/useRefreshPrivilegesStore.hook.ts

@@ -16,15 +16,20 @@ export const useRefreshPrivilegesStore = (): RefreshPrivilegesStore => {
   const [isError, setIsError] = useState(gotten.isError);
   const [errorMessage, setErrorMessage] = useState(gotten.errorMessage);
 
-  //Приходит объект. В его значениях массивы привилегий для разных сервисов. Высыпаем в общую кучу и обновляем стор
-
-
   useEffect(() => {
     let extracted:RealPrivilege[] = []
-    for (let serviceKey in gotten.privilegies) {
+    for (let serviceKey in gotten.privilegies) { //Приходит объект. В его значениях массивы привилегий для разных сервисов. Высыпаем в общую кучу и обновляем стор
       extracted = extracted.concat(gotten.privilegies[serviceKey])
     }
-    resetPrivilegeArray(extracted)
+    let readyArray = extracted.map((privilege) => ({
+      serviceKey: privilege.serviceKey,
+      privilegeId: privilege.privilegeId,
+      name: privilege.name,
+      description: privilege.description,
+      type: privilege.type,
+      price: privilege.price,
+    }))
+    resetPrivilegeArray(readyArray)
   }, [gotten.privilegies]);
   
 

src/kitUI/Cart/Cart.tsx

@@ -27,7 +27,7 @@ import { useMockDiscountStore } from "@root/stores/discounts";
 import { useCartStore } from "@root/stores/cart";
 import { findPrivilegeById } from "@root/stores/privilegesStore";
 import { testUser } from "@root/stores/mocks/user";
-import { useTariffStore } from "@root/stores/tariffs";
+import { useTariffStore } from "@root/stores/tariffsStore";
 
 interface Props {
   selectedTariffs: GridSelectionModel;
@@ -50,6 +50,7 @@ interface MergedTariff {
 }
 
 export default function Cart({ selectedTariffs }: Props) {
+  let cartTariffs = Object.values(useTariffStore().tariffs)
   const discounts = useMockDiscountStore((store) => store.discounts);
   const cartTotal = useCartStore((state) => state.cartTotal);
   const setCartTotal = useCartStore((store) => store.setCartTotal);
@@ -58,13 +59,6 @@ export default function Cart({ selectedTariffs }: Props) {
   const [errorMessage, setErrorMessage] = useState<string | null>(null);
   const [isNonCommercial, setIsNonCommercial] = useState<boolean>(false);
 
-  const exampleTariffs = useTariffStore((state) => state.tariffs);
-  const [tariffs, setTariffs] = useState<any>();
-  const mergeTariffs: MergedTariff[] = [...exampleTariffs, ...(tariffs || [])];
-
-  console.log(cartTotal, "cartTotal");
-
-
   const cartRows = cartTotal?.items.map((cartItemTotal) => {
     const privilege = findPrivilegeById(cartItemTotal.tariff.privilegeId);
 
@@ -124,7 +118,6 @@ export default function Cart({ selectedTariffs }: Props) {
 
   function handleCalcCartClick() {
     //рассчитать
-    const cartTariffs = mergeTariffs.filter((tariff) => selectedTariffs.includes(tariff._id ? tariff._id : tariff.id));
 
     const cartItems = cartTariffs.map((tariff) => createCartItem(tariff));
     console.log(cartTariffs);

src/model/tariff.ts

@@ -29,24 +29,6 @@ export interface Privilege_BACKEND {
     updatedAt: string;
     _id: string;
 }
-export type Tariff_BACKEND = {
-    _id: string,
-    name: string,
-    price: number,
-    isCustom: boolean,
-    isFront: boolean,
-    privilegies: Privilege_BACKEND[],
-    isDeleted: boolean,
-    createdAt: string,
-    updatedAt: string;
-};
-export type Tariff_FRONTEND = {
-    id: string,
-    name: string,
-    amount: number,
-    privilegeId: string,
-    customPricePerUnit?: number;
-};
 
 /** @deprecated */
 export interface Privilege {
@@ -60,14 +42,23 @@ export interface Privilege {
     price: number;
 }
 
-/** @deprecated */
-export interface Tariff {
+export type Tariff_BACKEND = {
+    _id: string,
+    name: string,
+    price: number,
+    isCustom: boolean,
+    isFront: false,
+    privilegies: Privilege_BACKEND[],
+    isDeleted: boolean,
+    createdAt: string,
+    updatedAt: string;
+};
+export type Tariff = {
     id: string;
     name: string;
     privilegeId: string;
-    /** Количество единиц привелегии */
-    amount: number;
-    /** Кастомная цена, если есть, то используется вместо privilege.price */
-    customPricePerUnit?: number;
+    amount: number; //Количество единиц привелегии
+    customPricePerUnit?: number; //Кастомная цена, если есть, то используется вместо privilege.price
+    isDeleted?: boolean,
     isFront?: boolean;
-}
+}

src/pages/dashboard/Content/Tariffs/CreateTariff.tsx

@@ -6,7 +6,6 @@ import axios from "axios";
 
 import { CustomTextField } from "@root/kitUI/CustomTextField";
 
-import { addTariffs } from "@root/stores/tariffs";
 import { authStore } from "@root/stores/auth";
 // import { mergedPrivilegeStore } from "@root/stores/mergedPrivileges";
 import { Tariff_BACKEND } from "@root/model/tariff";

src/pages/dashboard/Content/Tariffs/EditModal.tsx

@@ -7,9 +7,9 @@ import Modal from "@mui/material/Modal";
 import TextField from "@mui/material/TextField";
 import axios from "axios";
 import { authStore } from "@root/stores/auth";
-import { Privilege, Tariff_FRONTEND } from "@root/model/tariff";
+import { Privilege, Tariff } from "@root/model/tariff";
 import { findPrivilegeById } from "@root/stores/privilegesStore";
-import { useTariffStore, updateTariff } from "@root/stores/tariffs";
+import { useTariffStore, updateTariff } from "@root/stores/tariffsStore";
 import { arrayBuffer } from "stream/consumers";
 
 
@@ -44,7 +44,7 @@ const editTariff = ({
   });
 }
 interface Props {
-  tariff: Tariff_FRONTEND,
+  tariff: Tariff,
   getTariffs: () => void
 }
 

src/pages/dashboard/Content/Tariffs/Privileges/Privileges.tsx

@@ -2,6 +2,7 @@ import { GridColDef } from "@mui/x-data-grid";
 import DataGrid from "@kitUI/datagrid";
 import { Typography } from "@mui/material";
 import { useCombinedPrivileges } from "@root/hooks/useCombinedPrivileges.hook";
+import { usePrivilegeStore } from "@root/stores/privilegesStore";
 
 const columns: GridColDef[] = [
   { field: "id", headerName: "id", width: 40 },
@@ -12,8 +13,9 @@ const columns: GridColDef[] = [
 ];
 
 export default function Privileges() {
-  const { mergedPrivileges } = useCombinedPrivileges();
-  const privilegesGridData = mergedPrivileges
+  const privileges = usePrivilegeStore((state) => state.privileges);
+  // const { mergedPrivileges } = useCombinedPrivileges();
+  const privilegesGridData = privileges
   .filter(privilege => (
     !privilege.isDeleted
   ))

src/pages/dashboard/Content/Tariffs/index.tsx

@@ -7,15 +7,16 @@ import Cart from "@root/kitUI/Cart/Cart";
 import axios from "axios";
 import { enqueueSnackbar } from "notistack";
 import { authStore } from "@root/stores/auth";
-import { Tariff_BACKEND } from "@root/model/tariff";
-import { updateTariff, useTariffStore } from "@root/stores/tariffs";
+import { useTariffStore } from "@root/stores/tariffsStore";
 import { usePrivilegeStore } from "@root/stores/privilegesStore";
+import { useGetTariffs } from "@root/hooks/useGetTariffs.hook";
 
 import TariffsDG from "./tariffsDG";
 import CreateTariff from "./CreateTariff";
 import Privileges from "./Privileges/Privileges";
 import ChangePriceModal from "./Privileges/ChangePriceModal";
 import {useRefreshPrivilegesStore} from "@root/hooks/useRefreshPrivilegesStore.hook"
+import { Tariff } from "@root/model/tariff";
 
 export default function Tariffs() {
   const token = authStore((state) => state.token);
@@ -23,63 +24,14 @@ export default function Tariffs() {
   const privileges = usePrivilegeStore((state) => state.privileges);
   const tariffs = useTariffStore((state) => state.tariffs);
   const [selectedTariffs, setSelectedTariffs] = useState<GridSelectionModel>([]);
-
+  const [allTariffs, setAllTariffs] = useState<Tariff[]>([]);
+  const {requestTariffs} =  useGetTariffs()
   useRefreshPrivilegesStore()
+  
 
-  const getTariffs = (page: number = 1) => {
-    axios({
-      method: "get",
-      url: "https://admin.pena.digital/strator/tariff",
-      params: { page, limit: 100 },
-      headers: {
-        Authorization: `Bearer ${token}`,
-      },
-    })
-      .then((data: any) => {
-        //Получили список тарифов. Сразу убираем удалённые и записываем остальное в стор
-        data.data.tariffs.forEach((tariff: Tariff_BACKEND) => {
-          if (!tariff.isDeleted) {
-            let toFrontTariff = {
-              id: tariff._id,
-              name: tariff.name,
-              amount: tariff.privilegies[0].amount,
-              isFront: false,
-              privilegeId: tariff.privilegies[0].privilegeId,
-              customPricePerUnit: tariff.price,
-            };
-
-            console.log(data.data.tariffs)
-            console.log("reade")
-            updateTariff(toFrontTariff);
-          }
-        });
-        if (page < data.totalPages) {
-          return getTariffs(page + 1);
-        }
-        // data.data.tariffs.forEach(async (t:any) => {
-        //   if (t._id) {
-        //     console.log(t._id)
-        //   await axios({
-        //     method: "delete",
-        //     url: "https://admin.pena.digital/strator/tariff/delete",
-        //     headers: {
-        //       Authorization: `Bearer ${token}`,
-        //     },
-        //     data: { id: t._id },
-        //   });
-        //   }
-
-        // })
-      })
-      .catch((error) => {
-        console.log(error)
-        enqueueSnackbar("Ошибка получения тарифов");
-      });
-  };
   useEffect(() => {
-    getTariffs();
-
-  }, []);
+    requestTariffs()
+  },[])
 
   return (
     <Container
@@ -110,7 +62,6 @@ export default function Tariffs() {
       <TariffsDG
         selectedTariffs={selectedTariffs}
         handleSelectionChange={(selectionModel) => setSelectedTariffs(selectionModel)}
-        getTariffs={getTariffs}
       />
 
       <Cart selectedTariffs={selectedTariffs} />

src/pages/dashboard/Content/Tariffs/tariffsDG.tsx

@@ -9,7 +9,7 @@ import ModeEditOutlineOutlinedIcon from "@mui/icons-material/ModeEditOutlineOutl
 
 import DataGrid from "@kitUI/datagrid";
 
-import { deleteTariffs, useTariffStore } from "@root/stores/tariffs";
+import { deleteTariffs, useTariffStore } from "@root/stores/tariffsStore";
 import { SERVICE_LIST } from "@root/model/tariff";
 import { findPrivilegeById } from "@root/stores/privilegesStore";
 
@@ -17,85 +17,26 @@ import axios from "axios";
 import { authStore } from "@root/stores/auth";
 import DeleteModal from "@root/kitUI/DeleteModal";
 import EditModal from "./EditModal";
-import { Tariff_FRONTEND } from "@root/model/tariff";
+import { Tariff } from "@root/model/tariff";
 
 interface Props {
   selectedTariffs: GridSelectionModel;
   handleSelectionChange: (selectionModel: GridSelectionModel) => void;
-  getTariffs: () => void;
 }
 
 /** @deprecated */
-export default function TariffsDG({ selectedTariffs, handleSelectionChange, getTariffs }: Props) {
+export default function TariffsDG({ selectedTariffs, handleSelectionChange }: Props) {
   const { token } = authStore();
 
-  const tariffs = useTariffStore((state) => state.tariffs);
+  const tariffs = Object.values(useTariffStore().tariffs)
 
   const [deletedRows, setDeletedRows] = useState<string[]>([]);
   const [openDeleteModal, setOpenDeleteModal] = useState(false);
-  const [changingTariff, setChangingTariff] = useState<Tariff_FRONTEND | undefined>();
+  const [changingTariff, setChangingTariff] = useState<Tariff | undefined>();
   const [errorDelete, setErrorDelete] = useState(false);
 
-  const tariffDeleteDataGrid = async (tarifIid: string) => {
-    if (exampleTariffs.find((tariff) => tariff.id === tarifIid)) {
-      deleteTariffs(tarifIid);
-      enqueueSnackbar("Тариф удалён");
-      return;
-    }
 
-    try {
-      await axios({
-        method: "delete",
-        url: "https://admin.pena.digital/strator/tariff",
-        headers: {
-          Authorization: `Bearer ${token}`,
-        },
-        data: { id: tarifIid },
-      });
-      setDeletedRows((prevDeletedRows) => [...prevDeletedRows, tarifIid]);
-      enqueueSnackbar("Тариф удалён");
-      getTariffs();
-    } catch (error: any) {
-      setErrorDelete(true);
-      enqueueSnackbar("Ошибка удаления :", error.message);
-    }
-  };
-
-  const tariffDelete = async (tarifIid: GridSelectionModel) => {
-    const deleted = [];
-    const notDeleted = [];
-
-    for (let index = 0; index < tarifIid.length; index++) {
-      if (exampleTariffs.find((tariff) => tariff.id === (tarifIid[index] as string))) {
-        deleted.push(tarifIid[index]);
-        deleteTariffs(tarifIid[index] as string);
-        continue;
-      }
-
-      try {
-        await axios({
-          method: "delete",
-          url: "https://admin.pena.digital/strator/tariff",
-          headers: {
-            Authorization: `Bearer ${token}`,
-          },
-          data: { id: tarifIid[index] },
-        });
-        setDeletedRows((prevDeletedRows) => [...prevDeletedRows, tarifIid[index] as string]);
-
-        deleted.push(tarifIid[index]);
-      } catch (error: any) {
-        notDeleted.push(tarifIid[index]);
-
-        setErrorDelete(true);
-        enqueueSnackbar(error.message);
-      }
-    }
-    getTariffs();
-
-    enqueueSnackbar(`Deleted: ${deleted.join(", ")}`);
-    enqueueSnackbar(`Not deleted: ${notDeleted.join(", ")}`);
-  };
+    
 
   const columns: GridColDef[] = [
     { field: "id", headerName: "ID", width: 100 },
@@ -138,27 +79,45 @@ export default function TariffsDG({ selectedTariffs, handleSelectionChange, getT
     },
   ];
 
-  // const selectedTariff = gridData.find((tariff) => tariff.id === selectedTariffs[0]);
-  // const selectedTariffPrivilege = selectedTariff ? selectedTariff.privilege : [];
 
-  const allName = () => {
-    const selectedNames = [];
+  const gridData = tariffs
+    ?.map((tariff) => {
+      const privilege = findPrivilegeById(tariff.privilegeId);
 
-    for (let index = 0; index < selectedTariffs.length; index++) {
-      const tariff = gridData.find((tariff) => tariff.id === selectedTariffs[index]);
-      const name = tariff ? tariff.name : "";
-      selectedNames.push(name);
-    }
+      console.log(privilege)
+      return {
+        id: tariff.id,
+        name: tariff.name,
+        serviceName: privilege?.serviceKey,
+        privilegeName: privilege?.name,
+        amount: tariff.amount,
+        pricePerUnit: tariff.isCustom
+          ? (tariff.customPricePerUnit || 0) / 100
+          : (tariff?.price || 0) / 100,
+        type:
+          findPrivilegeById(tariff.privilegeId)?.type === "count"
+            ? "день"
+            : "шт.",
+        isCustomPrice: tariff.isCustom ? "Да" : "Нет",
+        total: tariff.amount
+          ? (tariff.amount *
+              (tariff.isCustom
+                ? tariff.customPricePerUnit || 0 * tariff.amount
+                : findPrivilegeById(tariff.privilegeId)?.price || 0)) /
+            100
+          : 0,
+      };
+    })
+    .filter((tariff) => !tariff.isDelete)
+    .sort((item, previous) => (!item?.isFront && previous?.isFront ? 1 : -1));
 
-    return selectedNames;
-  };
 
   return (
     <>
       <DataGrid
         disableSelectionOnClick={true}
         checkboxSelection={true}
-        rows={tariffs}
+        rows={gridData}
         columns={columns}
         getRowId={(row) => row.id}
         components={{ Toolbar: GridToolbar }}
@@ -184,7 +143,7 @@ export default function TariffsDG({ selectedTariffs, handleSelectionChange, getT
         }}
       /> */}
       {console.log(changingTariff)}
-      <EditModal tariff={changingTariff} getTariffs={getTariffs} />
+      {/* <EditModal tariff={changingTariff} getTariffs={getTariffs} /> */}
     </>
   );
 }

src/stores/privilegesStore.ts

@@ -2,10 +2,10 @@ import { Privilege } from "@root/model/tariff";
 import { create } from "zustand";
 import { devtools } from "zustand/middleware";
 import { exampleCartValues } from "./mocks/exampleCartValues";
-import { RealPrivilege } from "@root/model/privilege";
+import { mergedBackFrontPrivilege } from "@root/model/privilege";
 
 interface RealPrivilegeStore {
-    privileges: RealPrivilege[];
+    privileges: mergedBackFrontPrivilege[];
 }
 
 export const usePrivilegeStore = create<RealPrivilegeStore>()(
@@ -88,7 +88,6 @@ export const resetPrivilegeArray = (privileges: RealPrivilegeStore["privileges"]
 //     });
 // };
 
-/** @deprecated */
 export const findPrivilegeById = (privilegeId: string) => {
     return usePrivilegeStore.getState().privileges.find((privilege) => privilege.privilegeId === privilegeId) ?? null;
 };

src/stores/tariffs.ts

@@ -1,50 +0,0 @@
-import { create } from "zustand";
-import { persist } from "zustand/middleware";
-import { Tariff_BACKEND, Tariff_FRONTEND } from "@root/model/tariff";
-
-
-interface TariffStore {
-  tariffs: Tariff_FRONTEND[]
-}
-
-export const useTariffStore = create<TariffStore>()(
-  persist(
-    (set, get) => ({
-      tariffs: [],
-      // tariffs: exampleTariffs,
-    }),
-    {
-      name: "Tariff store",
-    }
-  )
-);
-
-
-export const resetTariffs = (newTariff: Tariff_FRONTEND[]) => useTariffStore.setState((state) => ({ tariffs: newTariff }));
-
-export const updateTariff = (tariff: Tariff_FRONTEND) => {
-    let stateTariffs = useTariffStore.getState().tariffs
-    let index
-    stateTariffs.forEach((e,i) => { //ищем такой тариф для замены на новый
-      if (e.id == tariff.id) index = i
-    })
-    if (index === undefined) {// не нашли. Добавляем 
-      addTariffs([tariff])
-    } else { //нашли. Заменяем
-      stateTariffs[index] = tariff
-      useTariffStore.setState(() => ({tariffs: stateTariffs}))
-    }
-}
-
-
-export const addTariffs = (newTariffs: Tariff_FRONTEND[]) => {
-  let stateTariffs = useTariffStore.getState().tariffs
-  let newArrayTariffs = [...stateTariffs, ...newTariffs]
-  newArrayTariffs.forEach((tariff) => {
-    updateTariff(tariff)
-  })
-}
-export const deleteTariffs = (tariffId: string) =>
-  useTariffStore.setState((state) => ({
-    tariffs: state.tariffs.filter((tariff) => tariff.id !== tariffId),
-  }));

src/stores/tariffsStore.ts

@@ -0,0 +1,37 @@
+import { create } from "zustand";
+import { persist } from "zustand/middleware";
+import { Tariff } from "@root/model/tariff";
+
+
+interface TariffStore {
+  tariffs: Record<string, Tariff>
+}
+
+export const useTariffStore = create<TariffStore>()(
+  persist(
+    (set, get) => ({
+      tariffs: {},
+    }),
+    {
+      name: "Tariff store",
+    }
+  )
+);
+
+
+
+export const updateTariffs = (newTariffs: Record<string, Tariff>) => {
+  useTariffStore.setState((state) => ({
+    tariffs: {...state.tariffs, ...newTariffs},
+  }));
+};
+
+export const deleteTariffs = (tariffId: string) => {
+  let tariffs = useTariffStore.getState().tariffs
+  delete tariffs[tariffId]
+  useTariffStore.setState(() => ({tariffs: tariffs}));
+};
+
+export const resetTariffsStore = (newTariffs: Record<string, Tariff>) => {
+  useTariffStore.setState(() => ({tariffs: newTariffs}));
+};