Merge remote-tracking branch 'origin/main' into ui-i18n

Author: Joel Vandal

.github/.trivyignore.yaml

@@ -0,0 +1,2 @@
+# Trivy ignore file
+# Add patterns to ignore specific vulnerabilities

.github/trivy.yaml

@@ -0,0 +1,29 @@
+# Trivy Security Scanner Configuration
+# Documentation: https://aquasecurity.github.io/trivy/latest/docs/configuration/
+
+scan:
+  scanners:
+    - vuln
+    - secret
+
+  skip-dirs:
+    - node_modules
+    - .git
+    - coverage
+    - ci
+
+severity:
+  - CRITICAL
+  - HIGH
+  - MEDIUM
+  - LOW
+
+pkg:
+  types:
+    - os
+    - library
+  include-dev-deps: true
+
+format: "sarif"
+ignorefile: ".github/.trivyignore.yaml"
+exit-code: 0

.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.42.0'
+    uses: 'flowfuse/github-actions-workflows/.github/workflows/build_node_package.yml@v0.46.0'
     with:
       node: '[
               {"version": "20", "tests": true, "lint": true},

.github/workflows/deploy-docs.yml

@@ -14,10 +14,10 @@ jobs:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           fetch-depth: 0
-      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version: 20
           cache: npm

.github/workflows/e2e-tests.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       - name: Install Dependencies
         run: npm ci
       - name: Install Node-RED Dependencies
@@ -20,13 +20,13 @@ jobs:
       - name: Run Linting Tests
         run: npm run lint
       - name: Run Dashboard E2E (Cypress) Tests
-        uses: cypress-io/github-action@b8ba51a856ba5f4c15cf39007636d4ab04f23e3c # v6.10.2
+        uses: cypress-io/github-action@2ad32e649e4db26c07674ebae31a297601dbcbaf # v6.10.8
         with:
           install: false
           config-file: cypress.config.js
           build: npm run build
           start: npm run cy:server
-      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+      - uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         if: failure()
         with:
           name: cypress-output

.github/workflows/publish-private.yml

@@ -10,7 +10,7 @@ concurrency:
 
 jobs:
   build:
-    uses: 'flowfuse/github-actions-workflows/.github/workflows/build_node_package.yml@v0.42.0'
+    uses: 'flowfuse/github-actions-workflows/.github/workflows/build_node_package.yml@v0.46.0'
     with:
       node: '[
               {"version": "20", "tests": true, "lint": true},
@@ -20,7 +20,7 @@ jobs:
     needs: build
     if: |
       github.ref == 'refs/heads/main'
-    uses: 'flowfuse/github-actions-workflows/.github/workflows/publish_node_package.yml@v0.42.0'
+    uses: 'flowfuse/github-actions-workflows/.github/workflows/publish_node_package.yml@v0.46.0'
     with:
       package_name: node-red-dashboard
       publish_package: true

.github/workflows/publish-release.yml

@@ -13,9 +13,9 @@ jobs:
       contents: read
     steps:
       - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       - name: Setup Node
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version: 20
       - name: Install Dependencies
@@ -25,6 +25,6 @@ jobs:
       - name: Build
         run: npm run build
       - name: Publish package to public npm registry
-        uses: JS-DevTools/npm-publish@ad693561f8a5b5d4c76f14407da60aa15cb10f90 # v4.0.1
+        uses: JS-DevTools/npm-publish@4ce4bd0f334d5316473155078da1955d42148494 # v4.1.4
         with:
           token: ${{ secrets.NPM_PUBLISH_TOKEN }}

.github/workflows/sast-scan.yml

@@ -0,0 +1,19 @@
+name: SAST Scan
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  scan:
+    name: SAST Scan
+    uses : flowfuse/github-actions-workflows/.github/workflows/sast_scan.yaml@v0.46.0

README.md

@@ -31,7 +31,7 @@ FlowFuse also comes with a collection of [FlowFuse Dashboard Blueprints](https:/
 
 ## Features
 
-FlowFuse Dashboard provides a base set of nodes for building your own user interfaces and data visualisations. Much like it's predecessor, it provides a set of easy-to-use, core nodes, but provides complete flexibility for customisation and control over theming, layout and behaviour if you want to go further.
+FlowFuse Dashboard provides a base set of nodes for building your own user interfaces and data visualisations. Much like its predecessor, it provides a set of easy-to-use, core nodes, but provides complete flexibility for customisation and control over theming, layout and behaviour if you want to go further.
 
 ### Easy Integration
 

…s/dashboard-chart-line-max-3-points.json …ows/dashboard-chart-line-max-limits.jsoncypress/fixtures/flows/dashboard-chart-line-max-3-points.json renamed to cypress/fixtures/flows/dashboard-chart-line-max-limits.json cypress/fixtures/flows/dashboard-chart-line-max-3-points.json renamed to cypress/fixtures/flows/dashboard-chart-line-max-limits.json

@@ -2,10 +2,10 @@
     {
         "id": "chart-1",
         "type": "ui-chart",
-        "z": "9524c548fb0b956c",
+        "z": "b508b2cf4781499a",
         "group": "dashboard-ui-group",
-        "name": "line-append-max-3-points",
-        "label": "line-append-max-3-points",
+        "name": "line-append-max-3-seconds",
+        "label": "line-append-max-3-seconds",
         "order": 2,
         "chartType": "line",
         "category": "",
@@ -16,18 +16,22 @@
         "xAxisType": "time",
         "xAxisFormat": "",
         "xAxisFormatType": "auto",
+        "xmin": "",
+        "xmax": "",
         "yAxisLabel": "",
         "yAxisProperty": "",
+        "yAxisPropertyType": "property",
         "ymin": "",
         "ymax": "",
+        "bins": "",
         "action": "append",
         "stackSeries": false,
         "pointShape": "circle",
         "pointRadius": 4,
         "showLegend": true,
-        "removeOlder": 1,
-        "removeOlderUnit": "3600",
-        "removeOlderPoints": "3",
+        "removeOlder": "3",
+        "removeOlderUnit": "1",
+        "removeOlderPoints": "",
         "colors": [
             "#1f77b4",
             "#aec7e8",
@@ -50,16 +54,17 @@
         "width": 6,
         "height": "4",
         "className": "",
-        "x": 1690,
-        "y": 640,
+        "interpolation": "linear",
+        "x": 580,
+        "y": 40,
         "wires": [
             []
         ]
     },
     {
         "id": "da1332f160b6a255",
         "type": "inject",
-        "z": "9524c548fb0b956c",
+        "z": "b508b2cf4781499a",
         "name": "",
         "props": [
             {
@@ -77,8 +82,8 @@
         "topic": "",
         "payload": "[]",
         "payloadType": "json",
-        "x": 1490,
-        "y": 680,
+        "x": 370,
+        "y": 80,
         "wires": [
             [
                 "chart-1"
@@ -88,7 +93,7 @@
     {
         "id": "13bf93c81c0bd0a7",
         "type": "change",
-        "z": "9524c548fb0b956c",
+        "z": "b508b2cf4781499a",
         "name": "rand",
         "rules": [
             {
@@ -104,8 +109,8 @@
         "from": "",
         "to": "",
         "reg": false,
-        "x": 1490,
-        "y": 640,
+        "x": 370,
+        "y": 40,
         "wires": [
             [
                 "chart-1"
@@ -115,11 +120,11 @@
     {
         "id": "12a55e898bb4162f",
         "type": "ui-button",
-        "z": "9524c548fb0b956c",
+        "z": "b508b2cf4781499a",
         "group": "dashboard-ui-group",
         "name": "random",
         "label": "random",
-        "order": 0,
+        "order": 1,
         "width": 0,
         "height": 0,
         "emulateClick": true,
@@ -136,8 +141,9 @@
         "buttonColor": "",
         "textColor": "",
         "iconColor": "",
-        "x": 1340,
-        "y": 640,
+        "enableClick": true,
+        "x": 220,
+        "y": 40,
         "wires": [
             [
                 "13bf93c81c0bd0a7"
@@ -161,33 +167,36 @@
         "id": "dashboard-ui-page-1",
         "type": "ui-page",
         "name": "import demos",
-        "ui": "dashboard-ui-base",
+        "ui": "72c1e5a9ec204878",
         "path": "/page4",
         "icon": "home",
         "layout": "grid",
         "theme": "dashboard-ui-theme",
-        "order": 1,
+        "order": 2,
         "className": "",
         "visible": "true",
         "disabled": "false"
     },
     {
-        "id": "dashboard-ui-base",
+        "id": "72c1e5a9ec204878",
         "type": "ui-base",
-        "name": "base",
+        "name": "My Dashboard",
         "path": "/dashboard",
+        "appIcon": "",
         "includeClientData": true,
         "acceptsClientConfig": [
             "ui-notification",
             "ui-control"
         ],
         "showPathInSidebar": false,
+        "headerContent": "page",
         "navigationStyle": "default",
-        "titleBarStyle": "default"
+        "titleBarStyle": "default",
+        "showReconnectNotification": true,
+        "notificationDisplayTime": 5,
+        "showDisconnectNotification": true,
+        "allowInstall": true
     },
-
-
-
     {
         "id": "dashboard-ui-theme",
         "type": "ui-theme",
@@ -207,4 +216,4 @@
             "density": "default"
         }
     }
-]
+]