sonot
/
PteroTheme
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix error handling and simplify showing http errors

This commit is contained in:
Dane Everitt 2020-07-09 20:00:05 -07:00
parent fc9054312d
commit 9c3b9a0fae
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
resources/scripts/components/server/network/NetworkContainer.tsx
View File

@ -14,28 +14,30 @@ import { Allocation } from '@/api/server/getServer';
import Spinner from '@/components/elements/Spinner'; import Spinner from '@/components/elements/Spinner';
import setPrimaryServerAllocation from '@/api/server/network/setPrimaryServerAllocation'; import setPrimaryServerAllocation from '@/api/server/network/setPrimaryServerAllocation';
import useFlash from '@/plugins/useFlash'; 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 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 Label = styled.label`${tw`uppercase text-xs mt-1 text-neutral-400 block px-1 select-none transition-colors duration-150`}`;
const NetworkContainer = () => { const NetworkContainer = () => {
const server = useServer(); 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 { data, error, mutate } = useSWR<Allocation[]>(server.uuid, key => getServerAllocations(key), { initialData: server.allocations });
const setPrimaryAllocation = (ip: string, port: number) => { const setPrimaryAllocation = (ip: string, port: number) => {
clearFlashes('server:network'); 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) setPrimaryServerAllocation(server.uuid, ip, port)
.catch(error => clearAndAddError({ key: 'server:network', message: httpErrorToHuman(error) })); .catch(error => clearAndAddHttpError({ key: 'server:network', error }));
}; };
useEffect(() => { useEffect(() => {
if (error) { if (error) {
clearAndAddError({ key: 'server:network', message: error }); clearAndAddHttpError({ key: 'server:network', error });
} }
}, [ error ]); }, [ error ]);

7
resources/scripts/state/flashes.ts
View File

@ -1,11 +1,12 @@
import { Action, action } from 'easy-peasy'; import { Action, action } from 'easy-peasy';
import { FlashMessageType } from '@/components/MessageBox'; import { FlashMessageType } from '@/components/MessageBox';
import { httpErrorToHuman } from '@/api/http';
export interface FlashStore { export interface FlashStore {
items: FlashMessage[]; items: FlashMessage[];
addFlash: Action<FlashStore, FlashMessage>; addFlash: Action<FlashStore, FlashMessage>;
addError: Action<FlashStore, { message: string; key?: string }>; 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>; clearFlashes: Action<FlashStore, string | void>;
} }
@ -28,8 +29,8 @@ const flashes: FlashStore = {
state.items.push({ type: 'error', title: 'Error', ...payload }); state.items.push({ type: 'error', title: 'Error', ...payload });
}), }),
clearAndAddError: action((state, payload) => { clearAndAddHttpError: action((state, { key, error }) => {
state.items = [ { type: 'error', title: 'Error', ...payload } ]; state.items = [ { type: 'error', title: 'Error', key, message: httpErrorToHuman(error) } ];
}), }),
clearFlashes: action((state, payload) => { clearFlashes: action((state, payload) => {