[Lens] Remove unnecessary fields and indexing from mappings (#43285)

elastic · Aug 15, 2019 · 4b09eba · 4b09eba
1 parent e9f5807
commit 4b09eba
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 72 deletions.
diff --git a/x-pack/legacy/plugins/lens/mappings.json b/x-pack/legacy/plugins/lens/mappings.json
@@ -7,14 +7,13 @@
       "visualizationType": {
         "type": "keyword"
       },
-      "activeDatasourceId": {
-        "type": "keyword"
-      },
       "state": {
-        "type": "text"
+        "enabled": false,
+        "type": "object"
       },
       "expression": {
-        "type": "text"
+        "index": false,
+        "type": "keyword"
       }
     }
   }

diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/editor_frame.test.tsx b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/editor_frame.test.tsx
@@ -154,7 +154,6 @@ describe('editor_frame', () => {
             initialVisualizationId="testVis"
             ExpressionRenderer={expressionRendererMock}
             doc={{
-              activeDatasourceId: 'testDatasource',
               visualizationType: 'testVis',
               title: '',
               expression: '',
@@ -482,7 +481,6 @@ describe('editor_frame', () => {
           initialVisualizationId="testVis"
           ExpressionRenderer={expressionRendererMock}
           doc={{
-            activeDatasourceId: 'testDatasource',
             visualizationType: 'testVis',
             title: '',
             expression: '',
@@ -725,7 +723,6 @@ describe('editor_frame', () => {
           initialVisualizationId="testVis"
           ExpressionRenderer={expressionRendererMock}
           doc={{
-            activeDatasourceId: 'testDatasource',
             visualizationType: 'testVis',
             title: '',
             expression: '',
@@ -779,7 +776,6 @@ describe('editor_frame', () => {
           initialVisualizationId="testVis"
           ExpressionRenderer={expressionRendererMock}
           doc={{
-            activeDatasourceId: 'testDatasource',
             visualizationType: 'testVis',
             title: '',
             expression: '',
@@ -1379,7 +1375,6 @@ describe('editor_frame', () => {
       expect(onChange).toHaveBeenNthCalledWith(1, {
         indexPatternTitles: ['resolved'],
         doc: {
-          activeDatasourceId: 'testDatasource',
           expression: '',
           id: undefined,
           state: {
@@ -1397,7 +1392,6 @@ describe('editor_frame', () => {
       expect(onChange).toHaveBeenLastCalledWith({
         indexPatternTitles: ['resolved'],
         doc: {
-          activeDatasourceId: 'testDatasource',
           expression: '',
           id: undefined,
           state: {
@@ -1457,7 +1451,6 @@ describe('editor_frame', () => {
       expect(onChange).toHaveBeenNthCalledWith(3, {
         indexPatternTitles: [],
         doc: {
-          activeDatasourceId: 'testDatasource',
           expression: expect.stringContaining('vis "expression"'),
           id: undefined,
           state: {

diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/editor_frame.tsx b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/editor_frame.tsx
@@ -198,7 +198,6 @@ export function EditorFrame(props: EditorFrameProps) {
       ),
       visualization,
       state,
-      activeDatasourceId: state.activeDatasourceId!,
       framePublicAPI,
     });
 

diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/save.test.ts b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/save.test.ts
@@ -28,7 +28,6 @@ describe('save editor frame state', () => {
       activeDatasourceId: 'indexpattern',
       visualization: { activeId: '2', state: {} },
     },
-    activeDatasourceId: 'indexpattern',
     framePublicAPI: {
       addNewLayer: jest.fn(),
       removeLayers: jest.fn(),
@@ -71,7 +70,6 @@ describe('save editor frame state', () => {
     });
 
     expect(doc).toEqual({
-      activeDatasourceId: 'indexpattern',
       id: undefined,
       expression: '',
       state: {

diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/save.ts b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/save.ts
@@ -16,15 +16,13 @@ export interface Props {
   state: EditorFrameState;
   visualization: Visualization;
   framePublicAPI: FramePublicAPI;
-  activeDatasourceId: string;
 }
 
 export function getSavedObjectFormat({
   activeDatasources,
   state,
   visualization,
   framePublicAPI,
-  activeDatasourceId,
 }: Props): Document {
   const expression = buildExpression({
     visualization,
@@ -53,7 +51,6 @@ export function getSavedObjectFormat({
     type: 'lens',
     visualizationType: state.visualization.activeId,
     expression: expression ? toExpression(expression) : '',
-    activeDatasourceId,
     state: {
       datasourceStates,
       datasourceMetaData: {

diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/state_management.test.ts b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/state_management.test.ts
@@ -45,7 +45,6 @@ describe('editor_frame state management', () => {
       const initialState = getInitialState({
         ...props,
         doc: {
-          activeDatasourceId: 'testDatasource',
           expression: '',
           state: {
             datasourceStates: {
@@ -370,7 +369,6 @@ describe('editor_frame state management', () => {
           doc: {
             id: 'b',
             expression: '',
-            activeDatasourceId: 'a',
             state: {
               datasourceMetaData: { filterableIndexPatterns: [] },
               datasourceStates: { a: { foo: 'c' } },

diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/state_management.ts b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/state_management.ts
@@ -64,6 +64,21 @@ export type Action =
       newDatasourceId: string;
     };
 
+export function getActiveDatasourceIdFromDoc(doc?: Document) {
+  if (!doc) {
+    return null;
+  }
+
+  const [initialDatasourceId] = Object.keys(doc.state.datasourceStates);
+  return initialDatasourceId || null;
+}
+
+function getInitialDatasourceId(props: EditorFrameProps) {
+  return props.initialDatasourceId
+    ? props.initialDatasourceId
+    : getActiveDatasourceIdFromDoc(props.doc);
+}
+
 export const getInitialState = (props: EditorFrameProps): EditorFrameState => {
   const datasourceStates: EditorFrameState['datasourceStates'] = {};
 
@@ -81,7 +96,7 @@ export const getInitialState = (props: EditorFrameProps): EditorFrameState => {
   return {
     title: i18n.translate('xpack.lens.chartTitle', { defaultMessage: 'New visualization' }),
     datasourceStates,
-    activeDatasourceId: props.initialDatasourceId ? props.initialDatasourceId : null,
+    activeDatasourceId: getInitialDatasourceId(props),
     visualization: {
       state: null,
       activeId: props.initialVisualizationId,
@@ -124,7 +139,7 @@ export const reducer = (state: EditorFrameState, action: Action): EditorFrameSta
           }),
           {}
         ),
-        activeDatasourceId: action.doc.activeDatasourceId,
+        activeDatasourceId: getActiveDatasourceIdFromDoc(action.doc),
         visualization: {
           ...state.visualization,
           activeId: action.doc.visualizationType,

diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/embeddable/embeddable.test.tsx b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/embeddable/embeddable.test.tsx
@@ -17,7 +17,6 @@ jest.mock('../../../../../../../src/legacy/ui/public/inspector', () => ({
 }));
 
 const savedVis: Document = {
-  activeDatasourceId: '',
   expression: 'my | expression',
   state: {
     visualization: {},

diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/plugin.tsx b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/plugin.tsx
@@ -19,6 +19,7 @@ import { Datasource, Visualization, EditorFrameSetup, EditorFrameInstance } from
 import { EditorFrame } from './editor_frame';
 import { mergeTables } from './merge_tables';
 import { EmbeddableFactory } from './embeddable/embeddable_factory';
+import { getActiveDatasourceIdFromDoc } from './editor_frame/state_management';
 
 export interface EditorFrameSetupPlugins {
   data: typeof data;
@@ -67,7 +68,7 @@ export class EditorFramePlugin {
                 onError={onError}
                 datasourceMap={this.datasources}
                 visualizationMap={this.visualizations}
-                initialDatasourceId={(doc && doc.activeDatasourceId) || firstDatasourceId || null}
+                initialDatasourceId={getActiveDatasourceIdFromDoc(doc) || firstDatasourceId || null}
                 initialVisualizationId={
                   (doc && doc.visualizationType) || firstVisualizationId || null
                 }

diff --git a/x-pack/legacy/plugins/lens/public/persistence/saved_object_store.test.ts b/x-pack/legacy/plugins/lens/public/persistence/saved_object_store.test.ts
@@ -27,7 +27,6 @@ describe('LensStore', () => {
         title: 'Hello',
         visualizationType: 'bar',
         expression: '',
-        activeDatasourceId: 'indexpattern',
         state: {
           datasourceMetaData: {
             filterableIndexPatterns: [],
@@ -46,7 +45,6 @@ describe('LensStore', () => {
         title: 'Hello',
         visualizationType: 'bar',
         expression: '',
-        activeDatasourceId: 'indexpattern',
         state: {
           datasourceMetaData: {
             filterableIndexPatterns: [],
@@ -64,18 +62,16 @@ describe('LensStore', () => {
       expect(client.create).toHaveBeenCalledWith('lens', {
         title: 'Hello',
         visualizationType: 'bar',
-
         expression: '',
-        activeDatasourceId: 'indexpattern',
-        state: JSON.stringify({
+        state: {
           datasourceMetaData: { filterableIndexPatterns: [] },
           datasourceStates: {
             indexpattern: { type: 'index_pattern', indexPattern: '.kibana_test' },
           },
           visualization: { x: 'foo', y: 'baz' },
           query: { query: '', language: 'lucene' },
           filters: [],
-        }),
+        },
       });
     });
 
@@ -86,7 +82,6 @@ describe('LensStore', () => {
         title: 'Even the very wise cannot see all ends.',
         visualizationType: 'line',
         expression: '',
-        activeDatasourceId: 'indexpattern',
         state: {
           datasourceMetaData: { filterableIndexPatterns: [] },
           datasourceStates: { indexpattern: { type: 'index_pattern', indexPattern: 'lotr' } },
@@ -101,7 +96,6 @@ describe('LensStore', () => {
         title: 'Even the very wise cannot see all ends.',
         visualizationType: 'line',
         expression: '',
-        activeDatasourceId: 'indexpattern',
         state: {
           datasourceMetaData: { filterableIndexPatterns: [] },
           datasourceStates: { indexpattern: { type: 'index_pattern', indexPattern: 'lotr' } },
@@ -116,46 +110,18 @@ describe('LensStore', () => {
         title: 'Even the very wise cannot see all ends.',
         visualizationType: 'line',
         expression: '',
-        activeDatasourceId: 'indexpattern',
-        state: JSON.stringify({
+        state: {
           datasourceMetaData: { filterableIndexPatterns: [] },
           datasourceStates: { indexpattern: { type: 'index_pattern', indexPattern: 'lotr' } },
           visualization: { gear: ['staff', 'pointy hat'] },
           query: { query: '', language: 'lucene' },
           filters: [],
-        }),
+        },
       });
     });
   });
 
   describe('load', () => {
-    test('parses the visState', async () => {
-      const { client, store } = testStore();
-      client.get = jest.fn(async () => ({
-        id: 'Paul',
-        type: 'lens',
-        attributes: {
-          title: 'Hope clouds observation.',
-          visualizationType: 'dune',
-          state: '{ "datasource": { "giantWorms": true } }',
-        },
-      }));
-      const doc = await store.load('Paul');
-
-      expect(doc).toEqual({
-        id: 'Paul',
-        type: 'lens',
-        title: 'Hope clouds observation.',
-        visualizationType: 'dune',
-        state: {
-          datasource: { giantWorms: true },
-        },
-      });
-
-      expect(client.get).toHaveBeenCalledTimes(1);
-      expect(client.get).toHaveBeenCalledWith('lens', 'Paul');
-    });
-
     test('throws if an error is returned', async () => {
       const { client, store } = testStore();
       client.get = jest.fn(async () => ({

diff --git a/x-pack/legacy/plugins/lens/public/persistence/saved_object_store.ts b/x-pack/legacy/plugins/lens/public/persistence/saved_object_store.ts
@@ -14,7 +14,6 @@ export interface Document {
   type?: string;
   visualizationType: string | null;
   title: string;
-  activeDatasourceId: string;
   expression: string;
   state: {
     datasourceMetaData: {
@@ -62,18 +61,14 @@ export class SavedObjectIndexStore implements SavedObjectStore {
 
   async save(vis: Document) {
     const { id, type, ...rest } = vis;
-    const attributes = {
-      ...rest,
-      state: JSON.stringify(rest.state),
-    };
+    // TODO: SavedObjectAttributes should support this kind of object,
+    // remove this workaround when SavedObjectAttributes is updated.
+    const attributes = (rest as unknown) as SavedObjectAttributes;
     const result = await (id
       ? this.client.update(DOC_TYPE, id, attributes)
       : this.client.create(DOC_TYPE, attributes));
 
-    return {
-      ...vis,
-      id: result.id,
-    };
+    return { ...vis, id: result.id };
   }
 
   async load(id: string): Promise<Document> {
@@ -87,7 +82,6 @@ export class SavedObjectIndexStore implements SavedObjectStore {
       ...attributes,
       id,
       type,
-      state: JSON.parse(((attributes as unknown) as { state: string }).state as string),
     } as Document;
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -198,7 +198,6 @@ export function EditorFrame(props: EditorFrameProps) { @@
           ),
           visualization,
           state,
-          activeDatasourceId: state.activeDatasourceId!,
           framePublicAPI,
         });
@@ Expand Down @@