@sapui5/sap.ushell 1.140.0 → 1.141.1

package/src/main/js/sap/ushell/ApplicationType/wdaResolution.js

@@ -77,8 +77,8 @@ sap.ui.define([
                 undefined /* no Component */,
                 true /* transient */
             )
-                .fail((sError) => {
-                    fnReject(sError);
+                .fail((oError) => {
+                    fnReject(oError);
                 })
                 .then((oEffectiveCompactedIntentParams) => {
                     // important to extract after compaction to get a potentially modified client
@@ -360,8 +360,6 @@ sap.ui.define([
             const oResolutionResult = createWDAResolutionResult(oInbound, sFinalWDAURL, sSapSystem, sSapSystemDataSrc);
 
             return oResolutionResult;
-        }, (sError) => {
-            return Promise.reject(sError);
         });
     }
 
@@ -418,12 +416,15 @@ sap.ui.define([
             }
 
             if (oPromise) {
-                oPromise.then((oResult) => {
-                    oResult.extendedInfo = oApplicationTypeUtils.getExtendedInfo(oMatchingTarget);
-                    oApplicationTypeUtils.checkOpenWithPost(oMatchingTarget, oResult);
-                    oApplicationTypeUtils.addKeepAliveToURLTemplateResult(oResult);
-                    return oResult;
-                }).then(fnResolve, fnReject);
+                oPromise
+                    .then((oResult) => {
+                        oResult.extendedInfo = oApplicationTypeUtils.getExtendedInfo(oMatchingTarget);
+                        oApplicationTypeUtils.checkOpenWithPost(oMatchingTarget, oResult);
+                        oApplicationTypeUtils.addKeepAliveToURLTemplateResult(oResult);
+                        return oResult;
+                    })
+                    .then(fnResolve)
+                    .catch(fnReject);
             } else {
                 fnResolve();
             }

package/src/main/js/sap/ushell/ApplicationType.js

@@ -11,7 +11,7 @@ sap.ui.define([
         const _arguments = arguments;
         return new Promise((fnResolve, fnReject) => {
             sap.ui.require(["sap/ushell/ApplicationType/wdaResolution"], (oWdaResolution) => {
-                oWdaResolution.generateWDAResolutionResult.apply(oWdaResolution, _arguments).then(fnResolve, fnReject);
+                oWdaResolution.generateWDAResolutionResult.apply(oWdaResolution, _arguments).then(fnResolve).catch(fnReject);
             });
         });
     }
@@ -20,7 +20,7 @@ sap.ui.define([
         const _arguments = arguments;
         return new Promise((fnResolve, fnReject) => {
             sap.ui.require(["sap/ushell/ApplicationType/wdaResolution"], (oWdaResolution) => {
-                oWdaResolution.resolveEasyAccessMenuIntentWDA.apply(oWdaResolution, _arguments).then(fnResolve, fnReject);
+                oWdaResolution.resolveEasyAccessMenuIntentWDA.apply(oWdaResolution, _arguments).then(fnResolve).catch(fnReject);
             });
         });
     }
@@ -28,7 +28,7 @@ sap.ui.define([
     function generateTRResolutionResult (oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver) {
         return new Promise((fnResolve, fnReject) => {
             sap.ui.require(["sap/ushell/ApplicationType/guiResolution"], (oGuiResolution) => {
-                oGuiResolution.generateTRResolutionResult(oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver).then(fnResolve, fnReject);
+                oGuiResolution.generateTRResolutionResult(oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver).then(fnResolve).catch(fnReject);
             });
         });
     }
@@ -37,7 +37,7 @@ sap.ui.define([
         const _arguments = arguments;
         return new Promise((fnResolve, fnReject) => {
             sap.ui.require(["sap/ushell/ApplicationType/guiResolution"], (oGuiResolution) => {
-                oGuiResolution.resolveEasyAccessMenuIntentWebgui.apply(oGuiResolution, _arguments).then(fnResolve, fnReject);
+                oGuiResolution.resolveEasyAccessMenuIntentWebgui.apply(oGuiResolution, _arguments).then(fnResolve).catch(fnReject);
             });
         });
     }
@@ -46,7 +46,7 @@ sap.ui.define([
         const _arguments = arguments;
         return new Promise((fnResolve, fnReject) => {
             sap.ui.require(["sap/ushell/ApplicationType/wcfResolution"], (oWcfResolution) => {
-                oWcfResolution.generateWCFResolutionResult.apply(oWcfResolution, _arguments).then(fnResolve, fnReject);
+                oWcfResolution.generateWCFResolutionResult.apply(oWcfResolution, _arguments).then(fnResolve).catch(fnReject);
             });
         });
     }
@@ -55,7 +55,7 @@ sap.ui.define([
         const _arguments = arguments;
         return new Promise((fnResolve, fnReject) => {
             sap.ui.require(["sap/ushell/ApplicationType/ui5Resolution"], (oUi5Resolution) => {
-                oUi5Resolution.generateUI5ResolutionResult.apply(oUi5Resolution, _arguments).then(fnResolve, fnReject);
+                oUi5Resolution.generateUI5ResolutionResult.apply(oUi5Resolution, _arguments).then(fnResolve).catch(fnReject);
             });
         });
     }
@@ -64,7 +64,7 @@ sap.ui.define([
         const _arguments = arguments;
         return new Promise((fnResolve, fnReject) => {
             sap.ui.require(["sap/ushell/ApplicationType/urlTemplateResolution"], (oUrlTemplateResolution) => {
-                oUrlTemplateResolution.generateURLTemplateResolutionResult.apply(oUrlTemplateResolution, _arguments).then(fnResolve, fnReject);
+                oUrlTemplateResolution.generateURLTemplateResolutionResult.apply(oUrlTemplateResolution, _arguments).then(fnResolve).catch(fnReject);
             });
         });
     }
@@ -73,7 +73,7 @@ sap.ui.define([
         const _arguments = arguments;
         return new Promise((fnResolve, fnReject) => {
             sap.ui.require(["sap/ushell/ApplicationType/urlResolution"], (oUrlResolution) => {
-                oUrlResolution.generateURLResolutionResult.apply(oUrlResolution, _arguments).then(fnResolve, fnReject);
+                oUrlResolution.generateURLResolutionResult.apply(oUrlResolution, _arguments).then(fnResolve).catch(fnReject);
             });
         });
     }

package/src/main/js/sap/ushell/Container.js

@@ -904,9 +904,8 @@ sap.ui.define([
             try {
                 oLocalStorage.setItem(sUid, "CHECK");
                 oLocalStorage.removeItem(sUid);
-            } catch (e) {
-                Log.warning(`Error calling localStorage.setItem(): ${e}`, null,
-                    "sap.ushell.Container");
+            } catch (oError) {
+                Log.warning("Error calling localStorage.setItem():", oError, "sap.ushell.Container");
                 return oDeferred.resolve(this.DirtyState.MAYBE_DIRTY).promise();
             }
 
@@ -1358,15 +1357,14 @@ sap.ui.define([
              * @name sap.ushell.services.ContainerInterface#createAdapter
              */
             function createRemoteAdapter (oSystem) {
-                const oDeferred = new jQuery.Deferred();
                 if (!oSystem) {
                     throw new Error("Missing system");
                 }
                 // Note: this might become really asynchronous once the remote adapter is loaded
                 // from the remote system itself
-                oDeferred.resolve(createAdapter(sServiceName, oSystem, sParameter));
+                const oRemoteAdapter = createAdapter(sServiceName, oSystem, sParameter);
                 oContainerInstance.addRemoteSystem(oSystem);
-                return oDeferred.promise();
+                return ushellUtils.toDeferred(oRemoteAdapter);
             }
 
             if (!sServiceName) {
@@ -1475,15 +1473,14 @@ sap.ui.define([
              * @name sap.ushell.services.ContainerInterface#createAdapter
              */
             function createRemoteAdapter (oSystem) {
-                const oDeferred = new jQuery.Deferred();
                 if (!oSystem) {
                     throw new Error("Missing system");
                 }
                 // Note: this might become really asynchronous once the remote adapter is loaded
                 // from the remote system itself
-                oDeferred.resolve(createAdapter(sServiceName, oSystem, sParameter));
+                const oRemoteAdapter = createAdapter(sServiceName, oSystem, sParameter);
                 oContainerInstance.addRemoteSystem(oSystem);
-                return oDeferred.promise();
+                return ushellUtils.toDeferred(oRemoteAdapter);
             }
 
             if (!sServiceName) {
@@ -1514,8 +1511,13 @@ sap.ui.define([
                     oService = new ServiceClass(oContainerInterface, sParameter, oServiceProperties);
                 } else {
                     // create and pass adapter for logon system as first parameter
-                    const oServiceAdapter = createAdapter(sServiceName, oAdapter.getSystem(),
-                        sParameter, true, ServiceClass.useConfiguredAdapterOnly);
+                    const oServiceAdapter = createAdapter(
+                        sServiceName,
+                        oAdapter.getSystem(),
+                        sParameter,
+                        true,
+                        ServiceClass.useConfiguredAdapterOnly
+                    );
                     return oServiceAdapter.then((serviceAdapter) => {
                         const oServiceInstance = createService(ServiceClass, serviceAdapter);
                         mServicesByName.put(sKey, oServiceInstance);
@@ -1562,7 +1564,7 @@ sap.ui.define([
                         const sSystemAlias = sKey.substring(sRemoteSystemPrefix.length);
                         const oSystemData = JSON.parse(oLocalStorage.getItem(sKey));
                         mRemoteSystems[sSystemAlias] = new System(oSystemData);
-                    } catch (e) {
+                    } catch {
                         // local storage contained garbage (non-parsable)
                         oLocalStorage.removeItem(sKey);
                     }
@@ -1806,26 +1808,16 @@ sap.ui.define([
          * Logs out the current user from all relevant back-end systems, including the logon system itself.
          * This method also iterates through all registered logout handlers and calls them before continuing with the default logout.
          *
-         * @returns {jQuery.Promise} Resolves when logout is finished, even when it fails.
+         * @returns {Promise} Resolves when logout is finished, even when it fails.
          *
          * @since 1.15.0
          * @private
          * @alias sap.ushell.Container#defaultLogout
          */
         this.defaultLogout = function () {
-            const oDeferred = new jQuery.Deferred();
-
-            this.callRegisteredLogoutHandlers().then(() => {
-                function resolve () {
-                    ushellUtils.promisify(oAdapter.logout(true)).finally(() => {
-                        oLocalStorage.removeItem(sSessionTerminationKey);
-                        oDeferred.resolve();
-                    });
-                }
-
-                function logoutLogonSystem () {
-                    const oDeferredAsyncLogoutEvent = new jQuery.Deferred();
-                    const oPromiseAsyncLogoutEvent = oDeferredAsyncLogoutEvent.promise();
+            return this.callRegisteredLogoutHandlers().then(async () => {
+                async function logoutLogonSystem () {
+                    const oDeferredAsyncLogoutEvent = new Deferred();
                     const arrLogoutEventsPromises = [];
 
                     if (aAsyncLogoutEventFunctions.length > 0) {
@@ -1841,17 +1833,20 @@ sap.ui.define([
                         oDeferredAsyncLogoutEvent.resolve();
                     }
 
-                    oPromiseAsyncLogoutEvent.done(() => {
-                        if (oEventProvider.fireEvent("Logout", true)) {
-                            resolve();
-                        } else {
+                    return oDeferredAsyncLogoutEvent.promise
+                        .then(() => {
+                            if (oEventProvider.fireEvent("Logout", true)) {
+                                return;
+                            }
                             // defer UShell redirect to let NWBC receive message asynchronously
-                            setTimeout(resolve, 1000);
-                        }
-                    });
+                            return ushellUtils.awaitTimeout(1000);
+                        })
+                        .then(() => {
+                            return ushellUtils.promisify(oAdapter.logout(true));
+                        });
                 }
 
-                function federatedLogout () {
+                async function federatedLogout () {
                     const aRemoteLogoutPromises = [];
 
                     if (fnStorageEventListener) {
@@ -1870,9 +1865,8 @@ sap.ui.define([
                                 // may return a native promise or jQuery deferred.
                                 ushellUtils.promisify(createAdapter("Container", mSystems[sAlias]).logout(false))
                             );
-                        } catch (e) {
-                            Log.warning(`Could not create adapter for ${sAlias}`,
-                                e.toString(), "sap.ushell.Container");
+                        } catch (oError) {
+                            Log.warning(`Could not create adapter for ${sAlias}`, oError, "sap.ushell.Container");
                         }
                         oLocalStorage.removeItem(sRemoteSystemPrefix + sAlias);
                     });
@@ -1881,21 +1875,26 @@ sap.ui.define([
                     // If we use "Promise.all" and any adapter's promise is rejected, all other promises are *immediately* rejected, too.
                     // Then the redirect happens before all remote logouts are finished.
                     // TODO force logoutLogonSystem after timeout?
-                    Promise.allSettled(aRemoteLogoutPromises).then(logoutLogonSystem);
+                    return Promise.allSettled(aRemoteLogoutPromises)
+                        .then(logoutLogonSystem)
+                        .catch(() => {
+                            // fail silently
+                        })
+                        .then(() => {
+                            oLocalStorage.removeItem(sSessionTerminationKey);
+                        });
                 }
 
                 if (typeof oAdapter.addFurtherRemoteSystems === "function") {
-                    oAdapter.addFurtherRemoteSystems().always(federatedLogout);
-                } else {
-                    federatedLogout();
+                    await ushellUtils.promisify(oAdapter.addFurtherRemoteSystems())
+                        .catch(() => { /* fail silently */ });
                 }
-            });
 
-            return oDeferred.promise();
+                return federatedLogout();
+            });
         };
 
         /**
-         * @function
          * Logs out the current user from all relevant back-end systems, including the logon system itself.
          * This member represents the default native implementation of logout.
          * If SessionHandler was created, we register the alternate logout function using registerLogout function.
@@ -1907,7 +1906,9 @@ sap.ui.define([
          * @deprecated since 1.120
          * @alias sap.ushell.Container#logout
          */
-        this.logout = this.defaultLogout;
+        this.logout = function () {
+            return ushellUtils.toDeferred(this.defaultLogout());
+        };
 
         /**
          * If SessionHandler was created, we will override the default native container logout
@@ -1987,9 +1988,9 @@ sap.ui.define([
             if (aRegisteredLogoutHandlers.length > 0) {
                 for (const fnLogout of aRegisteredLogoutHandlers) {
                     try {
-                        await fnLogout();
-                    } catch (error) {
-                        Log.error("Error executing logout handler:", error);
+                        await ushellUtils.promisify(fnLogout());
+                    } catch (oError) {
+                        Log.error("Error executing logout handler:", oError);
                     }
                 }
             }
@@ -2117,10 +2118,11 @@ sap.ui.define([
          *
          * @since 1.87
          * @private
+         * @ui5-restricted sap.fe, sap.suite.ui.generic
          * @alias sap.ushell.Container#getFLPUrlAsync
          */
         this.getFLPUrlAsync = function (bIncludeHash) {
-            return new jQuery.Deferred().resolve(that.getFLPUrl(bIncludeHash)).promise();
+            return ushellUtils.toDeferred(that.getFLPUrl(bIncludeHash));
         };
 
         /**
@@ -2454,12 +2456,8 @@ sap.ui.define([
             commonUtils.migrateV2ServiceConfig(window["sap-ushell-config"]);
         }
 
-        const oDeferred = new jQuery.Deferred();
-        oContainerInstance.init(sPlatform, mAdapterPackagesByPlatform)
-            .then(() => {
-                oDeferred.resolve();
-            });
-        return oDeferred.promise();
+        const pInit = oContainerInstance.init(sPlatform, mAdapterPackagesByPlatform);
+        return ushellUtils.toDeferred(pInit);
     };
 
     return oContainerInstance;

package/src/main/js/sap/ushell/EventHub.js

@@ -26,8 +26,8 @@ sap.ui.define([
         store: createEmptyStore()
     };
 
-    function log (sMessage, sDetails, fnCausedBy) {
-        Log.error(sMessage, sDetails, "sap.ushell.EventHub");
+    function log (sErrorMessage, oError, fnCausedBy) {
+        Log.error(sErrorMessage, oError, "sap.ushell.EventHub");
         return;
     }
 
@@ -97,7 +97,7 @@ sap.ui.define([
                 }
                 return JSON.stringify.apply(JSON, aStringifyArgs);
             } catch (oError) {
-                log(`${oError}`, oError.stack, serialize);
+                log("serialize failed:", oError, serialize);
             }
         }
         return vData;
@@ -223,10 +223,8 @@ sap.ui.define([
             return dispatchEventToGroup(oHub, sEvent, aSubscriberGroup, oDispatchOperation, 0);
         });
 
-        Promise.all(aGroupsDispatchedPromise).then(
-            oDispatchOperation.complete,
-            oDispatchOperation.complete
-        );
+        Promise.all(aGroupsDispatchedPromise)
+            .finally(oDispatchOperation.complete);
 
         return oDispatchOperation;
     }

package/src/main/js/sap/ushell/Fiori20Adapter.js

@@ -4,7 +4,7 @@
  *
  * The Fiori20 adapter automatically re-styles old (Fiori 1) applications to match Fiori2 design requirements.
  *
- * @version 1.140.0
+ * @version 1.141.1
  */
 sap.ui.define([
     "sap/ui/base/Object",
@@ -14,7 +14,8 @@ sap.ui.define([
     "sap/ui/model/resource/ResourceModel",
     "sap/m/Fiori20Adapter",
     "sap/ui/thirdparty/hasher",
-    "sap/base/util/extend"
+    "sap/base/util/extend",
+    "sap/ushell/utils/CallbackQueue"
 ], (
     BaseObject,
     Component,
@@ -23,7 +24,8 @@ sap.ui.define([
     ResourceModel,
     SapMFiori20Adapter,
     hasher,
-    extend
+    extend,
+    CallbackQueue
 ) => {
     "use strict";
     ComponentHooks.onUIComponentInstanceDestroy.register((oComponent) => {
@@ -91,7 +93,7 @@ sap.ui.define([
                 this._sDefaultTitle = sDefaultTitle;
             });
         },
-        registerView: async function (oViewInfo) {
+        registerView: async function (oViewInfo, sHash) {
             if (this._oConfig.bMoveTitle === true) { // disabled by configuration
                 if (!oViewInfo.oTitleInfo && oViewInfo.oSubTitleInfo) {
                     oViewInfo.oTitleInfo = oViewInfo.oSubTitleInfo; // subtitle promotion in the absence of title
@@ -108,7 +110,7 @@ sap.ui.define([
                          */
                     }
                 }
-                await this._updateHierarchy(oViewInfo);
+                await this._updateHierarchy(oViewInfo, sHash);
             }
             this._setBackNavigation(oViewInfo.oBackButton, oViewInfo.oAdaptOptions);
         },
@@ -122,7 +124,7 @@ sap.ui.define([
             }
             this._oShellUIService.setBackNavigation(fnBackPress);
         },
-        _updateHierarchy: async function (oViewInfo) {
+        _updateHierarchy: async function (oViewInfo, sHash) {
             if (this._oConfig.bHierarchy === false) { // disabled by configuration
                 return;
             }
@@ -131,7 +133,6 @@ sap.ui.define([
                 return;
             }
             let bNew = true;
-            const sHash = `#${hasher.getHash()}`;
             for (let i = this._aHierarchy.length - 1; i >= 0; i--) {
                 let oEntry = this._aHierarchy[i];
                 const bKnownView = (oEntry.id === oViewInfo.sViewId);
@@ -148,7 +149,7 @@ sap.ui.define([
                 }
             }
             if (bNew) {
-                const oHierarchyEntry = this._createHierarchyEntry(oViewInfo);
+                const oHierarchyEntry = this._createHierarchyEntry(oViewInfo, sHash);
                 this._aHierarchy.push(oHierarchyEntry);
             }
             const aNewHierarchy = [];
@@ -164,12 +165,12 @@ sap.ui.define([
                  */
             }
         },
-        _createHierarchyEntry: function (oViewInfo) {
+        _createHierarchyEntry: function (oViewInfo, sHash) {
             return {
                 id: oViewInfo.sViewId,
                 title: oViewInfo.oTitleInfo ? oViewInfo.oTitleInfo.text : this._sDefaultTitle,
                 subtitle: oViewInfo.oSubTitleInfo ? oViewInfo.oSubTitleInfo.text : undefined,
-                intent: `#${hasher.getHash()}`
+                intent: sHash
             };
         },
         _updateHierarchyEntry: function (oEntry, oViewInfo) {
@@ -199,6 +200,7 @@ sap.ui.define([
             if (SapMFiori20Adapter) {
                 SapMFiori20Adapter.attachViewChange(this._onViewChange, this);
             }
+            this._oViewChangeQueue = new CallbackQueue();
         },
         init: function () {
             if (!SapMFiori20Adapter) {
@@ -213,7 +215,11 @@ sap.ui.define([
             }
         },
         _onViewChange: async function (oEvent) {
-            await this._oHeaderInfo.registerView(oEvent.getParameters());
+            // await previous view changes as they might interfere with each other
+            const sHash = `#${hasher.getHash()}`; // store now the hash as it might change later on
+            await this._oViewChangeQueue.push(async () => {
+                await this._oHeaderInfo.registerView(oEvent.getParameters(), sHash);
+            });
         }
     });
     Fiori20Adapter.applyTo = function (oControl, oComponent, oConfig, oShellUIService) {

package/src/main/js/sap/ushell/Fiori20AdapterTest.js

@@ -4,7 +4,7 @@
  * @fileOverview The purpose Fiori20AdapterTest in this file is to decide whether to load the Fiori20Adapter at all.
  * This file is kept small in size on purpose as it is always required in productive code even when Fiori2 adaptation is not required.
  *
- * @version 1.140.0
+ * @version 1.141.1
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/NWBCInterface.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview NWBCInterface for NWBC client
  *
- * @version 1.140.0
+ * @version 1.141.1
  */
 sap.ui.define([
     "sap/ushell/EventHub",

package/src/main/js/sap/ushell/SessionHandler.js

@@ -493,7 +493,7 @@ sap.ui.define([
             let bIsSupported;
             try {
                 bIsSupported = storage.isSupported();
-            } catch (error) {
+            } catch (oError) {
                 bIsSupported = false;
             }
 

package/src/main/js/sap/ushell/TechnicalParameters.js

@@ -42,7 +42,7 @@
  * parameters. If the application tries to access an internal parameter (e.g.,
  * sap-ui-app-id-hint) via the API, the application receives an error message.
  *
- * @version 1.140.0
+ * @version 1.141.1
  * @private
  */
 sap.ui.define([
@@ -61,8 +61,8 @@ sap.ui.define([
      *
      * @private
      */
-    function denyParameterValue (sParameterName) {
-        return Promise.reject(`${sParameterName} is reserved for shell internal usage only`);
+    async function denyParameterValue (sParameterName) {
+        throw new Error(`${sParameterName} is reserved for shell internal usage only`);
     }
 
     /**
@@ -262,9 +262,9 @@ sap.ui.define([
      *
      * @private
      */
-    function getParameterValue (sParameterName, oApplicationComponent, oApplicationContainer, sApplicationType) {
+    async function getParameterValue (sParameterName, oApplicationComponent, oApplicationContainer, sApplicationType) {
         if (!oTechnicalParameters[sParameterName]) {
-            return Promise.reject(`${sParameterName} is not a known technical parameter`);
+            throw new Error(`${sParameterName} is not a known technical parameter`);
         }
 
         return oTechnicalParameters[sParameterName].getValue(

package/src/main/js/sap/ushell/URLTemplateProcessor/DefinitionParameterSetBuilder.js

@@ -4,7 +4,7 @@
  * @fileOverview Methods to build the set of parameters used by the URL template.
  *
  *
- * @version 1.140.0
+ * @version 1.141.1
  *
  * @private
  *

package/src/main/js/sap/ushell/URLTemplateProcessor/DependencyGraph.js

@@ -8,7 +8,7 @@
  * The proper order of evaluation can be determined by creating and visiting a graph that represents parameters and depending parameters
  * as nodes. This graph can be also used to detect cyclic references in the parameter set definition.
  *
- * @version 1.140.0
+ * @version 1.141.1
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/URLTemplateProcessor/Functions.js

@@ -2,7 +2,7 @@
 
 /**
  * @file Methods to parse and execute functions defined for the URL Template parameter language.
- * @version 1.140.0
+ * @version 1.141.1
  * @private
  */
 sap.ui.define([
@@ -104,7 +104,15 @@ sap.ui.define([
             minValues: 0,
             maxValues: 0,
             fn: function (oArgs) {
-                const oURL = new URI();
+                let oURL;
+                const sURIHashContext = _utils.getURIHashContext();
+                if (typeof sURIHashContext === "string") {
+                    const sUrlWithoutHash = location.hash ? location.href.split(location.hash)[0] : location.href;
+                    oURL = new URI(sUrlWithoutHash + sURIHashContext);
+                } else {
+                    oURL = new URI();
+                }
+
                 const aAllowedPartArg = [
                     "protocol",
                     "scheme",
@@ -459,8 +467,7 @@ sap.ui.define([
 
     function applyFunction (bPipeContext, sFunctionName, aFunctionArgs, aInitialValues) {
         if (!O_FUNCTION.hasOwnProperty(sFunctionName)) {
-            // eslint-disable-next-line no-throw-literal
-            throw `Invalid function: ${sFunctionName}`;
+            throw new Error(`Invalid function: ${sFunctionName}`);
         }
 
         const oParsedArgs = parseFunctionArgs(sFunctionName, aFunctionArgs);

package/src/main/js/sap/ushell/URLTemplateProcessor/Resolvers.js

@@ -5,7 +5,7 @@
  * For a given context (e.g. the reference to a site, the application section from the site, parameters added during runtime, etc),
  * this module can be used to find the values associated to given URL Template parameter names.
  *
- * @version 1.140.0
+ * @version 1.141.1
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/URLTemplateProcessor/TemplateParameterParser.js

@@ -34,7 +34,7 @@
  *     }
  *   }
  *   </pre>
- * @version 1.140.0
+ * @version 1.141.1
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/URLTemplateProcessor/utils.js

@@ -2,7 +2,7 @@
 
 /**
  * @file Utility functions for modules of <code>URLTemplateProcessor</code>.
- * @version 1.140.0
+ * @version 1.141.1
  * @private
  */
 sap.ui.define([
@@ -12,6 +12,15 @@ sap.ui.define([
 ) => {
     "use strict";
 
+    let sURIContext;
+    function getURIHashContext () {
+        return sURIContext;
+    }
+
+    function setURIHashContext (sContext) {
+        sURIContext = sContext;
+    }
+
     function hasValue (vValue) {
         return vValue !== null && typeof vValue !== "undefined";
     }
@@ -43,6 +52,8 @@ sap.ui.define([
     return {
         mergeObject: mergeObject,
         hasValue: hasValue,
-        removeArrayParameterNotation: removeArrayParameterNotation
+        removeArrayParameterNotation: removeArrayParameterNotation,
+        getURIHashContext: getURIHashContext,
+        setURIHashContext: setURIHashContext
     };
 });