@visns-studio/visns-components 5.26.3 → 5.26.5

package/package.json

@@ -94,7 +94,7 @@
         "react-dom": "^17.0.0 || ^18.0.0"
     },
     "name": "@visns-studio/visns-components",
-    "version": "5.26.3",
+    "version": "5.26.5",
     "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,34 @@ 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({});
@@ -699,42 +720,14 @@ function GenericDashboard({ setting, userProfile, dynamicDashboard = false }) {
         }
     };
 
-    // Single useEffect for initial data fetch
-    useEffect(() => {
-        // This will run once after filters are initialized
-        if (Object.keys(filters).length > 0 && initialLoadRef.current) {
-            // Fetch data once with initial filters
-            fetchData(filters);
-            // Mark initial load as complete
-            initialLoadRef.current = false;
-        }
-    }, [filters]);
-
-    // Handle filter changes after initial load
-    const isInitialFilterChangeRef = useRef(true);
-
+    // Single fetch trigger: filters are (re)built whenever dashboardSetting
+    // changes, so every load path funnels through this one effect — the old
+    // split effects fired twice per mount (every widget fetched twice).
     useEffect(() => {
-        // Skip the first filter change (which happens during initialization)
-        if (isInitialFilterChangeRef.current) {
-            isInitialFilterChangeRef.current = false;
-            return;
-        }
-
-        // Only fetch data if filters have been initialized
-        if (!initialLoadRef.current && Object.keys(filters).length > 0) {
-            fetchData(filters);
-        }
+        if (Object.keys(filters).length === 0) return;
+        fetchData(filters);
     }, [filters]);
 
-    // Handle dashboardSetting changes
-    useEffect(() => {
-        // Skip the initial render
-        if (!initialLoadRef.current) {
-            // Only fetch data if it's not the initial load
-            fetchData(filters);
-        }
-    }, [dashboardSetting]);
-
     // Handle window resize events to update viewportWidth
     useEffect(() => {
         const handleResize = () => {
@@ -1122,11 +1115,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 && (