From 96bc57f5f9a18f749ae4a1c64897ed4bef88a023 Mon Sep 17 00:00:00 2001
From: Tim Chamberlain <tchamberlain76@gmail.com>
Date: Thu, 18 May 2023 19:36:16 -0500
Subject: [PATCH] fixed layout, null checks

---
 .../components/widgets/DashboardWidgets.tsx   | 24 +++++++++++++++----
 src/qqq/components/widgets/Widget.tsx         |  2 +-
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/qqq/components/widgets/DashboardWidgets.tsx b/src/qqq/components/widgets/DashboardWidgets.tsx
index b870b85..831e735 100644
--- a/src/qqq/components/widgets/DashboardWidgets.tsx
+++ b/src/qqq/components/widgets/DashboardWidgets.tsx
@@ -102,12 +102,18 @@ function DashboardWidgets({widgetMetaDataList, tableName, entityPrimaryKey, omit
                widgetData[i] = await qController.widget(widgetMetaData.name, urlParams);
                setWidgetData(widgetData);
                setWidgetCounter(widgetCounter + 1);
-               widgetData[i]["errorLoading"] = false;
+               if(widgetData[i])
+               {
+                  widgetData[i]["errorLoading"] = false;
+               }
             }
             catch(e)
             {
                console.error(e);
-               widgetData[i]["errorLoading"] = true;
+               if(widgetData[i])
+               {
+                  widgetData[i]["errorLoading"] = true;
+               }
             }
 
             forceUpdate();
@@ -121,23 +127,31 @@ function DashboardWidgets({widgetMetaDataList, tableName, entityPrimaryKey, omit
       {
          const urlParams = getQueryParams(widgetMetaDataList[index], data);
          setCurrentUrlParams(urlParams);
+         widgetData[index] = {};
 
          try
          {
             widgetData[index] = await qController.widget(widgetMetaDataList[index].name, urlParams);
             setWidgetCounter(widgetCounter + 1);
             setWidgetData(widgetData);
-            widgetData[index]["errorLoading"] = false;
+
+            if (widgetData[index])
+            {
+               widgetData[index]["errorLoading"] = false;
+            }
          }
          catch(e)
          {
             console.error(e);
-            widgetData[index]["errorLoading"] = true;
+            if (widgetData[index])
+            {
+               widgetData[index]["errorLoading"] = true;
+            }
          }
 
          forceUpdate();
       })();
-   };
+   }
 
    function getQueryParams(widgetMetaData: QWidgetMetaData, extraParams: string): string
    {
diff --git a/src/qqq/components/widgets/Widget.tsx b/src/qqq/components/widgets/Widget.tsx
index 5e5a4d3..447cfc9 100644
--- a/src/qqq/components/widgets/Widget.tsx
+++ b/src/qqq/components/widgets/Widget.tsx
@@ -384,7 +384,7 @@ function Widget(props: React.PropsWithChildren<Props>): JSX.Element
          </Box>
          {
             errorLoading ? (
-               <Box p={3} sx={{display: "flex", justifyContent: "center", alignItems: "flex-start"}}>
+               <Box pb={3} sx={{display: "flex", justifyContent: "center", alignItems: "flex-start"}}>
                   <Icon color="error">error</Icon>
                   <Typography sx={{paddingLeft: "4px", textTransform: "revert"}} variant="button">An error occurred loading widget content.</Typography>
                </Box>