Merge branch 'chore/extract-device-editor-nested-routes' into chore/extract-immersive-editor-components-into-a-global-namespace

Author: cstns

.github/workflows/branch-deploy.yaml

@@ -262,7 +262,7 @@ jobs:
           mask-password: true
 
       - name: Login to GHCR
-        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
+        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

.github/workflows/docs.yml

@@ -49,7 +49,7 @@ jobs:
           path: 'blueprint-library'
           token: ${{ steps.generate_token.outputs.token }}
       - name: Cache image pipeline output
-        uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           key: img-pipeline-cache
           path: website/_site/img         

.github/workflows/tests.yml

@@ -140,7 +140,7 @@ jobs:
       - name: Install Dependencies
         run: npm ci
       - name: Run UI E2E (Cypress) Tests - OS
-        uses: cypress-io/github-action@8a35f965fbd13e3b18d9fb3bdc5f50ae2f4a5e76 # v7.1.0
+        uses: cypress-io/github-action@0f330ebf0d60f87608ed72f1d6232e5644aa3171 # v7.1.1
         with:
           install: false
           config-file: config/cypress-os.config.js
@@ -180,7 +180,7 @@ jobs:
       - name: Install Dependencies
         run: npm ci
       - name: Run UI E2E (Cypress) Tests - EE
-        uses: cypress-io/github-action@8a35f965fbd13e3b18d9fb3bdc5f50ae2f4a5e76 # v7.1.0
+        uses: cypress-io/github-action@0f330ebf0d60f87608ed72f1d6232e5644aa3171 # v7.1.1
         with:
             install: false
             config-file: config/cypress-ee.config.js

CHANGELOG.md

@@ -1,3 +1,28 @@
+#### 2.26.2: Release
+
+ - Bump cypress-io/github-action from 7.1.0 to 7.1.1 (#6616)
+ - Bump docker/login-action from 3.6.0 to 3.7.0 (#6617)
+ - Bump actions/cache from 5.0.2 to 5.0.3 (#6615)
+ - Bump flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml (#6574)
+ - Bump flowfuse/github-actions-workflows/.github/workflows/publish_node_package.yml (#6575)
+ - Bump flowfuse/github-actions-workflows/.github/workflows/sast_scan.yaml (#6576)
+ - Bump fastify from 5.6.2 to 5.7.4 (#6620) @app/dependabot
+ - chore: Update features for teams on pre-staging (#6595) @ppawlowski
+ - Add issues and suggestions display to `ExpertChatMessage` component with icon support (#6607) @cstns
+ - Allow team owners to edit their application roles (#6555) @cstns
+ - Update Assistant Link (#6596) @sumitshinde-84
+ - Rename FlowFuse Assistant and related references to FlowFuse Expert (#6571) @sumitshinde-84
+ - Alter the expert's chat input (#6581) @cstns
+ - Create UI component to include selected flows (#6580) @cstns
+ - Add confirmation dialog for administrator privilege grant (#6548) @dimitrieh
+ - Fix Device based MCP error log in app log (#6587) @Steve-Mcl
+ - Fix Expert errors when device are present in MCPRegistrations (#6584) @cstns
+ - docs: add hosted vs remote instance comparison table (#6481) @dgatti0213
+ - Bump jsonwebtoken from 9.0.2 to 9.0.3 (#6469) @app/dependabot
+ - Bump @node-red/util from 4.0.2 to 4.1.2 (#6468) @app/dependabot
+ - Bump nodemailer from 7.0.11 to 7.0.12 (#6467) @app/dependabot
+ - Bump lodash from 4.17.21 to 4.17.23 (#6550) @app/dependabot
+
 #### 2.26.1: Release
 
  - Bump cypress-io/github-action from 6.10.8 to 7.1.0 (#6577)

docs/install/kubernetes/aws.md

@@ -125,7 +125,13 @@ controller:
     configNameSpace: $(POD_NAMESPACE)/udp-services
   config:
     proxy-body-size: "0"
+    annotations-risk-level: "Critical"
+    use-gzip: true
     use-proxy-protocol: true
+    enable-real-ip: true
+    use-forwarded-headers: true
+    server-snippet: |
+      real_ip_header X-Forwarded-For;
   service:
     # AWS Annotations for LoadBalaner with Certificate ARN
     annotations:
@@ -141,6 +147,7 @@ controller:
     externalTrafficPolicy: Cluster
   ingressClassResource:
     default: true
+  allowSnippetAnnotations: true
 ```
 
 > The `proxy-body-size: "0"` removes the `1m` nginx default limit, you can set this to a