datastake-daf 0.6.159 → 0.6.161

package/dist/components/index.js

@@ -14044,7 +14044,7 @@ function useAjaxModal$2({
 }
 
 const mergeObject = obj => {
-  return Object.entries(obj).reduce((acc, [key, value]) => {
+  return Object.entries(obj || {}).reduce((acc, [key, value]) => {
     if (typeof value === "object" && !Array.isArray(value) && value !== null) {
       return {
         ...acc,
@@ -14706,7 +14706,7 @@ const TreeNode = _ref => {
       }
     } else if (config !== null && config !== void 0 && config.inputs) {
       if (config.type === 'dataLinkGroup' || config.type === 'dataLink') {
-        const inputKeys = Object.keys(config.inputs).filter(inputKey => {
+        const inputKeys = Object.keys(config === null || config === void 0 ? void 0 : config.inputs).filter(inputKey => {
           const inputConfig = config.inputs[inputKey];
           // Check showIf condition for input
           if (inputConfig !== null && inputConfig !== void 0 && inputConfig.showIf && !evaluateShowIfCondition(inputConfig.showIf, allData)) {
@@ -20624,7 +20624,8 @@ const WidgetCard = _ref => {
     description,
     loading = false,
     iconColor,
-    buttonIcon
+    buttonIcon,
+    imageUrl
   } = _ref;
   useToken$h();
   return /*#__PURE__*/jsxRuntime.jsx(Style$x, {
@@ -20636,7 +20637,10 @@ const WidgetCard = _ref => {
           display: "flex",
           alignItems: "center"
         },
-        children: [/*#__PURE__*/jsxRuntime.jsx("div", {
+        children: [imageUrl ? /*#__PURE__*/jsxRuntime.jsx("img", {
+          src: imageUrl,
+          className: "widget-card-logo-icon mr-2"
+        }) : /*#__PURE__*/jsxRuntime.jsx("div", {
           className: "widget-card-logo-icon mr-2",
           children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
             name: logoIcon,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datastake-daf",
-	"version": "0.6.159",
+	"version": "0.6.161",
 	"dependencies": {
 		"@ant-design/icons": "^5.2.5",
 		"@antv/g2": "^5.1.1",

package/src/@daf/core/components/Dashboard/Widget/WidgetCard/WidgetCard.stories.js

@@ -24,6 +24,7 @@ export const Primary = {
         "description": "This is a description of the widget card. It can be long and scrollable.",
         "buttonIcon": 'ArrowUpRight',
         "iconColor": "#ff0000",
+        "imageUrl": "https://picsum.photos/200/300",
         "data": [
             {
                 "label": "Type",

package/src/@daf/core/components/Dashboard/Widget/WidgetCard/index.js

@@ -16,7 +16,8 @@ const WidgetCard = ({
     description, 
     loading=false, 
     iconColor, 
-    buttonIcon
+    buttonIcon,
+    imageUrl,
 }) => {
     const { token } = useToken();
     return (
@@ -24,9 +25,11 @@ const WidgetCard = ({
             <Widget
             title={
                 <div style={{display: "flex", alignItems: "center"}}>
-                    <div className="widget-card-logo-icon mr-2">
-                        <CustomIcon name={logoIcon} width={25} height={25} />
-                    </div> 
+                    {imageUrl ? <img src={imageUrl} className="widget-card-logo-icon mr-2" /> 
+                        : <div className="widget-card-logo-icon mr-2">
+                            <CustomIcon name={logoIcon} width={25} height={25} />
+                        </div> 
+                    }
                     <Tooltip title={title}>{title}</Tooltip>
                 </div>
             }

package/src/@daf/core/components/PdfForm/components/dataLinkGroupHandler.js

@@ -2,7 +2,7 @@ import React, { useMemo } from 'react';
 import useAjaxModal from '../utils/useAjaxModal';
 
 const mergeObject = (obj) => {
-  return Object.entries(obj).reduce((acc, [key, value]) => {
+  return Object.entries(obj || {}).reduce((acc, [key, value]) => {
     if (typeof value === "object" && !Array.isArray(value) && value !== null) {
       return { ...acc, ...value };
     }

package/src/@daf/core/components/PdfForm/index.js

@@ -89,7 +89,7 @@ const TreeNode = ({ nodeKey, config, value, level = 0, isLast = false, t, rootFo
           }
     }  else if (config?.inputs) {
       if (config.type === 'dataLinkGroup' || config.type === 'dataLink') {
-        const inputKeys = Object.keys(config.inputs)
+        const inputKeys = Object.keys(config?.inputs)
           .filter(inputKey => {
             const inputConfig = config.inputs[inputKey];
             // Check showIf condition for input