这是indexloc提供的服务，不要输入任何密码
Skip to content

Fix white screen bug when deleting chats under Workspace Chats menu #681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 6, 2024
Merged

Fix white screen bug when deleting chats under Workspace Chats menu #681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4defebc
use filter instead of ref to delete row from workspace chat component…
shatfield4 Feb 6, 2024
f0e56b6
Merge branch 'master' into 669-bug-white-screen-after-deleting-a-work…
shatfield4 Feb 6, 2024
a715435
remove ref from pagination on embed chats and fix white screen bug
shatfield4 Feb 6, 2024
9519725
remove unneeded import
shatfield4 Feb 6, 2024
129c9e3
normalize response object
timothycarambat Feb 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions frontend/src/pages/GeneralSettings/Chats/ChatRow/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
import { useRef } from "react";
import truncate from "truncate";
import { X, Trash } from "@phosphor-icons/react";
import System from "@/models/system";
import ModalWrapper from "@/components/ModalWrapper";
import { useModal } from "@/hooks/useModal";

export default function ChatRow({ chat }) {
const rowRef = useRef(null);
export default function ChatRow({ chat, onDelete }) {
const {
isOpen: isPromptOpen,
openModal: openPromptModal,
Expand All @@ -25,16 +23,13 @@ export default function ChatRow({ chat }) {
)
)
return false;
rowRef?.current?.remove();
await System.deleteChat(chat.id);
onDelete(chat.id);
};

return (
<>
<tr
ref={rowRef}
className="bg-transparent text-white text-opacity-80 text-sm font-medium"
>
<tr className="bg-transparent text-white text-opacity-80 text-sm font-medium">
<td className="px-6 py-4 font-medium whitespace-nowrap text-white">
{chat.id}
</td>
Expand Down
8 changes: 7 additions & 1 deletion frontend/src/pages/GeneralSettings/Chats/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,10 @@ function ChatsContainer() {
setOffset(offset + 1);
};

const handleDeleteChat = (chatId) => {
setChats((prevChats) => prevChats.filter((chat) => chat.id !== chatId));
};

useEffect(() => {
async function fetchChats() {
const { chats: _chats, hasPages = false } = await System.chats(offset);
Expand Down Expand Up @@ -196,7 +200,9 @@ function ChatsContainer() {
</thead>
<tbody>
{!!chats &&
chats.map((chat) => <ChatRow key={chat.id} chat={chat} />)}
chats.map((chat) => (
<ChatRow key={chat.id} chat={chat} onDelete={handleDeleteChat} />
))}
</tbody>
</table>
<div className="flex w-full justify-between items-center">
Expand Down
11 changes: 3 additions & 8 deletions frontend/src/pages/GeneralSettings/EmbedChats/ChatRow/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import { useRef } from "react";
import truncate from "truncate";
import { X, Trash, LinkSimple } from "@phosphor-icons/react";
import ModalWrapper from "@/components/ModalWrapper";
import { useModal } from "@/hooks/useModal";
import paths from "@/utils/paths";
import Embed from "@/models/embed";

export default function ChatRow({ chat }) {
const rowRef = useRef(null);
export default function ChatRow({ chat, onDelete }) {
const {
isOpen: isPromptOpen,
openModal: openPromptModal,
Expand All @@ -26,16 +24,13 @@ export default function ChatRow({ chat }) {
)
)
return false;
rowRef?.current?.remove();
await Embed.deleteChat(chat.id);
onDelete(chat.id);
};

return (
<>
<tr
ref={rowRef}
className="bg-transparent text-white text-opacity-80 text-sm font-medium"
>
<tr className="bg-transparent text-white text-opacity-80 text-sm font-medium">
<td className="px-6 py-4 font-medium whitespace-nowrap text-white">
<a
href={paths.settings.embedSetup()}
Expand Down
8 changes: 7 additions & 1 deletion frontend/src/pages/GeneralSettings/EmbedChats/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ function ChatsContainer() {
setOffset(offset + 1);
};

const handleDeleteChat = (chatId) => {
setChats((prevChats) => prevChats.filter((chat) => chat.id !== chatId));
};

useEffect(() => {
async function fetchChats() {
const { chats: _chats, hasPages = false } = await Embed.chats(offset);
Expand Down Expand Up @@ -99,7 +103,9 @@ function ChatsContainer() {
</thead>
<tbody>
{!!chats &&
chats.map((chat) => <ChatRow key={chat.id} chat={chat} />)}
chats.map((chat) => (
<ChatRow key={chat.id} chat={chat} onDelete={handleDeleteChat} />
))}
</tbody>
</table>
<div className="flex w-full justify-between items-center">
Expand Down
2 changes: 1 addition & 1 deletion server/endpoints/system.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,7 @@ function systemEndpoints(app) {
try {
const { id } = request.params;
await WorkspaceChats.delete({ id: Number(id) });
response.sendStatus(200).end();
response.json({ success: true, error: null });
} catch (e) {
console.error(e);
response.sendStatus(500).end();
Expand Down