Merge branch 'master' into telemetry-increment

elastic · Feb 18, 2021 · 33cf2ca · 33cf2ca
2 parents 1487a91 + 386afdc
commit 33cf2ca
Show file tree

Hide file tree

Showing 393 changed files with 8,475 additions and 1,779 deletions.
diff --git a/...evelopment/core/server/kibana-plugin-core-server.savedobjectsfindresult.sort.md b/...evelopment/core/server/kibana-plugin-core-server.savedobjectsfindresult.sort.md
@@ -25,7 +25,7 @@ const page1 = await savedObjectsClient.find({
   type: 'visualization',
   sortField: 'updated_at',
   sortOrder: 'asc',
-  pit,
+  pit: { id },
 });
 const lastHit = page1.saved_objects[page1.saved_objects.length - 1];
 const page2 = await savedObjectsClient.find({

diff --git a/...rver/kibana-plugin-core-server.savedobjectsrepository.openpointintimefortype.md b/...rver/kibana-plugin-core-server.savedobjectsrepository.openpointintimefortype.md
@@ -29,19 +29,16 @@ openPointInTimeForType(type: string | string[], { keepAlive, preference }?: Save
 
 
 ```ts
-const repository = coreStart.savedObjects.createInternalRepository();
-
-const { id } = await repository.openPointInTimeForType(
-  type: 'index-pattern',
-  { keepAlive: '2m' },
+const { id } = await savedObjectsClient.openPointInTimeForType(
+  type: 'visualization',
+  { keepAlive: '5m' },
 );
 const page1 = await savedObjectsClient.find({
   type: 'visualization',
   sortField: 'updated_at',
   sortOrder: 'asc',
-  pit,
+  pit: { id, keepAlive: '2m' },
 });
-
 const lastHit = page1.saved_objects[page1.saved_objects.length - 1];
 const page2 = await savedObjectsClient.find({
   type: 'visualization',
@@ -50,7 +47,6 @@ const page2 = await savedObjectsClient.find({
   pit: { id: page1.pit_id },
   searchAfter: lastHit.sort,
 });
-
 await savedObjectsClient.closePointInTime(page2.pit_id);
 
 ```

diff --git a/...plugins/data/public/kibana-plugin-plugins-data-public.searchsource.getfields.md b/...plugins/data/public/kibana-plugin-plugins-data-public.searchsource.getfields.md
@@ -9,15 +9,8 @@ returns all search source fields
 <b>Signature:</b>
 
 ```typescript
-getFields(recurse?: boolean): SearchSourceFields;
+getFields(): SearchSourceFields;
 ```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  recurse | <code>boolean</code> |  |
-
 <b>Returns:</b>
 
 `SearchSourceFields`

diff --git a/...velopment/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.md b/...velopment/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.md
@@ -35,7 +35,7 @@ export declare class SearchSource
 |  [fetch(options)](./kibana-plugin-plugins-data-public.searchsource.fetch.md) |  | Fetch this source and reject the returned Promise on error |
 |  [fetch$(options)](./kibana-plugin-plugins-data-public.searchsource.fetch_.md) |  | Fetch this source from Elasticsearch, returning an observable over the response(s) |
 |  [getField(field, recurse)](./kibana-plugin-plugins-data-public.searchsource.getfield.md) |  | Gets a single field from the fields |
-|  [getFields(recurse)](./kibana-plugin-plugins-data-public.searchsource.getfields.md) |  | returns all search source fields |
+|  [getFields()](./kibana-plugin-plugins-data-public.searchsource.getfields.md) |  | returns all search source fields |
 |  [getId()](./kibana-plugin-plugins-data-public.searchsource.getid.md) |  | returns search source id |
 |  [getOwnField(field)](./kibana-plugin-plugins-data-public.searchsource.getownfield.md) |  | Get the field from our own fields, don't traverse up the chain |
 |  [getParent()](./kibana-plugin-plugins-data-public.searchsource.getparent.md) |  | Get the parent of this SearchSource  {<!-- -->undefined\|searchSource<!-- -->} |

diff --git a/...ent/plugins/data/public/kibana-plugin-plugins-data-public.searchsourcefields.md b/...ent/plugins/data/public/kibana-plugin-plugins-data-public.searchsourcefields.md
@@ -24,6 +24,7 @@ export interface SearchSourceFields
 |  [highlight](./kibana-plugin-plugins-data-public.searchsourcefields.highlight.md) | <code>any</code> |  |
 |  [highlightAll](./kibana-plugin-plugins-data-public.searchsourcefields.highlightall.md) | <code>boolean</code> |  |
 |  [index](./kibana-plugin-plugins-data-public.searchsourcefields.index.md) | <code>IndexPattern</code> |  |
+|  [parent](./kibana-plugin-plugins-data-public.searchsourcefields.parent.md) | <code>SearchSourceFields</code> |  |
 |  [query](./kibana-plugin-plugins-data-public.searchsourcefields.query.md) | <code>Query</code> | [Query](./kibana-plugin-plugins-data-public.query.md) |
 |  [searchAfter](./kibana-plugin-plugins-data-public.searchsourcefields.searchafter.md) | <code>EsQuerySearchAfter</code> |  |
 |  [size](./kibana-plugin-plugins-data-public.searchsourcefields.size.md) | <code>number</code> |  |

diff --git a/...gins/data/public/kibana-plugin-plugins-data-public.searchsourcefields.parent.md b/...gins/data/public/kibana-plugin-plugins-data-public.searchsourcefields.parent.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [SearchSourceFields](./kibana-plugin-plugins-data-public.searchsourcefields.md) &gt; [parent](./kibana-plugin-plugins-data-public.searchsourcefields.parent.md)
+
+## SearchSourceFields.parent property
+
+<b>Signature:</b>
+
+```typescript
+parent?: SearchSourceFields;
+```
diff --git a/src/plugins/data/common/search/search_source/search_source.test.ts b/src/plugins/data/common/search/search_source/search_source.test.ts
@@ -95,164 +95,6 @@ describe('SearchSource', () => {
         }
       `);
     });
-
-    test('recurses parents to get the entire filters: plain object filter', () => {
-      const RECURSE = true;
-
-      const parent = new SearchSource({}, searchSourceDependencies);
-      parent.setField('filter', [
-        {
-          meta: {
-            index: 'd180cae0-60c3-11eb-8569-bd1f5ed24bc9',
-            params: {},
-            alias: null,
-            disabled: false,
-            negate: false,
-          },
-          query: {
-            range: {
-              '@date': {
-                gte: '2016-01-27T18:11:05.010Z',
-                lte: '2021-01-27T18:11:05.010Z',
-                format: 'strict_date_optional_time',
-              },
-            },
-          },
-        },
-      ]);
-      searchSource.setParent(parent);
-      searchSource.setField('aggs', 5);
-      expect(searchSource.getFields(RECURSE)).toMatchInlineSnapshot(`
-        Object {
-          "aggs": 5,
-          "filter": Array [
-            Object {
-              "meta": Object {
-                "alias": null,
-                "disabled": false,
-                "index": "d180cae0-60c3-11eb-8569-bd1f5ed24bc9",
-                "negate": false,
-                "params": Object {},
-              },
-              "query": Object {
-                "range": Object {
-                  "@date": Object {
-                    "format": "strict_date_optional_time",
-                    "gte": "2016-01-27T18:11:05.010Z",
-                    "lte": "2021-01-27T18:11:05.010Z",
-                  },
-                },
-              },
-            },
-          ],
-        }
-      `);
-
-      // calling twice gives the same result: no searchSources in the hierarchy were modified
-      expect(searchSource.getFields(RECURSE)).toMatchInlineSnapshot(`
-        Object {
-          "aggs": 5,
-          "filter": Array [
-            Object {
-              "meta": Object {
-                "alias": null,
-                "disabled": false,
-                "index": "d180cae0-60c3-11eb-8569-bd1f5ed24bc9",
-                "negate": false,
-                "params": Object {},
-              },
-              "query": Object {
-                "range": Object {
-                  "@date": Object {
-                    "format": "strict_date_optional_time",
-                    "gte": "2016-01-27T18:11:05.010Z",
-                    "lte": "2021-01-27T18:11:05.010Z",
-                  },
-                },
-              },
-            },
-          ],
-        }
-      `);
-    });
-
-    test('recurses parents to get the entire filters: function filter', () => {
-      const RECURSE = true;
-
-      const parent = new SearchSource({}, searchSourceDependencies);
-      parent.setField('filter', () => ({
-        meta: {
-          index: 'd180cae0-60c3-11eb-8569-bd1f5ed24bc9',
-          params: {},
-          alias: null,
-          disabled: false,
-          negate: false,
-        },
-        query: {
-          range: {
-            '@date': {
-              gte: '2016-01-27T18:11:05.010Z',
-              lte: '2021-01-27T18:11:05.010Z',
-              format: 'strict_date_optional_time',
-            },
-          },
-        },
-      }));
-      searchSource.setParent(parent);
-      searchSource.setField('aggs', 5);
-      expect(searchSource.getFields(RECURSE)).toMatchInlineSnapshot(`
-        Object {
-          "aggs": 5,
-          "filter": Array [
-            Object {
-              "meta": Object {
-                "alias": null,
-                "disabled": false,
-                "index": "d180cae0-60c3-11eb-8569-bd1f5ed24bc9",
-                "negate": false,
-                "params": Object {},
-              },
-              "query": Object {
-                "range": Object {
-                  "@date": Object {
-                    "format": "strict_date_optional_time",
-                    "gte": "2016-01-27T18:11:05.010Z",
-                    "lte": "2021-01-27T18:11:05.010Z",
-                  },
-                },
-              },
-            },
-          ],
-        }
-      `);
-
-      // calling twice gives the same result: no double-added filters
-      expect(searchSource.getFields(RECURSE)).toMatchInlineSnapshot(`
-        Object {
-          "aggs": 5,
-          "filter": Array [
-            Object {
-              "meta": Object {
-                "alias": null,
-                "disabled": false,
-                "index": "d180cae0-60c3-11eb-8569-bd1f5ed24bc9",
-                "negate": false,
-                "params": Object {},
-              },
-              "query": Object {
-                "range": Object {
-                  "@date": Object {
-                    "format": "strict_date_optional_time",
-                    "gte": "2016-01-27T18:11:05.010Z",
-                    "lte": "2021-01-27T18:11:05.010Z",
-                  },
-                },
-              },
-            },
-          ],
-        }
-      `);
-    });
   });
 
   describe('#removeField()', () => {
@@ -975,4 +817,74 @@ describe('SearchSource', () => {
       expect(request._source).toEqual(['geometry']);
     });
   });
+
+  describe('getSerializedFields', () => {
+    const filter = [
+      {
+        query: 'query',
+        meta: {
+          alias: 'alias',
+          disabled: false,
+          negate: false,
+          index: '456',
+        },
+      },
+    ];
+
+    test('should return serialized fields', () => {
+      const indexPattern123 = { id: '123' } as IndexPattern;
+      searchSource.setField('index', indexPattern123);
+      searchSource.setField('filter', () => {
+        return filter;
+      });
+      const serializedFields = searchSource.getSerializedFields();
+      expect(serializedFields).toMatchInlineSnapshot(
+        { index: '123', filter },
+        `
+        Object {
+          "filter": Array [
+            Object {
+              "meta": Object {
+                "alias": "alias",
+                "disabled": false,
+                "index": "456",
+                "negate": false,
+              },
+              "query": "query",
+            },
+          ],
+          "index": "123",
+        }
+      `
+      );
+    });
+
+    test('should support nested search sources', () => {
+      const indexPattern123 = { id: '123' } as IndexPattern;
+      searchSource.setField('index', indexPattern123);
+      searchSource.setField('from', 123);
+      const childSearchSource = searchSource.createChild();
+      childSearchSource.setField('timeout', '100');
+      const serializedFields = childSearchSource.getSerializedFields(true);
+      expect(serializedFields).toMatchInlineSnapshot(
+        {
+          timeout: '100',
+          parent: {
+            index: '123',
+            from: 123,
+          },
+        },
+        `
+        Object {
+          "index": undefined,
+          "parent": Object {
+            "from": 123,
+            "index": "123",
+          },
+          "timeout": "100",
+        }
+      `
+      );
+    });
+  });
 });