Made lens work with the attribute service copied from elastic#68719

ThomThomson · Jun 25, 2020 · 297dba0 · 297dba0
1 parent ef496ff
commit 297dba0
Show file tree

Hide file tree

Showing 18 changed files with 291 additions and 148 deletions.
diff --git a/src/plugins/embeddable/public/index.ts b/src/plugins/embeddable/public/index.ts
@@ -69,7 +69,7 @@ export {
   isRangeSelectTriggerContext,
   isValueClickTriggerContext,
   EmbeddableStateTransfer,
-  EmbeddableOriginatingAppState,
+  EmbeddableEditorState,
   EmbeddablePackageState,
   EmbeddableRenderer,
   EmbeddableRendererProps,

diff --git a/src/plugins/embeddable/public/lib/actions/edit_panel_action.test.tsx b/src/plugins/embeddable/public/lib/actions/edit_panel_action.test.tsx
@@ -59,7 +59,7 @@ test('redirects to app using state transfer', async () => {
   const embeddable = new EditableEmbeddable({ id: '123', viewMode: ViewMode.EDIT }, true);
   embeddable.getOutput = jest.fn(() => ({ editApp: 'ultraVisualize', editPath: '/123' }));
   await action.execute({ embeddable });
-  expect(stateTransferMock.navigateToWithOriginatingApp).toHaveBeenCalledWith('ultraVisualize', {
+  expect(stateTransferMock.navigateToEditor).toHaveBeenCalledWith('ultraVisualize', {
     path: '/123',
     state: { originatingApp: 'superCoolCurrentApp' },
   });

diff --git a/src/plugins/embeddable/public/lib/actions/edit_panel_action.ts b/src/plugins/embeddable/public/lib/actions/edit_panel_action.ts
@@ -88,7 +88,7 @@ export class EditPanelAction implements Action<ActionContext> {
     const appTarget = this.getAppTarget(context);
     if (appTarget) {
       if (this.stateTransfer && appTarget.state) {
-        await this.stateTransfer.navigateToWithOriginatingApp(appTarget.app, {
+        await this.stateTransfer.navigateToEditor(appTarget.app, {
           path: appTarget.path,
           state: appTarget.state,
         });

diff --git a/src/plugins/embeddable/public/lib/state_transfer/embeddable_state_transfer.test.ts b/src/plugins/embeddable/public/lib/state_transfer/embeddable_state_transfer.test.ts
@@ -38,7 +38,7 @@ describe('embeddable state transfer', () => {
   });
 
   it('can send an outgoing originating app state', async () => {
-    await stateTransfer.navigateToWithOriginatingApp(destinationApp, { state: { originatingApp } });
+    await stateTransfer.navigateToEditor(destinationApp, { state: { originatingApp } });
     expect(application.navigateToApp).toHaveBeenCalledWith('superUltraVisualize', {
       state: { originatingApp: 'superUltraTestDashboard' },
     });
@@ -50,7 +50,7 @@ describe('embeddable state transfer', () => {
       application.navigateToApp,
       (historyMock as unknown) as ScopedHistory
     );
-    await stateTransfer.navigateToWithOriginatingApp(destinationApp, {
+    await stateTransfer.navigateToEditor(destinationApp, {
       state: { originatingApp },
       appendToExistingState: true,
     });
@@ -94,7 +94,7 @@ describe('embeddable state transfer', () => {
       application.navigateToApp,
       (historyMock as unknown) as ScopedHistory
     );
-    const fetchedState = stateTransfer.getIncomingOriginatingApp();
+    const fetchedState = stateTransfer.getIncomingEditorState();
     expect(fetchedState).toEqual({ originatingApp: 'extremeSportsKibana' });
   });
 
@@ -104,7 +104,7 @@ describe('embeddable state transfer', () => {
       application.navigateToApp,
       (historyMock as unknown) as ScopedHistory
     );
-    const fetchedState = stateTransfer.getIncomingOriginatingApp();
+    const fetchedState = stateTransfer.getIncomingEditorState();
     expect(fetchedState).toBeUndefined();
   });
 

diff --git a/src/plugins/embeddable/public/lib/state_transfer/embeddable_state_transfer.ts b/src/plugins/embeddable/public/lib/state_transfer/embeddable_state_transfer.ts
@@ -20,8 +20,8 @@
 import { cloneDeep } from 'lodash';
 import { ScopedHistory, ApplicationStart } from '../../../../../core/public';
 import {
-  EmbeddableOriginatingAppState,
-  isEmbeddableOriginatingAppState,
+  EmbeddableEditorState,
+  isEmbeddableEditorState,
   EmbeddablePackageState,
   isEmbeddablePackageState,
 } from './types';
@@ -45,10 +45,10 @@ export class EmbeddableStateTransfer {
    * @param history - the scoped history to fetch from
    * @param options.keysToRemoveAfterFetch - an array of keys to be removed from the state after they are retrieved
    */
-  public getIncomingOriginatingApp(options?: {
+  public getIncomingEditorState(options?: {
     keysToRemoveAfterFetch?: string[];
-  }): EmbeddableOriginatingAppState | undefined {
-    return this.getIncomingState<EmbeddableOriginatingAppState>(isEmbeddableOriginatingAppState, {
+  }): EmbeddableEditorState | undefined {
+    return this.getIncomingState<EmbeddableEditorState>(isEmbeddableEditorState, {
       keysToRemoveAfterFetch: options?.keysToRemoveAfterFetch,
     });
   }
@@ -72,15 +72,15 @@ export class EmbeddableStateTransfer {
    * A wrapper around the {@link ApplicationStart.navigateToApp} method which navigates to the specified appId
    * with {@link EmbeddableOriginatingAppState | originating app state}
    */
-  public async navigateToWithOriginatingApp(
+  public async navigateToEditor(
     appId: string,
     options?: {
       path?: string;
-      state: EmbeddableOriginatingAppState;
+      state: EmbeddableEditorState;
       appendToExistingState?: boolean;
     }
   ): Promise<void> {
-    await this.navigateToWithState<EmbeddableOriginatingAppState>(appId, options);
+    await this.navigateToWithState<EmbeddableEditorState>(appId, options);
   }
 
   /**

diff --git a/src/plugins/embeddable/public/lib/state_transfer/index.ts b/src/plugins/embeddable/public/lib/state_transfer/index.ts
@@ -18,4 +18,4 @@
  */
 
 export { EmbeddableStateTransfer } from './embeddable_state_transfer';
-export { EmbeddableOriginatingAppState, EmbeddablePackageState } from './types';
+export { EmbeddableEditorState, EmbeddablePackageState } from './types';
diff --git a/src/plugins/embeddable/public/lib/state_transfer/types.ts b/src/plugins/embeddable/public/lib/state_transfer/types.ts
@@ -17,33 +17,43 @@
  * under the License.
  */
 
+import { EmbeddableInput } from '..';
+
 /**
  * Represents a state package that contains the last active app id.
  * @public
  */
-export interface EmbeddableOriginatingAppState {
+export interface EmbeddableEditorState {
   originatingApp: string;
+  byValueMode?: boolean;
 }
 
-export function isEmbeddableOriginatingAppState(
-  state: unknown
-): state is EmbeddableOriginatingAppState {
+export function isEmbeddableEditorState(state: unknown): state is EmbeddableEditorState {
   return ensureFieldOfTypeExists('originatingApp', state, 'string');
 }
 
 /**
  * Represents a state package that contains all fields necessary to create an embeddable in a container.
  * @public
  */
-export interface EmbeddablePackageState {
+export interface EmbeddablePackageByReferenceState {
   type: string;
   id: string;
 }
 
+export interface EmbeddablePackageByValueState {
+  input: EmbeddableInput;
+}
+
+export type EmbeddablePackageState =
+  | EmbeddablePackageByReferenceState
+  | EmbeddablePackageByValueState;
+
 export function isEmbeddablePackageState(state: unknown): state is EmbeddablePackageState {
   return (
-    ensureFieldOfTypeExists('type', state, 'string') &&
-    ensureFieldOfTypeExists('id', state, 'string')
+    (ensureFieldOfTypeExists('type', state, 'string') &&
+      ensureFieldOfTypeExists('id', state, 'string')) ||
+    ensureFieldOfTypeExists('input', state, 'object')
   );
 }
 

diff --git a/src/plugins/embeddable/public/mocks.tsx b/src/plugins/embeddable/public/mocks.tsx
@@ -78,9 +78,9 @@ export const createEmbeddablePanelMock = ({
 
 export const createEmbeddableStateTransferMock = (): Partial<EmbeddableStateTransfer> => {
   return {
-    getIncomingOriginatingApp: jest.fn(),
+    getIncomingEditorState: jest.fn(),
     getIncomingEmbeddablePackage: jest.fn(),
-    navigateToWithOriginatingApp: jest.fn(),
+    navigateToEditor: jest.fn(),
     navigateToWithEmbeddablePackage: jest.fn(),
   };
 };

diff --git a/src/plugins/visualizations/public/embeddable/visualize_embeddable_factory.tsx b/src/plugins/visualizations/public/embeddable/visualize_embeddable_factory.tsx
@@ -130,6 +130,7 @@ export class VisualizeEmbeddableFactory
     showNewVisModal({
       originatingApp: await this.getCurrentAppId(),
       outsideVisualizeApp: true,
+      createByValue: true,
     });
     return undefined;
   }

diff --git a/src/plugins/visualizations/public/wizard/new_vis_modal.test.tsx b/src/plugins/visualizations/public/wizard/new_vis_modal.test.tsx
@@ -165,7 +165,7 @@ describe('NewVisModal', () => {
       );
       const visButton = wrapper.find('button[data-test-subj="visType-visWithAliasUrl"]');
       visButton.simulate('click');
-      expect(stateTransfer.navigateToWithOriginatingApp).toBeCalledWith('otherApp', {
+      expect(stateTransfer.navigateToEditor).toBeCalledWith('otherApp', {
         path: '#/aliasUrl',
         state: { originatingApp: 'coolJestTestApp' },
       });

diff --git a/src/plugins/visualizations/public/wizard/new_vis_modal.tsx b/src/plugins/visualizations/public/wizard/new_vis_modal.tsx
@@ -43,6 +43,7 @@ interface TypeSelectionProps {
   application: ApplicationStart;
   outsideVisualizeApp?: boolean;
   stateTransfer?: EmbeddableStateTransfer;
+  createByValue?: boolean;
   originatingApp?: string;
 }
 
@@ -172,9 +173,9 @@ class NewVisModal extends React.Component<TypeSelectionProps, TypeSelectionState
 
   private navigate(appId: string, params: string) {
     if (this.props.stateTransfer && this.props.originatingApp) {
-      this.props.stateTransfer.navigateToWithOriginatingApp(appId, {
+      this.props.stateTransfer.navigateToEditor(appId, {
         path: params,
-        state: { originatingApp: this.props.originatingApp },
+        state: { originatingApp: this.props.originatingApp, byValueMode: this.props.createByValue },
       });
     } else {
       this.props.application.navigateToApp(appId, {

diff --git a/src/plugins/visualizations/public/wizard/show_new_vis.tsx b/src/plugins/visualizations/public/wizard/show_new_vis.tsx
@@ -37,6 +37,7 @@ export interface ShowNewVisModalParams {
   onClose?: () => void;
   originatingApp?: string;
   outsideVisualizeApp?: boolean;
+  createByValue?: boolean;
 }
 
 /**
@@ -49,6 +50,7 @@ export function showNewVisModal({
   onClose,
   originatingApp,
   outsideVisualizeApp,
+  createByValue,
 }: ShowNewVisModalParams = {}) {
   const container = document.createElement('div');
   let isClosed = false;
@@ -69,6 +71,7 @@ export function showNewVisModal({
         isOpen={true}
         onClose={handleClose}
         originatingApp={originatingApp}
+        createByValue={createByValue}
         stateTransfer={getEmbeddable().getStateTransfer()}
         outsideVisualizeApp={outsideVisualizeApp}
         editorParams={editorParams}

diff --git a/x-pack/plugins/lens/common/constants.ts b/x-pack/plugins/lens/common/constants.ts
@@ -13,6 +13,6 @@ export function getBasePath() {
   return `#/`;
 }
 
-export function getEditPath(id: string) {
-  return `#/edit/${encodeURIComponent(id)}`;
+export function getEditPath(id: string | undefined) {
+  return id ? `#/edit/${encodeURIComponent(id)}` : '#/edit/value';
 }
diff --git a/x-pack/plugins/lens/public/app_plugin/app.tsx b/x-pack/plugins/lens/public/app_plugin/app.tsx
@@ -38,6 +38,7 @@ import {
   SavedQuery,
   UI_SETTINGS,
 } from '../../../../../src/plugins/data/public';
+import { EmbeddableEditorState } from '../../../../../src/plugins/embeddable/public';
 
 interface State {
   isLoading: boolean;
@@ -64,7 +65,7 @@ export function App({
   docId,
   docStorage,
   redirectTo,
-  originatingApp,
+  embeddableEditorIncomingState,
   navigation,
   onAppLeave,
   history,
@@ -77,7 +78,7 @@ export function App({
   docId?: string;
   docStorage: SavedObjectStore;
   redirectTo: (id?: string, returnToOrigin?: boolean, newlyCreated?: boolean) => void;
-  originatingApp?: string | undefined;
+  embeddableEditorIncomingState?: EmbeddableEditorState;
   onAppLeave: AppMountParameters['onAppLeave'];
   history: History;
 }) {
@@ -256,6 +257,7 @@ export function App({
     if (!lastKnownDoc) {
       return;
     }
+
     const [pinnedFilters, appFilters] = _.partition(
       lastKnownDoc.state?.filters,
       esFilters.isFilterPinned
@@ -297,32 +299,34 @@ export function App({
     );
 
     const newlyCreated: boolean = saveProps.newCopyOnSave || !lastKnownDoc?.id;
-    docStorage
-      .save(doc)
-      .then(({ id }) => {
-        // Prevents unnecessary network request and disables save button
-        const newDoc = { ...doc, id };
-        setState((s) => ({
-          ...s,
-          isSaveModalVisible: false,
-          persistedDoc: newDoc,
-          lastKnownDoc: newDoc,
-        }));
-        if (docId !== id || saveProps.returnToOrigin) {
-          redirectTo(id, saveProps.returnToOrigin, newlyCreated);
-        }
-      })
-      .catch((e) => {
-        // eslint-disable-next-line no-console
-        console.dir(e);
-        trackUiEvent('save_failed');
-        core.notifications.toasts.addDanger(
-          i18n.translate('xpack.lens.app.docSavingError', {
-            defaultMessage: 'Error saving document',
-          })
-        );
-        setState((s) => ({ ...s, isSaveModalVisible: false }));
-      });
+    if (!embeddableEditorIncomingState?.byValueMode) {
+      docStorage
+        .save(doc)
+        .then(({ id }) => {
+          // Prevents unnecessary network request and disables save button
+          const newDoc = { ...doc, id };
+          setState((s) => ({
+            ...s,
+            isSaveModalVisible: false,
+            persistedDoc: newDoc,
+            lastKnownDoc: newDoc,
+          }));
+          if (docId !== id || saveProps.returnToOrigin) {
+            redirectTo(id, saveProps.returnToOrigin, newlyCreated);
+          }
+        })
+        .catch((e) => {
+          // eslint-disable-next-line no-console
+          console.dir(e);
+          trackUiEvent('save_failed');
+          core.notifications.toasts.addDanger(
+            i18n.translate('xpack.lens.app.docSavingError', {
+              defaultMessage: 'Error saving document',
+            })
+          );
+          setState((s) => ({ ...s, isSaveModalVisible: false }));
+        });
+    }
   };
 
   const onError = useCallback(
@@ -349,7 +353,8 @@ export function App({
           <div className="lnsApp__header">
             <TopNavMenu
               config={[
-                ...(!!originatingApp && lastKnownDoc?.id
+                ...((!!embeddableEditorIncomingState?.originatingApp && lastKnownDoc?.id) ||
+                embeddableEditorIncomingState?.byValueMode
                   ? [
                       {
                         label: i18n.translate('xpack.lens.app.saveAndReturn', {
@@ -374,14 +379,16 @@ export function App({
                   : []),
                 {
                   label:
-                    lastKnownDoc?.id && !!originatingApp
+                    lastKnownDoc?.id ||
+                    (embeddableEditorIncomingState?.byValueMode &&
+                      !!embeddableEditorIncomingState?.originatingApp)
                       ? i18n.translate('xpack.lens.app.saveAs', {
                           defaultMessage: 'Save as',
                         })
                       : i18n.translate('xpack.lens.app.save', {
                           defaultMessage: 'Save',
                         }),
-                  emphasize: !originatingApp || !lastKnownDoc?.id,
+                  emphasize: !embeddableEditorIncomingState?.originatingApp,
                   run: () => {
                     if (isSaveable && lastKnownDoc) {
                       setState((s) => ({ ...s, isSaveModalVisible: true }));
@@ -502,7 +509,7 @@ export function App({
         </div>
         {lastKnownDoc && state.isSaveModalVisible && (
           <SavedObjectSaveModalOrigin
-            originatingApp={originatingApp}
+            originatingApp={embeddableEditorIncomingState?.originatingApp}
             onSave={(props) => runSave(props)}
             onClose={() => setState((s) => ({ ...s, isSaveModalVisible: false }))}
             documentInfo={{