Merge branch 'main' into auto-snapshot-user

FlowFuse · Sep 25, 2024 · bce9b71 · bce9b71
2 parents 385ae4e + 8810adc
commit bce9b71
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -26,7 +26,7 @@ on:
 
 jobs:
   build:
-    uses: 'flowfuse/github-actions-workflows/.github/workflows/build_node_package.yml@v0.29.0'
+    uses: 'flowfuse/github-actions-workflows/.github/workflows/build_node_package.yml@v0.30.0'
     with:
       node: '[
               {"version": "18", "tests": true, "lint": true},
@@ -37,7 +37,7 @@ jobs:
     if: |
       ( github.event_name == 'push' && github.ref == 'refs/heads/main' ) ||
       ( github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main' )
-    uses: 'flowfuse/github-actions-workflows/.github/workflows/publish_node_package.yml@v0.29.0'
+    uses: 'flowfuse/github-actions-workflows/.github/workflows/publish_node_package.yml@v0.30.0'
     with:
       package_name: flowfuse-nr-launcher
       publish_package: true
@@ -53,7 +53,7 @@ jobs:
     if: |
       ( github.event_name == 'push' && github.ref == 'refs/heads/main' ) ||
       ( github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main' )
-    uses: 'flowfuse/github-actions-workflows/.github/workflows/publish_node_package.yml@v0.29.0'
+    uses: 'flowfuse/github-actions-workflows/.github/workflows/publish_node_package.yml@v0.30.0'
     with:
       package_name: flowfuse-nr-theme
       publish_package: true

diff --git a/lib/theme/common/forge-common.js b/lib/theme/common/forge-common.js
@@ -26,6 +26,18 @@
                 navigateTo(url)
             })
     }
+    const interceptLogOutClick = (url) => {
+        document.querySelector('#usermenu-item-logout')
+            .addEventListener('click', (e) => {
+                e.preventDefault()
+                e.stopPropagation()
+                if (context.shouldEmitInsteadOfRedirect) {
+                    window.parent.postMessage({
+                        type: 'logout'
+                    }, '*')
+                }
+            })
+    }
 
     function changeFavicon (src) {
         const link = document.createElement('link')
@@ -102,7 +114,7 @@
                     }
                 })
             }
-
+            interceptLogOutClick()
             interceptLogoClick(projectURL)
         })
     })