@sapui5/sap.ushell 1.125.0 → 1.126.0

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

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's user information service. Allows retrieving information about the logged-in user.
  *
- * @version 1.125.0
+ * @version 1.126.0
  */
 sap.ui.define([
     "sap/base/Log",

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The Unified Shell's user activity service.
- * @version 1.125.0
+ * @version 1.126.0
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",

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

@@ -7,7 +7,7 @@
  *
  * Configured with the LaunchPageAdapter.
  *
- * @version 1.125.0
+ * @version 1.126.0
  */
 sap.ui.define([
     "sap/ushell/resources",

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module deals with the instantiation of visualizations in a platform independent way.
- * @version 1.125.0
+ * @version 1.126.0
  */
 sap.ui.define([
     "sap/ushell/ui/launchpad/VizInstance",

package/src/main/js/sap/ushell/services/_ClientSideTargetResolution/Formatter.js

@@ -13,7 +13,7 @@
  * <p>This is a dependency of ClientSideTargetResolution.  Interfaces exposed
  * by this module may change at any time without notice.</p>
  *
- * @version 1.125.0
+ * @version 1.126.0
  */
 sap.ui.define([
 ], function () {
@@ -69,7 +69,7 @@ sap.ui.define([
         var aMatches = sInbound.match(/^#(.+?)-(.+?)({(.+)})?$/);
 
         if (!aMatches) {
-            throw "Cannot parse inbound";
+            throw new Error("Cannot parse inbound");
         }
 
         var oResult = {
@@ -136,7 +136,7 @@ sap.ui.define([
      *
      * @private
      */
-    function formatInboundSignature(oInboundSignature) {
+    function formatInboundSignature (oInboundSignature) {
         var oInboundSignatureSafe = oInboundSignature || {},
             mParams = oInboundSignatureSafe.parameters || {},
             oTypeNotation = {
@@ -166,7 +166,7 @@ sap.ui.define([
 
         var aResults = [];
 
-        Object.keys(mParams).forEach(function(sParamName) {
+        Object.keys(mParams).forEach(function (sParamName) {
             var oParamDefinition = mParams[sParamName],
                 sParamType = oParamDefinition.required ? "required" : "optional",
                 sParamFilterValue = oParamDefinition.filter && oParamDefinition.filter.value,
@@ -215,9 +215,9 @@ sap.ui.define([
      *
      * @private
      */
-    function parseInboundSignature(sCompactSignature) {
+    function parseInboundSignature (sCompactSignature) {
 
-        function parseParameterValue(sValue) {
+        function parseParameterValue (sValue) {
             var oValue = [
                 { re: new RegExp(/^[/](.+)[/]$/), format: "regexp" },
                 { re: new RegExp(/^[@](.+)[@]$/), format: "reference" },
@@ -225,7 +225,7 @@ sap.ui.define([
             ].reduce(function (oResult, oDefinition) {
                 var aMatch = sValue.match(oDefinition.re);
 
-                if (oResult) {  // we have it already
+                if (oResult) { // we have it already
                     return oResult;
                 }
 
@@ -313,9 +313,9 @@ sap.ui.define([
         // additional parameters
         function parseAdditionalParametersValue (sAdditionalParametersToParse) {
             return [
-                { "<+>" : "allowed" },
-                { "<->" : "notallowed" },
-                { "<o>" : "ignored" }
+                { "<+>": "allowed" },
+                { "<->": "notallowed" },
+                { "<o>": "ignored" }
             ].reduce(function (sResult, oPossibleResult, iIdx, aPossibilities) {
                 if (sResult) {
                     return sResult;

package/src/main/js/sap/ushell/services/_ClientSideTargetResolution/InboundIndex.js

@@ -27,12 +27,15 @@
  *
  * @private
  *
- * @version 1.125.0
+ * @version 1.126.0
  */
 sap.ui.define([
-"sap/base/util/ObjectPath",
-"sap/base/Log"
-], function (ObjectPath, Log) {
+    "sap/base/util/ObjectPath",
+    "sap/base/Log"
+], function (
+    ObjectPath,
+    Log
+) {
     "use strict";
 
     /**
@@ -159,8 +162,8 @@ sap.ui.define([
      *   {
      *      index: {
      *          segment: {
-     *            "SemantiObject1" : [ ...oInbounds1 ],
-     *            "SemantiObject2" : [ ...oInbounds2 ],
+     *            "SemanticObject1" : [ ...oInbounds1 ],
+     *            "SemanticObject2" : [ ...oInbounds2 ],
      *            ...
      *          },
      *          tag: {  // may not be there

package/src/main/js/sap/ushell/services/_ClientSideTargetResolution/InboundProvider.js

@@ -34,12 +34,17 @@
  * <p>This is a dependency of ClientSideTargetResolution.  Interfaces exposed
  * by this module may change at any time without notice.</p>
  *
- * @version 1.125.0
+ * @version 1.126.0
  */
 sap.ui.define([
     "sap/ushell/services/_ClientSideTargetResolution/VirtualInbounds",
-    "sap/ushell/services/_ClientSideTargetResolution/InboundIndex"
-], function (oVirtualInbounds, oInboundIndex) {
+    "sap/ushell/services/_ClientSideTargetResolution/InboundIndex",
+    "sap/ushell/utils"
+], function (
+    VirtualInbounds,
+    InboundIndex,
+    ushellUtils
+) {
     "use strict";
 
     /**
@@ -84,7 +89,7 @@ sap.ui.define([
      *
      * @private
      */
-    InboundProvider.prototype.getInbounds = function(aSegments) {
+    InboundProvider.prototype.getInbounds = function (aSegments) {
         if (aSegments) {
             return this._getSomeInbounds(aSegments);
         }
@@ -117,16 +122,10 @@ sap.ui.define([
      *
      * @private
      */
-    InboundProvider.prototype._getSomeInbounds = function (aSegments) {
-        var that = this;
+    InboundProvider.prototype._getSomeInbounds = async function (aSegments) {
+        const aInbounds = await ushellUtils.promisify(this._fnRetrieveInbounds(aSegments));
 
-        return new Promise(function (fnResolve, fnReject) {
-            that._fnRetrieveInbounds(aSegments).done(function (aInbounds) {
-                fnResolve(oInboundIndex.createIndex(aInbounds.concat(oVirtualInbounds.getInbounds())));
-            }).fail(function () {
-                fnReject.apply(null, arguments);
-            });
-        });
+        return InboundIndex.createIndex(aInbounds.concat(VirtualInbounds.getInbounds()));
     };
 
     /**
@@ -140,19 +139,11 @@ sap.ui.define([
      * @private
      */
     InboundProvider.prototype._getAllInbounds = function () {
-        var that = this;
-
-        if (this._oInboundsRetrievalPromise) {
-            return this._oInboundsRetrievalPromise;
-        }
-
-        this._oInboundsRetrievalPromise = new Promise(function (fnResolve, fnReject) {
-            that._fnRetrieveInbounds().done(function (aInbounds) {
-                fnResolve(oInboundIndex.createIndex((aInbounds || []).concat(oVirtualInbounds.getInbounds())));
-            }).fail(function () {
-                fnReject.apply(null, arguments);
+        if (!this._oInboundsRetrievalPromise) {
+            this._oInboundsRetrievalPromise = ushellUtils.promisify(this._fnRetrieveInbounds()).then((aInbounds) => {
+                return InboundIndex.createIndex((aInbounds || []).concat(VirtualInbounds.getInbounds()));
             });
-        });
+        }
 
         return this._oInboundsRetrievalPromise;
 

package/src/main/js/sap/ushell/services/_ClientSideTargetResolution/ParameterMapping.js

@@ -2,7 +2,9 @@
 
 sap.ui.define([
     "sap/base/Log"
-], function (Log) {
+], function (
+    Log
+) {
     "use strict";
 
     /**

package/src/main/js/sap/ushell/services/_ClientSideTargetResolution/PrelaunchOperations.js

@@ -4,17 +4,19 @@
  * @file PrelaunchOperations are executed just before launching the application (post parameter mapping and app state merging) if the
  * <code>sap-prelaunch-operations</code> parameter is specified as a technical parameter.
  *
- * @version 1.125.0
+ * @version 1.126.0
  */
 sap.ui.define([
     "sap/base/Log",
     "sap/base/util/deepExtend",
     "sap/fe/navigation/SelectionVariant",
+    "sap/ushell/utils",
     "sap/ushell/Container"
 ], function (
     Log,
     deepExtend,
     SelectionVariant,
+    ushellUtils,
     Container
 ) {
     "use strict";
@@ -29,9 +31,9 @@ sap.ui.define([
      * @since 1.69.0
      * @private
      */
-    function _getAppState (sAppStateKey) {
+    async function _getAppState (sAppStateKey) {
         if (!sAppStateKey) {
-            return Promise.resolve(null);
+            return null;
         }
 
         return Container.getServiceAsync("AppState")
@@ -60,7 +62,7 @@ sap.ui.define([
      * @since 1.69.0
      * @private
      */
-    function _updateMatchingTarget (oPrelaunchOperationsResult, oMatchingTarget, oSelectionVariant, oStartupParameters, aDefaultedParameterNames) {
+    async function _updateMatchingTarget (oPrelaunchOperationsResult, oMatchingTarget, oSelectionVariant, oStartupParameters, aDefaultedParameterNames) {
         if (oPrelaunchOperationsResult.startupParametersModified) {
             oMatchingTarget.mappedIntentParamsPlusSimpleDefaults = oStartupParameters;
         }
@@ -70,23 +72,15 @@ sap.ui.define([
         }
 
         if (oPrelaunchOperationsResult.selectionVariantModified) {
-            return Container.getServiceAsync("AppState")
-                .then(function (oAppStateService) {
-                    var oNewAppState = oAppStateService.createEmptyAppState(undefined, true);
-                    oNewAppState.setData({
-                        selectionVariant: oSelectionVariant.toJSONObject()
-                    });
-                    return new Promise(function (fnResolve, fnReject) {
-                        oNewAppState.save()
-                            .done(function () {
-                                oMatchingTarget.mappedIntentParamsPlusSimpleDefaults["sap-xapp-state"] = [oNewAppState.getKey()];
-                                fnResolve(oMatchingTarget);
-                            })
-                            .fail(function (error) {
-                                fnReject(error);
-                            });
-                    });
-                });
+            const AppState = await Container.getServiceAsync("AppState");
+
+            var oNewAppState = AppState.createEmptyAppState(undefined, true);
+            oNewAppState.setData({
+                selectionVariant: oSelectionVariant.toJSONObject()
+            });
+            await ushellUtils.promisify(oNewAppState.save());
+
+            oMatchingTarget.mappedIntentParamsPlusSimpleDefaults["sap-xapp-state"] = [oNewAppState.getKey()];
         }
 
         return Promise.resolve(oMatchingTarget);

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

@@ -8,7 +8,7 @@
  * <p>This is a dependency of ClientSideTargetResolution.  Interfaces exposed
  * by this module may change at any time without notice.</p>
  *
- * @version 1.125.0
+ * @version 1.126.0
  */
 sap.ui.define([
     "sap/ushell/utils",
@@ -16,9 +16,15 @@ sap.ui.define([
     "sap/ushell/services/_ClientSideTargetResolution/VirtualInbounds",
     "sap/ushell/services/_ClientSideTargetResolution/Formatter",
     "sap/ushell/TechnicalParameters",
-    "sap/base/Log",
-    "sap/ui/thirdparty/jquery"
-], function (oUshellUtils, oUtils, oVirtualInbounds, oFormatter, oTechnicalParameters, Log, jQuery) {
+    "sap/base/Log"
+], function (
+    ushellUtils,
+    CstrUtils,
+    VirtualInbounds,
+    Formatter,
+    TechnicalParameters,
+    Log
+) {
     "use strict";
 
     // Latter entries give a certain technology a higher precedence
@@ -629,7 +635,7 @@ sap.ui.define([
      *    The function to get list providers with the list of compatible data origins
      * @param {boolean} bDebugEnabled
      *    Whether should include debugging information
-     * @returns {jQuery.Promise} Always resolves to the following match result
+     * @returns {Promise<object>} Always resolves to the following match result
      * structure:
      *
      * <pre>
@@ -641,50 +647,51 @@ sap.ui.define([
      * </pre>
      *
      */
-    function match (oIntent, aInbounds, oKnownReferences, fnContentProviderLoader, bDebugEnabled) {
+    async function match (oIntent, aInbounds, oKnownReferences, fnContentProviderLoader, bDebugEnabled) {
 
         function collectDebugInformation (oNoMatchReasons, oMatchResult, oInbound) {
-            var sInbound = oFormatter.formatInbound(oInbound);
+            var sInbound = Formatter.formatInbound(oInbound);
             oNoMatchReasons[sInbound] = oMatchResult.noMatchReason
                 + (oMatchResult.noMatchDebug ? "| DEBUG: " + oMatchResult.noMatchDebug : "");
         }
 
-        var oContentProviderDeferred = fnContentProviderLoader ? fnContentProviderLoader() : new jQuery.Deferred().resolve(null).promise();
-        return oContentProviderDeferred.then(function (oContentProviderLookup) {
-            var oMatchResults = aInbounds.reduce(function (oResult, oInbound) {
-                var sContentProviderId = oInbound.contentProviderId || "";
+        let oContentProviderLookup;
+        if (fnContentProviderLoader) {
+            oContentProviderLookup = await ushellUtils.promisify(fnContentProviderLoader());
+        }
 
-                var oReferences = oKnownReferences[sContentProviderId] || {};
-                if (!oResult.missingReferences[sContentProviderId]) {
-                    oResult.missingReferences[sContentProviderId] = {};
-                }
+        var oMatchResults = aInbounds.reduce(function (oResult, oInbound) {
+            var sContentProviderId = oInbound.contentProviderId || "";
 
-                var oMatchResult = matchOne(
-                    oIntent,
-                    oInbound,
-                    oReferences,
-                    oResult.missingReferences[sContentProviderId], // it's augmented
-                    oContentProviderLookup ? oContentProviderLookup[sContentProviderId] : null
-                );
-
-                if (oMatchResult.matches) {
-                    oResult.matchResults.push(oMatchResult);
-                } else if (bDebugEnabled) {
-                    // collect some debugging information
-                    collectDebugInformation(oResult.noMatchReasons, oMatchResult, oInbound);
-                }
+            var oReferences = oKnownReferences[sContentProviderId] || {};
+            if (!oResult.missingReferences[sContentProviderId]) {
+                oResult.missingReferences[sContentProviderId] = {};
+            }
 
-                return oResult;
+            var oMatchResult = matchOne(
+                oIntent,
+                oInbound,
+                oReferences,
+                oResult.missingReferences[sContentProviderId], // it's augmented
+                oContentProviderLookup ? oContentProviderLookup[sContentProviderId] : null
+            );
+
+            if (oMatchResult.matches) {
+                oResult.matchResults.push(oMatchResult);
+            } else if (bDebugEnabled) {
+                // collect some debugging information
+                collectDebugInformation(oResult.noMatchReasons, oMatchResult, oInbound);
+            }
 
-            }, { // the result
-                matchResults: [],
-                noMatchReasons: {},
-                missingReferences: {}
-            });
+            return oResult;
 
-            return jQuery.when(oMatchResults);
+        }, { // the result
+            matchResults: [],
+            noMatchReasons: {},
+            missingReferences: {}
         });
 
+        return oMatchResults;
     }
 
     function matchParameterSignature (oInboundSignatureParameters, oIntentParamsPlusAllDefaults, oIntentParams, aDefaultedParameterNames, oKnownReferenceIn, oMissingReferencesOut) {
@@ -745,7 +752,7 @@ sap.ui.define([
             oStats = {};
 
         function isNotTechnicalParameter (sParameterName) {
-            return !oTechnicalParameters.isTechnicalParameter(sParameterName);
+            return !TechnicalParameters.isTechnicalParameter(sParameterName);
         }
 
         var aIntentParamsWithoutTechnicalParameters = Object.keys(oIntentParams).filter(isNotTechnicalParameter);
@@ -902,7 +909,7 @@ sap.ui.define([
 
         function fnMatch (oResult) {
             oResult.matches = true;
-            oResult.matchesVirtualInbound = oVirtualInbounds.isVirtualInbound(oInbound);
+            oResult.matchesVirtualInbound = VirtualInbounds.isVirtualInbound(oInbound);
             oResult.parsedIntent = oIntent;
             return oResult;
         }
@@ -966,7 +973,7 @@ sap.ui.define([
             sInboundContentProviderId = oInbound.contentProviderId;
         //Test navigation to the given content provider
         if (sAppOrigin && sAppOrigin !== sInboundContentProviderId) {
-            return fnNoMatch(oMatchResult, "Contetn provider as filter \"" + sAppOrigin + "\" did not match",
+            return fnNoMatch(oMatchResult, "Content provider as filter \"" + sAppOrigin + "\" did not match",
                     "Inbound: [" + sInboundContentProviderId + "]");
         }
         //Test that sap-system and content provider is compatible
@@ -995,15 +1002,15 @@ sap.ui.define([
 
         if (!bSignatureMatches) {
             return fnNoMatch(oMatchResult, "Inbound parameter signature did not match",
-                oFormatter.formatInboundSignature(oInbound.signature));
+                Formatter.formatInboundSignature(oInbound.signature));
         }
 
         // If multiple parameters map onto the same parameter with renameTo,
         // a value which was explicitly passed dominates all other values
         // we remove the spurious defaulted values.
-        var oParameterDominatorMap = oUtils.constructParameterDominatorMap(oInbound.signature.parameters);
+        var oParameterDominatorMap = CstrUtils.constructParameterDominatorMap(oInbound.signature.parameters);
 
-        var oDominatedDefaultParametersToRemove = oUtils.findDominatedDefaultParameters(
+        var oDominatedDefaultParametersToRemove = CstrUtils.findDominatedDefaultParameters(
             oIntentParamsPlusAllDefaults, aDefaultedParamNames, oParameterDominatorMap
         );
 
@@ -1013,18 +1020,18 @@ sap.ui.define([
             });
 
         var oIntentParamsPlusAllDefaultsWithoutDominatedParams =
-            oUtils.filterObjectKeys(oIntentParamsPlusAllDefaults, function (sDefaultedParam) {
+            CstrUtils.filterObjectKeys(oIntentParamsPlusAllDefaults, function (sDefaultedParam) {
                 return !oDominatedDefaultParametersToRemove[sDefaultedParam]; // keep condition
             });
 
         if (!checkAdditionalParameters(oInbound, oIntentParamsPlusAllDefaultsWithoutDominatedParams)) {
             return fnNoMatch(oMatchResult, "Additional parameters not allowed",
-                oFormatter.formatInboundSignature(oInbound.signature));
+                Formatter.formatInboundSignature(oInbound.signature));
         }
 
         var bAdditionalParametersIgnored = oInbound.signature.additionalParameters === "ignored";
         if (bAdditionalParametersIgnored) {
-            oUtils.filterObjectKeys(oIntentParamsPlusAllDefaultsWithoutDominatedParams, function (sKey) {
+            CstrUtils.filterObjectKeys(oIntentParamsPlusAllDefaultsWithoutDominatedParams, function (sKey) {
                 if (sKey.indexOf("sap-") === 0) {
                     return true; // keep sap params
                 }

package/src/main/js/sap/ushell/services/_ClientSideTargetResolution/StagedLogger.js

@@ -39,14 +39,12 @@
  *
  * This is a dependency of ClientSideTargetResolution. Interfaces exposed by this module may change at any time without notice.
  *
- * @version 1.125.0
+ * @version 1.126.0
  */
 sap.ui.define([
-    "sap/base/Log",
-    "sap/ushell/services/_ClientSideTargetResolution/Utils"
+    "sap/base/Log"
 ], function (
-    Log,
-    _Utils
+    Log
 ) {
     "use strict";
 

package/src/main/js/sap/ushell/services/_ClientSideTargetResolution/SystemContext.js

@@ -8,12 +8,15 @@
  * <p>This is a dependency of ClientSideTargetResolution. Interfaces exposed
  * by this module may change at any time without notice.</p>
  *
- * @version 1.125.0
+ * @version 1.126.0
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",
     "sap/ui/thirdparty/URI"
-], function (ObjectPath, URI) {
+], function (
+    ObjectPath,
+    URI
+) {
     "use strict";
 
     var SystemContext = {};

package/src/main/js/sap/ushell/services/_ClientSideTargetResolution/Utils.js

@@ -6,7 +6,7 @@
  * This is a dependency of ClientSideTargetResolution.
  * Interfaces exposed by this module may change at any time without notice.
  *
- * @version 1.125.0
+ * @version 1.126.0
  */
 sap.ui.define([
     "sap/base/util/deepExtend"

package/src/main/js/sap/ushell/services/_ClientSideTargetResolution/VirtualInbounds.js

@@ -12,7 +12,7 @@
  * <p>This is a dependency of ClientSideTargetResolution.  Interfaces
  * exposed by this module may change at any time without notice.</p>
  *
- * @version 1.125.0
+ * @version 1.126.0
  */
 sap.ui.define([], function () {
     "use strict";