From 1dd45a2e04637bfda3029d9998785d79b6523992 Mon Sep 17 00:00:00 2001 From: Manav Rathi Date: Tue, 5 Nov 2024 14:11:25 +0530 Subject: [PATCH] Make the message optional --- web/apps/photos/src/components/Sidebar/MapSettings.tsx | 4 ++-- web/apps/photos/src/pages/_app.tsx | 2 +- web/packages/base/components/MiniDialog.tsx | 2 +- web/packages/base/log.ts | 10 ++++++++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/web/apps/photos/src/components/Sidebar/MapSettings.tsx b/web/apps/photos/src/components/Sidebar/MapSettings.tsx index 1c1c99d5d0..f4e5d9a66b 100644 --- a/web/apps/photos/src/components/Sidebar/MapSettings.tsx +++ b/web/apps/photos/src/components/Sidebar/MapSettings.tsx @@ -87,7 +87,7 @@ const ModifyMapSettings = ({ open, onClose, onRootClose, mapEnabled }) => { await updateMapEnabled(false); handleClose(); } catch (e) { - log.error("Error", e); + log.error(e); setPhase("failed"); } }; @@ -98,7 +98,7 @@ const ModifyMapSettings = ({ open, onClose, onRootClose, mapEnabled }) => { await updateMapEnabled(true); handleClose(); } catch (e) { - log.error("Error", e); + log.error(e); setPhase("failed"); } }; diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx index 36c43c7420..bfcc8bb96a 100644 --- a/web/apps/photos/src/pages/_app.tsx +++ b/web/apps/photos/src/pages/_app.tsx @@ -225,7 +225,7 @@ export default function App({ Component, pageProps }: AppProps) { ); const onGenericError = useCallback((e: unknown) => { - log.error("Error", e); + log.error(e); showMiniDialog(genericErrorDialogAttributes()); }, []); diff --git a/web/packages/base/components/MiniDialog.tsx b/web/packages/base/components/MiniDialog.tsx index e8986cae09..a8b4767903 100644 --- a/web/packages/base/components/MiniDialog.tsx +++ b/web/packages/base/components/MiniDialog.tsx @@ -174,7 +174,7 @@ export const AttributedMiniDialog: React.FC< await attributes.continue?.action?.(); resetPhaseAndClose(); } catch (e) { - log.error("Error", e); + log.error(e); setPhase("failed"); } }} diff --git a/web/packages/base/log.ts b/web/packages/base/log.ts index 10ad52bd3d..01c28c6c99 100644 --- a/web/packages/base/log.ts +++ b/web/packages/base/log.ts @@ -65,8 +65,11 @@ const messageWithError = (message: string, e?: unknown) => { return `${message}: ${es}`; }; -const logError = (message: string, e?: unknown) => { - const m = `[error] ${messageWithError(message, e)}`; +const logError = (message: unknown, e?: unknown) => { + const m = + typeof message == "string" + ? `[error] ${messageWithError(message, e)}` + : `[error] ${messageWithError("Error", message)}`; console.error(m); if (shouldLogToDisk) logToDisk(m); }; @@ -128,6 +131,9 @@ export default { * any arbitrary object that we obtain, say, when in a try-catch handler (in * JavaScript any arbitrary value can be thrown). * + * If only one argument is specified, and it is not a string, then it is + * taken as the error to be printed, paired with a generic message. + * * The log is written to disk and printed to the browser console. */ error: logError,