diff --git a/packages/insomnia/src/common/hotkeys.ts b/packages/insomnia/src/common/hotkeys.ts index 0f4d7fb3ede..11cf4a6c63f 100644 --- a/packages/insomnia/src/common/hotkeys.ts +++ b/packages/insomnia/src/common/hotkeys.ts @@ -12,7 +12,7 @@ export const keyboardShortcutDescriptions: Record = { 'request_showSettings': 'Show Request Settings', 'preferences_showKeyboardShortcuts': 'Show Keyboard Shortcuts', 'preferences_showGeneral': 'Show App Preferences', - 'request_quickSwitch': 'Switch Requests', + 'request_quickSwitch': 'Quick search', 'request_showRecent': 'Show Recent Requests', 'request_showRecentPrevious': 'Show Recent Requests (Previous)', 'plugin_reload': 'Reload Plugins', diff --git a/packages/insomnia/src/ui/components/command-palette.tsx b/packages/insomnia/src/ui/components/command-palette.tsx index d57f5f339ff..e37a380d529 100644 --- a/packages/insomnia/src/ui/components/command-palette.tsx +++ b/packages/insomnia/src/ui/components/command-palette.tsx @@ -1,8 +1,9 @@ import React from 'react'; import { useState } from 'react'; -import { Collection, ComboBox, Dialog, Header, Input, Label, ListBox, ListBoxItem, Modal, ModalOverlay, Section, Text } from 'react-aria-components'; +import { Button, Collection, ComboBox, Dialog, DialogTrigger, Header, Input, Keyboard, Label, ListBox, ListBoxItem, Modal, ModalOverlay, Section, Text } from 'react-aria-components'; import { useNavigate, useParams, useRouteLoaderData } from 'react-router-dom'; +import { constructKeyCombinationDisplay, getPlatformKeyCombinations } from '../../common/hotkeys'; import { fuzzyMatch } from '../../common/misc'; import { isGrpcRequest } from '../../models/grpc-request'; import { isRequest } from '../../models/request'; @@ -10,6 +11,7 @@ import { isRequestGroup } from '../../models/request-group'; import { isWebSocketRequest } from '../../models/websocket-request'; import { Workspace } from '../../models/workspace'; import { ProjectLoaderData } from '../routes/project'; +import { RootLoaderData } from '../routes/root'; import { Collection as WorkspaceCollection, WorkspaceLoaderData } from '../routes/workspace'; import { Icon } from './icon'; import { useDocBodyKeyboardShortcuts } from './keydown-binder'; @@ -25,7 +27,7 @@ export const CommandPalette = () => { } = useParams(); const workspaceData = useRouteLoaderData(':workspaceId') as WorkspaceLoaderData | undefined; const projectData = useRouteLoaderData('/project/:projectId') as ProjectLoaderData | undefined; - + const { settings } = useRouteLoaderData('root') as RootLoaderData; let collection: WorkspaceCollection = []; let workspaces: Workspace[] = []; if (workspaceData) { @@ -42,8 +44,18 @@ export const CommandPalette = () => { }, }); + const requestSwitchKeyCombination = getPlatformKeyCombinations(settings.hotKeyRegistry.request_quickSwitch)[0]; + return ( - + + + {({ close }) => ( @@ -159,5 +171,6 @@ export const CommandPalette = () => { + ); }; diff --git a/packages/insomnia/src/ui/components/dropdowns/remote-workspaces-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/remote-workspaces-dropdown.tsx index bfcc862b723..6bf63030e82 100644 --- a/packages/insomnia/src/ui/components/dropdowns/remote-workspaces-dropdown.tsx +++ b/packages/insomnia/src/ui/components/dropdowns/remote-workspaces-dropdown.tsx @@ -8,6 +8,7 @@ import { RemoteProject } from '../../../models/project'; import { RemoteCollectionsLoaderData } from '../../routes/remote-collections'; import { Dropdown, DropdownButton, DropdownItem, DropdownSection, ItemContent } from '../base/dropdown'; import { HelpTooltip } from '../help-tooltip'; +import { Icon } from '../icon'; import { Tooltip } from '../tooltip'; interface Props { @@ -52,11 +53,13 @@ export const RemoteWorkspacesDropdown: FC = ({ project: { remoteId } }) = onOpen={() => load(`/organization/${organizationId}/project/${projectId}/remote-collections`)} triggerButton={ - Pull + + Pull } > diff --git a/packages/insomnia/src/ui/routes/organization.tsx b/packages/insomnia/src/ui/routes/organization.tsx index 4aa4216e2f3..26bcb25f848 100644 --- a/packages/insomnia/src/ui/routes/organization.tsx +++ b/packages/insomnia/src/ui/routes/organization.tsx @@ -434,10 +434,11 @@ const OrganizationRoute = () => {
-
-
+
+
+ {!user ? : null}
@@ -471,18 +472,18 @@ const OrganizationRoute = () => { -
- {} ); }; diff --git a/packages/insomnia/src/ui/routes/project.tsx b/packages/insomnia/src/ui/routes/project.tsx index 917df5133d2..07e70f6d791 100644 --- a/packages/insomnia/src/ui/routes/project.tsx +++ b/packages/insomnia/src/ui/routes/project.tsx @@ -1029,7 +1029,7 @@ const ProjectRoute: FC = () => { )}
} -
+
{ > @@ -1107,9 +1107,9 @@ const ProjectRoute: FC = () => { { key={item._id} id={item._id} textValue={item.name} - className="flex-1 overflow-hidden flex-col outline-none p-[--padding-md] flex select-none w-full rounded-sm hover:shadow-md aspect-square ring-1 ring-[--hl-md] hover:ring-[--hl-sm] focus:ring-[--hl-lg] hover:bg-[--hl-xs] focus:bg-[--hl-sm] transition-all" + className="flex-1 overflow-hidden flex-col outline-none p-[--padding-md] flex select-none w-full rounded-md hover:shadow-md aspect-square ring-1 ring-[--hl-md] hover:ring-[--hl-sm] focus:ring-[--hl-lg] hover:bg-[--hl-xs] focus:bg-[--hl-sm] transition-all" >