From 9c3b9a0faef063db6ea343b96b31c16e5763c9a8 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Thu, 9 Jul 2020 20:00:05 -0700
Subject: [PATCH] Fix error handling and simplify showing http errors

---
 .../components/server/network/NetworkContainer.tsx   | 12 +++++++-----
 resources/scripts/state/flashes.ts                   |  7 ++++---
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/resources/scripts/components/server/network/NetworkContainer.tsx b/resources/scripts/components/server/network/NetworkContainer.tsx
index 776713ee9..4d83e2185 100644
--- a/resources/scripts/components/server/network/NetworkContainer.tsx
+++ b/resources/scripts/components/server/network/NetworkContainer.tsx
@@ -14,28 +14,30 @@ import { Allocation } from '@/api/server/getServer';
 import Spinner from '@/components/elements/Spinner';
 import setPrimaryServerAllocation from '@/api/server/network/setPrimaryServerAllocation';
 import useFlash from '@/plugins/useFlash';
-import { httpErrorToHuman } from '@/api/http';
 
 const Code = styled.code`${tw`font-mono py-1 px-2 bg-neutral-900 rounded text-sm block`}`;
 const Label = styled.label`${tw`uppercase text-xs mt-1 text-neutral-400 block px-1 select-none transition-colors duration-150`}`;
 
 const NetworkContainer = () => {
     const server = useServer();
-    const { clearFlashes, clearAndAddError } = useFlash();
+    const { clearFlashes, clearAndAddHttpError } = useFlash();
     const { data, error, mutate } = useSWR<Allocation[]>(server.uuid, key => getServerAllocations(key), { initialData: server.allocations });
 
     const setPrimaryAllocation = (ip: string, port: number) => {
         clearFlashes('server:network');
 
-        mutate(data?.map(a => (a.ip === ip && a.port === port) ? { ...a, isDefault: true } : { ...a, isDefault: false }), false);
+        mutate(data?.map(a => (a.ip === ip && a.port === port) ? { ...a, isDefault: true } : {
+            ...a,
+            isDefault: false,
+        }), false);
 
         setPrimaryServerAllocation(server.uuid, ip, port)
-            .catch(error => clearAndAddError({ key: 'server:network', message: httpErrorToHuman(error) }));
+            .catch(error => clearAndAddHttpError({ key: 'server:network', error }));
     };
 
     useEffect(() => {
         if (error) {
-            clearAndAddError({ key: 'server:network', message: error });
+            clearAndAddHttpError({ key: 'server:network', error });
         }
     }, [ error ]);
 
diff --git a/resources/scripts/state/flashes.ts b/resources/scripts/state/flashes.ts
index 96b30824f..8e4fb258e 100644
--- a/resources/scripts/state/flashes.ts
+++ b/resources/scripts/state/flashes.ts
@@ -1,11 +1,12 @@
 import { Action, action } from 'easy-peasy';
 import { FlashMessageType } from '@/components/MessageBox';
+import { httpErrorToHuman } from '@/api/http';
 
 export interface FlashStore {
     items: FlashMessage[];
     addFlash: Action<FlashStore, FlashMessage>;
     addError: Action<FlashStore, { message: string; key?: string }>;
-    clearAndAddError: Action<FlashStore, { message: string, key: string }>;
+    clearAndAddHttpError: Action<FlashStore, { error: any, key: string }>;
     clearFlashes: Action<FlashStore, string | void>;
 }
 
@@ -28,8 +29,8 @@ const flashes: FlashStore = {
         state.items.push({ type: 'error', title: 'Error', ...payload });
     }),
 
-    clearAndAddError: action((state, payload) => {
-        state.items = [ { type: 'error', title: 'Error', ...payload } ];
+    clearAndAddHttpError: action((state, { key, error }) => {
+        state.items = [ { type: 'error', title: 'Error', key, message: httpErrorToHuman(error) } ];
     }),
 
     clearFlashes: action((state, payload) => {