@flowfuse/node-red-dashboard 1.30.1-9f365cd-202512291502.0 → 1.30.1-a60a579-202512301349.0

package/nodes/store/data.js

@@ -102,6 +102,22 @@ const setters = {
             }
             data[node.id].push(config.RED.util.cloneMessage(msg))
         }
+    },
+    /**
+     * Fast filtering of existing array data (skips cloning and save checks for fast data cleanup)
+     * @param {*} base - the base node
+     * @param {*} node - the owner node
+     * @param {(msg) => Boolean} filterFunction
+     */
+    filter (base, node, filterFunction) {
+        const currentData = data[node.id]
+        if (filterFunction && Array.isArray(currentData) && currentData.length) {
+            const filteredMessages = currentData.filter(filterFunction)
+            if (filteredMessages.length !== currentData.length) {
+                // no need for save operation to process messages - just apply them
+                data[node.id] = filteredMessages
+            }
+        }
     }
 }
 
@@ -111,5 +127,6 @@ module.exports = {
     setConfig: setters.setConfig,
     save: setters.save,
     append: setters.append,
+    filter: setters.filter,
     clear: setters.clear
 }

package/nodes/widgets/ui_chart.js

@@ -61,17 +61,34 @@ module.exports = function (RED) {
             if (removeOlder > 0) {
                 const removeOlderUnit = parseFloat(config.removeOlderUnit)
                 const ago = (removeOlder * removeOlderUnit) * 1000 // milliseconds ago
-                const cutoff = (new Date()).getTime() - ago
-                const _msg = datastore.get(node.id).filter((msg) => {
+                const cutOff = (new Date()).getTime() - ago
+                const filterFn = (msg) => {
                     let timestamp = msg._datapoint.x
                     // is x already a millisecond timestamp?
                     if (typeof (msg._datapoint.x) === 'string') {
                         timestamp = (new Date(msg._datapoint.x)).getTime()
                     }
-                    return timestamp > cutoff
-                })
-                datastore.save(base, node, _msg)
+                    return timestamp > cutOff
+                }
+                datastore.filter(base, node, filterFn)
+            }
+        }
+
+        /**
+         * For categorical xaxis and types other than histogram then only keep the latest data point for
+         * each category in each series
+         */
+        function clearOldCategoricalPoints () {
+            const points = datastore.get(node.id)
+            const latestSet = {}
+            for (const item of points) {
+                const { category, x } = item._datapoint
+                const key = JSON.stringify([category, x]) // a unique key for each category/series combination
+                latestSet[key] = item
             }
+
+            const filtered = Object.values(latestSet)
+            datastore.save(base, node, filtered)
         }
 
         // ensure sane defaults
@@ -249,26 +266,40 @@ module.exports = function (RED) {
                         if (maxPoints && config.removeOlderPoints) {
                             // account for multiple lines?
                             // client-side does this for _each_ line
-                            // remove older points
+                            // remove older points using datastore.filter instead of saving the whole array
                             const lineCounts = {}
-                            const _msg = datastore.get(node.id)
-                            // trawl through in reverse order, and only keep the latest points (up to maxPoints) for each label
+                            const _msg = datastore.get(node.id) || []
+
+                            // determine which message objects to keep (latest maxPoints per label)
+                            const keepIndexes = []
+                            let doFiltering = false
                             for (let i = _msg.length - 1; i >= 0; i--) {
-                                const msg = _msg[i]
-                                const label = msg.topic
+                                const m = _msg[i]
+                                const label = m.topic
                                 lineCounts[label] = lineCounts[label] || 0
-                                if (lineCounts[label] >= maxPoints) {
-                                    _msg.splice(i, 1)
-                                } else {
+                                if (lineCounts[label] < maxPoints) {
+                                    keepIndexes[i] = true
                                     lineCounts[label]++
+                                } else {
+                                    doFiltering = true
                                 }
                             }
-                            datastore.save(base, node, _msg)
+
+                            // filter the datastore to only keep the selected messages
+                            if (doFiltering) {
+                                datastore.filter(base, node, (m, i) => {
+                                    return keepIndexes[i]
+                                })
+                            }
                         }
 
                         if (config.xAxisType === 'time' && config.removeOlder && config.removeOlderUnit) {
                             // remove any points older than the specified time
                             clearOldPoints()
+                        } else if (config.xAxisType === 'category' && config.chartType !== 'histogram') {
+                            // for categorical xaxis and types other than histogram then only keep the latest data point for
+                            // each category in each series
+                            clearOldCategoricalPoints()
                         }
                     }
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@flowfuse/node-red-dashboard",
-    "version": "1.30.1-9f365cd-202512291502.0",
+    "version": "1.30.1-a60a579-202512301349.0",
     "description": "FlowFuse Dashboard - A collection of Node-RED nodes that provide functionality to build your own UI applications (inc. forms, buttons, charts).",
     "keywords": [
         "node-red"