@sapui5/sap.ushell 1.125.0 → 1.126.0

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview resolves references
- * @version 1.125.0
+ * @version 1.126.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -17,6 +17,7 @@ sap.ui.define([
     "sap/ui/model/odata/v4/ODataUtils",
     "sap/ui/thirdparty/jquery",
     "sap/ushell/User",
+    "sap/ushell/utils",
     "sap/ushell/Container"
 ], function (
     Log,
@@ -31,11 +32,12 @@ sap.ui.define([
     ODataUtilsV4,
     jQuery,
     User,
+    ushellUtils,
     Container
 ) {
     "use strict";
 
-    var sModuleName = "sap.ushell.services.ReferenceResolver";
+    const sModuleName = "sap.ushell.services.ReferenceResolver";
 
     function UserEnvReferenceResolver () {
         /**
@@ -166,45 +168,40 @@ sap.ui.define([
          * @since 1.42.0
          */
         this.resolveReferences = function (aReferences, oSystemContext) {
-            var that = this;
-            var oDeferred = new jQuery.Deferred();
-            var aReferencePromises = [];
-            var bAllRefsResolvable = true;
-            var oDistinctRefs = {};
-            var oDistinctEnvRefs = {};
-            var oUserDefaultParametersSrvcPromise = Container.getServiceAsync("UserDefaultParameters");
-            var oResolver;
-            var oSystemContextPromise;
+            const oDeferred = new jQuery.Deferred();
+            const aReferencePromises = [];
+            let bAllRefsResolvable = true;
+            const oDistinctRefs = {};
+            const oDistinctEnvRefs = {};
+            const oUserDefaultParametersPromise = Container.getServiceAsync("UserDefaultParameters");
+            let oResolver,
+             oSystemContextPromise;
 
             if (!oSystemContext) {
                 oSystemContextPromise = Container.getServiceAsync("ClientSideTargetResolution")
-                    .then(function (oCstr) {
+                    .then((oCstr) => {
                         return oCstr.getSystemContext();
                     });
             } else {
                 oSystemContextPromise = Promise.resolve(oSystemContext);
             }
 
-            var aRichRefs = aReferences
-                .map(function (sRefWithPrefix) {
-                    var sRefName;
+            const aRichRefs = aReferences
+                .map((sRefWithPrefix) => {
+                    let sRefName;
 
                     if (sRefWithPrefix.indexOf("User.env.") === 0) {
                         sRefName = sRefWithPrefix;
                         oDistinctEnvRefs[sRefName] = 1;
                     }
                     if (sRefWithPrefix.indexOf("UserDefault.") === 0) {
-                        sRefName = that._extractAnyUserDefaultReferenceName(sRefWithPrefix);
+                        sRefName = this._extractAnyUserDefaultReferenceName(sRefWithPrefix);
                         oDistinctRefs[sRefName] = 1;
                     }
 
                     if (typeof sRefName !== "string") {
                         bAllRefsResolvable = false;
-                        Log.error(
-                            "'" + sRefWithPrefix + "' is not a legal reference name",
-                            null,
-                            sModuleName
-                        );
+                        Log.error(`'${ sRefWithPrefix }' is not a legal reference name`, null, sModuleName);
                     }
                     return {
                         full: sRefWithPrefix,
@@ -220,56 +217,58 @@ sap.ui.define([
 
             Promise.all([
                 oSystemContextPromise,
-                oUserDefaultParametersSrvcPromise
-            ]).then(function (aResults) {
-                var oResolvedSystemContext = aResults[0];
-                var oUserDefaultParametersSrvc = aResults[1];
+                oUserDefaultParametersPromise
+            ])
+                .then((aResults) => {
+                    const oResolvedSystemContext = aResults[0];
+                    const UserDefaultParameters = aResults[1];
+
+                    Object.keys(oDistinctRefs).forEach((sName) => {
+                        const oDeferred = UserDefaultParameters.getValue(sName, oResolvedSystemContext);
+                        aReferencePromises.push(ushellUtils.promisify(oDeferred));
+                    });
 
-                Object.keys(oDistinctRefs).forEach(function (sName) {
-                    aReferencePromises.push(oUserDefaultParametersSrvc.getValue(sName, oResolvedSystemContext));
-                });
+                    Object.keys(oDistinctEnvRefs).forEach((sName) => {
+                        oResolver = oResolver || this._getUserEnvReferenceResolver();
+                        aReferencePromises.push(ushellUtils.promisify(oResolver.getValue(sName)));
+                    });
 
-                Object.keys(oDistinctEnvRefs).forEach(function (sName) {
-                    oResolver = oResolver || that._getUserEnvReferenceResolver();
-                    aReferencePromises.push(oResolver.getValue(sName));
-                });
+                    return Promise.all(aReferencePromises);
+                })
+                .then((aRefValues) => {
+                    const oKnownRefs = {};
+                    let iIndex = 0;
+                    Object.keys(oDistinctRefs).forEach((sName) => {
+                        oDistinctRefs[sName] = aRefValues[iIndex];
+                        iIndex = iIndex + 1;
+                    });
+                    Object.keys(oDistinctEnvRefs).forEach((sName) => {
+                        oDistinctEnvRefs[sName] = aRefValues[iIndex];
+                        iIndex = iIndex + 1;
+                    });
 
-                jQuery.when.apply(jQuery, aReferencePromises)
-                    .done(function () {
-                        var oKnownRefs = {};
-                        var iIndex = 0;
-                        var aRefValues = arguments;
-                        Object.keys(oDistinctRefs).forEach(function (sName) {
-                            oDistinctRefs[sName] = aRefValues[iIndex];
-                            iIndex = iIndex + 1;
-                        });
-                        Object.keys(oDistinctEnvRefs).forEach(function (sName) {
-                            oDistinctEnvRefs[sName] = aRefValues[iIndex];
-                            iIndex = iIndex + 1;
-                        });
-
-                        // All parameters retrieved successfully and stored in arguments.
-                        aRichRefs.forEach(function (oRef) {
-                            var oMergedValue;
-                            if (oRef.full.indexOf("UserDefault.extended.") === 0) {
-                                oMergedValue = that.mergeSimpleAndExtended(oDistinctRefs[oRef.name]);
-                                if (!isEmptyObject(oMergedValue)) {
-                                    oKnownRefs[oRef.full] = oMergedValue;
-                                } else {
-                                    // even if no value is provided, the property must exist to indicate that the
-                                    // reference could be resolved
-                                    oKnownRefs[oRef.full] = undefined;
-                                }
-                            } else if (oRef.full.indexOf("UserDefault.") === 0) {
-                                oKnownRefs[oRef.full] = oDistinctRefs[oRef.name].value;
-                            } else if (oRef.full.indexOf("User.env.") === 0) {
-                                oKnownRefs[oRef.full] = oDistinctEnvRefs[oRef.name].value;
-                            } // one of the above branches must have been hit, there can be no else here,
-                            // else  { assert(0); }
-                        });
-                        oDeferred.resolve(oKnownRefs);
+                    // All parameters retrieved successfully and stored in arguments.
+                    aRichRefs.forEach((oRef) => {
+                        let oMergedValue;
+                        if (oRef.full.indexOf("UserDefault.extended.") === 0) {
+                            oMergedValue = this.mergeSimpleAndExtended(oDistinctRefs[oRef.name]);
+                            if (!isEmptyObject(oMergedValue)) {
+                                oKnownRefs[oRef.full] = oMergedValue;
+                            } else {
+                                // even if no value is provided, the property must exist to indicate that the
+                                // reference could be resolved
+                                oKnownRefs[oRef.full] = undefined;
+                            }
+                        } else if (oRef.full.indexOf("UserDefault.") === 0) {
+                            oKnownRefs[oRef.full] = oDistinctRefs[oRef.name].value;
+                        } else if (oRef.full.indexOf("User.env.") === 0) {
+                            oKnownRefs[oRef.full] = oDistinctEnvRefs[oRef.name].value;
+                        } // one of the above branches must have been hit, there can be no else here,
+                        // else  { assert(0); }
                     });
-            });
+
+                    oDeferred.resolve(oKnownRefs);
+                });
 
             return oDeferred.promise();
         };
@@ -289,7 +288,7 @@ sap.ui.define([
          * @since 1.42.0
          */
         this._extractAnyUserDefaultReferenceName = function (sRefParamName) {
-            var sParamName = this.extractExtendedUserDefaultReferenceName(sRefParamName);
+            const sParamName = this.extractExtendedUserDefaultReferenceName(sRefParamName);
             if (typeof sParamName === "string") {
                 return sParamName;
             }
@@ -354,7 +353,7 @@ sap.ui.define([
          * @since 1.42.0
          */
         this.mergeSimpleAndExtended = function (oValueObject) {
-            var oMergedExtendedObject = deepExtend({}, oValueObject.extendedValue);
+            const oMergedExtendedObject = deepExtend({}, oValueObject.extendedValue);
             if (typeof oValueObject.value === "string") {
                 if (!Array.isArray(oMergedExtendedObject.Ranges)) {
                     oMergedExtendedObject.Ranges = [];
@@ -391,16 +390,16 @@ sap.ui.define([
          * @private
          */
         function findReferences (sUrl) {
-            var reReferenceNames = /{([^}%]*%%[^%]+%%)}?/g;
-            var reGetEdmType = /([^%]*)%%/;
-            var reGetName = /%%([^%]+)%%/;
-            var aFoundReferences = [];
+            const reReferenceNames = /{([^}%]*%%[^%]+%%)}?/g;
+            const reGetEdmType = /([^%]*)%%/;
+            const reGetName = /%%([^%]+)%%/;
+            const aFoundReferences = [];
 
             // search and collect all found references user default references in the URL
-            var oCurrentMatch = reReferenceNames.exec(sUrl);
+            let oCurrentMatch = reReferenceNames.exec(sUrl);
             while (oCurrentMatch) {
-                var oCurrentEdmType = reGetEdmType.exec(oCurrentMatch[1]);
-                var oCurrentName = reGetName.exec(oCurrentMatch[1]);
+                const oCurrentEdmType = reGetEdmType.exec(oCurrentMatch[1]);
+                const oCurrentName = reGetName.exec(oCurrentMatch[1]);
 
                 aFoundReferences.push({ edmType: oCurrentEdmType[1], name: oCurrentName[1] });
 
@@ -423,9 +422,9 @@ sap.ui.define([
          * @since 1.110.0
          */
         this._extractUrlPlaceholders = function (sUrl, sFilterRegex) {
-            var oUrl;
-            var aReferences;
-            var aIgnoredReferences = [];
+            let oUrl,
+             aReferences;
+            const aIgnoredReferences = [];
 
             /*
              * A typical oDataV2 call:
@@ -445,7 +444,7 @@ sap.ui.define([
             oUrl = /[^(?]*/.exec(sUrl);
             aReferences = (oUrl === null) ? [] : findReferences(oUrl[0]);
 
-            aReferences.forEach(function (oReference) {
+            aReferences.forEach((oReference) => {
                 aIgnoredReferences.push(oReference.name);
             });
 
@@ -453,8 +452,8 @@ sap.ui.define([
             oUrl = /[(?][^]*/.exec(sUrl);
             aReferences = (oUrl === null) ? [] : findReferences(oUrl[0]);
 
-            var aExtractedReferences = aReferences.filter(function (oReference) {
-                var sReferenceName = oReference.name;
+            const aExtractedReferences = aReferences.filter((oReference) => {
+                const sReferenceName = oReference.name;
 
                 if (sFilterRegex.test(sReferenceName)) {
                     return true;
@@ -485,14 +484,14 @@ sap.ui.define([
          * @since 1.110.0
          */
         this._replaceUrlPlaceholders = function (sUrl, aResolvedPlaceholders, bODataV4) {
-            var sResolvedUrl = sUrl;
-            var aPlaceholdersWithoutValue = [];
-            var fnFormatODataValue = bODataV4 ? ODataUtilsV4.formatLiteral.bind(ODataUtilsV4) : ODataUtilsV2.formatValue.bind(ODataUtilsV2);
+            let sResolvedUrl = sUrl;
+            const aPlaceholdersWithoutValue = [];
+            const fnFormatODataValue = bODataV4 ? ODataUtilsV4.formatLiteral.bind(ODataUtilsV4) : ODataUtilsV2.formatValue.bind(ODataUtilsV2);
 
-            aResolvedPlaceholders.forEach(function (oResolvedPlaceholder) {
-                var sDefaultName = oResolvedPlaceholder.name;
-                var sOldResolvedUrl = null;
-                var bPlaceholderWithoutValue = false;
+            aResolvedPlaceholders.forEach((oResolvedPlaceholder) => {
+                const sDefaultName = oResolvedPlaceholder.name;
+                let sOldResolvedUrl = null;
+                let bPlaceholderWithoutValue = false;
 
                 // incase the reference is present multiple times (replace all)
                 while (sOldResolvedUrl !== sResolvedUrl) {
@@ -501,13 +500,13 @@ sap.ui.define([
                     if (oResolvedPlaceholder.value !== undefined) {
                         // replace the references with the actual value, encoding is required
 
-                        var sFormattedValue = fnFormatODataValue(oResolvedPlaceholder.value, oResolvedPlaceholder.edmType);
+                        const sFormattedValue = fnFormatODataValue(oResolvedPlaceholder.value, oResolvedPlaceholder.edmType);
 
-                        sResolvedUrl = sResolvedUrl.replace("{" + oResolvedPlaceholder.edmType + "%%" + sDefaultName + "%%}",
+                        sResolvedUrl = sResolvedUrl.replace(`{${ oResolvedPlaceholder.edmType }%%${ sDefaultName }%%}`,
                             window.encodeURIComponent(sFormattedValue));
                     } else {
                         bPlaceholderWithoutValue = true;
-                        sResolvedUrl = sResolvedUrl.replace("{" + oResolvedPlaceholder.edmType + "%%" + sDefaultName + "%%}", "");
+                        sResolvedUrl = sResolvedUrl.replace(`{${ oResolvedPlaceholder.edmType }%%${ sDefaultName }%%}`, "");
                     }
                 }
 
@@ -550,11 +549,11 @@ sap.ui.define([
          * @private
          */
         this.resolveUserDefaultParameters = function (sUrl, oSystemContext) {
-            var oDeferred = new jQuery.Deferred();
+            const oDeferred = new jQuery.Deferred();
 
-            var oPlaceholders = this._extractUrlPlaceholders(sUrl, /^UserDefault\.(?!extended\.).+/);
-            var aSimpleUserDefaultReferences = oPlaceholders.extractedReferences;
-            var aIgnoredReferences = oPlaceholders.ignoredReferences;
+            const oPlaceholders = this._extractUrlPlaceholders(sUrl, /^UserDefault\.(?!extended\.).+/);
+            const aSimpleUserDefaultReferences = oPlaceholders.extractedReferences;
+            const aIgnoredReferences = oPlaceholders.ignoredReferences;
 
             if (aSimpleUserDefaultReferences.length === 0) {
                 oDeferred.resolve({
@@ -565,22 +564,23 @@ sap.ui.define([
                 return oDeferred.promise();
             }
 
-            var aReferenceNames = aSimpleUserDefaultReferences.map(function (oReference) {
+            const aReferenceNames = aSimpleUserDefaultReferences.map((oReference) => {
                 return oReference.name;
             });
-            this.resolveReferences(aReferenceNames, oSystemContext)
-                .done(function (oResolvedDefaults) {
-                    aSimpleUserDefaultReferences.forEach(function (oPlaceholder) {
+
+            ushellUtils.promisify(this.resolveReferences(aReferenceNames, oSystemContext))
+                .then((oResolvedDefaults) => {
+                    aSimpleUserDefaultReferences.forEach((oPlaceholder) => {
                         oPlaceholder.value = oResolvedDefaults[oPlaceholder.name];
                     });
-                    var oReplacementResult = this._replaceUrlPlaceholders(sUrl, aSimpleUserDefaultReferences);
+                    const oReplacementResult = this._replaceUrlPlaceholders(sUrl, aSimpleUserDefaultReferences);
 
                     oDeferred.resolve({
                         url: oReplacementResult.resolvedUrl,
                         defaultsWithoutValue: oReplacementResult.placeholdersWithoutValue,
                         ignoredReferences: aIgnoredReferences
                     });
-                }.bind(this));
+                });
 
             return oDeferred.promise();
         };
@@ -589,16 +589,12 @@ sap.ui.define([
          * Loads the Dynamic Date Range und its prerequisite, the unified library.
          * @returns {Promise} Promise that resolves with the Dynamic Date Range.
          */
-        this._loadDynamicDateRange = function () {
-            return Library
-                .load("sap.ui.unified")
-                .then(function () {
-                    return new Promise(function (fnResolve) {
-                        sap.ui.require(["sap/m/DynamicDateRange"], function (oDynamicDateRange) {
-                            fnResolve(oDynamicDateRange);
-                        });
-                    });
-                });
+        this._loadDynamicDateRange = async function () {
+            await Library.load("sap.ui.unified");
+
+            const [ DynamicDateRange ] = await ushellUtils.requireAsync(["sap/m/DynamicDateRange"]);
+
+            return DynamicDateRange;
         };
 
         /**
@@ -654,51 +650,50 @@ sap.ui.define([
          * @private
          * @since 1.110.0
          */
-        this.resolveSemanticDateRanges = function (sUrl, sODataVersion) {
-            var oPlaceholders = this._extractUrlPlaceholders(sUrl, this._rSemanticDateRangeRegex);
-            var aSemanticDateRangeReferences = oPlaceholders.extractedReferences;
-            var aIgnoredReferences = oPlaceholders.ignoredReferences;
+        this.resolveSemanticDateRanges = async function (sUrl, sODataVersion) {
+            const oPlaceholders = this._extractUrlPlaceholders(sUrl, this._rSemanticDateRangeRegex);
+            const aSemanticDateRangeReferences = oPlaceholders.extractedReferences;
+            const aIgnoredReferences = oPlaceholders.ignoredReferences;
 
             if (aSemanticDateRangeReferences.length === 0) {
-                return Promise.resolve({
+                return {
                     url: sUrl,
                     hasSemanticDateRanges: false,
                     invalidSemanticDates: [],
                     ignoredReferences: aIgnoredReferences
-                });
+                };
             }
 
-            var aValidODataVersions = ["2.0", "4.0"];
+            const aValidODataVersions = ["2.0", "4.0"];
             if (!sODataVersion || !aValidODataVersions.includes(sODataVersion)) {
-                return Promise.reject("Invalid OData version: " + sODataVersion);
+                throw new Error(`Invalid OData version: ${ sODataVersion}`);
             }
-            var bODataV4 = sODataVersion === "4.0";
-
-            return this._resolveSemanticDateRanges(aSemanticDateRangeReferences, bODataV4)
-                .then(function (aSemanticDateRanges) {
-                    var oReplacementResult = this._replaceUrlPlaceholders(sUrl, aSemanticDateRanges, bODataV4);
-
-                    if (Log.getLevel() >= Log.Level.DEBUG) {
-                        var aResolvedSemanticDateRanges = aSemanticDateRanges.filter(function (oElement) {
-                            return "value" in oElement;
-                        });
-                        Log.debug(
-                            "Resolving semantic date ranges \n" +
-                            "- OData Version: " + sODataVersion + "\n" +
-                            "- URL: " + sUrl + "\n" +
-                            "- ignoring references: " + JSON.stringify(aIgnoredReferences, null, 4) + "\n" +
-                            "- resolved semantic date ranges: " + JSON.stringify(aResolvedSemanticDateRanges, null, 4) + "\n" +
-                            "- invalid semantic date ranges:" + JSON.stringify(oReplacementResult.placeholdersWithoutValue, null, 4) + "\n" +
-                            "- final URL: " + oReplacementResult.resolvedUrl, null, sModuleName);
-                    }
+            const bODataV4 = sODataVersion === "4.0";
 
-                    return {
-                        url: oReplacementResult.resolvedUrl,
-                        hasSemanticDateRanges: aSemanticDateRangeReferences.length > 0,
-                        invalidSemanticDates: oReplacementResult.placeholdersWithoutValue,
-                        ignoredReferences: aIgnoredReferences
-                    };
-                }.bind(this));
+            const aSemanticDateRanges = await this._resolveSemanticDateRanges(aSemanticDateRangeReferences, bODataV4);
+
+            const oReplacementResult = this._replaceUrlPlaceholders(sUrl, aSemanticDateRanges, bODataV4);
+
+            if (Log.getLevel() >= Log.Level.DEBUG) {
+                const aResolvedSemanticDateRanges = aSemanticDateRanges.filter((oElement) => {
+                    return "value" in oElement;
+                });
+                Log.debug(
+                    "Resolving semantic date ranges \n" +
+                    `- OData Version: ${ sODataVersion }\n` +
+                    `- URL: ${ sUrl }\n` +
+                    `- ignoring references: ${ JSON.stringify(aIgnoredReferences, null, 4) }\n` +
+                    `- resolved semantic date ranges: ${ JSON.stringify(aResolvedSemanticDateRanges, null, 4) }\n` +
+                    `- invalid semantic date ranges:${ JSON.stringify(oReplacementResult.placeholdersWithoutValue, null, 4) }\n` +
+                    `- final URL: ${ oReplacementResult.resolvedUrl}`, null, sModuleName);
+            }
+
+            return {
+                url: oReplacementResult.resolvedUrl,
+                hasSemanticDateRanges: aSemanticDateRangeReferences.length > 0,
+                invalidSemanticDates: oReplacementResult.placeholdersWithoutValue,
+                ignoredReferences: aIgnoredReferences
+            };
         };
 
         /**
@@ -712,95 +707,94 @@ sap.ui.define([
          * @private
          * @since 1.110.0
          */
-        this._resolveSemanticDateRanges = function (aSemanticDateRanges, bODataV4) {
-            var oDateTimeFormatters = this._getDateTimeFormatters();
-
+        this._resolveSemanticDateRanges = async function (aSemanticDateRanges, bODataV4) {
+            const oDateTimeFormatters = this._getDateTimeFormatters();
             // must be required dynamically because of a dependency to sap.ui.unified
-            return this._loadDynamicDateRange().then(function (DynamicDateRange) {
-                return aSemanticDateRanges.map(function resolveSemanticDateRange (oSemanticDate) {
-                    var oResult = {
-                        name: oSemanticDate.name,
-                        edmType: oSemanticDate.edmType
-                    };
-                    var aSemanticDate = oSemanticDate.name.split(".");
-
-                    /*
-                     * Analyze the semantic date. It can have 2 - 5 parts, depending on the operator and the usage in the OData request.
-                     * Examples:
-                     * - DynamicDate.YESTERDAY
-                     * - DynamicDate.YESTERDAY.start
-                     * - DynamicDate.NEXTDAYS.5.start
-                     * - DynamicDate.TODAYFROMTO.1.5.start
-                     */
-
-                    var oDateValue = {
-                        operator: aSemanticDate[1],
-                        values: []
-                    };
-                    var sPosition;
-
-                    if (aSemanticDate.length === 3) {
-                        sPosition = aSemanticDate[2];
-                    } else if (aSemanticDate.length === 4) {
-                        oDateValue.values.push(aSemanticDate[2]);
-                        sPosition = aSemanticDate[3];
-                    } else if (aSemanticDate.length === 5) {
-                        oDateValue.values = aSemanticDate.slice(2, 4);
-                        sPosition = aSemanticDate[4];
-                    }
+            const DynamicDateRange = await this._loadDynamicDateRange();
 
-                    var aDynamicDate;
-                    try {
-                        aDynamicDate = DynamicDateRange.toDates(oDateValue);
-                    } catch (error) {
-                        return oResult;
-                    }
+            return aSemanticDateRanges.map((oSemanticDate) => {
+                const oResult = {
+                    name: oSemanticDate.name,
+                    edmType: oSemanticDate.edmType
+                };
+                const aSemanticDate = oSemanticDate.name.split(".");
+
+                /*
+                    * Analyze the semantic date. It can have 2 - 5 parts, depending on the operator and the usage in the OData request.
+                    * Examples:
+                    * - DynamicDate.YESTERDAY
+                    * - DynamicDate.YESTERDAY.start
+                    * - DynamicDate.NEXTDAYS.5.start
+                    * - DynamicDate.TODAYFROMTO.1.5.start
+                    */
+
+                const oDateValue = {
+                    operator: aSemanticDate[1],
+                    values: []
+                };
+                let sPosition;
+
+                if (aSemanticDate.length === 3) {
+                    sPosition = aSemanticDate[2];
+                } else if (aSemanticDate.length === 4) {
+                    oDateValue.values.push(aSemanticDate[2]);
+                    sPosition = aSemanticDate[3];
+                } else if (aSemanticDate.length === 5) {
+                    oDateValue.values = aSemanticDate.slice(2, 4);
+                    sPosition = aSemanticDate[4];
+                }
 
-                    if (aSemanticDate.length >= 3 && sPosition !== "start" && sPosition !== "end") {
-                        return oResult;
-                    }
+                let aDynamicDate;
+                try {
+                    aDynamicDate = DynamicDateRange.toDates(oDateValue);
+                } catch (error) {
+                    return oResult;
+                }
 
-                    var oDate;
-                    if (sPosition === "end") {
-                        oDate = aDynamicDate[1];
-                    } else {
-                        oDate = aDynamicDate[0];
-                    }
-                    if (!oDate) {
-                        return oResult;
-                    }
+                if (aSemanticDate.length >= 3 && sPosition !== "start" && sPosition !== "end") {
+                    return oResult;
+                }
 
-                    switch (oSemanticDate.edmType) {
-                        case "Edm.String":
-                            oResult.value = oDateTimeFormatters.string.format(oDate);
-                            break;
-                        case "Edm.Date":
-                            // This is an OData V4 only type
-                            // The OData V4 formatter doesn't do any formatting for date so it is done here
-                            oResult.value = oDateTimeFormatters.date.format(oDate);
-                            break;
-                        case "Edm.DateTime":
-                            // The OData formatter that is used later on converts the date object's UTC time to an OData string
-                            // Therefore set the UTC date to the local date
-                            oDate.setUTCFullYear(oDate.getFullYear(), oDate.getMonth(), oDate.getDate());
-                            oDate.setUTCHours(0, 0, 0, 0);
+                let oDate;
+                if (sPosition === "end") {
+                    oDate = aDynamicDate[1];
+                } else {
+                    oDate = aDynamicDate[0];
+                }
+                if (!oDate) {
+                    return oResult;
+                }
+
+                switch (oSemanticDate.edmType) {
+                    case "Edm.String":
+                        oResult.value = oDateTimeFormatters.string.format(oDate);
+                        break;
+                    case "Edm.Date":
+                        // This is an OData V4 only type
+                        // The OData V4 formatter doesn't do any formatting for date so it is done here
+                        oResult.value = oDateTimeFormatters.date.format(oDate);
+                        break;
+                    case "Edm.DateTime":
+                        // The OData formatter that is used later on converts the date object's UTC time to an OData string
+                        // Therefore set the UTC date to the local date
+                        oDate.setUTCFullYear(oDate.getFullYear(), oDate.getMonth(), oDate.getDate());
+                        oDate.setUTCHours(0, 0, 0, 0);
+                        oResult.value = oDate;
+                        break;
+                    case "Edm.DateTimeOffset":
+                        if (bODataV4) {
+                            // The OData V4 formatter doesn't do any formatting for datetimeoffset so it is done here
+                            oResult.value = oDateTimeFormatters.dateTimeOffsetV4.format(oDate, true);
+                        } else {
+                            // The OData formatter converts the date object's UTC time to an OData string
                             oResult.value = oDate;
-                            break;
-                        case "Edm.DateTimeOffset":
-                            if (bODataV4) {
-                                // The OData V4 formatter doesn't do any formatting for datetimeoffset so it is done here
-                                oResult.value = oDateTimeFormatters.dateTimeOffsetV4.format(oDate, true);
-                            } else {
-                                // The OData formatter converts the date object's UTC time to an OData string
-                                oResult.value = oDate;
-                            }
-                            break;
-                        default:
-                            break;
-                    }
+                        }
+                        break;
+                    default:
+                        break;
+                }
 
-                    return oResult;
-                });
+                return oResult;
             });
         };
 
@@ -845,7 +839,7 @@ sap.ui.define([
          * @since 1.112.0
          */
         this.hasSemanticDateRanges = function (sUrl) {
-            var oPlaceholders = this._extractUrlPlaceholders(sUrl, this._rSemanticDateRangeRegex);
+            const oPlaceholders = this._extractUrlPlaceholders(sUrl, this._rSemanticDateRangeRegex);
             return oPlaceholders.extractedReferences.length > 0;
         };
     }

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The Unified Shell's search service which provides Enterprise Search via SINA.
- * @version 1.125.0
+ * @version 1.126.0
  */
 sap.ui.define(["sap/ui/core/Lib"], function (Library) {
     "use strict";