Исправление открытия чата: не закрывать при сбое опроса списка, сохранять активную карточку

This commit is contained in:
root
2026-05-17 10:13:53 +00:00
parent 81beafda29
commit 083eae4059
+20 -10
View File
@@ -91,6 +91,10 @@
};
}
function ticketApiPath(ticketNumber) {
return encodeURIComponent(String(ticketNumber ?? ""));
}
function revokeAttachmentUrls() {
for (const u of state.blobUrls) {
try {
@@ -949,6 +953,9 @@
await refreshLastMessageSignaturesStaggered();
updateBoardUnreadFingerprints();
renderTickets();
if (state.chatModalOpen && state.currentTicket != null) {
reapplyActiveTicketCard(state.currentTicket);
}
}
function partitionClientTickets(list) {
@@ -1015,22 +1022,24 @@
const tnSel = String(ticketNumber).replace(/\\/g, "\\\\").replace(/"/g, '\\"');
const card = document.querySelector(`.f7-ticket-card[data-ticket-number="${tnSel}"]`);
if (card) card.classList.add("f7-ticket-card--active");
showError("");
openChatModal(ticket);
delete state.ticketUnreadByLastMsg[String(ticketNumber)];
try {
await fetchMessages();
await fetchTickets();
} catch (e) {
showError(e.message || "Не удалось загрузить сообщения");
disconnectTicketSocket();
await closeChatModal();
return;
}
const row = state.tickets.find((x) => x.ticket_number === ticketNumber);
if (row) row.has_unread = false;
renderTickets();
reapplyActiveTicketCard(ticketNumber);
void markClientTicketRead(ticket.ticket_number);
connectTicketSocket(ticket.ticket_number);
} catch (e) {
showError(e.message || "Не удалось загрузить сообщения");
disconnectTicketSocket();
await closeChatModal();
}
fetchTickets().catch(() => {});
}
function renderTickets() {
@@ -1052,7 +1061,8 @@
async function fetchMessages() {
if (!state.currentTicket) return;
const response = await fetch(`${apiBase}/api/client/tickets/${state.currentTicket}/messages`, {
const tn = ticketApiPath(state.currentTicket);
const response = await fetch(`${apiBase}/api/client/tickets/${tn}/messages`, {
headers: clientIdentityHeaders(),
});
if (!response.ok) throw new Error("Не удалось загрузить сообщения");
@@ -1062,7 +1072,7 @@
}
async function fetchClientAttachmentBlob(attachmentId) {
const url = `${apiBase}/api/client/tickets/${state.currentTicket}/attachments/${attachmentId}`;
const url = `${apiBase}/api/client/tickets/${ticketApiPath(state.currentTicket)}/attachments/${encodeURIComponent(String(attachmentId))}`;
const res = await fetch(url, { headers: clientIdentityHeaders() });
if (!res.ok) throw new Error("attachment");
return res.blob();
@@ -1226,7 +1236,7 @@
}
if (!text && file) text = `📎 ${file.name}`;
const response = await fetch(`${apiBase}/api/client/tickets/${state.currentTicket}/messages`, {
const response = await fetch(`${apiBase}/api/client/tickets/${ticketApiPath(state.currentTicket)}/messages`, {
method: "POST",
headers: {
"Content-Type": "application/json",
@@ -1243,7 +1253,7 @@
const form = new FormData();
form.append("message_id", String(created.id));
form.append("file", file);
const attRes = await fetch(`${apiBase}/api/client/tickets/${state.currentTicket}/attachments`, {
const attRes = await fetch(`${apiBase}/api/client/tickets/${ticketApiPath(state.currentTicket)}/attachments`, {
method: "POST",
headers: clientIdentityHeaders(),
body: form,