Skip to content

Commit bce9b71

Browse files
authored
Merge branch 'main' into auto-snapshot-user
2 parents 385ae4e + 8810adc commit bce9b71

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

Diff for: .github/workflows/publish.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ on:
2626

2727
jobs:
2828
build:
29-
uses: 'flowfuse/github-actions-workflows/.github/workflows/build_node_package.yml@v0.29.0'
29+
uses: 'flowfuse/github-actions-workflows/.github/workflows/build_node_package.yml@v0.30.0'
3030
with:
3131
node: '[
3232
{"version": "18", "tests": true, "lint": true},
@@ -37,7 +37,7 @@ jobs:
3737
if: |
3838
( github.event_name == 'push' && github.ref == 'refs/heads/main' ) ||
3939
( github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main' )
40-
uses: 'flowfuse/github-actions-workflows/.github/workflows/publish_node_package.yml@v0.29.0'
40+
uses: 'flowfuse/github-actions-workflows/.github/workflows/publish_node_package.yml@v0.30.0'
4141
with:
4242
package_name: flowfuse-nr-launcher
4343
publish_package: true
@@ -53,7 +53,7 @@ jobs:
5353
if: |
5454
( github.event_name == 'push' && github.ref == 'refs/heads/main' ) ||
5555
( github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main' )
56-
uses: 'flowfuse/github-actions-workflows/.github/workflows/publish_node_package.yml@v0.29.0'
56+
uses: 'flowfuse/github-actions-workflows/.github/workflows/publish_node_package.yml@v0.30.0'
5757
with:
5858
package_name: flowfuse-nr-theme
5959
publish_package: true

Diff for: lib/theme/common/forge-common.js

+13-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,18 @@
2626
navigateTo(url)
2727
})
2828
}
29+
const interceptLogOutClick = (url) => {
30+
document.querySelector('#usermenu-item-logout')
31+
.addEventListener('click', (e) => {
32+
e.preventDefault()
33+
e.stopPropagation()
34+
if (context.shouldEmitInsteadOfRedirect) {
35+
window.parent.postMessage({
36+
type: 'logout'
37+
}, '*')
38+
}
39+
})
40+
}
2941

3042
function changeFavicon (src) {
3143
const link = document.createElement('link')
@@ -102,7 +114,7 @@
102114
}
103115
})
104116
}
105-
117+
interceptLogOutClick()
106118
interceptLogoClick(projectURL)
107119
})
108120
})

0 commit comments

Comments
 (0)