diff --git a/src/plugins/wizard/public/application/components/data_tab/field_selector.tsx b/src/plugins/wizard/public/application/components/data_tab/field_selector.tsx index 353f642afcf6..a794093bc00d 100644 --- a/src/plugins/wizard/public/application/components/data_tab/field_selector.tsx +++ b/src/plugins/wizard/public/application/components/data_tab/field_selector.tsx @@ -16,7 +16,7 @@ import { FieldSelectorField } from './field_selector_field'; import './field_selector.scss'; import { useTypedSelector } from '../../utils/state_management'; -import { useIndexPattern } from '../../utils/use'; +import { useIndexPatterns } from '../../utils/use'; import { getAvailableFields } from './utils'; interface IFieldCategories { @@ -33,7 +33,7 @@ const META_FIELDS: string[] = [ ]; export const FieldSelector = () => { - const indexPattern = useIndexPattern(); + const indexPattern = useIndexPatterns().selected; const fieldSearchValue = useTypedSelector((state) => state.visualization.searchField); const [filteredFields, setFilteredFields] = useState([]); diff --git a/src/plugins/wizard/public/application/components/data_tab/secondary_panel.tsx b/src/plugins/wizard/public/application/components/data_tab/secondary_panel.tsx index c897a9b018c5..21bdf256422d 100644 --- a/src/plugins/wizard/public/application/components/data_tab/secondary_panel.tsx +++ b/src/plugins/wizard/public/application/components/data_tab/secondary_panel.tsx @@ -8,7 +8,7 @@ import { cloneDeep } from 'lodash'; import { useTypedDispatch, useTypedSelector } from '../../utils/state_management'; import { DefaultEditorAggParams } from '../../../../../vis_default_editor/public'; import { Title } from './title'; -import { useIndexPattern, useVisualizationType } from '../../utils/use'; +import { useIndexPatterns, useVisualizationType } from '../../utils/use'; import { useOpenSearchDashboards } from '../../../../../opensearch_dashboards_react/public'; import { WizardServices } from '../../../types'; import { IAggType } from '../../../../../data/public'; @@ -20,7 +20,7 @@ export function SecondaryPanel() { const [touched, setTouched] = useState(false); const dispatch = useTypedDispatch(); const vizType = useVisualizationType(); - const indexPattern = useIndexPattern(); + const indexPattern = useIndexPatterns().selected; const { services: { data: { diff --git a/src/plugins/wizard/public/application/components/data_tab/use/use_dropbox.tsx b/src/plugins/wizard/public/application/components/data_tab/use/use_dropbox.tsx index 60290fc96e93..decad4a2c334 100644 --- a/src/plugins/wizard/public/application/components/data_tab/use/use_dropbox.tsx +++ b/src/plugins/wizard/public/application/components/data_tab/use/use_dropbox.tsx @@ -16,7 +16,7 @@ import { reorderAgg, updateAggConfigParams, } from '../../../utils/state_management/visualization_slice'; -import { useIndexPattern } from '../../../utils/use/use_index_pattern'; +import { useIndexPatterns } from '../../../utils/use/use_index_pattern'; import { useOpenSearchDashboards } from '../../../../../../opensearch_dashboards_react/public'; import { WizardServices } from '../../../../types'; @@ -31,7 +31,7 @@ export const useDropbox = (props: UseDropboxProps): DropboxProps => { const { id: dropboxId, label, schema } = props; const [validAggTypes, setValidAggTypes] = useState([]); const dispatch = useTypedDispatch(); - const indexPattern = useIndexPattern(); + const indexPattern = useIndexPatterns().selected; const { services: { data: { diff --git a/src/plugins/wizard/public/application/components/top_nav.tsx b/src/plugins/wizard/public/application/components/top_nav.tsx index 7a4bfa1010f4..fd1d387c6a50 100644 --- a/src/plugins/wizard/public/application/components/top_nav.tsx +++ b/src/plugins/wizard/public/application/components/top_nav.tsx @@ -11,7 +11,7 @@ import { getTopNavConfig } from '../utils/get_top_nav_config'; import { WizardServices } from '../../types'; import './top_nav.scss'; -import { useIndexPattern, useSavedWizardVis } from '../utils/use'; +import { useIndexPatterns, useSavedWizardVis } from '../utils/use'; import { useTypedSelector } from '../utils/state_management'; export const TopNav = () => { @@ -48,7 +48,7 @@ export const TopNav = () => { ); }, [hasUnappliedChanges, rootState, savedWizardVis, services, visualizationIdFromUrl]); - const indexPattern = useIndexPattern(); + const indexPattern = useIndexPatterns().selected; return (
diff --git a/src/plugins/wizard/public/application/utils/use/index.ts b/src/plugins/wizard/public/application/utils/use/index.ts index c9203242e63c..e8d1087ce0a0 100644 --- a/src/plugins/wizard/public/application/utils/use/index.ts +++ b/src/plugins/wizard/public/application/utils/use/index.ts @@ -4,5 +4,5 @@ */ export { useVisualizationType } from './use_visualization_type'; -export { useIndexPattern, useIndexPatterns } from './use_index_pattern'; +export { useIndexPatterns } from './use_index_pattern'; export { useSavedWizardVis } from './use_saved_wizard_vis'; diff --git a/src/plugins/wizard/public/application/utils/use/use_index_pattern.tsx b/src/plugins/wizard/public/application/utils/use/use_index_pattern.tsx index 6ce448b9f055..b5c60ee20944 100644 --- a/src/plugins/wizard/public/application/utils/use/use_index_pattern.tsx +++ b/src/plugins/wizard/public/application/utils/use/use_index_pattern.tsx @@ -8,27 +8,6 @@ import { useOpenSearchDashboards } from '../../../../../opensearch_dashboards_re import { WizardServices } from '../../../types'; import { useTypedSelector } from '../state_management'; -export const useIndexPattern = (): IndexPattern | undefined => { - const { indexPattern: indexId = '' } = useTypedSelector((state) => state.visualization); - const [indexPattern, setIndexPattern] = useState(); - const { - services: { - data: { indexPatterns }, - }, - } = useOpenSearchDashboards(); - - useEffect(() => { - const handleIndexUpdate = async () => { - const currentIndex = await indexPatterns.get(indexId); - setIndexPattern(currentIndex); - }; - - handleIndexUpdate(); - }, [indexId, indexPatterns]); - - return indexPattern; -}; - export const useIndexPatterns = () => { const { indexPattern: indexId = '' } = useTypedSelector((state) => state.visualization); const [indexPatterns, setIndexPatterns] = useState([]);