From 741ea2d0ae8d592e7710b8e3e21ff1e4d20f5822 Mon Sep 17 00:00:00 2001 From: sawka Date: Wed, 3 Jul 2024 14:44:32 -0700 Subject: [PATCH] null pointer defense for widgets. log settings.json at startup in console --- frontend/app/workspace/workspace.tsx | 2 +- frontend/wave.ts | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/frontend/app/workspace/workspace.tsx b/frontend/app/workspace/workspace.tsx index a0cab87e..19f333e1 100644 --- a/frontend/app/workspace/workspace.tsx +++ b/frontend/app/workspace/workspace.tsx @@ -83,7 +83,7 @@ const Widgets = React.memo(() => {
home
- {settingsConfig.widgets.map((data, idx) => ( + {settingsConfig?.widgets?.map((data, idx) => (
handleWidgetSelect(data.blockdef)} diff --git a/frontend/wave.ts b/frontend/wave.ts index 1a0a7e0a..ea7dae07 100644 --- a/frontend/wave.ts +++ b/frontend/wave.ts @@ -35,7 +35,9 @@ document.addEventListener("DOMContentLoaded", async () => { const initialTab = await WOS.loadAndPinWaveObject(WOS.makeORef("tab", waveWindow.activetabid)); WOS.loadAndPinWaveObject(WOS.makeORef("layout", initialTab.layoutNode)); initWS(); - globalStore.set(atoms.settingsConfigAtom, await services.FileService.GetSettingsConfig()); + const settings = await services.FileService.GetSettingsConfig(); + console.log("settings", settings); + globalStore.set(atoms.settingsConfigAtom, settings); services.ObjectService.SetActiveTab(waveWindow.activetabid); // no need to wait const reactElem = React.createElement(App, null, null); const elem = document.getElementById("main");