Pass termOrder and hasTermsAgg properties to serializeThresholdWatch …

…function (elastic#54391) * Fix Watcher regression in which a threshold watch's termOrder and hasTermsAgg properties weren't being passed to the serializeThresholdWatch function. * Remove unused upstreamJson getter method from server models.
XavierM · Jan 10, 2020 · 2e3ce5c · 2e3ce5c
1 parent 9decc43
commit 2e3ce5c
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 86 deletions.
diff --git a/x-pack/legacy/plugins/watcher/__jest__/client_integration/watch_create_threshold.test.tsx b/x-pack/legacy/plugins/watcher/__jest__/client_integration/watch_create_threshold.test.tsx
@@ -257,9 +257,11 @@ describe('<ThresholdWatchEdit /> create route', () => {
             triggerIntervalUnit: 'm',
             aggType: 'count',
             termSize: 5,
+            termOrder: 'desc',
             thresholdComparator: '>',
             timeWindowSize: 5,
             timeWindowUnit: 'm',
+            hasTermsAgg: false,
             threshold: 1000,
           };
 
@@ -324,9 +326,11 @@ describe('<ThresholdWatchEdit /> create route', () => {
             triggerIntervalUnit: 'm',
             aggType: 'count',
             termSize: 5,
+            termOrder: 'desc',
             thresholdComparator: '>',
             timeWindowSize: 5,
             timeWindowUnit: 'm',
+            hasTermsAgg: false,
             threshold: 1000,
           };
 
@@ -387,9 +391,11 @@ describe('<ThresholdWatchEdit /> create route', () => {
             triggerIntervalUnit: 'm',
             aggType: 'count',
             termSize: 5,
+            termOrder: 'desc',
             thresholdComparator: '>',
             timeWindowSize: 5,
             timeWindowUnit: 'm',
+            hasTermsAgg: false,
             threshold: 1000,
           };
 
@@ -461,9 +467,11 @@ describe('<ThresholdWatchEdit /> create route', () => {
             triggerIntervalUnit: 'm',
             aggType: 'count',
             termSize: 5,
+            termOrder: 'desc',
             thresholdComparator: '>',
             timeWindowSize: 5,
             timeWindowUnit: 'm',
+            hasTermsAgg: false,
             threshold: 1000,
           };
 
@@ -554,9 +562,11 @@ describe('<ThresholdWatchEdit /> create route', () => {
             triggerIntervalUnit: 'm',
             aggType: 'count',
             termSize: 5,
+            termOrder: 'desc',
             thresholdComparator: '>',
             timeWindowSize: 5,
             timeWindowUnit: 'm',
+            hasTermsAgg: false,
             threshold: 1000,
           };
 
@@ -642,9 +652,11 @@ describe('<ThresholdWatchEdit /> create route', () => {
             triggerIntervalUnit: 'm',
             aggType: 'count',
             termSize: 5,
+            termOrder: 'desc',
             thresholdComparator: '>',
             timeWindowSize: 5,
             timeWindowUnit: 'm',
+            hasTermsAgg: false,
             threshold: 1000,
           };
 
@@ -710,9 +722,11 @@ describe('<ThresholdWatchEdit /> create route', () => {
             triggerIntervalUnit: 'm',
             aggType: 'count',
             termSize: 5,
+            termOrder: 'desc',
             thresholdComparator: '>',
             timeWindowSize: 5,
             timeWindowUnit: 'm',
+            hasTermsAgg: false,
             threshold: 1000,
           };
 
@@ -762,9 +776,11 @@ describe('<ThresholdWatchEdit /> create route', () => {
             triggerIntervalUnit: 'm',
             aggType: 'count',
             termSize: 5,
+            termOrder: 'desc',
             thresholdComparator: '>',
             timeWindowSize: 5,
             timeWindowUnit: 'm',
+            hasTermsAgg: false,
             threshold: 1000,
           };
 

diff --git a/x-pack/legacy/plugins/watcher/__jest__/client_integration/watch_edit.test.ts b/x-pack/legacy/plugins/watcher/__jest__/client_integration/watch_edit.test.ts
@@ -168,6 +168,7 @@ describe('<WatchEdit />', () => {
         });
 
         const latestRequest = server.requests[server.requests.length - 1];
+
         const {
           id,
           type,
@@ -194,9 +195,11 @@ describe('<WatchEdit />', () => {
             triggerIntervalUnit,
             aggType,
             termSize,
+            termOrder: 'desc',
             thresholdComparator,
             timeWindowSize,
             timeWindowUnit,
+            hasTermsAgg: false,
             threshold: threshold && threshold[0],
           })
         );

diff --git a/x-pack/legacy/plugins/watcher/public/np_ready/application/models/watch/threshold_watch.js b/x-pack/legacy/plugins/watcher/public/np_ready/application/models/watch/threshold_watch.js
@@ -256,9 +256,11 @@ export class ThresholdWatch extends BaseWatch {
       aggField: this.aggField,
       termSize: this.termSize,
       termField: this.termField,
+      termOrder: this.termOrder,
       thresholdComparator: this.thresholdComparator,
       timeWindowSize: this.timeWindowSize,
       timeWindowUnit: this.timeWindowUnit,
+      hasTermsAgg: this.hasTermsAgg,
       threshold:
         comparators[this.thresholdComparator].requiredValues > 1
           ? this.threshold

diff --git a/x-pack/legacy/plugins/watcher/server/np_ready/models/watch/base_watch.js b/x-pack/legacy/plugins/watcher/server/np_ready/models/watch/base_watch.js
@@ -66,16 +66,6 @@ export class BaseWatch {
     return json;
   }
 
-  // to Elasticsearch
-  get upstreamJson() {
-    const watch = this.watchJson;
-
-    return {
-      id: this.id,
-      watch,
-    };
-  }
-
   // from Kibana
   static getPropsFromDownstreamJson(json) {
     const actions = map(json.actions, action => {

diff --git a/x-pack/legacy/plugins/watcher/server/np_ready/models/watch/base_watch.test.js b/x-pack/legacy/plugins/watcher/server/np_ready/models/watch/base_watch.test.js
@@ -188,50 +188,6 @@ describe('BaseWatch', () => {
     });
   });
 
-  describe('upstreamJson getter method', () => {
-    let props;
-    beforeEach(() => {
-      props = {
-        id: 'foo',
-        name: 'bar',
-        type: 'json',
-        watchStatus: {
-          downstreamJson: {
-            prop1: 'prop1',
-            prop2: 'prop2',
-          },
-        },
-        actions: [
-          {
-            downstreamJson: {
-              prop1: 'prop3',
-              prop2: 'prop4',
-            },
-          },
-        ],
-      };
-    });
-
-    it('should return a valid object', () => {
-      const watch = new BaseWatch(props);
-
-      const actual = watch.upstreamJson;
-      const expected = {
-        id: props.id,
-        watch: {
-          metadata: {
-            name: props.name,
-            xpack: {
-              type: props.type,
-            },
-          },
-        },
-      };
-
-      expect(actual).toEqual(expected);
-    });
-  });
-
   describe('getPropsFromDownstreamJson method', () => {
     let downstreamJson;
     beforeEach(() => {

diff --git a/x-pack/legacy/plugins/watcher/server/np_ready/models/watch/json_watch.js b/x-pack/legacy/plugins/watcher/server/np_ready/models/watch/json_watch.js
@@ -23,12 +23,6 @@ export class JsonWatch extends BaseWatch {
     return serializeJsonWatch(this.name, this.watch);
   }
 
-  // To Elasticsearch
-  get upstreamJson() {
-    const result = super.upstreamJson;
-    return result;
-  }
-
   // To Kibana
   get downstreamJson() {
     const result = merge({}, super.downstreamJson, {

diff --git a/x-pack/legacy/plugins/watcher/server/np_ready/models/watch/json_watch.test.js b/x-pack/legacy/plugins/watcher/server/np_ready/models/watch/json_watch.test.js
@@ -52,26 +52,6 @@ describe('JsonWatch', () => {
     });
   });
 
-  describe('upstreamJson getter method', () => {
-    it('should return the correct result', () => {
-      const watch = new JsonWatch({ watch: { foo: 'bar' } });
-      const actual = watch.upstreamJson;
-      const expected = {
-        id: undefined,
-        watch: {
-          foo: 'bar',
-          metadata: {
-            xpack: {
-              type: 'json',
-            },
-          },
-        },
-      };
-
-      expect(actual).toEqual(expected);
-    });
-  });
-
   describe('downstreamJson getter method', () => {
     let props;
     beforeEach(() => {

diff --git a/...ck/legacy/plugins/watcher/server/np_ready/models/watch/threshold_watch/threshold_watch.js b/...ck/legacy/plugins/watcher/server/np_ready/models/watch/threshold_watch/threshold_watch.js
@@ -55,12 +55,6 @@ export class ThresholdWatch extends BaseWatch {
     return formatVisualizeData(this, results);
   }
 
-  // To Elasticsearch
-  get upstreamJson() {
-    const result = super.upstreamJson;
-    return result;
-  }
-
   // To Kibana
   get downstreamJson() {
     const result = merge({}, super.downstreamJson, {