handle empty response from state api in ui

elastic · Feb 11, 2020 · b9a1e0e · b9a1e0e
1 parent 059dcab
commit b9a1e0e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api.test.ts
@@ -133,6 +133,14 @@ describe('loadAlertState', () => {
     });
     expect(http.get).toHaveBeenCalledWith(`/api/alert/${alertId}/state`);
   });
+
+  test('should handle empty response from api', async () => {
+    const alertId = uuid.v4();
+    http.get.mockResolvedValueOnce('');
+
+    expect(await loadAlertState({ http, alertId })).toEqual({});
+    expect(http.get).toHaveBeenCalledWith(`/api/alert/${alertId}/state`);
+  });
 });
 
 describe('loadAlerts', () => {

diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api.ts
@@ -26,21 +26,25 @@ export async function loadAlert({
   return await http.get(`${BASE_ALERT_API_PATH}/${alertId}`);
 }
 
+type EmptyHttpResponse = '';
 export async function loadAlertState({
   http,
   alertId,
 }: {
   http: HttpSetup;
   alertId: string;
 }): Promise<AlertTaskState> {
-  return await http.get(`${BASE_ALERT_API_PATH}/${alertId}/state`).then((state: AlertTaskState) => {
-    return pipe(
-      alertStateSchema.decode(state),
-      fold((e: t.Errors) => {
-        throw new Error(`Alert "${alertId}" has invalid state`);
-      }, t.identity)
-    );
-  });
+  return await http
+    .get(`${BASE_ALERT_API_PATH}/${alertId}/state`)
+    .then((state: AlertTaskState | EmptyHttpResponse) => (state ? state : {}))
+    .then((state: AlertTaskState) => {
+      return pipe(
+        alertStateSchema.decode(state),
+        fold((e: t.Errors) => {
+          throw new Error(`Alert "${alertId}" has invalid state`);
+        }, t.identity)
+      );
+    });
 }
 
 export async function loadAlerts({