Added more context to log

ConductionNL · Feb 19, 2024 · 71bb659 · 71bb659
1 parent f35e41f
commit 71bb659
Show file tree

Hide file tree

Showing 12 changed files with 279 additions and 70 deletions.
diff --git a/pwa/src/apiService/apiService.ts b/pwa/src/apiService/apiService.ts
@@ -32,6 +32,7 @@ import Upload from "./resources/upload";
 interface PromiseMessage {
   loading?: string;
   success?: string;
+  error?: string;
 }
 
 export type TSendFunction = (
@@ -255,37 +256,35 @@ export default class APIService {
     switch (action) {
       case "GET":
         const response = instance.get(endpoint);
-
-        response.catch((err) => toast.error(err.message));
-
+        response.catch((err) => toast.error(promiseMessage?.error ?? err.message));
         return response;
 
       case "POST":
         return toast.promise(instance.post(endpoint, _payload), {
           loading: promiseMessage?.loading ?? "Creating item...",
           success: promiseMessage?.success ?? "Succesfully created item",
-          error: (err) => err.message,
+          error: (err) => promiseMessage?.error ?? err.message,
         });
 
       case "PUT":
         return toast.promise(instance.put(endpoint, _payload), {
           loading: promiseMessage?.loading ?? "Updating item...",
           success: promiseMessage?.success ?? "Succesfully updated item",
-          error: (err) => err.message,
+          error: (err) => promiseMessage?.error ?? err.message,
         });
 
       case "DELETE":
         return toast.promise(instance.delete(endpoint), {
           loading: promiseMessage?.loading ?? "Deleting item...",
           success: promiseMessage?.success ?? "Succesfully deleted item",
-          error: (err) => err.message,
+          error: (err) => promiseMessage?.error ?? err.message,
         });
 
       case "DOWNLOAD":
         return toast.promise(instance.get(endpoint), {
           loading: promiseMessage?.loading ?? "Downloading item...",
           success: promiseMessage?.success ?? "Succesfully downloaded item",
-          error: (err) => err.message,
+          error: (err) => promiseMessage?.error ?? err.message,
         });
     }
   };

diff --git a/pwa/src/apiService/resources/dashboardCards.tsx b/pwa/src/apiService/resources/dashboardCards.tsx
@@ -25,7 +25,9 @@ export default class DashboardCards {
   }
 
   public getAll = async (): Promise<any> => {
-    const { data } = await this._send(this._instance, "GET", "/admin/dashboardCards");
+    const { data } = await this._send(this._instance, "GET", "/admin/dashboardCards", undefined, {
+      error: "Could not fetch Dashboardcards.",
+    });
 
     return data;
   };

diff --git a/pwa/src/apiService/resources/source.ts b/pwa/src/apiService/resources/source.ts
@@ -16,6 +16,12 @@ export default class Source {
     return data;
   };
 
+  public getAllSelectOptions = async (): Promise<any> => {
+    const { data } = await this._send(this._instance, "GET", "/admin/gateways?limit=200");
+
+    return data?.map((source: any) => ({ label: source.name, value: source.id }));
+  };
+
   public getOne = async (id: string): Promise<any> => {
     const { data } = await this._send(this._instance, "GET", `/admin/gateways/${id}`);
 

diff --git a/pwa/src/context/logs.ts b/pwa/src/context/logs.ts
@@ -13,6 +13,7 @@ export interface ILogFiltersContext {
     process?: string;
     endpoint?: string;
     schema?: string;
+    source?: string;
     cronjob?: string;
     action?: string;
     user?: string;

diff --git a/pwa/src/context/tableColumns.ts b/pwa/src/context/tableColumns.ts
@@ -21,6 +21,7 @@ const logColumns = {
   created: true,
   endpoint: true,
   schema: true,
+  source: true,
   cronjob: true,
   action: true,
   user: true,

diff --git a/pwa/src/hooks/dashboardCards.ts b/pwa/src/hooks/dashboardCards.ts
@@ -13,6 +13,7 @@ export const useDashboardCards = (queryClient: QueryClient) => {
       onError: (error) => {
         console.warn(error.message);
       },
+      retry: 0,
     });
 
   const getOne = (dashboardCardsId: string) =>

diff --git a/pwa/src/hooks/source.ts b/pwa/src/hooks/source.ts
@@ -18,6 +18,13 @@ export const useSource = (queryClient: QueryClient) => {
       },
     });
 
+  const getAllSelectOptions = () =>
+    useQuery<any[], Error>("source_select_options", API.Sources.getAllSelectOptions, {
+      onError: (error) => {
+        console.warn(error.message);
+      },
+    });
+
   const getOne = (sourceId: string) =>
     useQuery<any, Error>(["sources", sourceId], () => API?.Sources.getOne(sourceId), {
       initialData: () => queryClient.getQueryData<any[]>("sources")?.find((_sources) => _sources.id === sourceId),
@@ -78,5 +85,5 @@ export const useSource = (queryClient: QueryClient) => {
       },
     });
 
-  return { getAll, getOne, remove, createOrEdit, getProxy };
+  return { getAll, getOne, remove, createOrEdit, getProxy, getAllSelectOptions };
 };
diff --git a/pwa/src/templates/gatewayDetailTemplate/GatewayDetailTemplate.tsx b/pwa/src/templates/gatewayDetailTemplate/GatewayDetailTemplate.tsx
@@ -70,7 +70,9 @@ export const GatewayDetailTemplate: React.FC = () => {
                     getPlugins.data.update ? getPlugins.data?.version : `Latest (${getPlugins.data?.version})`
                   } `}</p>
                 )}
-                <p>{`last update time: ${new Date(getPlugins.data?.time).toLocaleString()}`}</p>
+                <p>{`last update time: ${new Date(
+                  getPlugins.data?.versions[getPlugins.data?.version].time,
+                ).toLocaleString()}`}</p>
               </div>
 
               <div>