From f1c3b93049d672a11cf62203302efd39cab195b7 Mon Sep 17 00:00:00 2001 From: Darin Kelkhoff Date: Wed, 15 Nov 2023 19:54:59 -0600 Subject: [PATCH] CE-740 Widget and tab spacing adjustments; pass iconPath down into HeaderIcon --- src/qqq/components/widgets/DashboardWidgets.tsx | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/qqq/components/widgets/DashboardWidgets.tsx b/src/qqq/components/widgets/DashboardWidgets.tsx index a9315e6..22ffe0a 100644 --- a/src/qqq/components/widgets/DashboardWidgets.tsx +++ b/src/qqq/components/widgets/DashboardWidgets.tsx @@ -254,7 +254,7 @@ function DashboardWidgets({widgetMetaDataList, tableName, entityPrimaryKey, omit const topRightInsideCardIcon = widgetMetaData.icons.get("topRightInsideCard"); if (topRightInsideCardIcon) { - labelAdditionalComponentsRight.push(new HeaderIcon(topRightInsideCardIcon.name, topRightInsideCardIcon.color)); + labelAdditionalComponentsRight.push(new HeaderIcon(topRightInsideCardIcon.name, topRightInsideCardIcon.path, topRightInsideCardIcon.color)); } } @@ -343,7 +343,7 @@ function DashboardWidgets({widgetMetaDataList, tableName, entityPrimaryKey, omit reloadWidgetCallback={(data) => reloadWidget(i, data)} widgetData={widgetData[i]} > - + { widgetData && widgetData[i] && widgetData[i].html ? ( @@ -515,7 +515,7 @@ function DashboardWidgets({widgetMetaDataList, tableName, entityPrimaryKey, omit if (wrapWidgetsInTabPanels) { - renderedWidget = ( + renderedWidget = ( {renderedWidget} ); } @@ -528,7 +528,11 @@ function DashboardWidgets({widgetMetaDataList, tableName, entityPrimaryKey, omit const tabs = widgetMetaDataList && wrapWidgetsInTabPanels ? changeTab(newValue)} variant="standard" @@ -545,7 +549,7 @@ function DashboardWidgets({widgetMetaDataList, tableName, entityPrimaryKey, omit {tabs} { omitWrappingGridContainer ? body : ( - + {body} )