Skip to content

fix(History): navigate to the project if the last visited workspace has been deleted #7764

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
gatzjames merged 1 commit into from
Jul 26, 2024
Merged

fix(History): navigate to the project if the last visited workspace has been deleted #7764

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
10 changes: 1 addition & 9 deletions packages/insomnia/src/utils/router.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import * as models from '../models';
import type { Organization } from '../models/organization';
import { findPersonalOrganization } from '../models/organization';
import type { Project } from '../models/project';
import { scopeToActivity, type Workspace } from '../models/workspace';
import { scopeToActivity } from '../models/workspace';
export const enum AsyncTask {
SyncOrganization,
MigrateProjects,
Expand Down Expand Up @@ -56,14 +56,6 @@ export const getInitialRouteForOrganization = async ({
if (existingWorkspace) {
return `/organization/${match.params.organizationId}/project/${existingProject._id}/workspace/${existingWorkspace._id}/${scopeToActivity(existingWorkspace.scope)}`;
}

const firstWorkspace = await database.getWhere<Workspace>(models.workspace.type, {
parentId: existingProject._id,
});

if (firstWorkspace?._id) {
return `/organization/${match.params.organizationId}/project/${existingProject._id}/workspace/${firstWorkspace._id}/${scopeToActivity(firstWorkspace.scope)}`;
}
}

return `/organization/${match?.params.organizationId}/project/${existingProject._id}`;
Expand Down