Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport 2.x] [Vis Builder] Change wizard to vis_builder in file names and paths (#2587) #2719

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/plugins/saved_objects_management/public/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import { i18n } from '@osd/i18n';
import { CoreSetup, CoreStart, Plugin } from 'src/core/public';

import { WizardStart } from '../../wizard/public';
import { WizardStart } from '../../vis_builder/public';
import { ManagementSetup } from '../../management/public';
import { DataPublicPluginStart } from '../../data/public';
import { DashboardStart } from '../../dashboard/public';
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,7 @@ export const PLUGIN_NAME = 'Wizard';
export const VISUALIZE_ID = 'visualize';
export const EDIT_PATH = '/edit';

export { WizardSavedObjectAttributes, WIZARD_SAVED_OBJECT } from './wizard_saved_object_attributes';
export {
WizardSavedObjectAttributes,
WIZARD_SAVED_OBJECT,
} from './vis_builder_saved_object_attributes';
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@

export { useVisualizationType } from './use_visualization_type';
export { useIndexPatterns } from './use_index_pattern';
export { useSavedWizardVis } from './use_saved_wizard_vis';
export { useSavedWizardVis } from './use_saved_vis_builder_vis';
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { EDIT_PATH, PLUGIN_ID } from '../../../../common';
import { WizardServices } from '../../../types';
import { MetricOptionsDefaults } from '../../../visualizations/metric/metric_viz_type';
import { getCreateBreadcrumbs, getEditBreadcrumbs } from '../breadcrumbs';
import { getSavedWizardVis } from '../get_saved_wizard_vis';
import { getSavedWizardVis } from '../get_saved_vis_builder_vis';
import {
useTypedDispatch,
setStyleState,
Expand All @@ -24,7 +24,7 @@ import {
} from '../state_management';
import { useOpenSearchDashboards } from '../../../../../opensearch_dashboards_react/public';
import { setEditorState } from '../state_management/metadata_slice';
import { validateWizardState } from '../wizard_state_validation';
import { validateWizardState } from '../vis_builder_state_validation';

// This function can be used when instantiating a saved vis or creating a new one
// using url parameters, embedding and destroying it in DOM
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

import { validateWizardState } from './wizard_state_validation';
import { validateWizardState } from './vis_builder_state_validation';

describe('wizard state validation', () => {
const validStyleState = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import ReactDOM from 'react-dom';
import { Embeddable, EmbeddableOutput } from '../../../embeddable/public';

import { DisabledVisualization } from './disabled_visualization';
import { WizardInput, WIZARD_EMBEDDABLE } from './wizard_embeddable';
import { WizardInput, WIZARD_EMBEDDABLE } from './vis_builder_embeddable';

export class DisabledEmbeddable extends Embeddable<WizardInput, EmbeddableOutput> {
private domNode?: HTMLElement;
Expand Down
7 changes: 7 additions & 0 deletions src/plugins/vis_builder/public/embeddable/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/*
* Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
*/

export * from './vis_builder_embeddable';
export * from './vis_builder_embeddable_factory';
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import React from 'react';

import { SavedObjectEmbeddableInput, withEmbeddableSubscription } from '../../../embeddable/public';
import { WizardEmbeddable, WizardOutput } from './wizard_embeddable';
import { WizardEmbeddable, WizardOutput } from './vis_builder_embeddable';
import { getReactExpressionRenderer } from '../plugin_services';

interface Props {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
WIZARD_SAVED_OBJECT,
} from '../../common';
import { DisabledEmbeddable } from './disabled_embeddable';
import { WizardEmbeddable, WizardOutput, WIZARD_EMBEDDABLE } from './wizard_embeddable';
import { WizardEmbeddable, WizardOutput, WIZARD_EMBEDDABLE } from './vis_builder_embeddable';
import wizardIcon from '../assets/wizard_icon.svg';
import { getHttp, getSavedWizardLoader, getTimeFilter, getUISettings } from '../plugin_services';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
*/

import { coreMock, savedObjectsServiceMock } from '../../../core/public/mocks';
import { dashboardPluginMock } from '../../../plugins/dashboard/public/mocks';
import { dataPluginMock } from '../../../plugins/data/public/mocks';
import { embeddablePluginMock } from '../../../plugins/embeddable/public/mocks';
import { navigationPluginMock } from '../../../plugins/navigation/public/mocks';
import { visualizationsPluginMock } from '../../../plugins/visualizations/public/mocks';
import { dashboardPluginMock } from '../../dashboard/public/mocks';
import { dataPluginMock } from '../../data/public/mocks';
import { embeddablePluginMock } from '../../embeddable/public/mocks';
import { navigationPluginMock } from '../../navigation/public/mocks';
import { visualizationsPluginMock } from '../../visualizations/public/mocks';
import { PLUGIN_ID, PLUGIN_NAME } from '../common';
import { WizardPlugin } from './plugin';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

import { coreMock } from '../../../../core/public/mocks';
import { getStubIndexPattern } from '../../../../plugins/data/public/test_utils';
import { getStubIndexPattern } from '../../../data/public/test_utils';
import { IndexPattern } from '../../../data/public';
import { RootState } from '../application/utils/state_management';
import { WizardVisSavedObject } from '../types';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
* SPDX-License-Identifier: Apache-2.0
*/

export { wizardSavedObjectType } from './wizard_app';
export { wizardSavedObjectType } from './vis_builder_app';
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
WizardSavedObjectAttributes,
WIZARD_SAVED_OBJECT,
} from '../../common';
import { wizardSavedObjectTypeMigrations } from './wizard_migration';
import { wizardSavedObjectTypeMigrations } from './vis_builder_migration';

export const wizardSavedObjectType: SavedObjectsType = {
name: WIZARD_SAVED_OBJECT,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

import { SavedObjectMigrationFn, SavedObjectMigrationContext } from '../../../../core/server';
import { wizardSavedObjectTypeMigrations } from './wizard_migration';
import { wizardSavedObjectTypeMigrations } from './vis_builder_migration';

const savedObjectMigrationContext = (null as unknown) as SavedObjectMigrationContext;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"compilerOptions": {
"baseUrl": "./src/plugins/wizard",
"baseUrl": "./src/plugins/vis_builder",
"paths": {
// Allows for importing from `opensearch-dashboards` package for the exported types.
"opensearch-dashboards": ["./opensearch_dashboards"],
Expand Down
7 changes: 0 additions & 7 deletions src/plugins/wizard/public/embeddable/index.ts

This file was deleted.