Handle improperly defined Watcher Logging Action text parameter. (#60169

)
elastic · Mar 14, 2020 · 36d6590 · 36d6590
1 parent 02ee4b1
commit 36d6590
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/x-pack/plugins/watcher/public/application/models/action/logging_action.js b/x-pack/plugins/watcher/public/application/models/action/logging_action.js
@@ -37,7 +37,18 @@ export class LoggingAction extends BaseAction {
 
   get upstreamJson() {
     const result = super.upstreamJson;
-    const text = !!this.text.trim() ? this.text : undefined;
+    let text;
+
+    if (typeof this.text === 'string') {
+      // If this.text is a non-empty string, we can send it to the API.
+      if (!!this.text.trim()) {
+        text = this.text;
+      }
+    } else {
+      // If the user incorrectly defined this.text, e.g. as an object in a JSON watch, let the API
+      // deal with it.
+      text = this.text;
+    }
 
     Object.assign(result, {
       text,