Skip to content

Commit bb891c6

Browse files
committed
Rename wizard to visBuilder in class name, type name and function name (opensearch-project#2639)
Rname wizard to visBuilder Signed-off-by: abbyhu2000 <abigailhu2000@gmail.com> Signed-off-by: abbyhu2000 <abigailhu2000@gmail.com>
1 parent 9827e85 commit bb891c6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+298
-272
lines changed

src/plugins/vis_builder/common/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ export const VISUALIZE_ID = 'visualize';
99
export const EDIT_PATH = '/edit';
1010

1111
export {
12-
WizardSavedObjectAttributes,
13-
WIZARD_SAVED_OBJECT,
12+
VisBuilderSavedObjectAttributes,
13+
VISBUILDER_SAVED_OBJECT,
1414
} from './vis_builder_saved_object_attributes';

src/plugins/vis_builder/common/vis_builder_saved_object_attributes.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
import { SavedObjectAttributes } from '../../../core/types';
77

8-
export const WIZARD_SAVED_OBJECT = 'wizard';
8+
export const VISBUILDER_SAVED_OBJECT = 'wizard';
99

10-
export interface WizardSavedObjectAttributes extends SavedObjectAttributes {
10+
export interface VisBuilderSavedObjectAttributes extends SavedObjectAttributes {
1111
title: string;
1212
description?: string;
1313
visualizationState?: string;

src/plugins/vis_builder/public/application/app.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { Workspace } from './components/workspace';
1313
import './app.scss';
1414
import { RightNav } from './components/right_nav';
1515

16-
export const WizardApp = () => {
16+
export const VisBuilderApp = () => {
1717
// Render the application DOM.
1818
return (
1919
<I18nProvider>

src/plugins/vis_builder/public/application/components/data_tab/field_search.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export interface Props {
1717
}
1818

1919
/**
20-
* Component is Wizard's side bar to search of available fields
20+
* Component is VisBuilder's side bar to search of available fields
2121
* Additionally there's a button displayed that allows the user to show/hide more filter fields
2222
*/
2323
export function FieldSearch({ value }: Props) {

src/plugins/vis_builder/public/application/components/data_tab/secondary_panel.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { DefaultEditorAggParams } from '../../../../../vis_default_editor/public
1111
import { Title } from './title';
1212
import { useIndexPatterns, useVisualizationType } from '../../utils/use';
1313
import { useOpenSearchDashboards } from '../../../../../opensearch_dashboards_react/public';
14-
import { WizardServices } from '../../../types';
14+
import { VisBuilderServices } from '../../../types';
1515
import { AggParam, IAggType, IFieldParamType } from '../../../../../data/public';
1616
import { saveDraftAgg, editDraftAgg } from '../../utils/state_management/visualization_slice';
1717
import { setValidity } from '../../utils/state_management/metadata_slice';
@@ -33,7 +33,7 @@ export function SecondaryPanel() {
3333
search: { aggs: aggService },
3434
},
3535
},
36-
} = useOpenSearchDashboards<WizardServices>();
36+
} = useOpenSearchDashboards<VisBuilderServices>();
3737
const schemas = vizType.ui.containerConfig.data.schemas.all;
3838

3939
const aggConfigs = useMemo(() => {

src/plugins/vis_builder/public/application/components/data_tab/use/use_dropbox.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {
1818
} from '../../../utils/state_management/visualization_slice';
1919
import { useIndexPatterns } from '../../../utils/use/use_index_pattern';
2020
import { useOpenSearchDashboards } from '../../../../../../opensearch_dashboards_react/public';
21-
import { WizardServices } from '../../../../types';
21+
import { VisBuilderServices } from '../../../../types';
2222

2323
const filterByName = propFilter('name');
2424
const filterByType = propFilter('type');
@@ -38,7 +38,7 @@ export const useDropbox = (props: UseDropboxProps): DropboxProps => {
3838
search: { aggs: aggService },
3939
},
4040
},
41-
} = useOpenSearchDashboards<WizardServices>();
41+
} = useOpenSearchDashboards<VisBuilderServices>();
4242
const aggConfigParams = useTypedSelector(
4343
(state) => state.visualization.activeVisualization?.aggConfigParams
4444
);

src/plugins/vis_builder/public/application/components/right_nav.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ import { FormattedMessage } from '@osd/i18n/react';
1616
import { useVisualizationType } from '../utils/use';
1717
import './side_nav.scss';
1818
import { useOpenSearchDashboards } from '../../../../opensearch_dashboards_react/public';
19-
import { WizardServices } from '../../types';
19+
import { VisBuilderServices } from '../../types';
2020
import { setActiveVisualization, useTypedDispatch } from '../utils/state_management';
2121

2222
export const RightNav = () => {
2323
const [newVisType, setNewVisType] = useState<string>();
2424
const {
2525
services: { types },
26-
} = useOpenSearchDashboards<WizardServices>();
26+
} = useOpenSearchDashboards<VisBuilderServices>();
2727
const { ui, name: activeVisName } = useVisualizationType();
2828
const dispatch = useTypedDispatch();
2929
const StyleSection = ui.containerConfig.style.render;

src/plugins/vis_builder/public/application/components/top_nav.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import { useUnmount } from 'react-use';
99
import { PLUGIN_ID } from '../../../common';
1010
import { useOpenSearchDashboards } from '../../../../opensearch_dashboards_react/public';
1111
import { getTopNavConfig } from '../utils/get_top_nav_config';
12-
import { WizardServices } from '../../types';
12+
import { VisBuilderServices } from '../../types';
1313

1414
import './top_nav.scss';
15-
import { useIndexPatterns, useSavedWizardVis } from '../utils/use';
15+
import { useIndexPatterns, useSavedVisBuilderVis } from '../utils/use';
1616
import { useTypedSelector, useTypedDispatch } from '../utils/state_management';
1717
import { setEditorState } from '../utils/state_management/metadata_slice';
1818
import { useCanSave } from '../utils/use/use_can_save';
@@ -22,7 +22,7 @@ import { TopNavMenuData } from '../../../../navigation/public';
2222
export const TopNav = () => {
2323
// id will only be set for the edit route
2424
const { id: visualizationIdFromUrl } = useParams<{ id: string }>();
25-
const { services } = useOpenSearchDashboards<WizardServices>();
25+
const { services } = useOpenSearchDashboards<VisBuilderServices>();
2626
const {
2727
setHeaderActionMenu,
2828
navigation: {
@@ -33,18 +33,18 @@ export const TopNav = () => {
3333
const dispatch = useTypedDispatch();
3434

3535
const saveDisabledReason = useCanSave();
36-
const savedWizardVis = useSavedWizardVis(visualizationIdFromUrl);
36+
const savedVisBuilderVis = useSavedVisBuilderVis(visualizationIdFromUrl);
3737
const { selected: indexPattern } = useIndexPatterns();
3838
const [config, setConfig] = useState<TopNavMenuData[] | undefined>();
3939

4040
useEffect(() => {
4141
const getConfig = () => {
42-
if (!savedWizardVis || !indexPattern) return;
42+
if (!savedVisBuilderVis || !indexPattern) return;
4343

4444
return getTopNavConfig(
4545
{
4646
visualizationIdFromUrl,
47-
savedWizardVis: saveStateToSavedObject(savedWizardVis, rootState, indexPattern),
47+
savedVisBuilderVis: saveStateToSavedObject(savedVisBuilderVis, rootState, indexPattern),
4848
saveDisabledReason,
4949
dispatch,
5050
},
@@ -55,7 +55,7 @@ export const TopNav = () => {
5555
setConfig(getConfig());
5656
}, [
5757
rootState,
58-
savedWizardVis,
58+
savedVisBuilderVis,
5959
services,
6060
visualizationIdFromUrl,
6161
saveDisabledReason,

src/plugins/vis_builder/public/application/components/workspace.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { EuiEmptyPrompt, EuiFlexGroup, EuiFlexItem, EuiIcon, EuiPanel } from '@e
77
import React, { FC, useState, useMemo, useEffect, useLayoutEffect } from 'react';
88
import { useOpenSearchDashboards } from '../../../../opensearch_dashboards_react/public';
99
import { IExpressionLoaderParams } from '../../../../expressions/public';
10-
import { WizardServices } from '../../types';
10+
import { VisBuilderServices } from '../../types';
1111
import { validateSchemaState } from '../utils/validate_schema_state';
1212
import { useTypedSelector } from '../utils/state_management';
1313
import { useVisualizationType } from '../utils/use';
@@ -26,7 +26,7 @@ export const Workspace: FC = ({ children }) => {
2626
notifications: { toasts },
2727
data,
2828
},
29-
} = useOpenSearchDashboards<WizardServices>();
29+
} = useOpenSearchDashboards<VisBuilderServices>();
3030
const { toExpression, ui } = useVisualizationType();
3131
const [expression, setExpression] = useState<string>();
3232
const [searchContext, setSearchContext] = useState<IExpressionLoaderParams['searchContext']>({

src/plugins/vis_builder/public/application/index.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import { Router, Route, Switch } from 'react-router-dom';
99
import { Provider as ReduxProvider } from 'react-redux';
1010
import { Store } from 'redux';
1111
import { AppMountParameters } from '../../../../core/public';
12-
import { WizardServices } from '../types';
13-
import { WizardApp } from './app';
12+
import { VisBuilderServices } from '../types';
13+
import { VisBuilderApp } from './app';
1414
import { OpenSearchDashboardsContextProvider } from '../../../opensearch_dashboards_react/public';
1515
import { EDIT_PATH } from '../../common';
1616

1717
export const renderApp = (
1818
{ element, history }: AppMountParameters,
19-
services: WizardServices,
19+
services: VisBuilderServices,
2020
store: Store
2121
) => {
2222
ReactDOM.render(
@@ -26,7 +26,7 @@ export const renderApp = (
2626
<services.i18n.Context>
2727
<Switch>
2828
<Route path={[`${EDIT_PATH}/:id`, '/']} exact={false}>
29-
<WizardApp />
29+
<VisBuilderApp />
3030
</Route>
3131
</Switch>
3232
</services.i18n.Context>

0 commit comments

Comments
 (0)