From a6ea352180db3d073ec9290f45fce9f18ae8de8a Mon Sep 17 00:00:00 2001
From: nflnkr <molohov.eugeny@yandex.ru>
Date: Tue, 21 Mar 2023 15:59:46 +0300
Subject: [PATCH] refactor

---
 .../dashboard/Content/Support/Support.tsx     | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/pages/dashboard/Content/Support/Support.tsx b/src/pages/dashboard/Content/Support/Support.tsx
index 34660e9..ec427bc 100644
--- a/src/pages/dashboard/Content/Support/Support.tsx
+++ b/src/pages/dashboard/Content/Support/Support.tsx
@@ -2,12 +2,11 @@ import { useEffect } from "react";
 import { Box, Button, useTheme } from "@mui/material";
 import SearchOutlinedIcon from '@mui/icons-material/SearchOutlined';
 import HighlightOffOutlinedIcon from '@mui/icons-material/HighlightOffOutlined';
-import makeRequest from "@root/kitUI/makeRequest";
 import { enqueueSnackbar } from 'notistack';
-import { GetTicketsRequest, GetTicketsResponse, Ticket } from "@root/model/ticket";
+import { GetTicketsRequest, Ticket } from "@root/model/ticket";
 import { setTickets, addOrUpdateTicket, useTicketStore } from "@root/stores/tickets";
 import TicketItem from "./TicketItem";
-import { subscribeToAllTickets } from "@root/api/tickets";
+import { getTickets, subscribeToAllTickets } from "@root/api/tickets";
 import Chat from "./Chat";
 
 
@@ -21,17 +20,12 @@ export default function Support() {
             page: 0,
             status: "open",
         };
-
         const controller = new AbortController();
 
-        makeRequest({
-            url: "https://admin.pena.digital/heruvym/getTickets",
-            method: "POST",
-            useToken: true,
+        getTickets({
             body: getTicketsBody,
             signal: controller.signal,
-        }).then(response => {
-            const result = (response as any).data as GetTicketsResponse;
+        }).then(result => {
             console.log("GetTicketsResponse", result);
             setTickets(result.data);
         }).catch(error => {
@@ -49,12 +43,12 @@ export default function Support() {
         const unsubscribe = subscribeToAllTickets({
             accessToken: token,
             onMessage(event) {
-                console.log("SSE received:", event.data);
+                console.log("SSE: ticket received:", event.data);
                 try {
                     const newTicket = JSON.parse(event.data) as Ticket;
                     addOrUpdateTicket(newTicket);
                 } catch (error) {
-                    console.log("Error parsing SSE", error);
+                    console.log("Error parsing ticket SSE", error);
                 }
             },
             onError(event) {
@@ -71,12 +65,12 @@ export default function Support() {
         <Box sx={{
             width: "100%",
             display: "flex",
-            justifyContent: "space-between"
+            justifyContent: "space-between",
+            height: "600px",
         }}>
             <Chat />
             <Box sx={{
                 width: "max(40%, 460px)",
-                height: "540px",
                 display: "flex",
                 flexDirection: "column",
                 alignItems: "center",