Fixing format fn

elastic · Sep 29, 2023 · df618ff · df618ff
1 parent d263ac2
commit df618ff
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/x-pack/plugins/alerting/server/alerts_client/lib/format_alert.test.ts b/x-pack/plugins/alerting/server/alerts_client/lib/format_alert.test.ts
@@ -240,9 +240,15 @@ describe('compactObject', () => {
     expect(compactObject({ kibana: { alert: { rule: { execution: {} } }, rule: {} } })).toEqual({});
     expect(
       compactObject({
-        kibana: { rule: 34, alert: { rule: { execution: {}, nested_field: ['a', 'b'] } } },
+        kibana: {
+          rule: 34,
+          testField: [],
+          alert: { rule: { execution: {}, nested_field: ['a', 'b'] } },
+        },
       })
-    ).toEqual({ kibana: { rule: 34, alert: { rule: { nested_field: ['a', 'b'] } } } });
+    ).toEqual({
+      kibana: { rule: 34, testField: [], alert: { rule: { nested_field: ['a', 'b'] } } },
+    });
   });
   expect(compactObject({ 'kibana.alert.rule.execution': {} })).toEqual({});
   expect(

diff --git a/x-pack/plugins/alerting/server/alerts_client/lib/format_alert.ts b/x-pack/plugins/alerting/server/alerts_client/lib/format_alert.ts
@@ -32,9 +32,13 @@ type Obj = Record<string, unknown>;
 export const compactObject = (obj: Obj) => {
   return Object.keys(obj)
     .filter((key: string) => {
+      // just filter out empty objects
+      // keep any primitives or arrays, even empty arrays
       return (
         !!obj[key] &&
-        ((typeof obj[key] === 'object' && !isEmpty(obj[key])) || typeof obj[key] !== 'object')
+        (Array.isArray(obj[key]) ||
+          typeof obj[key] !== 'object' ||
+          (typeof obj[key] === 'object' && !isEmpty(obj[key])))
       );
     })
     .reduce<Obj>((acc, curr) => {