Skip to content

Commit

Permalink
add scratchpad check
Browse files Browse the repository at this point in the history
  • Loading branch information
gatzjames committed Feb 20, 2024
1 parent 21398b1 commit 0d8461c
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions packages/insomnia/src/ui/components/command-palette.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { getAccountId } from '../../account/session';
import { constructKeyCombinationDisplay, getPlatformKeyCombinations } from '../../common/hotkeys';
import { fuzzyMatch } from '../../common/misc';
import { isGrpcRequest } from '../../models/grpc-request';
import { isScratchpadOrganizationId } from '../../models/organization';
import { isRequest } from '../../models/request';
import { isRequestGroup } from '../../models/request-group';
import { isWebSocketRequest } from '../../models/websocket-request';
Expand All @@ -27,7 +28,12 @@ export const CommandPalette = () => {
projectId,
workspaceId,
requestId,
} = useParams();
} = useParams() as {
organizationId: string;
projectId: string;
workspaceId: string;
requestId: string;
};
const workspaceData = useRouteLoaderData(':workspaceId') as WorkspaceLoaderData | undefined;
const projectData = useRouteLoaderData('/project/:projectId') as ProjectLoaderData | undefined;
const { settings } = useRouteLoaderData('root') as RootLoaderData;
Expand All @@ -38,7 +44,7 @@ export const CommandPalette = () => {
const projectDataLoader = useFetcher<ProjectLoaderData>();

useEffect(() => {
if (!projectData && !projectDataLoader.data && projectDataLoader.state === 'idle') {
if (!projectData && !projectDataLoader.data && projectDataLoader.state === 'idle' && !isScratchpadOrganizationId(organizationId)) {
projectDataLoader.load(`/organization/${organizationId}/project/${projectId}`);
}
}, [organizationId, projectData, projectDataLoader, projectId]);
Expand Down Expand Up @@ -143,7 +149,7 @@ export const CommandPalette = () => {
})),
});

comboboxSections.push({
files.length > 0 && comboboxSections.push({
id: 'collections-and-documents',
name: 'Collections and documents',
children: files.map(file => ({
Expand Down

0 comments on commit 0d8461c

Please sign in to comment.