Lens adhoc dataviews

src/plugins/data/common/query/filters/persistable_state.test.ts

@@ -26,7 +26,7 @@ describe('filter manager persistable state tests', () => {
       const updatedFilters = inject(filters, [
         { type: DATA_VIEW_SAVED_OBJECT_TYPE, name: 'test123', id: '123' },
       ]);
-      expect(updatedFilters[0]).toHaveProperty('meta.index', undefined);
+      expect(updatedFilters[0]).toHaveProperty('meta.index', 'test');
     });
   });
 

src/plugins/data/common/query/filters/persistable_state.ts

@@ -46,7 +46,8 @@ export const inject = (filters: Filter[], references: SavedObjectReference[]) =>
       ...filter,
       meta: {
         ...filter.meta,
-        index: reference && reference.id,
+        // if no reference has been found, keep the current "index" property (used for adhoc data views)
+        index: reference ? reference.id : filter.meta.index,
       },
     };
   });

src/plugins/data/common/query/persistable_state.test.ts

@@ -41,7 +41,7 @@ describe('query service persistable state tests', () => {
       const updatedQueryState = inject(queryState, [
         { type: DATA_VIEW_SAVED_OBJECT_TYPE, name: 'test123', id: '123' },
       ]);
-      expect(updatedQueryState.filters[0]).toHaveProperty('meta.index', undefined);
+      expect(updatedQueryState.filters[0]).toHaveProperty('meta.index', 'test');
     });
   });
 

src/plugins/unified_search/public/dataview_picker/change_dataview.tsx

@@ -69,6 +69,7 @@ export function ChangeDataView({
   onSaveTextLanguageQuery,
   onTextLangQuerySubmit,
   textBasedLanguage,
+  adHocDataViews,
 }: DataViewPickerPropsExtended) {
   const { euiTheme } = useEuiTheme();
   const [isPopoverOpen, setPopoverIsOpen] = useState(false);
@@ -93,10 +94,21 @@ export function ChangeDataView({
   useEffect(() => {
     const fetchDataViews = async () => {
       const dataViewsRefs = await data.dataViews.getIdsWithTitle();
+      if (adHocDataViews?.length) {
+        adHocDataViews.forEach((adHocDataView) => {
+          if (adHocDataView.id) {
+            dataViewsRefs.push({
+              title: adHocDataView.title,
+              name: adHocDataView.name,
+              id: adHocDataView.id,
+            });
+          }
+        });
+      }
       setDataViewsList(dataViewsRefs);
     };
     fetchDataViews();
-  }, [data, currentDataViewId]);
+  }, [data, currentDataViewId, adHocDataViews]);
 
   useEffect(() => {
     if (trigger.label) {

src/plugins/unified_search/public/dataview_picker/index.tsx

@@ -7,6 +7,7 @@
  */
 
 import React from 'react';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import type { EuiButtonProps, EuiSelectableProps } from '@elastic/eui';
 import type { AggregateQuery, Query } from '@kbn/es-query';
 import { ChangeDataView } from './change_dataview';
@@ -44,6 +45,10 @@ export interface DataViewPickerProps {
    * The id of the selected dataview.
    */
   currentDataViewId?: string;
+  /**
+   * The adHocDataview selected.
+   */
+  adHocDataViews?: DataView[];
   /**
    * EuiSelectable properties.
    */
@@ -84,6 +89,7 @@ export interface DataViewPickerPropsExtended extends DataViewPickerProps {
 export const DataViewPicker = ({
   isMissingCurrent,
   currentDataViewId,
+  adHocDataViews,
   onChangeDataView,
   onAddField,
   onDataViewCreated,
@@ -98,6 +104,7 @@ export const DataViewPicker = ({
     <ChangeDataView
       isMissingCurrent={isMissingCurrent}
       currentDataViewId={currentDataViewId}
+      adHocDataViews={adHocDataViews}
       onChangeDataView={onChangeDataView}
       onAddField={onAddField}
       onDataViewCreated={onDataViewCreated}

x-pack/plugins/lens/public/app_plugin/app.test.tsx

@@ -477,7 +477,7 @@ describe('Lens App', () => {
       expect(services.navigation.ui.TopNavMenu).toHaveBeenCalledWith(
         expect.objectContaining({
           query: 'fake query',
-          indexPatterns: [{ id: 'mockip', isTimeBased: expect.any(Function) }],
+          indexPatterns: [{ id: 'mockip', isTimeBased: expect.any(Function), fields: [] }],
         }),
         {}
       );

x-pack/plugins/lens/public/app_plugin/app.tsx

@@ -25,11 +25,13 @@ import {
   LensAppState,
   DispatchSetState,
   selectSavedObjectFormat,
+  updateIndexPatterns,
 } from '../state_management';
 import { SaveModalContainer, runSaveLensVisualization } from './save_modal_container';
 import { LensInspector } from '../lens_inspector_service';
 import { getEditPath } from '../../common';
 import { isLensEqual } from './lens_document_equality';
+import { IndexPatternServiceAPI, createIndexPatternService } from '../indexpattern_service/service';
 
 export type SaveProps = Omit<OnSaveProps, 'onTitleDuplicate' | 'newDescription'> & {
   returnToOrigin: boolean;
@@ -66,6 +68,7 @@ export function App({
     getOriginatingAppName,
     spaces,
     http,
+    notifications,
     executionContext,
     // Temporarily required until the 'by value' paradigm is default.
     dashboardFeatureFlag,
@@ -360,6 +363,22 @@ export function App({
     );
   }, [initialContext]);
 
+  const indexPatternService = useMemo(
+    () =>
+      createIndexPatternService({
+        dataViews: lensAppServices.dataViews,
+        uiSettings: lensAppServices.uiSettings,
+        core: { http, notifications },
+        updateIndexPatterns: (newIndexPatternsState, options) => {
+          dispatch(updateIndexPatterns(newIndexPatternsState));
+          if (options?.applyImmediately) {
+            dispatch(applyChanges());
+          }
+        },
+      }),
+    [dispatch, http, notifications, lensAppServices]
+  );
+
   return (
     <>
       <div className="lnsApp" data-test-subj="lnsApp">
@@ -381,13 +400,15 @@ export function App({
           topNavMenuEntryGenerators={topNavMenuEntryGenerators}
           initialContext={initialContext}
           theme$={theme$}
+          indexPatternService={indexPatternService}
         />
         {getLegacyUrlConflictCallout()}
         {(!isLoading || persistedDoc) && (
           <MemoizedEditorFrameWrapper
             editorFrame={editorFrame}
             showNoDataPopover={showNoDataPopover}
             lensInspector={lensInspector}
+            indexPatternService={indexPatternService}
           />
         )}
       </div>
@@ -449,13 +470,19 @@ const MemoizedEditorFrameWrapper = React.memo(function EditorFrameWrapper({
   editorFrame,
   showNoDataPopover,
   lensInspector,
+  indexPatternService,
 }: {
   editorFrame: EditorFrameInstance;
   lensInspector: LensInspector;
   showNoDataPopover: () => void;
+  indexPatternService: IndexPatternServiceAPI;
 }) {
   const { EditorFrameContainer } = editorFrame;
   return (
-    <EditorFrameContainer showNoDataPopover={showNoDataPopover} lensInspector={lensInspector} />
+    <EditorFrameContainer
+      showNoDataPopover={showNoDataPopover}
+      lensInspector={lensInspector}
+      indexPatternService={indexPatternService}
+    />
   );
 });