[Step 2] ui/persisted_state 👉 src/plugins/visualizations

src/legacy/core_plugins/data/public/search/expressions/esaggs.ts

@@ -40,7 +40,7 @@ import {
 import { buildTabularInspectorData } from './build_tabular_inspector_data';
 import { calculateObjectHash } from '../../../../visualizations/public';
 import { tabifyAggResponse } from '../../../../../core_plugins/data/public';
-import { PersistedState } from '../../../../../ui/public/persisted_state';
+import { PersistedState } from '../../../../../../plugins/visualizations/public';
 import { Adapters } from '../../../../../../plugins/inspector/public';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { getQueryService, getIndexPatterns } from '../../../../../../plugins/data/public/services';

src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts

@@ -29,7 +29,6 @@ export { State } from 'ui/state_management/state';
 export { GlobalStateProvider } from 'ui/state_management/global_state';
 // @ts-ignore
 export { StateManagementConfigProvider } from 'ui/state_management/config_provider';
-export { PersistedState } from 'ui/persisted_state';
 
 export { subscribeWithScope } from 'ui/utils/subscribe_with_scope';
 // @ts-ignore

src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/lib/make_stateful.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { PersistedState } from '../../../legacy_imports';
+import { PersistedState } from '../../../../../../../../plugins/visualizations/public';
 import { ReduxLikeStateContainer } from '../../../../../../../../plugins/kibana_utils/public';
 import { VisualizeAppState, VisualizeAppStateTransitions } from '../../types';
 

src/legacy/core_plugins/kibana/public/visualize/np_ready/types.d.ts

@@ -19,9 +19,10 @@
 
 import { TimeRange, Query, Filter, DataPublicPluginStart } from 'src/plugins/data/public';
 import { IEmbeddableStart } from 'src/plugins/embeddable/public';
+import { PersistedState } from 'src/plugins/visualizations/public';
 import { LegacyCoreStart } from 'kibana/public';
 import { Vis } from 'src/legacy/core_plugins/visualizations/public';
-import { VisSavedObject, PersistedState } from '../legacy_imports';
+import { VisSavedObject } from '../legacy_imports';
 
 export type PureVisState = ReturnType<Vis['getCurrentState']>;
 

src/legacy/core_plugins/vis_default_editor/public/components/sidebar/sidebar.tsx

@@ -21,13 +21,13 @@ import React, { useMemo, useState, useCallback, KeyboardEventHandler, useEffect
 import { get, isEqual } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { keyCodes, EuiButtonIcon, EuiFlexGroup, EuiFlexItem, EuiTitle } from '@elastic/eui';
-
 import { Vis } from 'src/legacy/core_plugins/visualizations/public';
-import { PersistedState, AggGroupNames } from '../../legacy_imports';
+import { AggGroupNames } from '../../legacy_imports';
 import { DefaultEditorNavBar, OptionTab } from './navbar';
 import { DefaultEditorControls } from './controls';
 import { setStateParamValue, useEditorReducer, useEditorFormState, discardChanges } from './state';
 import { DefaultEditorAggCommonProps } from '../agg_common_props';
+import { PersistedState } from '../../../../../../plugins/visualizations/public';
 
 interface DefaultEditorSideBarProps {
   isCollapsed: boolean;

src/legacy/core_plugins/vis_default_editor/public/legacy_imports.ts

@@ -48,5 +48,4 @@ export { isValidJson, isValidInterval } from 'ui/agg_types';
 export { AggParamOption } from 'ui/agg_types';
 export { CidrMask } from 'ui/agg_types';
 
-export { PersistedState } from 'ui/persisted_state';
 export * from 'ui/vis/lib';

src/legacy/core_plugins/vis_default_editor/public/vis_options_props.tsx

@@ -17,7 +17,8 @@
  * under the License.
  */
 
-import { IAggConfigs, PersistedState } from './legacy_imports';
+import { PersistedState } from '../../../../plugins/visualizations/public';
+import { IAggConfigs } from './legacy_imports';
 import { Vis } from '../../visualizations/public';
 
 export interface VisOptionsProps<VisParamType = unknown> {

src/legacy/core_plugins/vis_type_timeseries/public/legacy_imports.ts

@@ -17,7 +17,6 @@
  * under the License.
  */
 
-export { PersistedState } from 'ui/persisted_state';
 // @ts-ignore
 export { defaultFeedbackMessage } from 'ui/vis/default_feedback_message';
 // @ts-ignore

src/legacy/core_plugins/vis_type_timeseries/public/metrics_fn.ts

@@ -24,10 +24,10 @@ import {
   KibanaContext,
   Render,
 } from '../../../../plugins/expressions/public';
+import { PersistedState } from '../../../../plugins/visualizations/public';
 
 // @ts-ignore
 import { metricsRequestHandler } from './request_handler';
-import { PersistedState } from './legacy_imports';
 
 type Input = KibanaContext | null;
 type Output = Promise<Render<RenderValue>>;

src/legacy/core_plugins/visualizations/public/legacy_imports.ts

@@ -17,7 +17,6 @@
  * under the License.
  */
 
-export { PersistedState } from '../../../ui/public/persisted_state';
 export {
   AggConfigs,
   IAggConfig,

src/legacy/core_plugins/visualizations/public/np_ready/public/components/visualization.tsx

@@ -19,8 +19,7 @@
 
 import { get } from 'lodash';
 import React from 'react';
-
-import { PersistedState } from '../../../legacy_imports';
+import { PersistedState } from '../../../../../../../plugins/visualizations/public';
 import { memoizeLast } from '../legacy/memoize';
 import { VisualizationChart } from './visualization_chart';
 import { VisualizationNoResults } from './visualization_noresults';

src/legacy/core_plugins/visualizations/public/np_ready/public/components/visualization_chart.tsx

@@ -20,8 +20,7 @@
 import React from 'react';
 import * as Rx from 'rxjs';
 import { debounceTime, filter, share, switchMap } from 'rxjs/operators';
-
-import { PersistedState } from '../../../legacy_imports';
+import { PersistedState } from '../../../../../../../plugins/visualizations/public';
 import { Vis, VisualizationController } from '../vis';
 import { getUpdateStatus } from '../legacy/update_status';
 import { ResizeChecker } from '../../../../../../../plugins/kibana_utils/public';

src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/visualize_embeddable.ts

@@ -43,10 +43,10 @@ import {
   IExpressionLoaderParams,
   ExpressionsStart,
 } from '../../../../../../../plugins/expressions/public';
+import { PersistedState } from '../../../../../../../plugins/visualizations/public';
 import { buildPipeline } from '../legacy/build_pipeline';
 import { Vis } from '../vis';
 import { getExpressions, getUiActions } from '../services';
-import { PersistedState } from '../../../legacy_imports';
 import { VisSavedObject } from '../types';
 
 const getKeys = <T extends {}>(o: T): Array<keyof T> => Object.keys(o) as Array<keyof T>;

src/legacy/core_plugins/visualizations/public/np_ready/public/expressions/vis.js

@@ -29,7 +29,7 @@
 
 import { EventEmitter } from 'events';
 import _ from 'lodash';
-import { PersistedState } from '../../../legacy_imports';
+import { PersistedState } from '../../../../../../../plugins/visualizations/public';
 
 import { getTypes } from '../services';
 

src/legacy/core_plugins/visualizations/public/np_ready/public/expressions/visualization_function.ts

@@ -19,12 +19,14 @@
 
 import { get } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { VisResponseValue } from '../../../../../../../plugins/visualizations/public';
+import {
+  VisResponseValue,
+  PersistedState,
+} from '../../../../../../../plugins/visualizations/public';
 import {
   ExpressionFunctionDefinition,
   Render,
 } from '../../../../../../../plugins/expressions/public';
-import { PersistedState } from '../../../legacy_imports';
 import { getTypes, getIndexPatterns, getFilterManager } from '../services';
 
 interface Arguments {

src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/update_status.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { PersistedState } from '../../../legacy_imports';
+import { PersistedState } from '../../../../../../../plugins/visualizations/public';
 import { calculateObjectHash } from './calculate_object_hash';
 import { Vis } from '../vis';
 

src/legacy/core_plugins/visualizations/public/np_ready/public/vis_impl.js

@@ -29,7 +29,8 @@
 
 import { EventEmitter } from 'events';
 import _ from 'lodash';
-import { AggConfigs, PersistedState } from '../../legacy_imports';
+import { PersistedState } from '../../../../../../../src/plugins/visualizations/public';
+import { AggConfigs } from '../../legacy_imports';
 import { updateVisualizationConfig } from './legacy/vis_update';
 import { getTypes } from './services';
 

src/legacy/ui/public/events.js

@@ -20,19 +20,19 @@
 /**
  * @name Events
  *
- * @extends SimpleEmitter
+ * @extends EventEmitter
  */
 
 import _ from 'lodash';
+import { EventEmitter } from 'events';
 import { fatalError } from './notify';
-import { SimpleEmitter } from './utils/simple_emitter';
 import { createLegacyClass } from './utils/legacy_class';
 import { createDefer } from 'ui/promises';
 
 const location = 'EventEmitter';
 
 export function EventsProvider(Promise) {
-  createLegacyClass(Events).inherits(SimpleEmitter);
+  createLegacyClass(Events).inherits(EventEmitter);
   function Events() {
     Events.Super.call(this);
     this._listeners = {};
@@ -79,6 +79,7 @@ export function EventsProvider(Promise) {
    */
   Events.prototype.off = function(name, handler) {
     if (!name && !handler) {
+      this._listeners = {};
       return this.removeAllListeners();
     }