@sapui5/sap.ushell 1.138.1 → 1.139.0

package/src/main/js/sap/ushell/services/ShellNavigationHashChanger.js

@@ -5,35 +5,30 @@
  */
 
 sap.ui.define([
-    "sap/ui/core/EventBus",
-    "sap/ushell/library",
-    "sap/ushell/utils/UrlShortening",
-    "sap/ushell/utils/UrlParsing",
+    "sap/base/Log",
+    "sap/base/util/isEmptyObject",
     "sap/ui/core/routing/HashChanger",
     "sap/ui/performance/trace/Interaction",
     "sap/ui/thirdparty/hasher",
-    "sap/base/util/isEmptyObject",
     "sap/ui/thirdparty/jquery",
-    "sap/base/Log",
-    "sap/ushell/Container"
-], function (
-    EventBus,
-    ushellLibrary,
-    UrlShortening,
-    UrlParsing,
+    "sap/ushell/Container",
+    "sap/ushell/navigation/NavigationState",
+    "sap/ushell/utils/UrlShortening",
+    "sap/ushell/utils/UrlParsing"
+], (
+    Log,
+    isEmptyObject,
     HashChanger,
     Interaction,
     hasher,
-    isEmptyObject,
     jQuery,
-    Log,
-    Container
-) {
+    Container,
+    NavigationState,
+    UrlShortening,
+    UrlParsing
+) => {
     "use strict";
 
-    // shortcut for sap.ushell.NavigationState
-    var NavigationState = ushellLibrary.NavigationState;
-
     /**
      * Denotes all possible events that can be emitted by the
      * ShellNavigationHashChanger. Each event is described by an object, with
@@ -49,7 +44,7 @@ sap.ui.define([
      * @enum {object}
      * @private
      */
-    var O_EVENT = {
+    const O_EVENT = {
         HASH_SET: {
             name: "hashSet",
             historyEntry: true
@@ -100,7 +95,7 @@ sap.ui.define([
      *
      * @private
      */
-    var ShellNavigationHashChanger = HashChanger.extend("sap.ushell.services.ShellNavigationHashChanger", /** @lends sap.ushell.services.ShellNavigationHashChanger.prototype*/ {
+    const ShellNavigationHashChanger = HashChanger.extend("sap.ushell.services.ShellNavigationHashChanger", /** @lends sap.ushell.services.ShellNavigationHashChanger.prototype */ {
         constructor: function (oConfig) {
             this.oServiceConfig = oConfig;
             this._oNavigationState = {};
@@ -121,20 +116,22 @@ sap.ui.define([
 
             // used by UI5 to understand what events affect the history
             this.getRelevantEventsInfo = function () {
-                return this._getAllEvents().filter(function (oEvent) {
-                    return oEvent.usedByUi5HistoryDetection;
-                }).map(function (oEvent) {
-                    var oEventInfo = {
-                        name: oEvent.name,
-                        paramMapping: oEvent.ui5EventParameterNames
-                    };
-
-                    if (oEvent.updateHashOnly !== undefined) {
-                        oEventInfo.updateHashOnly = oEvent.updateHashOnly;
-                    }
+                return this._getAllEvents()
+                    .filter((oEvent) => {
+                        return oEvent.usedByUi5HistoryDetection;
+                    })
+                    .map((oEvent) => {
+                        const oEventInfo = {
+                            name: oEvent.name,
+                            paramMapping: oEvent.ui5EventParameterNames
+                        };
 
-                    return oEventInfo;
-                });
+                        if (oEvent.updateHashOnly !== undefined) {
+                            oEventInfo.updateHashOnly = oEvent.updateHashOnly;
+                        }
+
+                        return oEventInfo;
+                    });
             };
         }
     });
@@ -146,9 +143,9 @@ sap.ui.define([
      * @private
      */
     ShellNavigationHashChanger.prototype.privgetCurrentShellHash = function () {
-        var res = this.privsplitHash(hasher.getHash());
+        const res = this.privsplitHash(hasher.getHash());
         return {
-            hash: "#" + ((res && res.shellPart) ? res.shellPart : "")
+            hash: `#${res?.shellPart || ""}`
         };
     };
 
@@ -160,9 +157,9 @@ sap.ui.define([
      * @private
      */
     ShellNavigationHashChanger.prototype.privconstructHash = function (sAppSpecific) {
-        var o = this.privgetCurrentShellHash();
-        o.hash += sAppSpecific;
-        return o;
+        const oShellHash = this.privgetCurrentShellHash();
+        oShellHash.hash += sAppSpecific;
+        return oShellHash;
     };
 
     /**
@@ -194,19 +191,19 @@ sap.ui.define([
         }
         // break down hash into parts
         // "#SO-ABC~CONTXT?ABC=3A&DEF=4B&/detail/1?A=B");
-        var oShellHash = UrlParsing.parseShellHash(sHash);
+        const oShellHash = UrlParsing.parseShellHash(sHash);
         if (oShellHash === undefined || oShellHash === null) {
             return null;
         }
 
-        var oShellHashParams = (oShellHash.params && !isEmptyObject(oShellHash.params)) ? oShellHash.params : null;
-        var sAppSpecificRoute = oShellHash.appSpecificRoute;
+        const oShellHashParams = (oShellHash.params && !isEmptyObject(oShellHash.params)) ? oShellHash.params : null;
+        const sAppSpecificRoute = oShellHash.appSpecificRoute;
         oShellHash.appSpecificRoute = undefined;
         return {
             shellPart: this.privstripLeadingHash(this.privconstructShellHash(oShellHash)) || null,
             appSpecificRoute: sAppSpecificRoute || null, // ,"&/detail/1?A=B");
             intent: (oShellHash.semanticObject && oShellHash.action
-                && (oShellHash.semanticObject + "-" + oShellHash.action + (oShellHash.contextRaw || ""))) || null,
+                && (`${oShellHash.semanticObject}-${oShellHash.action}${oShellHash.contextRaw || ""}`)) || null,
             params: oShellHashParams
         };
     };
@@ -257,7 +254,7 @@ sap.ui.define([
         if (typeof fnFilter !== "function") {
             throw new Error("fnFilter must be a function");
         }
-        this.aNavigationFilters = this.aNavigationFilters.filter(function (fnRegisteredFilter) {
+        this.aNavigationFilters = this.aNavigationFilters.filter((fnRegisteredFilter) => {
             return fnRegisteredFilter !== fnFilter;
         });
     };
@@ -287,9 +284,8 @@ sap.ui.define([
             return this.oAppState.getKey();
         };
         this.store = function (sValue) {
-            var nPromise;
             this.oAppState.setData(sValue);
-            nPromise = this.oAppState.save();
+            const nPromise = this.oAppState.save();
             this.oPromise = jQuery.when(this.oPromise, nPromise);
         };
         this.getPromise = function () {
@@ -311,8 +307,8 @@ sap.ui.define([
      * parameter object with the retained url parameters and a sap-intent-param with key value
      */
     ShellNavigationHashChanger.prototype.compactParams = function (oParams, aRetainParameterList, oComponent, bTransient) {
-        var oDeferred = new jQuery.Deferred();
-        var sHash = UrlParsing.constructShellHash({
+        const oDeferred = new jQuery.Deferred();
+        const sHash = UrlParsing.constructShellHash({
             target: {
                 semanticObject: "SO",
                 action: "action"
@@ -325,25 +321,22 @@ sap.ui.define([
         }
 
         Container.getServiceAsync("AppState")
-            .then(function (AppStateService) {
-                var oSaveContext = new StoreContext(AppStateService, oComponent, bTransient);
-                var oResult = UrlShortening.compactHash(sHash, aRetainParameterList, oSaveContext);
+            .then((AppStateService) => {
+                const oSaveContext = new StoreContext(AppStateService, oComponent, bTransient);
+                const oResult = UrlShortening.compactHash(sHash, aRetainParameterList, oSaveContext);
 
                 // separate the parameters
-                var oCompactedParams = UrlParsing.parseParameters(oResult.hash.match(/\?.*/)[0]);
-                var oPromise = oSaveContext.getPromise();
-                oPromise
-                    .done(function () {
+                const oCompactedParams = UrlParsing.parseParameters(oResult.hash.match(/\?.*/)[0]);
+                oSaveContext.getPromise()
+                    .done(() => {
                         oDeferred.resolve(oCompactedParams);
                     })
-                    .fail(function (sMsg) {
-                        oDeferred.reject(sMsg);
-                    });
+                    .fail(oDeferred.reject);
             });
         return oDeferred.promise();
     };
 
-    /// protected API, only used by shell services
+    // protected API, only used by shell services
     /**
      * Returns a string which can be put into the DOM (e.g. in a link tag), asynchronously.
      * Please use CrossApplicationNavigation service and do not invoke this method directly
@@ -403,20 +396,17 @@ sap.ui.define([
      * @since 1.15.0
      * @private
      */
-    ShellNavigationHashChanger.prototype.hrefForExternal = function (oArgs, bVerbose) {
+    ShellNavigationHashChanger.prototype.hrefForExternal = async function (oArgs, bVerbose) {
+        let vResult = await this.hrefForExternalNoEncAsync(oArgs, bVerbose);
+
         // must encode the result
-        function encodeResult (vResult, bIsVerbose) {
-            if (bIsVerbose === true) {
-                vResult.hash = encodeURI(vResult.hash);
-            } else {
-                vResult = encodeURI(vResult);
-            }
-            return vResult;
+        if (bVerbose) {
+            vResult.hash = encodeURI(vResult.hash);
+        } else {
+            vResult = encodeURI(vResult);
         }
 
-        return this.hrefForExternalNoEncAsync(oArgs, bVerbose).then(function (vResult) {
-            return encodeResult(vResult, bVerbose);
-        });
+        return vResult;
     };
 
     /**
@@ -482,18 +472,16 @@ sap.ui.define([
      * @deprecated since 1.119. Please use {@link #hrefForExternal} instead.
      */
     ShellNavigationHashChanger.prototype.hrefForExternalSync = function (oArgs, bVerbose, oComponent) {
+        let vResult = this.hrefForExternalNoEnc(oArgs, bVerbose, oComponent);
+
         // must encode the result
-        function encodeResult (vResult, bIsVerbose) {
-            if (bIsVerbose === true) {
-                vResult.hash = encodeURI(vResult.hash);
-            } else {
-                vResult = encodeURI(vResult);
-            }
-            return vResult;
+        if (bVerbose) {
+            vResult.hash = encodeURI(vResult.hash);
+        } else {
+            vResult = encodeURI(vResult);
         }
 
-        var vResult = this.hrefForExternalNoEnc(oArgs, bVerbose, oComponent);
-        return encodeResult(vResult, bVerbose);
+        return vResult;
     };
 
     /**
@@ -526,7 +514,7 @@ sap.ui.define([
         );
 
         if (bAsync) {
-            var oDeferred = new jQuery.Deferred();
+            const oDeferred = new jQuery.Deferred();
 
             this.hrefForExternalNoEncAsync(oArgs, bVerbose)
                 .then(oDeferred.resolve)
@@ -535,8 +523,8 @@ sap.ui.define([
             return oDeferred.promise();
         }
 
-        var oTmp = this.privhrefForExternalNoEnc(oArgs);
-        if (bVerbose === true) {
+        const oTmp = this.privhrefForExternalNoEnc(oArgs);
+        if (bVerbose) {
             return {
                 hash: oTmp.hash,
                 params: oTmp.params,
@@ -564,11 +552,11 @@ sap.ui.define([
      * @since 1.95.0
      * @private
      */
-    ShellNavigationHashChanger.prototype.hrefForExternalNoEncAsync = function (oArgs, bVerbose) {
-        var vResult;
+    ShellNavigationHashChanger.prototype.hrefForExternalNoEncAsync = async function (oArgs, bVerbose) {
+        let vResult;
 
-        var oTmp = this.privhrefForExternalNoEnc(oArgs);
-        if (bVerbose === true) {
+        const oTmp = this.privhrefForExternalNoEnc(oArgs);
+        if (bVerbose) {
             vResult = {
                 hash: oTmp.hash,
                 params: oTmp.params,
@@ -578,10 +566,7 @@ sap.ui.define([
             vResult = oTmp.hash;
         }
 
-        return new Promise(function (resolve) {
-            resolve(vResult);
-
-        });
+        return vResult;
     };
 
     /**
@@ -596,16 +581,16 @@ sap.ui.define([
         // construct url
         if (oArgs && oArgs.target && (typeof oArgs.target.semanticObject === "string" || typeof oArgs.target.shellHash === "string")) {
             return {
-                hash: "#" + this.privconstructShellHash(oArgs)
+                hash: `#${this.privconstructShellHash(oArgs)}`
             };
         }
         return this.privgetCurrentShellHash();
     };
 
     ShellNavigationHashChanger.prototype.privgetAppHash = function (oArgs) {
-        var sAppHash;
+        let sAppHash;
         if (oArgs && oArgs.target && (typeof oArgs.target.shellHash === "string")) {
-            var oShellHash = UrlParsing.parseShellHash(oArgs.target.shellHash);
+            const oShellHash = UrlParsing.parseShellHash(oArgs.target.shellHash);
             sAppHash = oShellHash && oShellHash.appSpecificRoute;
             sAppHash = sAppHash && sAppHash.substring(2);
         }
@@ -647,13 +632,13 @@ sap.ui.define([
      * @param {boolean} bWriteHistory
      *     set to false to invoke replaceHash
      *
-     * @returns {Promise<undefined>} A Promise which resolves after the navigation was triggered
+     * @returns {Promise} A Promise which resolves after the navigation was triggered
      *
      * @private
      */
     ShellNavigationHashChanger.prototype.toExternal = function (oArgs, oComponent, bWriteHistory) {
-        var sHash = this.privhrefForExternalNoEnc(oArgs).hash;
-        var sAppHash = this.privgetAppHash(oArgs);
+        const sHash = this.privhrefForExternalNoEnc(oArgs).hash;
+        const sAppHash = this.privgetAppHash(oArgs);
         this.privsetHash(sHash, sAppHash, bWriteHistory);
         return Promise.resolve();
     };
@@ -666,7 +651,7 @@ sap.ui.define([
      * @private
      */
     ShellNavigationHashChanger.prototype.toAppHash = function (sAppHash, bWriteHistory) {
-        var sHash = this.privconstructHash(this.privappHashPrefix + sAppHash).hash;
+        const sHash = this.privconstructHash(this.privappHashPrefix + sAppHash).hash;
         this.privsetHash(sHash, sAppHash, bWriteHistory);
     };
 
@@ -686,11 +671,11 @@ sap.ui.define([
 
         this.privfnShellCallback = fnShellCallback;
 
-        hasher.changed.add(this.treatHashChanged, this); //parse hash changes
+        hasher.changed.add(this.treatHashChanged, this); // parse hash changes
 
         if (!hasher.isActive()) {
-            hasher.initialized.addOnce(this.treatHashChanged, this); //parse initial hash
-            hasher.init(); //start listening for history change
+            hasher.initialized.addOnce(this.treatHashChanged, this); // parse initial hash
+            hasher.init(); // start listening for history change
         } else {
             this.treatHashChanged(hasher.getHash());
         }
@@ -713,10 +698,10 @@ sap.ui.define([
             return false;
         }
         // fire initial hash change event for the app-specific part
-        var oNewHash = this.privsplitHash(hasher.getHash());
-        var sAppSpecificRoute = ((oNewHash && oNewHash.appSpecificRoute) || "  ").substring(2); // strip &/
-        var sDelimiterIfNecessary = sAppSpecificRoute ? "&/" : "";
-        var sShellPart = (oNewHash && oNewHash.shellPart) || "";
+        const oNewHash = this.privsplitHash(hasher.getHash());
+        const sAppSpecificRoute = (oNewHash?.appSpecificRoute || "  ").substring(2); // strip &/
+        const sDelimiterIfNecessary = sAppSpecificRoute ? "&/" : "";
+        const sShellPart = oNewHash?.shellPart || "";
         this.fireEvent(O_EVENT.HASH_CHANGED.name, {
             newHash: sAppSpecificRoute,
             fullHash: sShellPart + sDelimiterIfNecessary + sAppSpecificRoute
@@ -729,18 +714,20 @@ sap.ui.define([
         return (sInnerAppRoute || "").replace("&/", "");
     };
 
-    ShellNavigationHashChanger.prototype._setNavigationStatus = function (sNavigationStatus) {
+    ShellNavigationHashChanger.prototype._startFesrInteraction = function () {
         // inform ui5 interaction about pending navigation
-        if (sNavigationStatus === NavigationState.InProgress && !this._fnResolveInteraction) {
+        if (!this._fnResolveFesrInteraction) {
             Log.debug(`${sLogFesrPrefix} Interaction Start`, null, sModuleName);
-            this._fnResolveInteraction = Interaction.notifyAsyncStep();
-        } else if (sNavigationStatus === NavigationState.Finished && this._fnResolveInteraction) {
-            Log.debug(`${sLogFesrPrefix} Interaction End`, null, sModuleName);
-            this._fnResolveInteraction();
-            this._fnResolveInteraction = null;
+            this._fnResolveFesrInteraction = Interaction.notifyAsyncStep();
         }
+    };
 
-        this._oNavigationState.status = sNavigationStatus;
+    ShellNavigationHashChanger.prototype._endFesrInteraction = function () {
+        if (this._fnResolveFesrInteraction) {
+            Log.debug(`${sLogFesrPrefix} Interaction End`, null, sModuleName);
+            this._fnResolveFesrInteraction();
+            this._fnResolveFesrInteraction = null;
+        }
     };
 
     /**
@@ -766,25 +753,27 @@ sap.ui.define([
      * @protected
      */
     ShellNavigationHashChanger.prototype.treatHashChanged = function (newHash, oldHash) {
+        NavigationState.startNavigation();
         this._trackNavigation(newHash, oldHash);
-        this._setNavigationStatus(NavigationState.InProgress);
+        this._startFesrInteraction();
 
         if (this.inAbandonFlow) {
             // in case and navigation was abandon by a navigation filter, we ignore the hash reset event
-            this._setNavigationStatus(NavigationState.Finished);
+            this._endFesrInteraction();
             this.setReloadApplication(false);
+            NavigationState.endNavigation();
             return;
         }
 
-        var bShouldKeep;
+        let bShouldKeep;
         newHash = UrlShortening.expandHash(newHash); // do synchronous expansion if possible
         oldHash = UrlShortening.expandHash(oldHash); // if not, the parameter remains and is expanded during NavTargetResolutionInternal
-        var oNewHash = this.privsplitHash(newHash);
-        var oOldHash = this.privsplitHash(oldHash);
+        const oNewHash = this.privsplitHash(newHash);
+        let oOldHash = this.privsplitHash(oldHash);
 
         if (!oNewHash) {
             // illegal new hash; pass the full string and an error object
-            var oError = new Error("Illegal new hash - cannot be parsed: '" + newHash + "'");
+            const oError = new Error(`Illegal new hash - cannot be parsed: '${newHash}'`);
             this.fireEvent(O_EVENT.SHELL_HASH_CHANGED.name, {
                 newShellHash: newHash,
                 newAppSpecificRoute: null,
@@ -793,7 +782,7 @@ sap.ui.define([
                 error: oError
             });
             this.privfnShellCallback(newHash, null, (oOldHash ? oOldHash.shellPart : oldHash), (oOldHash ? oOldHash.appSpecificRoute : null), oError);
-            this._setNavigationStatus(NavigationState.Finished);
+            this._endFesrInteraction();
             this.setReloadApplication(false);
             return;
         }
@@ -806,34 +795,34 @@ sap.ui.define([
             };
         }
 
-        //call all navigation filters
-        for (var i = 0; i < this.aNavigationFilters.length; i++) {
+        // call all navigation filters
+        for (let i = 0; i < this.aNavigationFilters.length; i++) {
             try {
-                var sFilterHash;
-                var vFilterResult = this.aNavigationFilters[i].call(undefined, newHash, oldHash);
-                var sFilterResult = vFilterResult;
+                let sFilterHash;
+                const vFilterResult = this.aNavigationFilters[i].call(undefined, newHash, oldHash);
+                let sFilterResult = vFilterResult;
                 if (typeof vFilterResult !== "string") {
                     sFilterResult = vFilterResult.status;
                     sFilterHash = vFilterResult.hash;
                 }
 
                 if (sFilterResult === this.NavigationFilterStatus.Custom) {
-                    //filter is handling navigation - stop the navigation flow.
+                    // filter is handling navigation - stop the navigation flow.
                     if (sFilterHash && sFilterHash.length > 0) {
                         this.inAbandonFlow = true;
                         hasher.replaceHash(sFilterHash);
                         this.inAbandonFlow = false;
                     }
-                    this._setNavigationStatus(NavigationState.Finished);
+                    this._endFesrInteraction();
                     this.setReloadApplication(false);
                     return;
                 }
                 if (sFilterResult === this.NavigationFilterStatus.Abandon) {
-                    //filter abandon this navigation, therefore we need to reset the hash and stop the navigation flow
+                    // filter abandon this navigation, therefore we need to reset the hash and stop the navigation flow
                     this.inAbandonFlow = true;
                     hasher.replaceHash(oldHash);
                     this.inAbandonFlow = false;
-                    this._setNavigationStatus(NavigationState.Finished);
+                    this._endFesrInteraction();
                     this.setReloadApplication(false);
                     return;
                 }
@@ -853,17 +842,18 @@ sap.ui.define([
                 oldHash: oldHash,
                 fullHash: newHash
             });
-            this._setNavigationStatus(NavigationState.Finished);
+            this._endFesrInteraction();
             this.setReloadApplication(false);
+            NavigationState.endNavigation();
             return;
         }
-        //else - continue with navigation
+        // else - continue with navigation
 
-        var bIsInitialHashChange = oldHash === undefined;
-        var oHashComparison = UrlParsing.compareHashes(newHash, oldHash);
+        const bIsInitialHashChange = oldHash === undefined;
+        const oHashComparison = UrlParsing.compareHashes(newHash, oldHash);
         oHashComparison.sameIntent = oHashComparison.sameIntent && !bIsInitialHashChange;
 
-        var bNavigationToExactSameHash = oHashComparison.sameIntent && oHashComparison.sameParameters && oHashComparison.sameAppSpecificRoute;
+        const bNavigationToExactSameHash = oHashComparison.sameIntent && oHashComparison.sameParameters && oHashComparison.sameAppSpecificRoute;
         if (bNavigationToExactSameHash) {
             // this kind of navigation might happen when the technical parameters are changed.
             // e.g. sap-ui-fl-control-variant-id
@@ -874,13 +864,13 @@ sap.ui.define([
                 oldHash: this._removeInnerAppSeparator(oOldHash.appSpecificRoute),
                 fullHash: newHash
             });
-            this._setNavigationStatus(NavigationState.Finished);
+            this._endFesrInteraction();
             this.setReloadApplication(false);
 
             return;
         }
 
-        var bInnerAppNavigation = oHashComparison.sameIntent && oHashComparison.sameParameters;
+        const bInnerAppNavigation = oHashComparison.sameIntent && oHashComparison.sameParameters;
         if (bInnerAppNavigation) {
             // In case a UI5 application navigates to itself without an appSpecificRoute, the app should be reloaded.
             // This check gives the option to continue the navigation, as if the navigation was not an app specific navigation.
@@ -888,16 +878,17 @@ sap.ui.define([
             if (this.getReloadApplication()) {
                 this.setReloadApplication(false);
             } else {
-                var sNewAppSpecificRoute = this._removeInnerAppSeparator(oNewHash.appSpecificRoute);
-                var sOldAppSpecificRoute = this._removeInnerAppSeparator(oOldHash.appSpecificRoute);
-                Log.info("Inner App Hash changed from '" + sOldAppSpecificRoute + "' to '" + sNewAppSpecificRoute + "'", null, "sap.ushell.services.ShellNavigationHashChanger");
+                const sNewAppSpecificRoute = this._removeInnerAppSeparator(oNewHash.appSpecificRoute);
+                const sOldAppSpecificRoute = this._removeInnerAppSeparator(oOldHash.appSpecificRoute);
+                Log.info(`Inner App Hash changed from '${sOldAppSpecificRoute}' to '${sNewAppSpecificRoute}'`, null, "sap.ushell.services.ShellNavigationHashChanger");
                 // an empty string has to be propagated!
                 this.fireEvent(O_EVENT.HASH_CHANGED.name, {
                     newHash: sNewAppSpecificRoute,
                     oldHash: sOldAppSpecificRoute,
                     fullHash: newHash
                 });
-                this._setNavigationStatus(NavigationState.Finished);
+                this._endFesrInteraction();
+                NavigationState.endNavigation();
 
                 return;
             }
@@ -912,20 +903,21 @@ sap.ui.define([
              * Attached listeners take control over the navigation after the
              * hash fragment changes.
              */
-            var sNewParameters = UrlParsing.paramsToString(oNewHash.params);
-            var sOldParameters = UrlParsing.paramsToString(oOldHash.params);
+            const sNewParameters = UrlParsing.paramsToString(oNewHash.params);
+            const sOldParameters = UrlParsing.paramsToString(oOldHash.params);
 
-            Log.info("Shell hash parameters changed from '" + sOldParameters + "' to '" + sNewParameters + "'", null, "sap.ushell.services.ShellNavigationHashChanger");
+            Log.info(`Shell hash parameters changed from '${sOldParameters}' to '${sNewParameters}'`, null, "sap.ushell.services.ShellNavigationHashChanger");
             this.fireEvent(O_EVENT.SHELL_HASH_PARAMETER_CHANGED.name, {
                 oNewParameters: oNewHash.params,
                 oOldParameters: oOldHash.params
             });
-            this._setNavigationStatus(NavigationState.Finished);
+            this._endFesrInteraction();
             this.setReloadApplication(false);
+            NavigationState.endNavigation();
             return;
         }
 
-        Log.info("Outer shell hash changed from '" + oldHash + "' to '" + newHash + "'", null, "sap.ushell.services.ShellNavigationHashChanger");
+        Log.info(`Outer shell hash changed from '${oldHash}' to '${newHash}'`, null, "sap.ushell.services.ShellNavigationHashChanger");
         // all Shell specific callback -> load other app !
         this.fireEvent(O_EVENT.SHELL_HASH_CHANGED.name, {
             newShellHash: oNewHash.shellPart,
@@ -939,7 +931,7 @@ sap.ui.define([
         });
         this.privfnShellCallback(oNewHash.shellPart, oNewHash.appSpecificRoute, oOldHash.shellPart, oOldHash.appSpecificRoute);
 
-        this._setNavigationStatus(NavigationState.Finished);
+        this._endFesrInteraction();
         this.setReloadApplication(false);
     };
 
@@ -950,7 +942,7 @@ sap.ui.define([
      * @protected
      */
     ShellNavigationHashChanger.prototype.setHash = function (sHash) {
-        this.toAppHash(sHash, /*bWriteHistory*/true);
+        this.toAppHash(sHash, /* bWriteHistory */true);
     };
 
     /**
@@ -982,8 +974,8 @@ sap.ui.define([
      * @private
      */
     ShellNavigationHashChanger.prototype.getAppHash = function () {
-        var oNewHash = this.privsplitHash(hasher.getHash());
-        var sAppSpecificRoute = ((oNewHash && oNewHash.appSpecificRoute) || "  ").substring(2); // strip &/
+        const oNewHash = this.privsplitHash(hasher.getHash());
+        const sAppSpecificRoute = (oNewHash?.appSpecificRoute || "  ").substring(2); // strip &/
         return sAppSpecificRoute;
     };
 
@@ -1006,7 +998,7 @@ sap.ui.define([
      * @private
      */
     ShellNavigationHashChanger.prototype._getAllEvents = function () {
-        return Object.keys(O_EVENT).map(function (sEvent) {
+        return Object.keys(O_EVENT).map((sEvent) => {
             return O_EVENT[sEvent];
         });
     };
@@ -1021,11 +1013,13 @@ sap.ui.define([
      * @protected
      */
     ShellNavigationHashChanger.prototype.getReplaceHashEvents = function () {
-        return this._getAllEvents().filter(function (oEvent) {
-            return oEvent.historyEntry === false;
-        }).map(function (oEvent) {
-            return oEvent.name;
-        });
+        return this._getAllEvents()
+            .filter((oEvent) => {
+                return oEvent.historyEntry === false;
+            })
+            .map((oEvent) => {
+                return oEvent.name;
+            });
     };
 
     /**
@@ -1038,11 +1032,13 @@ sap.ui.define([
      * @protected
      */
     ShellNavigationHashChanger.prototype.getSetHashEvents = function () {
-        return this._getAllEvents().filter(function (oEvent) {
-            return oEvent.historyEntry === true;
-        }).map(function (oEvent) {
-            return oEvent.name;
-        });
+        return this._getAllEvents()
+            .filter((oEvent) => {
+                return oEvent.historyEntry === true;
+            })
+            .map((oEvent) => {
+                return oEvent.name;
+            });
     };
 
     /**
@@ -1063,12 +1059,12 @@ sap.ui.define([
      * @protected
      */
     ShellNavigationHashChanger.prototype.isInnerAppNavigation = function (sNewHash, sOldHash) {
-        var oNewHash = UrlParsing.parseShellHash(sNewHash);
-        var oOldHash = UrlParsing.parseShellHash(sOldHash);
+        const oNewHash = UrlParsing.parseShellHash(sNewHash);
+        const oOldHash = UrlParsing.parseShellHash(sOldHash);
 
-        var bIsInitialHashChange = sOldHash === undefined;
-        var bHaveSameIntent = UrlParsing.haveSameIntent(oNewHash, oOldHash) && !bIsInitialHashChange;
-        var bHaveSameIntentParameters = UrlParsing.haveSameIntentParameters(oNewHash, oOldHash);
+        const bIsInitialHashChange = sOldHash === undefined;
+        const bHaveSameIntent = UrlParsing.haveSameIntent(oNewHash, oOldHash) && !bIsInitialHashChange;
+        const bHaveSameIntentParameters = UrlParsing.haveSameIntentParameters(oNewHash, oOldHash);
 
         return bHaveSameIntent && bHaveSameIntentParameters;
     };