From 48e3b9d8910881f91da3f4adf4e4db0b171dd6ed Mon Sep 17 00:00:00 2001
From: IlyaDoronin <ryletd@gmail.com>
Date: Tue, 11 Jul 2023 18:29:32 +0300
Subject: [PATCH] feat: update data buttons

---
 .../DiscountManagement/DiscountDataGrid.tsx   | 11 +++++-
 .../Content/Tariffs/Privileges/Privileges.tsx | 39 +++++++++++--------
 src/pages/dashboard/Content/Tariffs/index.tsx | 13 +------
 .../dashboard/Content/Tariffs/tariffsDG.tsx   |  8 +++-
 4 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/src/pages/dashboard/Content/DiscountManagement/DiscountDataGrid.tsx b/src/pages/dashboard/Content/DiscountManagement/DiscountDataGrid.tsx
index ac82f04..4442b89 100644
--- a/src/pages/dashboard/Content/DiscountManagement/DiscountDataGrid.tsx
+++ b/src/pages/dashboard/Content/DiscountManagement/DiscountDataGrid.tsx
@@ -1,5 +1,5 @@
 import { useEffect } from "react";
-import { Box, IconButton, useTheme } from "@mui/material";
+import { Box, IconButton, useTheme, Tooltip } from "@mui/material";
 import {
   DataGrid,
   GridColDef,
@@ -18,6 +18,7 @@ import EditIcon from "@mui/icons-material/Edit";
 import { deleteDiscount } from "@root/api/discounts";
 import { GridSelectionModel } from "@mui/x-data-grid";
 import { useDiscounts } from "@root/hooks/useDiscounts.hook";
+import AutorenewIcon from "@mui/icons-material/Autorenew";
 
 const columns: GridColDef[] = [
   // {
@@ -151,6 +152,14 @@ export default function DiscountDataGrid({ selectedRowsHC }: Props) {
     <Box
       sx={{ width: "100%", marginTop: "55px", p: "16px", maxWidth: "1000px" }}
     >
+      <Tooltip title="обновить список привилегий">
+        <IconButton
+          onClick={requestDiscounts}
+          style={{ display: "block", margin: "0 auto" }}
+        >
+          <AutorenewIcon sx={{ color: "white" }} />
+        </IconButton>
+      </Tooltip>
       <Box sx={{ height: 600 }}>
         <DataGrid
           checkboxSelection={true}
diff --git a/src/pages/dashboard/Content/Tariffs/Privileges/Privileges.tsx b/src/pages/dashboard/Content/Tariffs/Privileges/Privileges.tsx
index 96e716b..85c963a 100644
--- a/src/pages/dashboard/Content/Tariffs/Privileges/Privileges.tsx
+++ b/src/pages/dashboard/Content/Tariffs/Privileges/Privileges.tsx
@@ -1,7 +1,8 @@
 import { GridColDef } from "@mui/x-data-grid";
 import DataGrid from "@kitUI/datagrid";
-import { Typography } from "@mui/material";
+import { Tooltip, IconButton } from "@mui/material";
 import { usePrivilegeStore } from "@root/stores/privilegesStore";
+import AutorenewIcon from "@mui/icons-material/Autorenew";
 
 const columns: GridColDef[] = [
   { field: "id", headerName: "id", width: 150 },
@@ -11,25 +12,31 @@ const columns: GridColDef[] = [
   { field: "price", headerName: "Стоимость", width: 100 },
 ];
 
-export default function Privileges() {
+type Props = {
+  requestPrivilegies: () => Promise<void>;
+};
+
+export default function Privileges({ requestPrivilegies }: Props) {
   const privileges = usePrivilegeStore((state) => state.privileges);
   // const { mergedPrivileges } = useCombinedPrivileges();
   const privilegesGridData = privileges
-  .filter(privilege => (
-    !privilege.isDeleted
-  ))
-  .map((privilege) => ({
-    id: privilege.privilegeId,
-    name: privilege.name,
-    description: privilege.description,
-    type: privilege.type,
-    price: privilege.price,
-  }));
+    .filter((privilege) => !privilege.isDeleted)
+    .map((privilege) => ({
+      id: privilege.privilegeId,
+      name: privilege.name,
+      description: privilege.description,
+      type: privilege.type,
+      price: privilege.price,
+    }));
 
   return (
-    <DataGrid
-        rows={privilegesGridData}
-        columns={columns}
-      />
+    <>
+      <Tooltip title="обновить список привилегий">
+        <IconButton onClick={requestPrivilegies}>
+          <AutorenewIcon sx={{ color: "white" }} />
+        </IconButton>
+      </Tooltip>
+      <DataGrid rows={privilegesGridData} columns={columns} />
+    </>
   );
 }
diff --git a/src/pages/dashboard/Content/Tariffs/index.tsx b/src/pages/dashboard/Content/Tariffs/index.tsx
index 9b0bf70..75023b8 100644
--- a/src/pages/dashboard/Content/Tariffs/index.tsx
+++ b/src/pages/dashboard/Content/Tariffs/index.tsx
@@ -1,5 +1,5 @@
 import { useState, useEffect } from "react";
-import { Container, IconButton, Tooltip, Typography } from "@mui/material";
+import { Container, Typography } from "@mui/material";
 import { GridSelectionModel } from "@mui/x-data-grid";
 
 import Cart from "@root/kitUI/Cart/Cart";
@@ -12,7 +12,6 @@ import TariffsDG from "./tariffsDG";
 import CreateTariff from "./CreateTariff";
 import Privileges from "./Privileges/Privileges";
 import ChangePriceModal from "./Privileges/ChangePriceModal";
-import AutorenewIcon from "@mui/icons-material/Autorenew";
 
 export default function Tariffs() {
   const [selectedTariffs, setSelectedTariffs] = useState<GridSelectionModel>(
@@ -37,17 +36,9 @@ export default function Tariffs() {
         alignItems: "center",
       }}
     >
-      <button onClick={() => requestPrivilegies()}>provileges</button>
-      <button onClick={() => requestTariffs()}>tariffs</button>
-
       <Typography variant="h6">Список привилегий</Typography>
 
-      <Tooltip title="обновить список привилегий">
-        <IconButton onClick={requestPrivilegies}>
-          <AutorenewIcon sx={{ color: "white" }} />
-        </IconButton>
-      </Tooltip>
-      <Privileges />
+      <Privileges requestPrivilegies={requestPrivilegies} />
 
       <ChangePriceModal />
 
diff --git a/src/pages/dashboard/Content/Tariffs/tariffsDG.tsx b/src/pages/dashboard/Content/Tariffs/tariffsDG.tsx
index e5e511e..0bbf603 100644
--- a/src/pages/dashboard/Content/Tariffs/tariffsDG.tsx
+++ b/src/pages/dashboard/Content/Tariffs/tariffsDG.tsx
@@ -2,7 +2,7 @@
 import React from "react";
 import { useEffect, useState } from "react";
 import { GridColDef, GridSelectionModel, GridToolbar } from "@mui/x-data-grid";
-import { Box, Button, IconButton } from "@mui/material";
+import { Box, Button, IconButton,Tooltip } from "@mui/material";
 import BackspaceIcon from "@mui/icons-material/Backspace";
 import { enqueueSnackbar } from "notistack";
 import ModeEditOutlineOutlinedIcon from "@mui/icons-material/ModeEditOutlineOutlined";
@@ -18,6 +18,7 @@ import { authStore } from "@root/stores/auth";
 import DeleteModal from "@root/pages/dashboard/Content/Tariffs/DeleteModal";
 import EditModal from "./EditModal";
 import { Tariff } from "@root/model/tariff";
+import AutorenewIcon from "@mui/icons-material/Autorenew";
 
 interface Props {
   selectedTariffs: GridSelectionModel;
@@ -118,6 +119,11 @@ export default function TariffsDG({
 
   return (
     <>
+      <Tooltip title="обновить список тарифов">
+        <IconButton onClick={() => requestTariffs()}>
+          <AutorenewIcon sx={{ color: "white" }} />
+        </IconButton>
+      </Tooltip>
       <DataGrid
         disableSelectionOnClick={true}
         checkboxSelection={true}