diff --git a/packages/server/src/data/options.ts b/packages/server/src/data/options.ts index ae35fa5da..2c0377fda 100644 --- a/packages/server/src/data/options.ts +++ b/packages/server/src/data/options.ts @@ -136,6 +136,11 @@ export default { type: 'number', }, }, + inventory: { + cost_compute_running: { + type: 'boolean', + }, + }, accounts: { account_code_required: { type: 'boolean', diff --git a/packages/webapp/src/components/Dashboard/GlobalHotkeys.tsx b/packages/webapp/src/components/Dashboard/GlobalHotkeys.tsx index 24f4b12d7..6ec3fd02b 100644 --- a/packages/webapp/src/components/Dashboard/GlobalHotkeys.tsx +++ b/packages/webapp/src/components/Dashboard/GlobalHotkeys.tsx @@ -5,12 +5,16 @@ import { useHistory } from 'react-router-dom'; import { getDashboardRoutes } from '@/routes/dashboard'; import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; import withDialogActions from '@/containers/Dialog/withDialogActions'; +import withUniversalSearchActions from '@/containers/UniversalSearch/withUniversalSearchActions'; import { compose } from '@/utils'; function GlobalHotkeys({ // #withDashboardActions - toggleSidebarExpend, + toggleSidebarExpand, + + // withUniversalSearchActions + openGlobalSearch, // #withDialogActions openDialog, @@ -24,7 +28,7 @@ function GlobalHotkeys({ .toString(); const handleSidebarToggleBtn = () => { - toggleSidebarExpend(); + toggleSidebarExpand(); }; useHotkeys( globalHotkeys, @@ -37,10 +41,26 @@ function GlobalHotkeys({ }, [history], ); - useHotkeys('ctrl+/', (event, handle) => handleSidebarToggleBtn()); - useHotkeys('shift+d', (event, handle) => openDialog('money-in', {})); - useHotkeys('shift+q', (event, handle) => openDialog('money-out', {})); + useHotkeys('ctrl+/', () => { + handleSidebarToggleBtn(); + }); + useHotkeys('shift+d', () => { + openDialog('money-in', {}); + }); + useHotkeys('shift+q', () => { + openDialog('money-out', {}); + }); + useHotkeys('/', () => { + setTimeout(() => { + openGlobalSearch(); + }, 0); + }); + return
; } -export default compose(withDashboardActions, withDialogActions)(GlobalHotkeys); +export default compose( + withDashboardActions, + withDialogActions, + withUniversalSearchActions, +)(GlobalHotkeys); diff --git a/packages/webapp/src/components/UniversalSearch/UniversalSearch.tsx b/packages/webapp/src/components/UniversalSearch/UniversalSearch.tsx index b91eefc94..9d65ef565 100644 --- a/packages/webapp/src/components/UniversalSearch/UniversalSearch.tsx +++ b/packages/webapp/src/components/UniversalSearch/UniversalSearch.tsx @@ -152,6 +152,7 @@ function UniversalSearchBar({ isOpen, onSearchTypeChange, ...listProps }) { onSearchTypeChange={onSearchTypeChange} /> } + autoFocus={true} /> {listProps.itemList} diff --git a/packages/webapp/src/containers/UniversalSearch/DashboardUniversalSearch.tsx b/packages/webapp/src/containers/UniversalSearch/DashboardUniversalSearch.tsx index cf67c054b..38cc6a4be 100644 --- a/packages/webapp/src/containers/UniversalSearch/DashboardUniversalSearch.tsx +++ b/packages/webapp/src/containers/UniversalSearch/DashboardUniversalSearch.tsx @@ -11,11 +11,10 @@ import { compose } from '@/utils'; import withUniversalSearchActions from './withUniversalSearchActions'; import withUniversalSearch from './withUniversalSearch'; +import { useGetUniversalSearchTypeOptions } from './utils'; import DashboardUniversalSearchItemActions from './DashboardUniversalSearchItemActions'; import { DashboardUniversalSearchItem } from './components'; - import DashboardUniversalSearchHotkeys from './DashboardUniversalSearchHotkeys'; -import { useGetUniversalSearchTypeOptions } from './utils'; /** * Dashboard universal search.