From 41ab08c5b50834253cfe484daf0dd0881b837853 Mon Sep 17 00:00:00 2001
From: ArtChaos189 <tvolkiska967@gmail.com>
Date: Fri, 16 Jun 2023 00:27:38 +0300
Subject: [PATCH] useCombinedPrivileges : getPrivilegeId create

---
 src/hooks/useCombinedPrivileges.hook.ts       |  8 +++++++-
 src/pages/dashboard/Content/Tariffs/index.tsx | 19 ++++++++-----------
 .../dashboard/Content/Tariffs/tariffsDG.tsx   |  5 +----
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/hooks/useCombinedPrivileges.hook.ts b/src/hooks/useCombinedPrivileges.hook.ts
index 8ed53da..569d05f 100644
--- a/src/hooks/useCombinedPrivileges.hook.ts
+++ b/src/hooks/useCombinedPrivileges.hook.ts
@@ -22,9 +22,15 @@ export const useCombinedPrivileges = () => {
 
   const mergedPrivileges: mergedPrivilege[] = [];
 
+  const getPrivilegeId = (privilegeId: string): string | undefined => {
+    const privilege = mergedPrivileges.find((privilege) => privilege.privilegeId === privilegeId);
+
+    return privilege?._id;
+  };
+
   if (privilegies) {
     mergedPrivileges.push(...privilegies.Шаблонизатор, ...examplePrivileges);
   }
 
-  return { mergedPrivileges, isError, errorMessage };
+  return { mergedPrivileges, isError, errorMessage, getPrivilegeId };
 };
diff --git a/src/pages/dashboard/Content/Tariffs/index.tsx b/src/pages/dashboard/Content/Tariffs/index.tsx
index e417034..ac626a4 100644
--- a/src/pages/dashboard/Content/Tariffs/index.tsx
+++ b/src/pages/dashboard/Content/Tariffs/index.tsx
@@ -23,7 +23,7 @@ export default function Tariffs() {
     })
       .then((data: any) => {
         //Получили список тарифов. Сразу убираем удалённые и записываем остальное в стор
-        data.data.tariffs.forEach((tariff:Tariff_BACKEND) => {
+        data.data.tariffs.forEach((tariff: Tariff_BACKEND) => {
           if (!tariff.isDeleted) {
             let toFrontTariff = {
               id: tariff._id,
@@ -31,12 +31,12 @@ export default function Tariffs() {
               amount: tariff.privilegies[0].amount,
               isFront: false,
               privilegeId: tariff.privilegies[0].privilegeId,
-              customPricePerUnit: tariff.price
-            }
+              customPricePerUnit: tariff.price,
+            };
 
-            updateTariff(toFrontTariff)
+            updateTariff(toFrontTariff);
           }
-        })
+        });
 
         // data.data.tariffs.forEach(async (t:any) => {
         //   if (t._id) {
@@ -73,24 +73,21 @@ export default function Tariffs() {
     >
       <Typography variant="h6">Список привелегий</Typography>
 
-
       <Privileges />
 
-
       <ChangePriceModal />
 
-
       <CreateTariff />
 
-
-      <Typography variant="h6" mt="20px">Список тарифов</Typography>
+      <Typography variant="h6" mt="20px">
+        Список тарифов
+      </Typography>
       <TariffsDG
         selectedTariffs={selectedTariffs}
         handleSelectionChange={(selectionModel) => setSelectedTariffs(selectionModel)}
         getTariffs={getTariffs}
       />
 
-
       <Cart selectedTariffs={selectedTariffs} />
     </Container>
   );
diff --git a/src/pages/dashboard/Content/Tariffs/tariffsDG.tsx b/src/pages/dashboard/Content/Tariffs/tariffsDG.tsx
index 5da587b..1e36fe7 100644
--- a/src/pages/dashboard/Content/Tariffs/tariffsDG.tsx
+++ b/src/pages/dashboard/Content/Tariffs/tariffsDG.tsx
@@ -21,10 +21,9 @@ import { Tariff_FRONTEND } from "@root/model/tariff";
 interface Props {
   selectedTariffs: GridSelectionModel;
   handleSelectionChange: (selectionModel: GridSelectionModel) => void;
-  getTariffs: () => void
+  getTariffs: () => void;
 }
 
-
 export default function TariffsDG({ selectedTariffs, handleSelectionChange, getTariffs }: Props) {
   const { token } = authStore();
 
@@ -35,7 +34,6 @@ export default function TariffsDG({ selectedTariffs, handleSelectionChange, getT
   const [changingTariff, setChangingTariff] = useState<Tariff_FRONTEND | undefined>();
   const [errorDelete, setErrorDelete] = useState(false);
 
-
   const tariffDeleteDataGrid = async (tarifIid: string) => {
     if (exampleTariffs.find((tariff) => tariff.id === tarifIid)) {
       deleteTariffs(tarifIid);
@@ -97,7 +95,6 @@ export default function TariffsDG({ selectedTariffs, handleSelectionChange, getT
     enqueueSnackbar(`Not deleted: ${notDeleted.join(", ")}`);
   };
 
-
   const columns: GridColDef[] = [
     { field: "id", headerName: "ID", width: 100 },
     { field: "name", headerName: "Название тарифа", width: 150 },