Merge pull request #903 from digma-ai/feature/handle-error-responses

Handle error responses in Assets, Issues and Analytics
digma-ai · Jun 19, 2024 · d67534e · d67534e
2 parents 8ef9ac6 + 43557fd
commit d67534e
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 27 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/api/ActionDispatcher.ts b/src/api/ActionDispatcher.ts
@@ -1,4 +1,4 @@
-import { ActionListener } from "./types";
+import { ActionListener, DigmaMessageError } from "./types";
 
 export class ActionDispatcher {
   private actions: Record<string, ActionListener[]>;
@@ -24,9 +24,14 @@ export class ActionDispatcher {
     }
   }
 
-  public dispatch(timeStamp: number, type: string, data?: unknown): void {
+  public dispatch(
+    timeStamp: number,
+    type: string,
+    data: unknown,
+    error: DigmaMessageError | undefined
+  ): void {
     if (this.actions[type]) {
-      this.actions[type].forEach((fn) => fn(data, timeStamp));
+      this.actions[type].forEach((fn) => fn(data, timeStamp, error));
     }
   }
 }
diff --git a/src/api/index.ts b/src/api/index.ts
@@ -30,7 +30,12 @@ export const initializeDigmaMessageListener = (
         null,
         e.data
       );
-      dispatcher.dispatch(e.timeStamp, e.data.action, e.data.payload);
+      dispatcher.dispatch(
+        e.timeStamp,
+        e.data.action,
+        e.data.payload,
+        e.data.error
+      );
     }
   };
 

diff --git a/src/api/types.ts b/src/api/types.ts
@@ -1,9 +1,18 @@
-export type ActionListener = (data: unknown, timeStamp: number) => void;
+export type ActionListener = (
+  data: unknown,
+  timeStamp: number,
+  error: DigmaMessageError | undefined
+) => void;
+
+export interface DigmaMessageError {
+  message: string;
+}
 
 export interface DigmaIncomingMessageData {
   type: "digma";
   action: string;
   payload?: unknown;
+  error?: DigmaMessageError;
 }
 
 export interface DigmaOutgoingMessageData<T> {

diff --git a/src/components/Assets/AssetList/index.tsx b/src/components/Assets/AssetList/index.tsx
@@ -7,6 +7,7 @@ import {
   useState
 } from "react";
 import { DefaultTheme, useTheme } from "styled-components";
+import { DigmaMessageError } from "../../../api/types";
 import { dispatcher } from "../../../dispatcher";
 import { usePrevious } from "../../../hooks/usePrevious";
 import { isEnvironment } from "../../../typeGuards/isEnvironment";
@@ -231,8 +232,14 @@ export const AssetList = (props: AssetListProps) => {
     refreshData();
     setIsInitialLoading(true);
 
-    const handleAssetsData = (data: unknown, timeStamp: number) => {
-      setData(data as AssetsData);
+    const handleAssetsData = (
+      data: unknown,
+      timeStamp: number,
+      error: DigmaMessageError | undefined
+    ) => {
+      if (!error) {
+        setData(data as AssetsData);
+      }
       setLastSetDataTimeStamp(timeStamp);
     };
 

diff --git a/src/components/Assets/AssetTypeList/index.tsx b/src/components/Assets/AssetTypeList/index.tsx
@@ -1,4 +1,5 @@
 import { useCallback, useContext, useEffect, useRef, useState } from "react";
+import { DigmaMessageError } from "../../../api/types";
 import { dispatcher } from "../../../dispatcher";
 import { usePrevious } from "../../../hooks/usePrevious";
 import { isEnvironment } from "../../../typeGuards/isEnvironment";
@@ -96,8 +97,14 @@ export const AssetTypeList = (props: AssetTypeListProps) => {
     refreshData();
     setIsInitialLoading(true);
 
-    const handleCategoriesData = (data: unknown, timeStamp: number) => {
-      setData(data as AssetCategoriesData);
+    const handleCategoriesData = (
+      data: unknown,
+      timeStamp: number,
+      error: DigmaMessageError | undefined
+    ) => {
+      if (!error) {
+        setData(data as AssetCategoriesData);
+      }
       setLastSetDataTimeStamp(timeStamp);
     };
 

diff --git a/src/components/Insights/useInsightsData.ts b/src/components/Insights/useInsightsData.ts
@@ -1,5 +1,6 @@
 import { useContext, useEffect, useMemo, useRef, useState } from "react";
 import { actions as globalActions } from "../../actions";
+import { DigmaMessageError } from "../../api/types";
 import { dispatcher } from "../../dispatcher";
 import { usePrevious } from "../../hooks/usePrevious";
 import { GetInsightStatsPayload } from "../../types";
@@ -104,13 +105,19 @@ export const useInsightsData = ({
 
     setIsInitialLoading(true);
     setIsLoading(true);
-    const handleInsightsData = (data: unknown, timeStamp: number) => {
-      const insightsData = data as InsightsData;
-      insightsData.insightsStatus = InsightsStatus.DEFAULT;
-      insightsData.viewMode = ViewMode.INSIGHTS;
-
+    const handleInsightsData = (
+      data: unknown,
+      timeStamp: number,
+      error: DigmaMessageError | undefined
+    ) => {
+      if (!error) {
+        const insightsData = data as InsightsData;
+        insightsData.insightsStatus = InsightsStatus.DEFAULT;
+        insightsData.viewMode = ViewMode.INSIGHTS;
+
+        setData(insightsData);
+      }
       setIsLoading(false);
-      setData(insightsData);
       setLastSetDataTimeStamp(timeStamp);
     };