Skip to content

fix(app): route to opened workspace session context #16549

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

Closed
natewill wants to merge 1 commit into from
Closed

fix(app): route to opened workspace session context #16549

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 25 additions & 1 deletion packages/app/src/pages/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1170,6 +1170,7 @@ export default function Layout(props: ParentProps) {
if (!value) return false
return dirs.some((item) => workspaceKey(item) === workspaceKey(value))
}
const pref = canOpen(directory) ? directory : root
const refreshDirs = async (target?: string) => {
if (!target || target === root || canOpen(target)) return canOpen(target)
const listed = await globalSDK.client.worktree
Expand Down Expand Up @@ -1199,13 +1200,36 @@ export default function Layout(props: ParentProps) {
}

const projectSession = store.lastProjectSession[root]
if (projectSession?.id) {
const same = (a: string, b: string) => workspaceKey(a) === workspaceKey(b)
if (projectSession?.id && (pref === root || same(projectSession.directory, pref))) {
await refreshDirs(projectSession.directory)
const opened = await openSession(projectSession)
if (opened) return
clearLastProjectSession(root)
}

if (pref !== root) {
const local = latestRootSession([globalSync.child(pref, { bootstrap: false })[0]], Date.now())
if (local && (await openSession(local))) return

const fetched = latestRootSession(
[
{
path: { directory: pref },
session: await globalSDK.client.session
.list({ directory: pref })
.then((x) => x.data ?? [])
.catch(() => []),
},
],
Date.now(),
)
if (fetched && (await openSession(fetched))) return

navigateWithSidebarReset(`/${base64Encode(pref)}/session`)
return
}

const latest = latestRootSession(
dirs.map((item) => globalSync.child(item, { bootstrap: false })[0]),
Date.now(),
Expand Down
Loading