Merge remote-tracking branch 'origin/main' into 1294-data-storage

# Conflicts: # ui/src/widgets/ui-number-input/UINumberInput.vue # ui/src/widgets/ui-slider/UISlider.vue # ui/src/widgets/ui-text-input/UITextInput.vue # ui/src/widgets/ui-text/UIText.vue
bartbutenaers · Dec 16, 2024 · fa255c0 · fa255c0
2 parents fbe4b9c + a0c4941
commit fa255c0
Show file tree

Hide file tree

Showing 68 changed files with 2,860 additions and 660 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
@@ -37,11 +37,11 @@ body:
   id: estimation
   attributes:
     label: Have you provided an initial effort estimate for this issue?
-    description: See our [handbook](https://flowfuse.com/handbook/development/releases/planning/#effort-estimation) for more details.
+    description: See our [handbook](https://flowfuse.com/handbook/development/project-management/#sizing-issues) for more details.
     multiple: false
     options:
       - I have provided an initial effort estimate
       - I am not a FlowFuse team member
       - I can not provide an initial effort estimate
   validations:
-      required: true
+      required: true
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -3,7 +3,7 @@ on:
   pull_request:
 jobs:
   build:
-    uses: 'flowfuse/github-actions-workflows/.github/workflows/build_node_package.yml@v0.37.0'
+    uses: 'flowfuse/github-actions-workflows/.github/workflows/build_node_package.yml@v0.38.0'
     with:
       node: '[
               {"version": "18", "tests": true, "lint": true},

diff --git a/.github/workflows/publish-private.yml b/.github/workflows/publish-private.yml
@@ -4,9 +4,13 @@ on:
     branches:
       - main
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
-    uses: 'flowfuse/github-actions-workflows/.github/workflows/build_node_package.yml@v0.37.0'
+    uses: 'flowfuse/github-actions-workflows/.github/workflows/build_node_package.yml@v0.38.0'
     with:
       node: '[
               {"version": "18", "tests": true, "lint": true},
@@ -16,7 +20,7 @@ jobs:
     needs: build
     if: |
       github.ref == 'refs/heads/main'
-    uses: 'flowfuse/github-actions-workflows/.github/workflows/publish_node_package.yml@v0.37.0'
+    uses: 'flowfuse/github-actions-workflows/.github/workflows/publish_node_package.yml@v0.38.0'
     with:
       package_name: node-red-dashboard
       publish_package: true

diff --git a/cypress/fixtures/flows/dashboard-charts.json b/cypress/fixtures/flows/dashboard-charts.json
@@ -238,8 +238,8 @@
         "pointShape": "circle",
         "pointRadius": 4,
         "showLegend": true,
-        "removeOlder": 1,
-        "removeOlderUnit": "3600",
+        "removeOlder": 1000000,
+        "removeOlderUnit": "604800",
         "removeOlderPoints": "",
         "colors": [
             "#1f77b4",
@@ -286,7 +286,7 @@
         "className": "",
         "icon": "",
         "iconPosition": "left",
-        "payload": "[{\"location\":\"New York\",\"temp\":56,\"datestamp\":1643784000},{\"location\":\"Los Angeles\",\"temp\":67,\"datestamp\":1643784000},{\"location\":\"Chicago\",\"temp\":44,\"datestamp\":1643784000},{\"location\":\"New York\",\"temp\":60,\"datestamp\":1643798400},{\"location\":\"Los Angeles\",\"temp\":71,\"datestamp\":1643798400},{\"location\":\"Chicago\",\"temp\":48,\"datestamp\":1643798400},{\"location\":\"New York\",\"temp\":65,\"datestamp\":1643812800},{\"location\":\"Los Angeles\",\"temp\":74,\"datestamp\":1643812800},{\"location\":\"Chicago\",\"temp\":52,\"datestamp\":1643812800},{\"location\":\"New York\",\"temp\":69,\"datestamp\":1643827200},{\"location\":\"Los Angeles\",\"temp\":77,\"datestamp\":1643827200},{\"location\":\"Chicago\",\"temp\":56,\"datestamp\":1643827200},{\"location\":\"New York\",\"temp\":73,\"datestamp\":1643841600},{\"location\":\"Los Angeles\",\"temp\":80,\"datestamp\":1643841600},{\"location\":\"Chicago\",\"temp\":60,\"datestamp\":1643841600},{\"location\":\"New York\",\"temp\":77,\"datestamp\":1643856000},{\"location\":\"Los Angeles\",\"temp\":82,\"datestamp\":1643856000},{\"location\":\"Chicago\",\"temp\":64,\"datestamp\":1643856000},{\"location\":\"New York\",\"temp\":80,\"datestamp\":1643870400},{\"location\":\"Los Angeles\",\"temp\":84,\"datestamp\":1643870400},{\"location\":\"Chicago\",\"temp\":68,\"datestamp\":1643870400},{\"location\":\"New York\",\"temp\":83,\"datestamp\":1643884800},{\"location\":\"Los Angeles\",\"temp\":86,\"datestamp\":1643884800},{\"location\":\"Chicago\",\"temp\":72,\"datestamp\":1643884800},{\"location\":\"New York\",\"temp\":86,\"datestamp\":1643899200},{\"location\":\"Los Angeles\",\"temp\":88,\"datestamp\":1643899200},{\"location\":\"Chicago\",\"temp\":76,\"datestamp\":1643899200},{\"location\":\"New York\",\"temp\":89,\"datestamp\":1643913600},{\"location\":\"Los Angeles\",\"temp\":89,\"datestamp\":1643913600},{\"location\":\"Chicago\",\"temp\":80,\"datestamp\":1643913600},{\"location\":\"New York\",\"temp\":89,\"datestamp\":1643928000},{\"location\":\"Los Angeles\",\"temp\":88,\"datestamp\":1643928000},{\"location\":\"Chicago\",\"temp\":84,\"datestamp\":1643928000},{\"location\":\"New York\",\"temp\":86,\"datestamp\":1643942400},{\"location\":\"Los Angeles\",\"temp\":86,\"datestamp\":1643942400},{\"location\":\"Chicago\",\"temp\":88,\"datestamp\":1643942400},{\"location\":\"New York\",\"temp\":83,\"datestamp\":1643956800},{\"location\":\"Los Angeles\",\"temp\":84,\"datestamp\":1643956800},{\"location\":\"Chicago\",\"temp\":92,\"datestamp\":1643956800},{\"location\":\"New York\",\"temp\":79,\"datestamp\":1643971200},{\"location\":\"Los Angeles\",\"temp\":82,\"datestamp\":1643971200},{\"location\":\"Chicago\",\"temp\":96,\"datestamp\":1643971200},{\"location\":\"New York\",\"temp\":73,\"datestamp\":1643985600},{\"location\":\"Los Angeles\",\"temp\":80,\"datestamp\":1643985600},{\"location\":\"Chicago\",\"temp\":100,\"datestamp\":1643985600},{\"location\":\"New York\",\"temp\":66,\"datestamp\":1644000000},{\"location\":\"Los Angeles\",\"temp\":78,\"datestamp\":1644000000},{\"location\":\"Chicago\",\"temp\":96,\"datestamp\":1644000000},{\"location\":\"New York\",\"temp\":59,\"datestamp\":1644014400},{\"location\":\"Los Angeles\",\"temp\":76,\"datestamp\":1644014400},{\"location\":\"Chicago\",\"temp\":92,\"datestamp\":1644014400},{\"location\":\"New York\",\"temp\":53,\"datestamp\":1644028800},{\"location\":\"Los Angeles\",\"temp\":74,\"datestamp\":1644028800},{\"location\":\"Chicago\",\"temp\":88,\"datestamp\":1644028800},{\"location\":\"New York\",\"temp\":47,\"datestamp\":1644043200},{\"location\":\"Los Angeles\",\"temp\":72,\"datestamp\":1644043200},{\"location\":\"Chicago\",\"temp\":84,\"datestamp\":1644043200},{\"location\":\"New York\",\"temp\":42,\"datestamp\":1644057600},{\"location\":\"Los Angeles\",\"temp\":70,\"datestamp\":1644057600},{\"location\":\"Chicago\",\"temp\":80,\"datestamp\":1644057600},{\"location\":\"New York\",\"temp\":39,\"datestamp\":1644072000},{\"location\":\"Los Angeles\",\"temp\":68,\"datestamp\":1644072000},{\"location\":\"Chicago\",\"temp\":76,\"datestamp\":1644072000},{\"location\":\"New York\",\"temp\":37,\"datestamp\":1644086400},{\"location\":\"Los Angeles\",\"temp\":66,\"datestamp\":1644086400},{\"location\":\"Chicago\",\"temp\":72,\"datestamp\":1644086400},{\"location\":\"New York\",\"temp\":36,\"datestamp\":1644100800},{\"location\":\"Los Angeles\",\"temp\":64,\"datestamp\":1644100800},{\"location\":\"Chicago\",\"temp\":68,\"datestamp\":1644100800},{\"location\":\"New York\",\"temp\":37,\"datestamp\":1644115200},{\"location\":\"Los Angeles\",\"temp\":62,\"datestamp\":1644115200},{\"location\":\"Chicago\",\"temp\":64,\"datestamp\":1644115200}]",
+        "payload": "[{\"location\":\"New York\",\"temp\":56,\"datestamp\":1643784000000},{\"location\":\"Los Angeles\",\"temp\":67,\"datestamp\":1643784000000},{\"location\":\"Chicago\",\"temp\":44,\"datestamp\":1643784000000},{\"location\":\"New York\",\"temp\":60,\"datestamp\":1643798400000},{\"location\":\"Los Angeles\",\"temp\":71,\"datestamp\":1643798400000},{\"location\":\"Chicago\",\"temp\":48,\"datestamp\":1643798400000},{\"location\":\"New York\",\"temp\":65,\"datestamp\":1643812800000},{\"location\":\"Los Angeles\",\"temp\":74,\"datestamp\":1643812800000},{\"location\":\"Chicago\",\"temp\":52,\"datestamp\":1643812800000},{\"location\":\"New York\",\"temp\":69,\"datestamp\":1643827200000},{\"location\":\"Los Angeles\",\"temp\":77,\"datestamp\":1643827200000},{\"location\":\"Chicago\",\"temp\":56,\"datestamp\":1643827200000},{\"location\":\"New York\",\"temp\":73,\"datestamp\":1643841600000},{\"location\":\"Los Angeles\",\"temp\":80,\"datestamp\":1643841600000},{\"location\":\"Chicago\",\"temp\":60,\"datestamp\":1643841600000},{\"location\":\"New York\",\"temp\":77,\"datestamp\":1643856000000},{\"location\":\"Los Angeles\",\"temp\":82,\"datestamp\":1643856000000},{\"location\":\"Chicago\",\"temp\":64,\"datestamp\":1643856000000},{\"location\":\"New York\",\"temp\":80,\"datestamp\":1643870400000},{\"location\":\"Los Angeles\",\"temp\":84,\"datestamp\":1643870400000},{\"location\":\"Chicago\",\"temp\":68,\"datestamp\":1643870400},{\"location\":\"New York\",\"temp\":83,\"datestamp\":1643884800000},{\"location\":\"Los Angeles\",\"temp\":86,\"datestamp\":1643884800000},{\"location\":\"Chicago\",\"temp\":72,\"datestamp\":1643884800000},{\"location\":\"New York\",\"temp\":86,\"datestamp\":1643899200000},{\"location\":\"Los Angeles\",\"temp\":88,\"datestamp\":1643899200000},{\"location\":\"Chicago\",\"temp\":76,\"datestamp\":1643899200000},{\"location\":\"New York\",\"temp\":89,\"datestamp\":16439136000000},{\"location\":\"Los Angeles\",\"temp\":89,\"datestamp\":1643913600000},{\"location\":\"Chicago\",\"temp\":80,\"datestamp\":1643913600000},{\"location\":\"New York\",\"temp\":89,\"datestamp\":1643928000000},{\"location\":\"Los Angeles\",\"temp\":88,\"datestamp\":1643928000000},{\"location\":\"Chicago\",\"temp\":84,\"datestamp\":1643928000000},{\"location\":\"New York\",\"temp\":86,\"datestamp\":1643942400000},{\"location\":\"Los Angeles\",\"temp\":86,\"datestamp\":1643942400000},{\"location\":\"Chicago\",\"temp\":88,\"datestamp\":1643942400000},{\"location\":\"New York\",\"temp\":83,\"datestamp\":1643956800000},{\"location\":\"Los Angeles\",\"temp\":84,\"datestamp\":1643956800000},{\"location\":\"Chicago\",\"temp\":92,\"datestamp\":1643956800000},{\"location\":\"New York\",\"temp\":79,\"datestamp\":1643971200000},{\"location\":\"Los Angeles\",\"temp\":82,\"datestamp\":1643971200000},{\"location\":\"Chicago\",\"temp\":96,\"datestamp\":1643971200000},{\"location\":\"New York\",\"temp\":73,\"datestamp\":1643985600000},{\"location\":\"Los Angeles\",\"temp\":80,\"datestamp\":1643985600000},{\"location\":\"Chicago\",\"temp\":100,\"datestamp\":1643985600000},{\"location\":\"New York\",\"temp\":66,\"datestamp\":1644000000000000},{\"location\":\"Los Angeles\",\"temp\":78,\"datestamp\":1644000000000},{\"location\":\"Chicago\",\"temp\":96,\"datestamp\":1644000000000},{\"location\":\"New York\",\"temp\":59,\"datestamp\":1644014400000},{\"location\":\"Los Angeles\",\"temp\":76,\"datestamp\":1644014400000},{\"location\":\"Chicago\",\"temp\":92,\"datestamp\":1644014400000},{\"location\":\"New York\",\"temp\":53,\"datestamp\":1644028800000},{\"location\":\"Los Angeles\",\"temp\":74,\"datestamp\":1644028800000},{\"location\":\"Chicago\",\"temp\":88,\"datestamp\":1644028800000},{\"location\":\"New York\",\"temp\":47,\"datestamp\":1644043200000},{\"location\":\"Los Angeles\",\"temp\":72,\"datestamp\":1644043200000},{\"location\":\"Chicago\",\"temp\":84,\"datestamp\":1644043200000},{\"location\":\"New York\",\"temp\":42,\"datestamp\":1644057600000},{\"location\":\"Los Angeles\",\"temp\":70,\"datestamp\":1644057600000},{\"location\":\"Chicago\",\"temp\":80,\"datestamp\":1644057600000},{\"location\":\"New York\",\"temp\":39,\"datestamp\":1644072000000},{\"location\":\"Los Angeles\",\"temp\":68,\"datestamp\":1644072000000},{\"location\":\"Chicago\",\"temp\":76,\"datestamp\":1644072000000},{\"location\":\"New York\",\"temp\":37,\"datestamp\":1644086400000},{\"location\":\"Los Angeles\",\"temp\":66,\"datestamp\":1644086400000},{\"location\":\"Chicago\",\"temp\":72,\"datestamp\":1644086400000},{\"location\":\"New York\",\"temp\":36,\"datestamp\":1644100800000},{\"location\":\"Los Angeles\",\"temp\":64,\"datestamp\":1644100800000},{\"location\":\"Chicago\",\"temp\":68,\"datestamp\":1644100800000},{\"location\":\"New York\",\"temp\":37,\"datestamp\":1644115200000},{\"location\":\"Los Angeles\",\"temp\":62,\"datestamp\":1644115200000},{\"location\":\"Chicago\",\"temp\":64,\"datestamp\":1644115200000}]",
         "payloadType": "json",
         "topic": "topic",
         "topicType": "msg",

diff --git a/cypress/fixtures/flows/dashboard-slider.json b/cypress/fixtures/flows/dashboard-slider.json
@@ -329,5 +329,149 @@
                 "dashboard-ui-slider"
             ]
         ]
+    },
+    {
+        "id": "dashboard-ui-button-dynamic-textfield",
+        "type": "ui-button",
+        "z": "node-red-tab-slider",
+        "group": "dashboard-ui-group",
+        "name": "Show Text Field",
+        "label": "Show Text Field",
+        "order": 0,
+        "width": 0,
+        "height": 0,
+        "emulateClick": false,
+        "tooltip": "",
+        "color": "",
+        "bgcolor": "",
+        "className": "",
+        "icon": "",
+        "iconPosition": "left",
+        "payload": "",
+        "payloadType": "str",
+        "topic": "topic",
+        "topicType": "msg",
+        "buttonColor": "",
+        "textColor": "",
+        "iconColor": "",
+        "enableClick": true,
+        "enablePointerdown": false,
+        "pointerdownPayload": "",
+        "pointerdownPayloadType": "str",
+        "enablePointerup": false,
+        "pointerupPayload": "",
+        "pointerupPayloadType": "str",
+        "x": 180,
+        "y": 280,
+        "wires": [
+            [
+                "dashboard-ui-set-property-textfield"
+            ]
+        ]
+    },
+    {
+        "id": "dashboard-ui-set-property-textfield",
+        "type": "change",
+        "z": "node-red-tab-slider",
+        "name": "",
+        "rules": [
+            {
+                "t": "delete",
+                "p": "payload",
+                "pt": "msg"
+            },
+            {
+                "t": "delete",
+                "p": "topic",
+                "pt": "msg"
+            },
+            {
+                "t": "set",
+                "p": "ui_update.showTextField",
+                "pt": "msg",
+                "to": "true",
+                "tot": "bool"
+            }
+        ],
+        "action": "",
+        "property": "",
+        "from": "",
+        "to": "",
+        "reg": false,
+        "x": 380,
+        "y": 280,
+        "wires": [
+            [
+                "dashboard-ui-slider"
+            ]
+        ]
+    },
+    {
+      "id": "dashboard-ui-set-property-step",
+      "type": "change",
+      "z": "node-red-tab-slider",
+      "name": "",
+      "rules": [
+        {
+          "t": "delete",
+          "p": "payload",
+          "pt": "msg"
+        },
+        {
+          "t": "delete",
+          "p": "topic",
+          "pt": "msg"
+        },
+        {
+          "t": "set",
+          "p": "msg.ui_update.step",
+          "pt": "msg",
+          "to": "2",
+          "tot": "num"
+        }
+      ],
+      "action": "",
+      "property": "",
+      "from": "",
+      "to": "",
+      "reg": false,
+      "x": 380,
+      "y": 320,
+      "wires": [["dashboard-ui-slider"]]
+    },
+    {
+      "id": "dashboard-ui-button-dynamic-step",
+      "type": "ui-button",
+      "z": "node-red-tab-slider",
+      "group": "dashboard-ui-group",
+      "name": "Set Step",
+      "label": "Set Step",
+      "order": 0,
+      "width": 0,
+      "height": 0,
+      "emulateClick": false,
+      "tooltip": "",
+      "color": "",
+      "bgcolor": "",
+      "className": "",
+      "icon": "",
+      "iconPosition": "left",
+      "payload": "",
+      "payloadType": "str",
+      "topic": "topic",
+      "topicType": "msg",
+      "buttonColor": "",
+      "textColor": "",
+      "iconColor": "",
+      "enableClick": true,
+      "enablePointerdown": false,
+      "pointerdownPayload": "",
+      "pointerdownPayloadType": "str",
+      "enablePointerup": false,
+      "pointerupPayload": "",
+      "pointerupPayloadType": "str",
+      "x": 160,
+      "y": 320,
+      "wires": [["dashboard-ui-set-property-step"]]
     }
 ]