From 99cd9bf0b73bbbc9d28b806c4db1daf7a8869b67 Mon Sep 17 00:00:00 2001 From: cv <34649812+cpvalente@users.noreply.github.com> Date: Sun, 17 Sep 2023 20:49:02 +0200 Subject: [PATCH] refactor: simplify handling axios errors --- apps/client/src/common/api/apiUtils.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/apps/client/src/common/api/apiUtils.ts b/apps/client/src/common/api/apiUtils.ts index 1c15707fc..091e05fef 100644 --- a/apps/client/src/common/api/apiUtils.ts +++ b/apps/client/src/common/api/apiUtils.ts @@ -5,15 +5,18 @@ import { generateId, millisToString } from 'ontime-utils'; import { addLog } from '../stores/logger'; import { nowInMillis } from '../utils/time'; -export function logAxiosError(prepend: string, error: unknown) { - let message; +export function maybeAxiosError(error: unknown) { if (axios.isAxiosError(error)) { const statusText = (error as AxiosError).response?.statusText ?? ''; const data = (error as AxiosError).response?.data ?? ''; - message = `${prepend} ${statusText}: ${data}`; + return `${statusText}: ${data}`; } else { - message = `${prepend}: ${error}`; + return error as string; } +} + +export function logAxiosError(prepend: string, error: unknown) { + const message = `${prepend}: ${maybeAxiosError(error)}`; addLog({ id: generateId(),