[Discover] Enable tags for saved searches

.github/CODEOWNERS

@@ -17,6 +17,7 @@
 /x-pack/plugins/graph/ @elastic/kibana-data-discovery
 /x-pack/test/functional/apps/graph @elastic/kibana-data-discovery
 /src/plugins/unified_field_list/ @elastic/kibana-data-discovery
+/src/plugins/saved_objects_finder/ @elastic/kibana-data-discovery
 
 # Vis Editors
 /x-pack/plugins/lens/ @elastic/kibana-vis-editors

.i18nrc.json

@@ -64,6 +64,7 @@
     "newsfeed": "src/plugins/newsfeed",
     "presentationUtil": "src/plugins/presentation_util",
     "savedObjects": "src/plugins/saved_objects",
+    "savedObjectsFinder": "src/plugins/saved_objects_finder",
     "savedObjectsManagement": "src/plugins/saved_objects_management",
     "server": "src/legacy/server",
     "share": "src/plugins/share",

docs/developer/plugin-list.asciidoc

@@ -237,6 +237,10 @@ Content is fetched from the remote (https://feeds.elastic.co) once a day, with p
 |NOTE: This plugin is deprecated and will be removed in 8.0. See https://github.com/elastic/kibana/issues/46435 for more information.
 
 
+|{kib-repo}blob/{branch}/src/plugins/saved_objects_finder/README.md[savedObjectsFinder]
+|The savedObjectsFinder plugin exposes a UI for finding saved objects on the client side.
+
+
 |{kib-repo}blob/{branch}/src/plugins/saved_objects_management/README.md[savedObjectsManagement]
 |The savedObjectsManagement plugin manages the Saved Objects management section.
 

packages/kbn-optimizer/limits.yml

@@ -135,3 +135,4 @@ pageLoadAssetSize:
   kubernetesSecurity: 77234
   threatIntelligence: 29195
   files: 22673
+  savedObjectsFinder: 21691

src/plugins/discover/kibana.json

@@ -13,11 +13,20 @@
     "navigation",
     "uiActions",
     "savedObjects",
+    "savedObjectsFinder",
+    "savedObjectsManagement",
     "dataViewFieldEditor",
     "dataViewEditor",
     "expressions"
   ],
-  "optionalPlugins": ["home", "share", "usageCollection", "spaces", "triggersActionsUi"],
+  "optionalPlugins": [
+    "home",
+    "share",
+    "usageCollection",
+    "spaces",
+    "triggersActionsUi",
+    "savedObjectsTaggingOss"
+  ],
   "requiredBundles": ["kibanaUtils", "kibanaReact", "dataViews", "unifiedSearch", "savedSearch"],
   "extraPublicDirs": ["common"],
   "owner": {

src/plugins/discover/public/__mocks__/services.ts

@@ -113,4 +113,5 @@ export const discoverServiceMock = {
     addWarning: jest.fn(),
   },
   expressions: expressionsPlugin,
+  savedObjectsTagging: {},
 } as unknown as DiscoverServices;

src/plugins/discover/public/application/main/components/top_nav/on_save_search.test.tsx

@@ -6,37 +6,160 @@
  * Side Public License, v 1.
  */
 
-import { showSaveModal } from '@kbn/saved-objects-plugin/public';
+import * as savedObjectsPlugin from '@kbn/saved-objects-plugin/public';
 jest.mock('@kbn/saved-objects-plugin/public');
-
+jest.mock('../../utils/persist_saved_search', () => ({
+  persistSavedSearch: jest.fn(() => ({ id: 'the-saved-search-id' })),
+}));
 import { onSaveSearch } from './on_save_search';
 import { dataViewMock } from '../../../../__mocks__/data_view';
 import { savedSearchMock } from '../../../../__mocks__/saved_search';
 import { DiscoverServices } from '../../../../build_services';
 import { GetStateReturn } from '../../services/discover_state';
 import { i18nServiceMock } from '@kbn/core/public/mocks';
+import { ReactElement } from 'react';
+import { discoverServiceMock } from '../../../../__mocks__/services';
+import * as persistSavedSearchUtils from '../../utils/persist_saved_search';
+import { SavedSearch } from '@kbn/saved-search-plugin/public';
+
+describe('onSaveSearch', () => {
+  it('should call showSaveModal', async () => {
+    const serviceMock = {
+      core: {
+        i18n: i18nServiceMock.create(),
+      },
+    } as unknown as DiscoverServices;
+    const stateMock = {
+      appStateContainer: {
+        getState: () => ({
+          rowsPerPage: 250,
+        }),
+      },
+    } as unknown as GetStateReturn;
 
-test('onSaveSearch', async () => {
-  const serviceMock = {
-    core: {
-      i18n: i18nServiceMock.create(),
-    },
-  } as unknown as DiscoverServices;
-  const stateMock = {
-    appStateContainer: {
-      getState: () => ({
-        rowsPerPage: 250,
-      }),
-    },
-  } as unknown as GetStateReturn;
+    await onSaveSearch({
+      dataView: dataViewMock,
+      navigateTo: jest.fn(),
+      savedSearch: savedSearchMock,
+      services: serviceMock,
+      state: stateMock,
+    });
+
+    expect(savedObjectsPlugin.showSaveModal).toHaveBeenCalled();
+  });
 
-  await onSaveSearch({
-    dataView: dataViewMock,
-    navigateTo: jest.fn(),
-    savedSearch: savedSearchMock,
-    services: serviceMock,
-    state: stateMock,
+  it('should pass tags to the save modal', async () => {
+    const serviceMock = discoverServiceMock;
+    const stateMock = {
+      appStateContainer: {
+        getState: () => ({
+          rowsPerPage: 250,
+        }),
+      },
+    } as unknown as GetStateReturn;
+    let saveModal: ReactElement | undefined;
+    jest.spyOn(savedObjectsPlugin, 'showSaveModal').mockImplementationOnce((modal) => {
+      saveModal = modal;
+    });
+    await onSaveSearch({
+      dataView: dataViewMock,
+      navigateTo: jest.fn(),
+      savedSearch: {
+        ...savedSearchMock,
+        tags: ['tag1', 'tag2'],
+      },
+      services: serviceMock,
+      state: stateMock,
+    });
+    expect(saveModal?.props.tags).toEqual(['tag1', 'tag2']);
   });
 
-  expect(showSaveModal).toHaveBeenCalled();
+  it('should update the saved search tags', async () => {
+    const serviceMock = discoverServiceMock;
+    const stateMock = {
+      appStateContainer: {
+        getState: () => ({
+          rowsPerPage: 250,
+        }),
+      },
+      resetInitialAppState: jest.fn(),
+    } as unknown as GetStateReturn;
+    let saveModal: ReactElement | undefined;
+    jest.spyOn(savedObjectsPlugin, 'showSaveModal').mockImplementationOnce((modal) => {
+      saveModal = modal;
+    });
+    let savedSearch: SavedSearch = {
+      ...savedSearchMock,
+      tags: ['tag1', 'tag2'],
+    };
+    await onSaveSearch({
+      dataView: dataViewMock,
+      navigateTo: jest.fn(),
+      savedSearch,
+      services: serviceMock,
+      state: stateMock,
+    });
+    expect(savedSearch.tags).toEqual(['tag1', 'tag2']);
+    jest
+      .spyOn(persistSavedSearchUtils, 'persistSavedSearch')
+      .mockImplementationOnce((newSavedSearch, _) => {
+        savedSearch = newSavedSearch;
+        return Promise.resolve({ id: newSavedSearch.id });
+      });
+    saveModal?.props.onSave({
+      newTitle: savedSearch.title,
+      newCopyOnSave: false,
+      newDescription: savedSearch.description,
+      newTags: ['tag3', 'tag4'],
+      isTitleDuplicateConfirmed: false,
+      onTitleDuplicate: jest.fn(),
+    });
+    expect(savedSearch.tags).toEqual(['tag3', 'tag4']);
+  });
+
+  it('should not update tags if savedObjectsTagging is undefined', async () => {
+    const serviceMock = discoverServiceMock;
+    const stateMock = {
+      appStateContainer: {
+        getState: () => ({
+          rowsPerPage: 250,
+        }),
+      },
+      resetInitialAppState: jest.fn(),
+    } as unknown as GetStateReturn;
+    let saveModal: ReactElement | undefined;
+    jest.spyOn(savedObjectsPlugin, 'showSaveModal').mockImplementationOnce((modal) => {
+      saveModal = modal;
+    });
+    let savedSearch: SavedSearch = {
+      ...savedSearchMock,
+      tags: ['tag1', 'tag2'],
+    };
+    await onSaveSearch({
+      dataView: dataViewMock,
+      navigateTo: jest.fn(),
+      savedSearch,
+      services: {
+        ...serviceMock,
+        savedObjectsTagging: undefined,
+      },
+      state: stateMock,
+    });
+    expect(savedSearch.tags).toEqual(['tag1', 'tag2']);
+    jest
+      .spyOn(persistSavedSearchUtils, 'persistSavedSearch')
+      .mockImplementationOnce((newSavedSearch, _) => {
+        savedSearch = newSavedSearch;
+        return Promise.resolve({ id: newSavedSearch.id });
+      });
+    saveModal?.props.onSave({
+      newTitle: savedSearch.title,
+      newCopyOnSave: false,
+      newDescription: savedSearch.description,
+      newTags: ['tag3', 'tag4'],
+      isTitleDuplicateConfirmed: false,
+      onTitleDuplicate: jest.fn(),
+    });
+    expect(savedSearch.tags).toEqual(['tag1', 'tag2']);
+  });
 });

src/plugins/discover/public/application/main/components/top_nav/on_save_search.tsx

@@ -106,31 +106,38 @@ export async function onSaveSearch({
   onClose?: () => void;
   onSaveCb?: () => void;
 }) {
-  const { uiSettings } = services;
+  const { uiSettings, savedObjectsTagging } = services;
   const onSave = async ({
     newTitle,
     newCopyOnSave,
     newTimeRestore,
     newDescription,
+    newTags,
     isTitleDuplicateConfirmed,
     onTitleDuplicate,
   }: {
     newTitle: string;
     newTimeRestore: boolean;
     newCopyOnSave: boolean;
     newDescription: string;
+    newTags: string[];
     isTitleDuplicateConfirmed: boolean;
     onTitleDuplicate: () => void;
   }) => {
     const currentTitle = savedSearch.title;
     const currentTimeRestore = savedSearch.timeRestore;
     const currentRowsPerPage = savedSearch.rowsPerPage;
+    const currentDescription = savedSearch.description;
+    const currentTags = savedSearch.tags;
     savedSearch.title = newTitle;
     savedSearch.description = newDescription;
     savedSearch.timeRestore = newTimeRestore;
     savedSearch.rowsPerPage = uiSettings.get(DOC_TABLE_LEGACY)
       ? currentRowsPerPage
       : state.appStateContainer.getState().rowsPerPage;
+    if (savedObjectsTagging) {
+      savedSearch.tags = newTags;
+    }
     const saveOptions: SaveSavedSearchOptions = {
       onTitleDuplicate,
       copyOnSave: newCopyOnSave,
@@ -151,6 +158,10 @@ export async function onSaveSearch({
       savedSearch.title = currentTitle;
       savedSearch.timeRestore = currentTimeRestore;
       savedSearch.rowsPerPage = currentRowsPerPage;
+      savedSearch.description = currentDescription;
+      if (savedObjectsTagging) {
+        savedSearch.tags = currentTags;
+      }
     } else {
       state.resetInitialAppState();
     }
@@ -160,10 +171,12 @@ export async function onSaveSearch({
 
   const saveModal = (
     <SaveSearchObjectModal
+      services={services}
       title={savedSearch.title ?? ''}
       showCopyOnSave={!!savedSearch.id}
       description={savedSearch.description}
       timeRestore={savedSearch.timeRestore}
+      tags={savedSearch.tags ?? []}
       onSave={onSave}
       onClose={onClose ?? (() => {})}
     />
@@ -172,23 +185,46 @@ export async function onSaveSearch({
 }
 
 const SaveSearchObjectModal: React.FC<{
+  services: DiscoverServices;
   title: string;
   showCopyOnSave: boolean;
   description?: string;
   timeRestore?: boolean;
-  onSave: (props: OnSaveProps & { newTimeRestore: boolean }) => void;
+  tags: string[];
+  onSave: (props: OnSaveProps & { newTimeRestore: boolean; newTags: string[] }) => void;
   onClose: () => void;
-}> = ({ title, description, showCopyOnSave, timeRestore: savedTimeRestore, onSave, onClose }) => {
+}> = ({
+  services,
+  title,
+  description,
+  tags,
+  showCopyOnSave,
+  timeRestore: savedTimeRestore,
+  onSave,
+  onClose,
+}) => {
+  const { savedObjectsTagging } = services;
   const [timeRestore, setTimeRestore] = useState<boolean>(savedTimeRestore || false);
+  const [currentTags, setCurrentTags] = useState(tags);
 
   const onModalSave = (params: OnSaveProps) => {
     onSave({
       ...params,
       newTimeRestore: timeRestore,
+      newTags: currentTags,
     });
   };
 
-  const options = (
+  const tagSelector = savedObjectsTagging ? (
+    <savedObjectsTagging.ui.components.SavedObjectSaveModalTagSelector
+      initialSelection={currentTags}
+      onTagsSelected={(newTags) => {
+        setCurrentTags(newTags);
+      }}
+    />
+  ) : undefined;
+
+  const timeSwitch = (
     <EuiFormRow
       helpText={
         <FormattedMessage
@@ -211,6 +247,15 @@ const SaveSearchObjectModal: React.FC<{
     </EuiFormRow>
   );
 
+  const options = tagSelector ? (
+    <>
+      {tagSelector}
+      {timeSwitch}
+    </>
+  ) : (
+    timeSwitch
+  );
+
   return (
     <SavedObjectSaveModal
       title={title}