Skip to content

Commit

Permalink
Fixes #7011
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeroen Van den Berghe authored and gatzjames committed Jan 26, 2024
1 parent e1e3b13 commit 8ee52a6
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 7 deletions.
19 changes: 14 additions & 5 deletions packages/insomnia/src/ui/components/command-palette.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ import { isGrpcRequest } from '../../models/grpc-request';
import { isRequest } from '../../models/request';
import { isRequestGroup } from '../../models/request-group';
import { isWebSocketRequest } from '../../models/websocket-request';
import { WorkspaceLoaderData } from '../routes/workspace';
import { Workspace } from '../../models/workspace';
import { ProjectLoaderData } from '../routes/project';
import { Collection as WorkspaceCollection, WorkspaceLoaderData } from '../routes/workspace';
import { Icon } from './icon';
import { useDocBodyKeyboardShortcuts } from './keydown-binder';
import { getMethodShortHand } from './tags/method-tag';
Expand All @@ -20,10 +22,17 @@ export const CommandPalette = () => {
workspaceId,
requestId,
} = useParams();
const {
collection,
workspaces,
} = useRouteLoaderData(':workspaceId') as WorkspaceLoaderData;
const workspaceData = useRouteLoaderData(':workspaceId') as WorkspaceLoaderData | undefined;
const projectData = useRouteLoaderData('/project/:projectId') as ProjectLoaderData | undefined;

let collection: WorkspaceCollection = [];
let workspaces: Workspace[] = [];
if (workspaceData) {
collection = workspaceData.collection;
workspaces = workspaceData.workspaces;
} else if (projectData) {
workspaces = projectData.workspaces.map(workspace => workspace.workspace);
}

const navigate = useNavigate();
useDocBodyKeyboardShortcuts({
Expand Down
2 changes: 1 addition & 1 deletion packages/insomnia/src/ui/routes/organization.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -770,7 +770,7 @@ const OrganizationRoute = () => {
</div>
<Toast />
</div>
{workspaceId && <CommandPalette />}
{<CommandPalette />}
</InsomniaEventStreamProvider>
);
};
Expand Down
2 changes: 1 addition & 1 deletion packages/insomnia/src/ui/routes/workspace.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import { pushSnapshotOnInitialize } from '../../sync/vcs/initialize-backend-proj
import { VCSInstance } from '../../sync/vcs/insomnia-sync';
import { invariant } from '../../utils/invariant';

type Collection = Child[];
export type Collection = Child[];

export interface WorkspaceLoaderData {
workspaces: Workspace[];
Expand Down

0 comments on commit 8ee52a6

Please sign in to comment.