Merge pull request #1011 from ds-wizard/hotfix/4.0.2

Hotfix 4.0.2
ds-wizard · Nov 20, 2023 · 49c28ad · 49c28ad
2 parents e219720 + 6147202
commit 49c28ad
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 15 deletions.
diff --git a/engine-wizard/elm/Wizard/Common/Menu/Msgs.elm b/engine-wizard/elm/Wizard/Common/Menu/Msgs.elm
@@ -19,4 +19,3 @@ type Msg
     | GetElement String
     | GotElement String (Result Dom.Error Dom.Element)
     | HideElement String
-    | OpenAppSwitcherLink String
diff --git a/engine-wizard/elm/Wizard/Common/Menu/Update.elm b/engine-wizard/elm/Wizard/Common/Menu/Update.elm
@@ -2,7 +2,6 @@ module Wizard.Common.Menu.Update exposing (update)
 
 import ActionResult exposing (ActionResult(..))
 import Browser.Dom as Dom
-import Browser.Navigation as Navigation
 import Dict
 import Gettext exposing (gettext)
 import Shared.Api.BuildInfo as BuildInfoApi
@@ -92,9 +91,6 @@ update wrapMsg msg appState model =
         HideElement elementId ->
             ( { model | submenuPositions = Dict.remove elementId model.submenuPositions }, Cmd.none )
 
-        OpenAppSwitcherLink url ->
-            ( model, Navigation.load url )
-
 
 loadBuildInfo : (Msg -> Wizard.Msgs.Msg) -> AppState -> Cmd Wizard.Msgs.Msg
 loadBuildInfo wrapMsg appState =

diff --git a/engine-wizard/elm/Wizard/Common/Menu/View.elm b/engine-wizard/elm/Wizard/Common/Menu/View.elm
@@ -282,7 +282,7 @@ viewLogo model =
                 in
                 li []
                     [ a
-                        [ onClick (Wizard.Msgs.MenuMsg (Wizard.Common.Menu.Msgs.OpenAppSwitcherLink item.url))
+                        [ href item.url
                         , classList
                             [ ( "internal", not item.external )
                             , ( "external", item.external )

diff --git a/engine-wizard/elm/Wizard/Update.elm b/engine-wizard/elm/Wizard/Update.elm
@@ -169,15 +169,23 @@ update msg model =
                 case urlRequest of
                     Browser.Internal url ->
                         let
-                            nextRoute =
-                                parseLocation model.appState url
+                            isWizardRoute =
+                                String.startsWith "/wizard" url.path
                         in
-                        case isGuarded nextRoute model of
-                            Just guardMsg ->
-                                ( model, Ports.alert guardMsg )
+                        if isWizardRoute then
+                            let
+                                nextRoute =
+                                    parseLocation model.appState url
+                            in
+                            case isGuarded nextRoute model of
+                                Just guardMsg ->
+                                    ( model, Ports.alert guardMsg )
+
+                                Nothing ->
+                                    ( model, pushUrl model.appState.key (Url.toString url) )
 
-                            Nothing ->
-                                ( model, pushUrl model.appState.key (Url.toString url) )
+                        else
+                            ( model, load (Url.toString url) )
 
                     Browser.External url ->
                         if url == "" then

diff --git a/engine-wizard/index.js b/engine-wizard/index.js
@@ -133,7 +133,7 @@ function loadApp(config, locale, provisioning) {
     registerLocalStoragePorts(app)
     registerPageUnloadPorts(app)
     registerRefreshPorts(app)
-    registerSessionPorts(app, sessionKey)
+    registerSessionPorts(app, sessionKey, ['session/admin'])
     registerThemePorts(app)
     registerWebsocketPorts(app)
     cookies.registerCookiePorts(app)

diff --git a/engine-wizard/js/ports/session.js b/engine-wizard/js/ports/session.js
@@ -1,4 +1,4 @@
-module.exports = function (app, sessionKey) {
+module.exports = function (app, sessionKey, otherSessionKeys) {
     app.ports.storeSession.subscribe(storeSession);
     app.ports.clearSession.subscribe(clearSession);
     app.ports.clearSessionAndReload.subscribe(clearSessionAndReload);
@@ -11,6 +11,11 @@ module.exports = function (app, sessionKey) {
 
     function clearSession() {
         localStorage.removeItem(sessionKey);
+        if (otherSessionKeys) {
+            otherSessionKeys.forEach(function (otherSessionKey) {
+                localStorage.removeItem(otherSessionKey)
+            })
+        }
     }