Skip to content

Commit

Permalink
Delete legacy embeddable_api plugin (#61767)
Browse files Browse the repository at this point in the history
* Delete legacy `embeddable_api` plugin

Closes: #61545

* fix test:karma
  • Loading branch information
alexwizp authored Mar 31, 2020
1 parent ef72135 commit 1696dd5
Show file tree
Hide file tree
Showing 21 changed files with 30 additions and 153 deletions.
2 changes: 0 additions & 2 deletions src/legacy/core_plugins/embeddable_api/README.md

This file was deleted.

25 changes: 0 additions & 25 deletions src/legacy/core_plugins/embeddable_api/index.ts

This file was deleted.

4 changes: 0 additions & 4 deletions src/legacy/core_plugins/embeddable_api/package.json

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import moment from 'moment';
import { Subscription } from 'rxjs';
import { History } from 'history';

import { ViewMode } from '../../../../embeddable_api/public/np_ready/public';
import { ViewMode } from '../../../../../../plugins/embeddable/public';
import { SavedObjectDashboard } from '../../../../../../plugins/dashboard/public';
import { DashboardAppState, SavedDashboardPanel } from './types';
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ import {
isErrorEmbeddable,
openAddPanelFlyout,
ViewMode,
} from '../../../../embeddable_api/public/np_ready/public';
} from '../../../../../../plugins/embeddable/public';
import { NavAction, SavedDashboardPanel } from './types';

import { showOptionsPopover } from './top_nav/show_options_popover';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import {
} from './embeddable_saved_object_converters';
import { SavedDashboardPanel } from '../types';
import { DashboardPanelState } from 'src/plugins/dashboard/public';
import { EmbeddableInput } from 'src/legacy/core_plugins/embeddable_api/public/np_ready/public';
import { EmbeddableInput } from 'src/plugins/embeddable/public';

interface CustomInput extends EmbeddableInput {
something: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import {
Query,
IFieldType,
} from '../../../../../../../plugins/data/public';
import { Container, Embeddable } from '../../../../../embeddable_api/public/np_ready/public';
import { Container, Embeddable } from '../../../../../../../plugins/embeddable/public';
import * as columnActions from '../angular/doc_table/actions/columns';
import searchTemplate from './search_template.html';
import { ISearchEmbeddable, SearchInput, SearchOutput } from './types';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
*/

import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
import { TimeRange } from 'src/plugins/data/public';
import { EmbeddableInput } from 'src/legacy/core_plugins/embeddable_api/public/np_ready/public';
import { TimeRange, Filter as DataFilter } from 'src/plugins/data/public';
import { EmbeddableInput } from 'src/plugins/embeddable/public';
import { getQueryFilters } from '../../../public/lib/build_embeddable_filters';
import { Filter, TimeRange as TimeRangeArg } from '../../../types';
import {
Expand All @@ -15,7 +15,6 @@ import {
EmbeddableExpression,
} from '../../expression_types';
import { getFunctionHelp } from '../../../i18n';
import { Filter as DataFilter } from '../../../../../../../src/plugins/data/public';

interface Arguments {
id: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
*/

import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
import { TimeRange } from 'src/plugins/data/public';
import { EmbeddableInput } from 'src/legacy/core_plugins/embeddable_api/public/np_ready/public';
import { TimeRange, Filter as DataFilter } from 'src/plugins/data/public';
import { EmbeddableInput } from 'src/plugins/embeddable/public';
import { getQueryFilters } from '../../../public/lib/build_embeddable_filters';
import { Filter, MapCenter, TimeRange as TimeRangeArg } from '../../../types';
import {
Expand All @@ -15,7 +15,6 @@ import {
EmbeddableExpression,
} from '../../expression_types';
import { getFunctionHelp } from '../../../i18n';
import { Filter as DataFilter } from '../../../../../../../src/plugins/data/public';

interface Arguments {
id: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import {
EmbeddablePanel,
EmbeddableFactoryNotFoundError,
} from '../../../../../../../src/plugins/embeddable/public';
import { start } from '../../../../../../../src/legacy/core_plugins/embeddable_api/public/np_ready/public/legacy';
import { EmbeddableExpression } from '../../expression_types/embeddable';
import { RendererStrings } from '../../../i18n';
import { getSavedObjectFinder } from '../../../../../../../src/plugins/saved_objects/public';
Expand All @@ -39,8 +38,8 @@ const renderEmbeddable = (embeddableObject: IEmbeddable, domNode: HTMLElement) =
<EmbeddablePanel
embeddable={embeddableObject}
getActions={npStart.plugins.uiActions.getTriggerCompatibleActions}
getEmbeddableFactory={start.getEmbeddableFactory}
getAllEmbeddableFactories={start.getEmbeddableFactories}
getEmbeddableFactory={npStart.plugins.embeddable.getEmbeddableFactory}
getAllEmbeddableFactories={npStart.plugins.embeddable.getEmbeddableFactories}
notifications={npStart.core.notifications}
overlays={npStart.core.overlays}
inspector={npStart.plugins.inspector}
Expand All @@ -67,7 +66,7 @@ const embeddable = () => ({
const uniqueId = handlers.getElementId();

if (!embeddablesRegistry[uniqueId]) {
const factory = Array.from(start.getEmbeddableFactories()).find(
const factory = Array.from(npStart.plugins.embeddable.getEmbeddableFactories()).find(
embeddableFactory => embeddableFactory.type === embeddableType
) as EmbeddableFactory<EmbeddableInput>;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@
*/

import React from 'react';

import { npStart } from 'ui/new_platform';
import { EuiFlyout, EuiFlyoutHeader, EuiFlyoutBody, EuiTitle } from '@elastic/eui';
import {
SavedObjectFinderUi,
SavedObjectMetaData,
} from '../../../../../../../src/plugins/saved_objects/public/';
import { start } from '../../../../../../../src/legacy/core_plugins/embeddable_api/public/np_ready/public/legacy';
import { ComponentStrings } from '../../../i18n';
import { CoreStart } from '../../../../../../../src/core/public';

Expand All @@ -27,7 +26,7 @@ export interface Props {

export class AddEmbeddableFlyout extends React.Component<Props> {
onAddPanel = (id: string, savedObjectType: string, name: string) => {
const embeddableFactories = start.getEmbeddableFactories();
const embeddableFactories = npStart.plugins.embeddable.getEmbeddableFactories();

// Find the embeddable type from the saved object type
const found = Array.from(embeddableFactories).find(embeddableFactory => {
Expand All @@ -43,7 +42,7 @@ export class AddEmbeddableFlyout extends React.Component<Props> {
};

render() {
const embeddableFactories = start.getEmbeddableFactories();
const embeddableFactories = npStart.plugins.embeddable.getEmbeddableFactories();

const availableSavedObjects = Array.from(embeddableFactories)
.filter(factory => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {
ErrorEmbeddable,
EmbeddableInput,
IContainer,
} from '../../../../../../../src/legacy/core_plugins/embeddable_api/public/np_ready/public';
} from '../../../../../../../src/plugins/embeddable/public';
import { Embeddable } from './embeddable';
import { SavedObjectIndexStore, DOC_TYPE } from '../../persistence';
import { getEditPath } from '../../../../../../plugins/lens/common';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,13 @@ import { i18n } from '@kbn/i18n';
import { npSetup, npStart } from 'ui/new_platform';
import { SavedObjectLoader } from 'src/plugins/saved_objects/public';
import { IIndexPattern } from 'src/plugins/data/public';
import { MapEmbeddable, MapEmbeddableInput } from './map_embeddable';
import { getIndexPatternService } from '../kibana_services';
import {
EmbeddableFactory,
ErrorEmbeddable,
IContainer,
} from '../../../../../../src/legacy/core_plugins/embeddable_api/public/np_ready/public';
import { setup } from '../../../../../../src/legacy/core_plugins/embeddable_api/public/np_ready/public/legacy';
import { MapEmbeddable, MapEmbeddableInput } from './map_embeddable';
import { getIndexPatternService } from '../kibana_services';
} from '../../../../../../src/plugins/embeddable/public';

import { createMapPath, MAP_SAVED_OBJECT_TYPE, APP_ICON } from '../../common/constants';
// eslint-disable-next-line @kbn/eslint/no-restricted-paths
Expand Down Expand Up @@ -171,4 +170,7 @@ export class MapEmbeddableFactory extends EmbeddableFactory {
}
}

setup.registerEmbeddableFactory(MAP_SAVED_OBJECT_TYPE, new MapEmbeddableFactory());
npSetup.plugins.embeddable.registerEmbeddableFactory(
MAP_SAVED_OBJECT_TYPE,
new MapEmbeddableFactory()
);
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import { EuiLink, EuiText } from '@elastic/eui';
import React, { useEffect, useState } from 'react';
import { createPortalNode, InPortal } from 'react-reverse-portal';
import styled, { css } from 'styled-components';
import { npStart } from 'ui/new_platform';

import { EmbeddablePanel } from '../../../../../../../src/legacy/core_plugins/embeddable_api/public/np_ready/public';
import { start } from '../../../../../../../src/legacy/core_plugins/embeddable_api/public/np_ready/public/legacy';
import { EmbeddablePanel } from '../../../../../../../src/plugins/embeddable/public';
import { DEFAULT_INDEX_KEY } from '../../../common/constants';
import { getIndexPatternTitleIdMapping } from '../../hooks/api/helpers';
import { useIndexPatterns } from '../../hooks/use_index_patterns';
Expand Down Expand Up @@ -198,8 +198,8 @@ export const EmbeddedMapComponent = ({
data-test-subj="embeddable-panel"
embeddable={embeddable}
getActions={services.uiActions.getTriggerCompatibleActions}
getEmbeddableFactory={start.getEmbeddableFactory}
getAllEmbeddableFactories={start.getEmbeddableFactories}
getEmbeddableFactory={npStart.plugins.embeddable.getEmbeddableFactory}
getAllEmbeddableFactories={npStart.plugins.embeddable.getEmbeddableFactories}
notifications={services.notifications}
overlays={services.overlays}
inspector={services.inspector}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,13 @@ import uuid from 'uuid';
import React from 'react';
import { OutPortal, PortalNode } from 'react-reverse-portal';
import minimatch from 'minimatch';
import { ViewMode } from '../../../../../../../src/legacy/core_plugins/embeddable_api/public/np_ready/public';
import { IndexPatternMapping, SetQuery } from './types';
import { getLayerList } from './map_config';
import { MAP_SAVED_OBJECT_TYPE } from '../../../../../../plugins/maps/public';
import { MapEmbeddable, RenderTooltipContentParams } from '../../../../maps/public';
import * as i18n from './translations';
import { Query, Filter } from '../../../../../../../src/plugins/data/public';
import { EmbeddableStart } from '../../../../../../../src/plugins/embeddable/public';
import { EmbeddableStart, ViewMode } from '../../../../../../../src/plugins/embeddable/public';
import { IndexPatternSavedObject } from '../../hooks/types';

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
import React, { useEffect, useState, useContext, useRef } from 'react';
import uuid from 'uuid';
import styled from 'styled-components';
import { npStart } from 'ui/new_platform';

import { ViewMode } from '../../../../../../../../../src/plugins/embeddable/public';
import { start } from '../../../../../../../../../src/legacy/core_plugins/embeddable_api/public/np_ready/public/legacy';
import * as i18n from './translations';
import { MapEmbeddable, MapEmbeddableInput } from '../../../../../../maps/public';
import { MAP_SAVED_OBJECT_TYPE } from '../../../../../../../../plugins/maps/public';
Expand Down Expand Up @@ -47,7 +47,7 @@ export const EmbeddedMap = React.memo(({ upPoints, downPoints }: EmbeddedMapProp
const { colors } = useContext(UptimeThemeContext);
const [embeddable, setEmbeddable] = useState<MapEmbeddable>();
const embeddableRoot: React.RefObject<HTMLDivElement> = useRef<HTMLDivElement>(null);
const factory = start.getEmbeddableFactory(MAP_SAVED_OBJECT_TYPE);
const factory = npStart.plugins.embeddable.getEmbeddableFactory(MAP_SAVED_OBJECT_TYPE);

const input: MapEmbeddableInput = {
id: uuid.v4(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@ import { Action, IncompatibleActionError } from '../../../../../src/plugins/ui_a
import { LicensingPluginSetup } from '../../../licensing/public';
import { checkLicense } from '../lib/license_check';

import {
ViewMode,
IEmbeddable,
} from '../../../../../src/legacy/core_plugins/embeddable_api/public/np_ready/public';
import { ViewMode, IEmbeddable } from '../../../../../src/plugins/embeddable/public';

// @TODO: These import paths will need to be updated once discovery moves to non-legacy dir
import { SEARCH_EMBEDDABLE_TYPE } from '../../../../../src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/constants';
Expand Down

0 comments on commit 1696dd5

Please sign in to comment.