θΏ™ζ˜―indexlocζδΎ›ηš„ζœεŠ‘οΌŒδΈθ¦θΎ“ε…₯任何密码
Skip to content

Redirect to default thread on thread deletion #2808

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 13 commits into from
Dec 12, 2024
Merged

Redirect to default thread on thread deletion #2808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7159204
redirect to default thread on thread deletion
shatfield4 Dec 11, 2024
1a983dd
Merge branch 'master' into 2767-feat-redirect-to-the-default-thread-a…
timothycarambat Dec 11, 2024
f5cdc9c
reset submodule
timothycarambat Dec 11, 2024
ffac83b
handle redirect on bulk delete thread
shatfield4 Dec 11, 2024
dcb2cf8
Merge branch '2767-feat-redirect-to-the-default-thread-after-current-…
shatfield4 Dec 11, 2024
543467b
Merge branch 'master' into 2767-feat-redirect-to-the-default-thread-a…
shatfield4 Dec 11, 2024
73e7f97
redirect on bulk thread delete only if deleted thread is selected
shatfield4 Dec 11, 2024
70e35d7
Merge branch 'master' into 2767-feat-redirect-to-the-default-thread-a…
shatfield4 Dec 11, 2024
ea3cbc6
redirect only on single delete of active thread
shatfield4 Dec 11, 2024
0e499ca
lint
shatfield4 Dec 11, 2024
ccbf2a9
Merge branch 'master' into 2767-feat-redirect-to-the-default-thread-a…
shatfield4 Dec 11, 2024
8fc44fe
Merge branch 'master' into 2767-feat-redirect-to-the-default-thread-a…
timothycarambat Dec 12, 2024
fb1832c
patch threadSlug for clarity
timothycarambat Dec 12, 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
16 changes: 14 additions & 2 deletions frontend/src/components/Sidebar/ActiveWorkspaces/ThreadContainer/ThreadItem/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -142,6 +142,7 @@ export default function ThreadItem({
thread={thread}
onRemove={onRemove}
close={() => setShowOptions(false)}
currentThreadSlug={threadSlug}
/>
)}
</div>
Expand All @@ -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
Expand Down Expand Up @@ -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;
}
};
Expand Down
5 changes: 5 additions & 0 deletions frontend/src/components/Sidebar/ActiveWorkspaces/ThreadContainer/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down