fix requests, add fetch on scroll
This commit is contained in:
parent
5ebea0abbd
commit
50e462da6e
@ -1,13 +1,13 @@
|
|||||||
import { Box, FormControl, IconButton, InputAdornment, InputBase, SxProps, Theme, Typography, useMediaQuery, useTheme } from "@mui/material";
|
import { Box, FormControl, IconButton, InputAdornment, InputBase, SxProps, Theme, Typography, useMediaQuery, useTheme } from "@mui/material";
|
||||||
import { createTicket, getUnauthTicketMessages, sendTicketMessage, subscribeToUnauthTicketMessages } from "@root/api/tickets";
|
import { createTicket, getUnauthTicketMessages, sendTicketMessage, subscribeToUnauthTicketMessages } from "@root/api/tickets";
|
||||||
import { GetMessagesRequest, TicketMessage } from "@root/model/ticket";
|
import { GetMessagesRequest, TicketMessage } from "@root/model/ticket";
|
||||||
import { useMessageStore } from "@root/stores/messages";
|
import { addOrUpdateUnauthMessages, setUnauthTicketFetchState, useUnauthTicketStore, incrementUnauthMessageApiPage, setUnauthIsPreventAutoscroll, setUnauthSessionData } from "@root/stores/unauthTicket";
|
||||||
import { addOrUpdateUnauthMessages, setUnauthTicketFetchState, setUnauthTicketSessionId, useUnauthTicketStore } from "@root/stores/unauthTicket";
|
|
||||||
import { enqueueSnackbar } from "notistack";
|
import { enqueueSnackbar } from "notistack";
|
||||||
import { useEffect, useRef, useState } from "react";
|
import { useEffect, useRef, useState } from "react";
|
||||||
import ChatMessage from "../ChatMessage";
|
import ChatMessage from "../ChatMessage";
|
||||||
import SendIcon from "../icons/SendIcon";
|
import SendIcon from "../icons/SendIcon";
|
||||||
import UserCircleIcon from "./UserCircleIcon";
|
import UserCircleIcon from "./UserCircleIcon";
|
||||||
|
import { throttle } from "@root/utils/decorators";
|
||||||
|
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
@ -18,20 +18,22 @@ export default function Chat({ sx }: Props) {
|
|||||||
const theme = useTheme();
|
const theme = useTheme();
|
||||||
const upMd = useMediaQuery(theme.breakpoints.up("md"));
|
const upMd = useMediaQuery(theme.breakpoints.up("md"));
|
||||||
const [messageField, setMessageField] = useState<string>("");
|
const [messageField, setMessageField] = useState<string>("");
|
||||||
const sessionId = useUnauthTicketStore(state => state.sessionId);
|
const sessionData = useUnauthTicketStore(state => state.sessionData);
|
||||||
const messages = useUnauthTicketStore(state => state.messages);
|
const messages = useUnauthTicketStore(state => state.messages);
|
||||||
const messageApiPage = useUnauthTicketStore(state => state.apiPage);
|
const messageApiPage = useUnauthTicketStore(state => state.apiPage);
|
||||||
const messagesPerPage = useUnauthTicketStore(state => state.messagesPerPage);
|
const messagesPerPage = useUnauthTicketStore(state => state.messagesPerPage);
|
||||||
const messagesFetchStateRef = useRef(useMessageStore.getState().fetchState);
|
const messagesFetchStateRef = useRef(useUnauthTicketStore.getState().fetchState);
|
||||||
|
const isPreventAutoscroll = useUnauthTicketStore(state => state.isPreventAutoscroll);
|
||||||
|
const lastMessageId = useUnauthTicketStore(state => state.lastMessageId);
|
||||||
const chatBoxRef = useRef<HTMLDivElement>();
|
const chatBoxRef = useRef<HTMLDivElement>();
|
||||||
|
|
||||||
useEffect(function fetchTicketMessages() {
|
useEffect(function fetchTicketMessages() {
|
||||||
if (!sessionId) return;
|
if (!sessionData) return;
|
||||||
|
|
||||||
const getTicketsBody: GetMessagesRequest = {
|
const getTicketsBody: GetMessagesRequest = {
|
||||||
amt: messagesPerPage,
|
amt: messagesPerPage,
|
||||||
page: messageApiPage,
|
page: messageApiPage,
|
||||||
ticket: sessionId,
|
ticket: sessionData.ticketId,
|
||||||
};
|
};
|
||||||
const controller = new AbortController();
|
const controller = new AbortController();
|
||||||
|
|
||||||
@ -47,19 +49,19 @@ export default function Chat({ sx }: Props) {
|
|||||||
} else setUnauthTicketFetchState("all fetched");
|
} else setUnauthTicketFetchState("all fetched");
|
||||||
}).catch(error => {
|
}).catch(error => {
|
||||||
console.log("Error fetching messages", error);
|
console.log("Error fetching messages", error);
|
||||||
enqueueSnackbar(error.message);
|
if (error.code !== "ERR_CANCELED") enqueueSnackbar(error.message);
|
||||||
});
|
});
|
||||||
|
|
||||||
return () => {
|
return () => {
|
||||||
controller.abort();
|
controller.abort();
|
||||||
};
|
};
|
||||||
}, [messageApiPage, messagesPerPage, sessionId]);
|
}, [messageApiPage, messagesPerPage, sessionData]);
|
||||||
|
|
||||||
useEffect(function subscribeToMessages() {
|
useEffect(function subscribeToMessages() {
|
||||||
if (!sessionId) return;
|
if (!sessionData) return;
|
||||||
|
|
||||||
const unsubscribe = subscribeToUnauthTicketMessages({
|
const unsubscribe = subscribeToUnauthTicketMessages({
|
||||||
sessionId,
|
sessionId: sessionData.ticketId,
|
||||||
onMessage(event) {
|
onMessage(event) {
|
||||||
try {
|
try {
|
||||||
const newMessage = JSON.parse(event.data) as TicketMessage;
|
const newMessage = JSON.parse(event.data) as TicketMessage;
|
||||||
@ -79,33 +81,87 @@ export default function Chat({ sx }: Props) {
|
|||||||
return () => {
|
return () => {
|
||||||
unsubscribe();
|
unsubscribe();
|
||||||
// clearUnauthTicketState();
|
// clearUnauthTicketState();
|
||||||
|
setUnauthIsPreventAutoscroll(false);
|
||||||
};
|
};
|
||||||
}, [sessionId]);
|
}, [sessionData]);
|
||||||
|
|
||||||
useEffect(() => useMessageStore.subscribe(state => (messagesFetchStateRef.current = state.fetchState)), []);
|
useEffect(function attachScrollHandler() {
|
||||||
|
if (!chatBoxRef.current) return;
|
||||||
|
|
||||||
|
const chatBox = chatBoxRef.current;
|
||||||
|
const scrollHandler = () => {
|
||||||
|
const scrollBottom = chatBox.scrollHeight - chatBox.scrollTop - chatBox.clientHeight;
|
||||||
|
const isPreventAutoscroll = scrollBottom > chatBox.clientHeight;
|
||||||
|
setUnauthIsPreventAutoscroll(isPreventAutoscroll);
|
||||||
|
|
||||||
|
if (messagesFetchStateRef.current !== "idle") return;
|
||||||
|
|
||||||
|
if (chatBox.scrollTop < chatBox.clientHeight) {
|
||||||
|
if (chatBox.scrollTop < 1) chatBox.scrollTop = 1;
|
||||||
|
incrementUnauthMessageApiPage();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const throttledScrollHandler = throttle(scrollHandler, 200);
|
||||||
|
chatBox.addEventListener("scroll", throttledScrollHandler);
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
chatBox.removeEventListener("scroll", throttledScrollHandler);
|
||||||
|
};
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
useEffect(function scrollOnNewMessage() {
|
||||||
|
if (!chatBoxRef.current) return;
|
||||||
|
|
||||||
|
if (!isPreventAutoscroll) {
|
||||||
|
setTimeout(() => {
|
||||||
|
scrollToBottom();
|
||||||
|
}, 50);
|
||||||
|
}
|
||||||
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
|
}, [lastMessageId]);
|
||||||
|
|
||||||
|
useEffect(() => useUnauthTicketStore.subscribe(state => (messagesFetchStateRef.current = state.fetchState)), []);
|
||||||
|
|
||||||
async function handleSendMessage() {
|
async function handleSendMessage() {
|
||||||
if (!messageField) return;
|
if (!messageField) return;
|
||||||
|
|
||||||
if (!sessionId) {
|
if (!sessionData) {
|
||||||
const response = await createTicket({
|
const response = await createTicket({
|
||||||
Title: "Unauth title",
|
Title: "Unauth title",
|
||||||
Message: messageField,
|
Message: messageField,
|
||||||
}, false);
|
}, false);
|
||||||
|
|
||||||
setUnauthTicketSessionId(response.sess);
|
setUnauthSessionData({
|
||||||
|
ticketId: response.Ticket,
|
||||||
|
sessionId: response.sess,
|
||||||
|
});
|
||||||
} else {
|
} else {
|
||||||
sendTicketMessage({
|
sendTicketMessage({
|
||||||
ticket: sessionId,
|
ticket: sessionData.ticketId,
|
||||||
message: messageField,
|
message: messageField,
|
||||||
lang: "ru",
|
lang: "ru",
|
||||||
files: [],
|
files: [],
|
||||||
}, true);
|
}, true).catch(error => {
|
||||||
|
console.log("Coudn't send message", error);
|
||||||
|
enqueueSnackbar(error.message);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
setMessageField("");
|
setMessageField("");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function scrollToBottom(behavior?: ScrollBehavior) {
|
||||||
|
if (!chatBoxRef.current) return;
|
||||||
|
|
||||||
|
const chatBox = chatBoxRef.current;
|
||||||
|
chatBox.scroll({
|
||||||
|
left: 0,
|
||||||
|
top: chatBox.scrollHeight,
|
||||||
|
behavior,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
const handleTextfieldKeyPress: React.KeyboardEventHandler<HTMLInputElement | HTMLTextAreaElement> = (e) => {
|
const handleTextfieldKeyPress: React.KeyboardEventHandler<HTMLInputElement | HTMLTextAreaElement> = (e) => {
|
||||||
if (e.key === "Enter" && !e.shiftKey) {
|
if (e.key === "Enter" && !e.shiftKey) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
@ -157,6 +213,7 @@ export default function Chat({ sx }: Props) {
|
|||||||
sx={{
|
sx={{
|
||||||
display: "flex",
|
display: "flex",
|
||||||
width: "100%",
|
width: "100%",
|
||||||
|
flexBasis: 0,
|
||||||
flexDirection: "column",
|
flexDirection: "column",
|
||||||
gap: upMd ? "20px" : "16px",
|
gap: upMd ? "20px" : "16px",
|
||||||
px: upMd ? "20px" : "5px",
|
px: upMd ? "20px" : "5px",
|
||||||
@ -165,13 +222,13 @@ export default function Chat({ sx }: Props) {
|
|||||||
flexGrow: 1,
|
flexGrow: 1,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{messages.map((message) => (
|
{sessionData && messages.map((message) => (
|
||||||
<ChatMessage
|
<ChatMessage
|
||||||
unAuthenticated
|
unAuthenticated
|
||||||
key={message.id}
|
key={message.id}
|
||||||
text={message.message}
|
text={message.message}
|
||||||
time={new Date(message.created_at).toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" })}
|
time={new Date(message.created_at).toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" })}
|
||||||
isSelf={sessionId === message.user_id}
|
isSelf={sessionData.sessionId === message.user_id}
|
||||||
/>
|
/>
|
||||||
))}
|
))}
|
||||||
</Box>
|
</Box>
|
||||||
|
@ -1,27 +1,32 @@
|
|||||||
import { Ticket, TicketMessage } from "@root/model/ticket";
|
import { TicketMessage } from "@root/model/ticket";
|
||||||
import { create } from "zustand";
|
import { create } from "zustand";
|
||||||
import { createJSONStorage, devtools, persist } from "zustand/middleware";
|
import { createJSONStorage, devtools, persist } from "zustand/middleware";
|
||||||
|
|
||||||
|
|
||||||
interface UnauthTicketStore {
|
interface UnauthTicketStore {
|
||||||
ticket: Ticket | null; // TODO delete if unused
|
sessionData: {
|
||||||
sessionId: string | null;
|
ticketId: string;
|
||||||
|
sessionId: string;
|
||||||
|
} | null;
|
||||||
messages: TicketMessage[];
|
messages: TicketMessage[];
|
||||||
fetchState: "idle" | "fetching" | "all fetched";
|
fetchState: "idle" | "fetching" | "all fetched";
|
||||||
apiPage: number;
|
apiPage: number;
|
||||||
messagesPerPage: number;
|
messagesPerPage: number;
|
||||||
|
lastMessageId: string | undefined;
|
||||||
|
isPreventAutoscroll: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const useUnauthTicketStore = create<UnauthTicketStore>()(
|
export const useUnauthTicketStore = create<UnauthTicketStore>()(
|
||||||
persist(
|
persist(
|
||||||
devtools(
|
devtools(
|
||||||
(set, get) => ({
|
(set, get) => ({
|
||||||
ticket: null,
|
sessionData: null,
|
||||||
sessionId: null,
|
|
||||||
messages: [],
|
messages: [],
|
||||||
fetchState: "idle",
|
fetchState: "idle",
|
||||||
apiPage: 0,
|
apiPage: 0,
|
||||||
messagesPerPage: 10,
|
messagesPerPage: 10,
|
||||||
|
lastMessageId: undefined,
|
||||||
|
isPreventAutoscroll: false,
|
||||||
}),
|
}),
|
||||||
{
|
{
|
||||||
name: "Unauth ticket store"
|
name: "Unauth ticket store"
|
||||||
@ -29,16 +34,16 @@ export const useUnauthTicketStore = create<UnauthTicketStore>()(
|
|||||||
),
|
),
|
||||||
{
|
{
|
||||||
version: 0,
|
version: 0,
|
||||||
name: "session",
|
name: "unauth-ticket",
|
||||||
storage: createJSONStorage(() => localStorage),
|
storage: createJSONStorage(() => localStorage),
|
||||||
partialize: state => ({
|
partialize: state => ({
|
||||||
sessionId: state.sessionId,
|
sessionData: state.sessionData,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
export const setUnauthTicket = (ticket: Ticket) => useUnauthTicketStore.setState({ ticket });
|
export const setUnauthSessionData = (sessionData: UnauthTicketStore["sessionData"]) => useUnauthTicketStore.setState({ sessionData });
|
||||||
|
|
||||||
export const addOrUpdateUnauthMessages = (receivedMessages: TicketMessage[]) => {
|
export const addOrUpdateUnauthMessages = (receivedMessages: TicketMessage[]) => {
|
||||||
const state = useUnauthTicketStore.getState();
|
const state = useUnauthTicketStore.getState();
|
||||||
@ -48,16 +53,12 @@ export const addOrUpdateUnauthMessages = (receivedMessages: TicketMessage[]) =>
|
|||||||
|
|
||||||
const sortedMessages = Object.values(messageIdToMessageMap).sort(sortMessagesByTime);
|
const sortedMessages = Object.values(messageIdToMessageMap).sort(sortMessagesByTime);
|
||||||
|
|
||||||
useUnauthTicketStore.setState({ messages: sortedMessages });
|
useUnauthTicketStore.setState({
|
||||||
|
messages: sortedMessages,
|
||||||
|
lastMessageId: sortedMessages.at(-1)?.id,
|
||||||
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
export const clearUnauthTicketState = () => useUnauthTicketStore.setState({
|
|
||||||
ticket: null,
|
|
||||||
messages: [],
|
|
||||||
apiPage: 0,
|
|
||||||
fetchState: "idle",
|
|
||||||
});
|
|
||||||
|
|
||||||
export const setUnauthTicketFetchState = (fetchState: UnauthTicketStore["fetchState"]) => useUnauthTicketStore.setState({ fetchState });
|
export const setUnauthTicketFetchState = (fetchState: UnauthTicketStore["fetchState"]) => useUnauthTicketStore.setState({ fetchState });
|
||||||
|
|
||||||
export const incrementUnauthMessageApiPage = () => {
|
export const incrementUnauthMessageApiPage = () => {
|
||||||
@ -66,7 +67,7 @@ export const incrementUnauthMessageApiPage = () => {
|
|||||||
useUnauthTicketStore.setState({ apiPage: state.apiPage + 1 });
|
useUnauthTicketStore.setState({ apiPage: state.apiPage + 1 });
|
||||||
};
|
};
|
||||||
|
|
||||||
export const setUnauthTicketSessionId = (sessionId: string | null) => useUnauthTicketStore.setState({ sessionId });
|
export const setUnauthIsPreventAutoscroll = (isPreventAutoscroll: boolean) => useUnauthTicketStore.setState({ isPreventAutoscroll });
|
||||||
|
|
||||||
function sortMessagesByTime(ticket1: TicketMessage, ticket2: TicketMessage) {
|
function sortMessagesByTime(ticket1: TicketMessage, ticket2: TicketMessage) {
|
||||||
const date1 = new Date(ticket1.created_at).getTime();
|
const date1 = new Date(ticket1.created_at).getTime();
|
||||||
|
Loading…
Reference in New Issue
Block a user