diff --git a/admin/jsonsearch/JsonSearchPanel.ts b/admin/jsonsearch/JsonSearchPanel.ts index f066dc416..99e109e71 100644 --- a/admin/jsonsearch/JsonSearchPanel.ts +++ b/admin/jsonsearch/JsonSearchPanel.ts @@ -10,7 +10,7 @@ import {toolbar, toolbarSep} from '@xh/hoist/desktop/cmp/toolbar'; import {errorMessage} from '@xh/hoist/cmp/error'; import {grid, GridConfig, gridCountLabel} from '@xh/hoist/cmp/grid'; import {a, box, filler, h4, hframe, label, li, span, ul, vbox} from '@xh/hoist/cmp/layout'; -import {hoistCmp, SelectOption, useLocalModel} from '@xh/hoist/core'; +import {hoistCmp, HoistProps, SelectOption, useLocalModel} from '@xh/hoist/core'; import {button} from '@xh/hoist/desktop/cmp/button'; import {buttonGroupInput, jsonInput, select, textInput} from '@xh/hoist/desktop/cmp/input'; import {panel} from '@xh/hoist/desktop/cmp/panel'; @@ -19,7 +19,7 @@ import {popover} from '@xh/hoist/kit/blueprint'; import {clipboardButton} from '@xh/hoist/desktop/cmp/clipboard'; import {JsonSearchPanelImplModel} from './impl/JsonSearchPanelImplModel'; -export interface JsonSearchPanelProps { +export interface JsonSearchPanelProps extends HoistProps { /** Url to endpoint for searching for matching JSON documents */ docSearchUrl: string; @@ -37,7 +37,7 @@ export interface JsonSearchPanelProps { groupByOptions: SelectOption[]; } -export const [JsonSearchPanel, jsonSearchPanel] = hoistCmp.withFactory({ +export const [JsonSearchPanel, jsonSearchPanel] = hoistCmp.withFactory({ displayName: 'JsonSearchPanel', render() { diff --git a/admin/tabs/userData/jsonblob/JsonBlobPanel.ts b/admin/tabs/userData/jsonblob/JsonBlobPanel.ts index fc065752a..8d3810823 100644 --- a/admin/tabs/userData/jsonblob/JsonBlobPanel.ts +++ b/admin/tabs/userData/jsonblob/JsonBlobPanel.ts @@ -10,7 +10,10 @@ import * as AdminCol from '@xh/hoist/admin/columns'; import {hframe} from '@xh/hoist/cmp/layout'; import {creates, hoistCmp} from '@xh/hoist/core'; import {button} from '@xh/hoist/desktop/cmp/button'; -import {jsonSearchPanel} from '@xh/hoist/admin/jsonsearch/JsonSearchPanel'; +import { + jsonSearchPanel, + type JsonSearchPanelProps +} from '@xh/hoist/admin/jsonsearch/JsonSearchPanel'; import {panel} from '@xh/hoist/desktop/cmp/panel'; import {restGrid} from '@xh/hoist/desktop/cmp/rest'; import {Icon} from '@xh/hoist/icon'; @@ -64,7 +67,7 @@ export const jsonBlobPanel = hoistCmp.factory({ ] }, groupByOptions: ['owner', 'type', 'name'] - }), + } as JsonSearchPanelProps), differ({omit: !model.differModel}) ); } diff --git a/admin/tabs/userData/prefs/UserPreferencePanel.ts b/admin/tabs/userData/prefs/UserPreferencePanel.ts index a621727fd..446216308 100644 --- a/admin/tabs/userData/prefs/UserPreferencePanel.ts +++ b/admin/tabs/userData/prefs/UserPreferencePanel.ts @@ -11,7 +11,10 @@ import {UserPreferenceModel} from '@xh/hoist/admin/tabs/userData/prefs/UserPrefe import {hframe} from '@xh/hoist/cmp/layout'; import {creates, hoistCmp} from '@xh/hoist/core'; import {button} from '@xh/hoist/desktop/cmp/button'; -import {jsonSearchPanel} from '@xh/hoist/admin/jsonsearch/JsonSearchPanel'; +import { + jsonSearchPanel, + type JsonSearchPanelProps +} from '@xh/hoist/admin/jsonsearch/JsonSearchPanel'; import {panel} from '@xh/hoist/desktop/cmp/panel'; import {restGrid} from '@xh/hoist/desktop/cmp/rest'; import {Icon} from '@xh/hoist/icon'; @@ -56,7 +59,7 @@ export const userPreferencePanel = hoistCmp.factory({ ] }, groupByOptions: ['owner', 'groupName', 'name'] - }) + } as JsonSearchPanelProps) ); } });