[Saved Queries] Improve saved query management

packages/kbn-check-mappings-update-cli/current_fields.json

@@ -172,7 +172,8 @@
   ],
   "query": [
     "description",
-    "title"
+    "title",
+    "titleKeyword"
   ],
   "kql-telemetry": [],
   "search-session": [

packages/kbn-check-mappings-update-cli/current_mappings.json

@@ -572,6 +572,9 @@
       "title": {
         "type": "text"
       },
+      "titleKeyword": {
+        "type": "keyword"
+      },
       "description": {
         "type": "text"
       }

src/core/server/integration_tests/ci_checks/saved_objects/check_registered_types.test.ts

@@ -130,7 +130,7 @@ describe('checking migration metadata changes on all registered SO types', () =>
         "osquery-pack-asset": "cd140bc2e4b092e93692b587bf6e38051ef94c75",
         "osquery-saved-query": "6095e288750aa3164dfe186c74bc5195c2bf2bd4",
         "policy-settings-protection-updates-note": "33924bb246f9e5bcb876109cc83e3c7a28308352",
-        "query": "21cbbaa09abb679078145ce90087b1e88b7eae95",
+        "query": "501bece68f26fe561286a488eabb1a8ab12f1137",
         "risk-engine-configuration": "b105d4a3c6adce40708d729d12e5ef3c8fbd9508",
         "rules-settings": "892a2918ebaeba809a612b8d97cec0b07c800b5f",
         "sample-data-telemetry": "37441b12f5b0159c2d6d5138a494c9f440e950b5",

src/plugins/data/public/query/mocks.ts

@@ -38,7 +38,7 @@ const createStartContractMock = () => {
     addToQueryLog: jest.fn(),
     filterManager: createFilterManagerMock(),
     queryString: queryStringManagerMock.createStartContract(),
-    savedQueries: { getSavedQuery: jest.fn() } as any,
+    savedQueries: { getSavedQuery: jest.fn(), getSavedQueryCount: jest.fn() } as any,
     state$: new Observable(),
     getState: jest.fn(),
     timefilter: timefilterServiceMock.createStartContract(),

src/plugins/data/public/query/saved_query/saved_query_service.test.ts

@@ -14,12 +14,12 @@ import { SAVED_QUERY_BASE_URL } from '../../../common/constants';
 const http = httpServiceMock.createStartContract();
 
 const {
+  isDuplicateTitle,
   deleteSavedQuery,
   getSavedQuery,
   findSavedQueries,
   createQuery,
   updateQuery,
-  getAllSavedQueries,
   getSavedQueryCount,
 } = createSavedQueryService(http);
 
@@ -42,6 +42,18 @@ describe('saved query service', () => {
     http.delete.mockReset();
   });
 
+  describe('isDuplicateTitle', function () {
+    it('should post the title and ID', async () => {
+      http.post.mockResolvedValue({ isDuplicate: true });
+      await isDuplicateTitle('foo', 'bar');
+      expect(http.post).toBeCalled();
+      expect(http.post).toHaveBeenCalledWith(`${SAVED_QUERY_BASE_URL}/_is_duplicate_title`, {
+        body: '{"title":"foo","id":"bar"}',
+        version,
+      });
+    });
+  });
+
   describe('createQuery', function () {
     it('should post the stringified given attributes', async () => {
       await createQuery(savedQueryAttributes);
@@ -64,19 +76,6 @@ describe('saved query service', () => {
     });
   });
 
-  describe('getAllSavedQueries', function () {
-    it('should post and extract the saved queries from the response', async () => {
-      http.post.mockResolvedValue({
-        total: 0,
-        savedQueries: [{ attributes: savedQueryAttributes }],
-      });
-      const result = await getAllSavedQueries();
-      expect(http.post).toBeCalled();
-      expect(http.post).toHaveBeenCalledWith(`${SAVED_QUERY_BASE_URL}/_all`, { version });
-      expect(result).toEqual([{ attributes: savedQueryAttributes }]);
-    });
-  });
-
   describe('findSavedQueries', function () {
     it('should post and return the total & saved queries', async () => {
       http.post.mockResolvedValue({

src/plugins/data/public/query/saved_query/saved_query_service.ts

@@ -14,6 +14,17 @@ import { SAVED_QUERY_BASE_URL } from '../../../common/constants';
 const version = '1';
 
 export const createSavedQueryService = (http: HttpStart) => {
+  const isDuplicateTitle = async (title: string, id?: string) => {
+    const response = await http.post<{ isDuplicate: boolean }>(
+      `${SAVED_QUERY_BASE_URL}/_is_duplicate_title`,
+      {
+        body: JSON.stringify({ title, id }),
+        version,
+      }
+    );
+    return response.isDuplicate;
+  };
+
   const createQuery = async (attributes: SavedQueryAttributes, { overwrite = false } = {}) => {
     const savedQuery = await http.post<SavedQuery>(`${SAVED_QUERY_BASE_URL}/_create`, {
       body: JSON.stringify(attributes),
@@ -30,15 +41,6 @@ export const createSavedQueryService = (http: HttpStart) => {
     return savedQuery;
   };
 
-  // we have to tell the saved objects client how many to fetch, otherwise it defaults to fetching 20 per page
-  const getAllSavedQueries = async (): Promise<SavedQuery[]> => {
-    const { savedQueries } = await http.post<{ savedQueries: SavedQuery[] }>(
-      `${SAVED_QUERY_BASE_URL}/_all`,
-      { version }
-    );
-    return savedQueries;
-  };
-
   // findSavedQueries will do a 'match_all' if no search string is passed in
   const findSavedQueries = async (
     search: string = '',
@@ -69,9 +71,9 @@ export const createSavedQueryService = (http: HttpStart) => {
   };
 
   return {
+    isDuplicateTitle,
     createQuery,
     updateQuery,
-    getAllSavedQueries,
     findSavedQueries,
     getSavedQuery,
     deleteSavedQuery,

src/plugins/data/public/query/saved_query/types.ts

@@ -17,9 +17,9 @@ export type SavedQueryTimeFilter = TimeRange & {
 export type { SavedQuery, SavedQueryAttributes };
 
 export interface SavedQueryService {
+  isDuplicateTitle: (title: string, id?: string) => Promise<boolean>;
   createQuery: (attributes: SavedQueryAttributes) => Promise<SavedQuery>;
   updateQuery: (id: string, attributes: SavedQueryAttributes) => Promise<SavedQuery>;
-  getAllSavedQueries: () => Promise<SavedQuery[]>;
   findSavedQueries: (
     searchText?: string,
     perPage?: number,