@visns-studio/visns-components 5.26.2 → 5.26.4

package/package.json

@@ -94,7 +94,7 @@
         "react-dom": "^17.0.0 || ^18.0.0"
     },
     "name": "@visns-studio/visns-components",
-    "version": "5.26.2",
+    "version": "5.26.4",
     "description": "Various packages to assist in the development of our Custom Applications.",
     "main": "src/index.js",
     "files": [

package/src/components/generic/GenericDashboard.jsx

@@ -545,13 +545,35 @@ const showModal = (title, content) => {
 };
 
 
+// Duplicate widget ids (seen in saved user layouts) collide in the data map,
+// double-fetch, and can crash the renderer — keep the first occurrence only.
+const dedupeWidgets = (dashSetting) => {
+    if (!dashSetting?.widgets) return dashSetting;
+    const seen = new Set();
+    const widgets = dashSetting.widgets.filter((widget) => {
+        if (seen.has(widget.id)) {
+            console.warn(
+                `GenericDashboard: dropping duplicate widget id "${widget.id}"`
+            );
+            return false;
+        }
+        seen.add(widget.id);
+        return true;
+    });
+    return widgets.length === dashSetting.widgets.length
+        ? dashSetting
+        : { ...dashSetting, widgets };
+};
+
 function GenericDashboard({ setting, userProfile, dynamicDashboard = false }) {
     const swapy = useRef(null);
     const container = useRef(null);
     const navigate = useNavigate();
     const initialLoadRef = useRef(true); // Ref to track initial load
-    const [dashboardSetting, setDashboardSetting] = useState(
-        dynamicDashboard ? userProfile.dashboard_setting || setting : setting
+    const [dashboardSetting, setDashboardSetting] = useState(() =>
+        dedupeWidgets(
+            dynamicDashboard ? userProfile.dashboard_setting || setting : setting
+        )
     );
     const [data, setData] = useState({});
     const [dropdowns, setDropdowns] = useState({});
@@ -662,19 +684,31 @@ function GenericDashboard({ setting, userProfile, dynamicDashboard = false }) {
                 return null;
             });
 
-            const results = await Promise.all(promises);
+            // allSettled: one failed widget request must not blank the whole
+            // dashboard — failed widgets stay empty, the rest still render.
+            const results = await Promise.allSettled(promises);
 
             const fetchedData = dashboardSetting.widgets.reduce(
                 (acc, widget, index) => {
-                    if (results[index]) {
+                    const result = results[index];
+
+                    if (result.status === 'rejected') {
+                        console.error(
+                            `Error fetching data for widget ${widget.id}:`,
+                            result.reason
+                        );
+                        return acc;
+                    }
+
+                    if (result.value) {
                         // Check if the response indicates an error
-                        if (results[index]?.data?.value) {
+                        if (result.value?.data?.value) {
                             console.error(
                                 `API error for widget ${widget.id}:`,
-                                results[index].data.value
+                                result.value.data.value
                             );
                         } else {
-                            acc[widget.id] = results[index]?.data;
+                            acc[widget.id] = result.value?.data;
                         }
                     }
                     return acc;
@@ -1110,11 +1144,10 @@ function GenericDashboard({ setting, userProfile, dynamicDashboard = false }) {
                                 }`}
                             >
                                 <span>
-                                    {(Array.isArray(widgetData) &&
-                                        widgetData.length === 0) ||
-                                    widgetData == null
-                                        ? parse(`&nbsp;`)
-                                        : widgetData}
+                                    {typeof widgetData === 'number' ||
+                                    typeof widgetData === 'string'
+                                        ? widgetData
+                                        : parse(`&nbsp;`)}
                                 </span>
                             </div>
                             {widget.button && (