From 426e2360b3ebf34907a834c9e8d5376c648b54eb Mon Sep 17 00:00:00 2001
From: Sean Hatfield <seanhatfield5@gmail.com>
Date: Thu, 12 Dec 2024 09:00:30 +0800
Subject: [PATCH] Redirect to default thread on thread deletion (#2808)
* redirect to default thread on thread deletion
* reset submodule
* handle redirect on bulk delete thread
* redirect on bulk thread delete only if deleted thread is selected
* redirect only on single delete of active thread
* lint
* patch threadSlug for clarity
---------
Co-authored-by: Timothy Carambat <rambat1010@gmail.com>
---
.../ThreadContainer/ThreadItem/index.jsx | 16 ++++++++++++++--
.../ActiveWorkspaces/ThreadContainer/index.jsx | 5 +++++
2 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/frontend/src/components/Sidebar/ActiveWorkspaces/ThreadContainer/ThreadItem/index.jsx b/frontend/src/components/Sidebar/ActiveWorkspaces/ThreadContainer/ThreadItem/index.jsx
index cbe3b6301..4947de08f 100644
--- a/frontend/src/components/Sidebar/ActiveWorkspaces/ThreadContainer/ThreadItem/index.jsx
+++ b/frontend/src/components/Sidebar/ActiveWorkspaces/ThreadContainer/ThreadItem/index.jsx
@@ -24,7 +24,7 @@ export default function ThreadItem({
hasNext,
ctrlPressed = false,
}) {
- const { slug } = useParams();
+ const { slug, threadSlug = null } = useParams();
const optionsContainer = useRef(null);
const [showOptions, setShowOptions] = useState(false);
const linkTo = !thread.slug
@@ -142,6 +142,7 @@ export default function ThreadItem({
thread={thread}
onRemove={onRemove}
close={() => setShowOptions(false)}
+ currentThreadSlug={threadSlug}
/>
)}
</div>
@@ -151,7 +152,14 @@ export default function ThreadItem({
);
}
-function OptionsMenu({ containerRef, workspace, thread, onRemove, close }) {
+function OptionsMenu({
+ containerRef,
+ workspace,
+ thread,
+ onRemove,
+ close,
+ currentThreadSlug,
+}) {
const menuRef = useRef(null);
// Ref menu options
@@ -227,6 +235,10 @@ function OptionsMenu({ containerRef, workspace, thread, onRemove, close }) {
if (success) {
showToast("Thread deleted successfully!", "success", { clear: true });
onRemove(thread.id);
+ // Redirect if deleting the active thread
+ if (currentThreadSlug === thread.slug) {
+ window.location.href = paths.workspace.chat(workspace.slug);
+ }
return;
}
};
diff --git a/frontend/src/components/Sidebar/ActiveWorkspaces/ThreadContainer/index.jsx b/frontend/src/components/Sidebar/ActiveWorkspaces/ThreadContainer/index.jsx
index 157e6623e..f9c0ea4ed 100644
--- a/frontend/src/components/Sidebar/ActiveWorkspaces/ThreadContainer/index.jsx
+++ b/frontend/src/components/Sidebar/ActiveWorkspaces/ThreadContainer/index.jsx
@@ -87,6 +87,11 @@ export default function ThreadContainer({ workspace }) {
const slugs = threads.filter((t) => t.deleted === true).map((t) => t.slug);
await Workspace.threads.deleteBulk(workspace.slug, slugs);
setThreads((prev) => prev.filter((t) => !t.deleted));
+
+ // Only redirect if current thread is being deleted
+ if (slugs.includes(threadSlug)) {
+ window.location.href = paths.workspace.chat(workspace.slug);
+ }
};
function removeThread(threadId) {
--
GitLab