@sapui5/sap.ushell 1.140.0 → 1.141.0

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

@@ -6,7 +6,7 @@
  * It exposes interfaces to perform a hash change and/or trigger an external navigation.
  *
  * @deprecated since 1.120. Please use {@link sap.ushell.services.Navigation} instead.
- * @version 1.140.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/ushell/services/AppConfiguration",
@@ -26,7 +26,8 @@ sap.ui.define([
     "sap/ushell/utils/UrlParsing",
     "sap/base/util/deepClone",
     "sap/ui/base/Object",
-    "sap/ushell/api/common/ComponentInstantiation"
+    "sap/ushell/api/common/ComponentInstantiation",
+    "sap/ushell/Container"
 ], (
     AppConfiguration,
     crossApplicationNavigationUtils,
@@ -45,7 +46,8 @@ sap.ui.define([
     UrlParsing,
     deepClone,
     BaseObject,
-    ComponentInstantiation
+    ComponentInstantiation,
+    Container
 ) => {
     "use strict";
 
@@ -56,7 +58,7 @@ sap.ui.define([
      * Allows navigating to "external" targets outside of the currently running app (but still in scope of the current Fiori launchpad)
      * or to create links to such external targets.
      *
-     * <b>Note:</b> To retrieve a valid instance of this service, it is necessary to call {@link sap.ushell.Container#getServiceAsync}.
+     * <b>Note:</b> To retrieve a valid instance of this service, it is necessary to call {@link Container#getServiceAsync}.
      * <pre>
      *   sap.ui.require(["sap/ushell/Container"], async function (Container) {
      *     const CrossApplicationNavigation = await Container.getServiceAsync("CrossApplicationNavigation");
@@ -112,7 +114,7 @@ sap.ui.define([
      * @augments sap.ushell.services.Service
      * @hideconstructor
      *
-     * @see sap.ushell.Container#getServiceAsync
+     * @see Container#getServiceAsync
      * @since 1.15.0
      * @deprecated since 1.120. Please use {@link sap.ushell.services.Navigation} instead.
      * @public
@@ -550,12 +552,8 @@ sap.ui.define([
             }
 
             if (bAsync) {
-                const oDeferred = new jQuery.Deferred();
-                this.hrefForExternalAsync(oArgs, oComponent)
-                    .then(oDeferred.resolve)
-                    .catch(oDeferred.reject);
-
-                return oDeferred.promise();
+                const pResult = this.hrefForExternalAsync(oArgs, oComponent);
+                return ushellUtils.toDeferred(pResult);
             }
 
             Log.error("Deprecated option 'bAsync=false'. Please use 'bAsync=true' instead",
@@ -586,7 +584,7 @@ sap.ui.define([
 
             oArgsClone = this._injectInnerAppRoute(oArgsClone, oExtraction.innerAppRoute);
 
-            const ShellNavigationInternal = sap.ushell.Container.getService("ShellNavigationInternal"); // LEGACY API (deprecated)
+            const ShellNavigationInternal = Container.getService("ShellNavigationInternal"); // LEGACY API (deprecated)
 
             if (!ShellNavigationInternal) {
                 Log.debug("Shell not available, no Cross App Navigation");
@@ -691,12 +689,10 @@ sap.ui.define([
                 oArgsClone = amendTargetWithSapUshellEncTestParameter(oArgsClone);
                 oArgsClone = this._injectInnerAppRoute(oArgsClone, oExtraction.innerAppRoute);
 
-                const ShellNavigationInternal = await sap.ushell.Container.getServiceAsync("ShellNavigationInternal");
-                return new Promise((resolve, reject) => {
-                    ShellNavigationInternal.hrefForExternal(oArgsClone, undefined, oComponent)
-                        .then(resolve)
-                        .catch(reject);
-                });
+                const ShellNavigationInternal = await Container.getServiceAsync("ShellNavigationInternal");
+                const oDeferred = ShellNavigationInternal.hrefForExternal(oArgsClone, undefined, oComponent);
+
+                return ushellUtils.promisify(oDeferred);
             } catch (oError) {
                 Log.debug("Shell not available, no Cross App Navigation");
                 return "";
@@ -713,15 +709,14 @@ sap.ui.define([
          * @public
          */
         this.expandCompactHash = function (sHashFragment) {
-            const oDeferred = new jQuery.Deferred();
+            const pResult = Promise.resolve().then(async () => {
+                const NavTargetResolutionInternal = await Container.getServiceAsync("NavTargetResolutionInternal");
+                const oDeferred = NavTargetResolutionInternal.expandCompactHash(sHashFragment);
 
-            sap.ushell.Container.getServiceAsync("NavTargetResolutionInternal").then((NavTargetResolutionInternal) => {
-                NavTargetResolutionInternal.expandCompactHash(sHashFragment)
-                    .done(oDeferred.resolve)
-                    .fail(oDeferred.reject);
+                return ushellUtils.promisify(oDeferred);
             });
 
-            return oDeferred.promise();
+            return ushellUtils.toDeferred(pResult);
         };
 
         /**
@@ -787,12 +782,8 @@ sap.ui.define([
                 "sap.ushell.services.CrossApplicationNavigation"
             );
 
-            const oContainer = ObjectPath.get("sap.ushell.Container");
-            const oShellNavigationInternal = oContainer
-                && typeof oContainer.getService === "function"
-                && oContainer.getService("ShellNavigationInternal");
-
-            if (!oShellNavigationInternal) {
+            const ShellNavigationInternal = Container.getService("ShellNavigationInternal");
+            if (!ShellNavigationInternal) {
                 Log.debug(
                     "ShellNavigationInternal service not available",
                     "This will be treated as the initial navigation",
@@ -801,7 +792,7 @@ sap.ui.define([
                 return true;
             }
 
-            const bIsInitialNavigation = oShellNavigationInternal.isInitialNavigation();
+            const bIsInitialNavigation = ShellNavigationInternal.isInitialNavigation();
 
             // An undefined value indicates that the ShellNavigationInternal service did not initialize the ShellNavigationHashChanger yet.
             // Hence this is the first navigation in case asked at this point in time.
@@ -824,7 +815,7 @@ sap.ui.define([
          */
         this.isInitialNavigationAsync = async function () {
             try {
-                const ShellNavigationInternal = await sap.ushell.Container.getServiceAsync("ShellNavigationInternal");
+                const ShellNavigationInternal = await Container.getServiceAsync("ShellNavigationInternal");
                 const bIsInitialNavigation = ShellNavigationInternal.isInitialNavigation();
 
                 // An undefined value indicates that the ShellNavigationInternal service did not initialize the ShellNavigationHashChanger yet.
@@ -951,8 +942,8 @@ sap.ui.define([
             const vIntentNoAppRoute = oExtraction.intent;
 
             try {
-                const oAppLifeCycleService = await sap.ushell.Container.getServiceAsync("AppLifeCycle");
-                const oShellNavigationInternal = await sap.ushell.Container.getServiceAsync("ShellNavigationInternal");
+                const oAppLifeCycleService = await Container.getServiceAsync("AppLifeCycle");
+                const oShellNavigationInternal = await Container.getServiceAsync("ShellNavigationInternal");
                 const oCurrentApplication = oAppLifeCycleService.getCurrentApplication();
                 const oIntent = oCurrentApplication && await oCurrentApplication.getIntent();
                 this._checkIfAppNeedsToBeReloaded(oNavTarget, oCurrentApplication, oIntent, oShellNavigationInternal.hashChanger);
@@ -1068,12 +1059,9 @@ sap.ui.define([
                 "sap.ushell.services.CrossApplicationNavigation"
             );
 
-            const oContainer = ObjectPath.get("sap.ushell.Container");
-            if (oContainer && typeof oContainer.getService === "function") {
-                const oShellNavigationInternal = oContainer.getService("ShellNavigationInternal");
-                if (oShellNavigationInternal) {
-                    return oShellNavigationInternal.hrefForAppSpecificHash(sAppHash);
-                }
+            const ShellNavigationInternal = Container.getService("ShellNavigationInternal");
+            if (ShellNavigationInternal) {
+                return ShellNavigationInternal.hrefForAppSpecificHash(sAppHash);
             }
             Log.debug("Shell not available, no Cross App Navigation; fallback to app-specific part only");
             // Note: this encoding is to be kept aligned with the encoding in hasher.js ( see _encodePath( ) )
@@ -1099,7 +1087,7 @@ sap.ui.define([
          */
         this.hrefForAppSpecificHashAsync = async function (sAppHash) {
             try {
-                const ShellNavigationInternal = await sap.ushell.Container.getServiceAsync("ShellNavigationInternal");
+                const ShellNavigationInternal = await Container.getServiceAsync("ShellNavigationInternal");
                 return ShellNavigationInternal.hrefForAppSpecificHash(sAppHash);
             } catch (oError) {
                 Log.debug("Shell not available, no Cross App Navigation; fallback to app-specific part only");
@@ -1229,9 +1217,7 @@ sap.ui.define([
          * @public
          */
         this.getSemanticObjectLinks = function (sSemanticObject, mParameters, bIgnoreFormFactor, oComponent, sAppStateKey, bCompactIntents) {
-            const oDeferred = new jQuery.Deferred();
-
-            Promise.resolve()
+            const pResult = Promise.resolve()
                 .then(() => {
                     return crossApplicationNavigationUtils.injectStickyParametersAsync({
                         args: { params: mParameters },
@@ -1271,19 +1257,21 @@ sap.ui.define([
                     }
 
                     return Promise.all([
-                        sap.ushell.Container.getServiceAsync("NavTargetResolutionInternal"),
+                        Container.getServiceAsync("NavTargetResolutionInternal"),
                         vArgs
                     ]);
                 })
                 .then((aResults) => {
                     const NavTargetResolutionInternal = aResults[0];
                     const vArgs = aResults[1];
-                    ushellUtils.invokeUnfoldingArrayArguments(NavTargetResolutionInternal.getLinks.bind(NavTargetResolutionInternal), [vArgs])
-                        .done(oDeferred.resolve)
-                        .fail(oDeferred.reject);
+
+                    return ushellUtils.invokeUnfoldingArrayArguments(
+                        NavTargetResolutionInternal.getLinks.bind(NavTargetResolutionInternal),
+                        [vArgs]
+                    );
                 });
 
-            return oDeferred.promise();
+            return ushellUtils.toDeferred(pResult);
         };
 
         /**
@@ -1436,14 +1424,15 @@ sap.ui.define([
         this.getLinks = function (vArgs) {
             // the invokeUnfoldingArrayArguments does not want [oArg1, oArg2, oArg3], but [ [oArg1], [oArg2], [oArg3] ], because the
             // logic in that method is based on positional parameters - however we have only one argument (the oArg object in this case).
-            const aExpandedIntents = ushellUtils.invokeUnfoldingArrayArguments(this._getLinks.bind(this), [vArgs]);
+            const pExpandedIntents = ushellUtils.invokeUnfoldingArrayArguments(
+                this._getLinks.bind(this),
+                [vArgs]
+            );
 
-            return aExpandedIntents;
+            return ushellUtils.toDeferred(pExpandedIntents);
         };
 
-        this._getLinks = function (oNominalArgs) {
-            const oDeferred = new jQuery.Deferred();
-
+        this._getLinks = async function (oNominalArgs) {
             // If method gets called without vArgs, the result should be the same as if vArgs was an empty object.
             if (typeof oNominalArgs === "undefined") {
                 oNominalArgs = {};
@@ -1455,48 +1444,40 @@ sap.ui.define([
             oNominalArgsClone.action = oNominalArgsClone.action || undefined;
             oNominalArgsClone.paramsOptions = crossApplicationNavigationUtils.extractGetLinksParameterOptions(oNominalArgsClone.params);
 
-            Promise.resolve()
-                .then(() => {
-                    return crossApplicationNavigationUtils.injectStickyParametersAsync({
-                        args: oNominalArgsClone,
-                        appLifeCycle: AppLifeCycleAI,
-                        technicalParameters: TechnicalParameters,
-                        type: typeUtils
-                    });
-                })
-                .then((oNominalArgsCloneResult) => {
-                    oNominalArgsClone = oNominalArgsCloneResult;
-                    let mParameterDefinition;
-                    if (oNominalArgsClone.params) {
-                        mParameterDefinition = crossApplicationNavigationUtils.extractGetLinksParameterDefinition(oNominalArgsClone.params);
-                    } else {
-                        mParameterDefinition = oNominalArgsClone.params;
-                    }
+            const oNominalArgsCloneResult = await crossApplicationNavigationUtils.injectStickyParametersAsync({
+                args: oNominalArgsClone,
+                appLifeCycle: AppLifeCycleAI,
+                technicalParameters: TechnicalParameters,
+                type: typeUtils
+            });
 
-                    // propagate sap-system into parameters
-                    let mParametersPlusSapSystem = getTargetWithCurrentSystem(
-                        { params: mParameterDefinition }, oNominalArgsClone.ui5Component
-                    ).params;
-
-                    mParametersPlusSapSystem = amendTargetWithSapUshellEncTestParameter({
-                        params: mParametersPlusSapSystem
-                    }).params;
-                    if (oNominalArgsClone.appStateKey) {
-                        mParametersPlusSapSystem["sap-xapp-state"] = [oNominalArgsClone.appStateKey];
-                        delete oNominalArgsClone.appStateKey;
-                    }
+            oNominalArgsClone = oNominalArgsCloneResult;
+            let mParameterDefinition;
+            if (oNominalArgsClone.params) {
+                mParameterDefinition = crossApplicationNavigationUtils.extractGetLinksParameterDefinition(oNominalArgsClone.params);
+            } else {
+                mParameterDefinition = oNominalArgsClone.params;
+            }
 
-                    oNominalArgsClone.params = mParametersPlusSapSystem;
+            // propagate sap-system into parameters
+            let mParametersPlusSapSystem = getTargetWithCurrentSystem(
+                { params: mParameterDefinition }, oNominalArgsClone.ui5Component
+            ).params;
+
+            mParametersPlusSapSystem = amendTargetWithSapUshellEncTestParameter({
+                params: mParametersPlusSapSystem
+            }).params;
+            if (oNominalArgsClone.appStateKey) {
+                mParametersPlusSapSystem["sap-xapp-state"] = [oNominalArgsClone.appStateKey];
+                delete oNominalArgsClone.appStateKey;
+            }
 
-                    return sap.ushell.Container.getServiceAsync("NavTargetResolutionInternal");
-                })
-                .then((NavTargetResolutionInternal) => {
-                    NavTargetResolutionInternal.getLinks(oNominalArgsClone)
-                        .done(oDeferred.resolve)
-                        .fail(oDeferred.reject);
-                });
+            oNominalArgsClone.params = mParametersPlusSapSystem;
 
-            return oDeferred.promise();
+            const NavTargetResolutionInternal = await Container.getServiceAsync("NavTargetResolutionInternal");
+            const oDeferred = NavTargetResolutionInternal.getLinks(oNominalArgsClone);
+
+            return ushellUtils.promisify(oDeferred);
         };
 
         /**
@@ -1511,15 +1492,14 @@ sap.ui.define([
          * @public
          */
         this.getDistinctSemanticObjects = function () {
-            const oDeferred = new jQuery.Deferred();
+            const pResult = Promise.resolve().then(async () => {
+                const NavTargetResolutionInternal = await Container.getServiceAsync("NavTargetResolutionInternal");
+                const oDeferred = NavTargetResolutionInternal.getDistinctSemanticObjects();
 
-            sap.ushell.Container.getServiceAsync("NavTargetResolutionInternal").then((NavTargetResolutionInternal) => {
-                NavTargetResolutionInternal.getDistinctSemanticObjects()
-                    .done(oDeferred.resolve)
-                    .fail(oDeferred.reject);
+                return ushellUtils.promisify(oDeferred);
             });
 
-            return oDeferred.promise();
+            return ushellUtils.toDeferred(pResult);
         };
 
         /**
@@ -1561,30 +1541,30 @@ sap.ui.define([
          * @deprecated since 1.31. Please use {@link #isNavigationSupported} instead. Note that this has a slightly different response format.
          */
         this.isIntentSupported = function (aIntents, oComponent) {
-            const oDeferred = new jQuery.Deferred();
-            const mOriginalIntentHash = {}; // used for remapping
-            const aClonedIntentsWithSapSystem = aIntents.map((sIntent) => {
-                const sIntentWithSystem = getTargetWithCurrentSystem(sIntent, oComponent); // returns clone
-                mOriginalIntentHash[sIntentWithSystem] = sIntent;
-                return sIntentWithSystem;
-            });
+            const pResult = Promise.resolve().then(async () => {
+                const mOriginalIntentHash = {}; // used for remapping
+                const aClonedIntentsWithSapSystem = aIntents.map((sIntent) => {
+                    const sIntentWithSystem = getTargetWithCurrentSystem(sIntent, oComponent); // returns clone
+                    mOriginalIntentHash[sIntentWithSystem] = sIntent;
+                    return sIntentWithSystem;
+                });
 
-            sap.ushell.Container.getServiceAsync("NavTargetResolutionInternal").then((NavTargetResolutionInternal) => {
-                NavTargetResolutionInternal.isIntentSupported(aClonedIntentsWithSapSystem)
-                    .done((mIntentSupportedPlusSapSystem) => {
-                        // Must restore keys to what the application expects, as per NavTargetResolutionInternal contract.
-                        const mIntentSupportedNoSapSystem = {};
-                        Object.keys(mIntentSupportedPlusSapSystem).forEach((sKeyPlusSapSystem) => {
-                            mIntentSupportedNoSapSystem[
-                                mOriginalIntentHash[sKeyPlusSapSystem]
-                            ] = mIntentSupportedPlusSapSystem[sKeyPlusSapSystem];
-                        });
-                        oDeferred.resolve(mIntentSupportedNoSapSystem);
-                    })
-                    .fail(oDeferred.reject.bind(oDeferred));
+                const NavTargetResolutionInternal = await Container.getServiceAsync("NavTargetResolutionInternal");
+                const oDeferred = NavTargetResolutionInternal.isIntentSupported(aClonedIntentsWithSapSystem);
+                const mIntentSupportedPlusSapSystem = await ushellUtils.promisify(oDeferred);
+
+                // Must restore keys to what the application expects, as per NavTargetResolutionInternal contract.
+                const mIntentSupportedNoSapSystem = {};
+                Object.keys(mIntentSupportedPlusSapSystem).forEach((sKeyPlusSapSystem) => {
+                    mIntentSupportedNoSapSystem[
+                        mOriginalIntentHash[sKeyPlusSapSystem]
+                    ] = mIntentSupportedPlusSapSystem[sKeyPlusSapSystem];
+                });
+
+                return mIntentSupportedNoSapSystem;
             });
 
-            return oDeferred.promise();
+            return ushellUtils.toDeferred(pResult);
         };
 
         /**
@@ -1689,20 +1669,20 @@ sap.ui.define([
          * @public
          */
         this.isNavigationSupported = function (aIntents, oComponent) {
-            const oDeferred = new jQuery.Deferred();
-            const aClonedIntents = deepClone(aIntents)
-                .map((oIntent) => {
-                    const oExtraction = this._extractInnerAppRoute(oIntent);
-                    return getTargetWithCurrentSystem(oExtraction.intent, oComponent); // returns only shallow clone
-                });
+            const pResult = Promise.resolve().then(async () => {
+                const aClonedIntents = deepClone(aIntents)
+                    .map((oIntent) => {
+                        const oExtraction = this._extractInnerAppRoute(oIntent);
+                        return getTargetWithCurrentSystem(oExtraction.intent, oComponent); // returns only shallow clone
+                    });
+
+                const NavTargetResolutionInternal = await Container.getServiceAsync("NavTargetResolutionInternal");
+                const oDeferred = NavTargetResolutionInternal.isNavigationSupported(aClonedIntents);
 
-            sap.ushell.Container.getServiceAsync("NavTargetResolutionInternal").then((NavTargetResolutionInternal) => {
-                NavTargetResolutionInternal.isNavigationSupported(aClonedIntents)
-                    .done(oDeferred.resolve)
-                    .fail(oDeferred.reject);
+                return ushellUtils.promisify(oDeferred);
             });
 
-            return oDeferred.promise();
+            return ushellUtils.toDeferred(pResult);
         };
 
         /**
@@ -1731,32 +1711,29 @@ sap.ui.define([
          * @since 1.30.0
          * @private
          */
-        this.isUrlSupported = function (sUrl) {
-            return new Promise((resolve, reject) => {
-                if (typeof sUrl !== "string") {
-                    reject();
-                }
+        this.isUrlSupported = async function (sUrl) {
+            if (typeof sUrl !== "string") {
+                throw new Error("Input is not a string");
+            }
 
-                if (UrlParsing.isIntentUrl(sUrl)) {
-                    const sHash = UrlParsing.getHash(sUrl);
-                    const oTarget = {
-                        target: {
-                            shellHash: sHash
-                        }
-                    };
-                    this.isNavigationSupported([oTarget])
-                        .done((oResult) => {
-                            if (oResult[0].supported) {
-                                resolve();
-                            } else {
-                                reject();
-                            }
-                        })
-                        .fail(reject);
-                } else {
-                    resolve();
+            if (!UrlParsing.isIntentUrl(sUrl)) {
+                return;
+            }
+
+            const sHash = UrlParsing.getHash(sUrl);
+            const oTarget = {
+                target: {
+                    shellHash: sHash
                 }
-            });
+            };
+            const oDeferred = this.isNavigationSupported([oTarget]);
+            const oResult = await ushellUtils.promisify(oDeferred);
+
+            if (oResult[0].supported) {
+                return;
+            }
+
+            throw new Error("Navigation not supported");
         };
 
         /**
@@ -1779,21 +1756,18 @@ sap.ui.define([
          * @ui5-restricted cross.fnd.fiori.inbox (CA-INB-FIO), sap.cp.ui (MOB-UIA-CP-CLT)
          */
         this.createComponentInstance = function (sIntent, oConfig, oOwnerComponent) {
-            const oDeferred = new jQuery.Deferred();
-
-            // The following check is not needed by the new API, but it is kept for backward compatibility.
-            const sErrorMessage = this._checkComponentConfig(oConfig);
-            if (sErrorMessage) {
-                oDeferred.reject(sErrorMessage);
-                return oDeferred.promise();
-            }
+            const pResult = Promise.resolve().then(async () => {
+                // The following check is not needed by the new API, but it is kept for backward compatibility.
+                const sErrorMessage = this._checkComponentConfig(oConfig);
+                if (sErrorMessage) {
+                    throw new Error(sErrorMessage);
+                }
 
-            const oComponentData = oConfig?.componentData;
-            ComponentInstantiation.createComponentInstance(sIntent, oComponentData, oOwnerComponent)
-                .then(oDeferred.resolve)
-                .catch(oDeferred.reject);
+                const oComponentData = oConfig?.componentData;
+                return ComponentInstantiation.createComponentInstance(sIntent, oComponentData, oOwnerComponent);
+            });
 
-            return oDeferred.promise();
+            return ushellUtils.toDeferred(pResult);
         };
 
         /**
@@ -1813,11 +1787,11 @@ sap.ui.define([
          * @private
          * @ui5-restricted cross.fnd.fiori.inbox (CA-INB-FIO)
          */
-        this.createComponentData = function (sIntent, oConfig) {
+        this.createComponentData = async function (sIntent, oConfig) {
             // The following check is not needed by the new API, but it is kept for backward compatibility.
             const sErrorMessage = this._checkComponentConfig(oConfig);
             if (sErrorMessage) {
-                return Promise.reject(sErrorMessage);
+                throw new Error(sErrorMessage);
             }
 
             const oComponentData = oConfig?.componentData;
@@ -1865,7 +1839,7 @@ sap.ui.define([
                 "sap.ushell.services.CrossApplicationNavigation"
             );
 
-            const AppStateService = sap.ushell.Container.getService("AppState");
+            const AppStateService = Container.getService("AppState");
 
             if (!BaseObject.isA(oAppComponent, "sap.ui.core.UIComponent")) {
                 throw new Error("The passed oAppComponent must be a UI5 Component.");
@@ -1890,9 +1864,9 @@ sap.ui.define([
          */
         this.createEmptyAppStateAsync = async function (oAppComponent, bTransientEnforced, sPersistencyMethod, oPersistencySettings) {
             if (!BaseObject.isA(oAppComponent, "sap.ui.core.UIComponent")) {
-                return Promise.reject("The passed oAppComponent must be a UI5 Component.");
+                throw new Error("The passed oAppComponent must be a UI5 Component.");
             }
-            const AppStateService = await sap.ushell.Container.getServiceAsync("AppState");
+            const AppStateService = await Container.getServiceAsync("AppState");
             return AppStateService.createEmptyAppState(oAppComponent, bTransientEnforced, sPersistencyMethod, oPersistencySettings);
         };
 
@@ -1941,26 +1915,26 @@ sap.ui.define([
          */
         this.getAppState = function (oAppComponent, sAppStateKey) {
             // see stakeholders in SFIN etc.
-            const oDeferred = new jQuery.Deferred();
-            this._checkComponent(oAppComponent);
+            const pResult = Promise.resolve().then(async () => {
+                this._checkComponent(oAppComponent);
 
-            sap.ushell.Container.getServiceAsync("AppState").then((AppState) => {
+                const AppState = await Container.getServiceAsync("AppState");
                 if (typeof sAppStateKey !== "string") {
                     if (sAppStateKey !== undefined) {
                         Log.error("Illegal Argument sAppStateKey ");
                     }
-                    setTimeout(() => {
-                        const oContainer = AppState.createEmptyUnmodifiableAppState(oAppComponent);
-                        oDeferred.resolve(oContainer);
-                    }, 0);
-                    return;
+
+                    await ushellUtils.awaitTimeout(0);
+                    const oContainer = AppState.createEmptyUnmodifiableAppState(oAppComponent);
+                    return oContainer;
                 }
-                AppState.getAppState(sAppStateKey)
-                    .done(oDeferred.resolve)
-                    .fail(oDeferred.reject);
+
+                const oDeferred = AppState.getAppState(sAppStateKey);
+
+                return ushellUtils.promisify(oDeferred);
             });
 
-            return oDeferred.promise();
+            return ushellUtils.toDeferred(pResult);
         };
 
         /**
@@ -1983,7 +1957,11 @@ sap.ui.define([
          * @private
          */
         this.getAppStateData = function (sAppStateKeyOrArray) {
-            return ushellUtils.invokeUnfoldingArrayArguments(this._getAppStateData.bind(this), [sAppStateKeyOrArray]);
+            const pResult = ushellUtils.invokeUnfoldingArrayArguments(
+                this._getAppStateData.bind(this),
+                [sAppStateKeyOrArray]
+            );
+            return ushellUtils.toDeferred(pResult);
         };
 
         /**
@@ -2006,26 +1984,24 @@ sap.ui.define([
          * @ui5-restricted SAP Internal usage only, beware! internally public, cannot be changed, but not part of the public documentation.
          */
         this._getAppStateData = function (sAppStateKey) {
-            const oDeferred = new jQuery.Deferred();
-
-            sap.ushell.Container.getServiceAsync("AppState").then((AppState) => {
+            const pResult = Promise.resolve().then(async () => {
+                const AppState = await Container.getServiceAsync("AppState");
                 if (typeof sAppStateKey !== "string") {
                     if (sAppStateKey !== undefined) {
                         Log.error("Illegal Argument sAppStateKey ");
                     }
-                    setTimeout(() => {
-                        oDeferred.resolve(undefined);
-                    }, 0);
-                } else {
-                    AppState.getAppState(sAppStateKey)
-                        .done((oAppState) => {
-                            oDeferred.resolve(oAppState.getData());
-                        })
-                        .fail(oDeferred.resolve.bind(oDeferred, undefined));
+
+                    await ushellUtils.awaitTimeout(0);
+                    return;
                 }
-            });
 
-            return oDeferred.promise();
+                const oDeferred = AppState.getAppState(sAppStateKey);
+                const oAppState = await ushellUtils.promisify(oDeferred);
+
+                return oAppState.getData();
+            }).catch(() => { /* Fail silently */ });
+
+            return ushellUtils.toDeferred(pResult);
         };
 
         /**
@@ -2038,19 +2014,15 @@ sap.ui.define([
          * @ui5-restricted SAP Internal usage only, beware! internally public, cannot be changed, but not part of the public documentation
          */
         this.saveMultipleAppStates = function (aAppStates) {
-            const aResult = [];
-            const oDeferred = new jQuery.Deferred();
-            aAppStates.forEach((oAppState) => {
-                aResult.push(oAppState.save());
-            });
-            jQuery.when.apply(this, aResult)
-                .done(() => {
-                    oDeferred.resolve(aResult);
-                })
-                .fail(() => {
-                    oDeferred.reject("save failed");
+            const pResult = Promise.resolve().then(async () => {
+                const pResults = aAppStates.map((oAppState) => {
+                    return oAppState.save();
                 });
-            return oDeferred.promise();
+
+                return Promise.all(pResults);
+            });
+
+            return ushellUtils.toDeferred(pResult);
         };
 
         /*
@@ -2096,7 +2068,7 @@ sap.ui.define([
                 null,
                 "sap.ushell.services.CrossApplicationNavigation"
             );
-            const AppStateService = sap.ushell.Container.getService("AppState");
+            const AppStateService = Container.getService("AppState");
 
             return AppStateService.getSupportedPersistencyMethods();
         };
@@ -2109,7 +2081,7 @@ sap.ui.define([
          * @since 1.95
          */
         this.getSupportedAppStatePersistencyMethodsAsync = async function () {
-            const oAppStateService = await sap.ushell.Container.getServiceAsync("AppState");
+            const oAppStateService = await Container.getServiceAsync("AppState");
             return oAppStateService.getSupportedPersistencyMethods();
         };
 
@@ -2123,14 +2095,14 @@ sap.ui.define([
          * @returns {jQuery.Promise<string>}Resolves a new key.
          */
         this.makeStatePersistent = function (sKey, iPersistencyMethod, oPersistencySettings) {
-            const oDeferred = new jQuery.Deferred();
-            sap.ushell.Container.getServiceAsync("AppState").then((AppState) => {
-                AppState.makeStatePersistent(sKey, iPersistencyMethod, oPersistencySettings)
-                    .done(oDeferred.resolve)
-                    .fail(oDeferred.reject);
+            const pResult = Promise.resolve().then(async () => {
+                const AppState = await Container.getServiceAsync("AppState");
+                const oDeferred = AppState.makeStatePersistent(sKey, iPersistencyMethod, oPersistencySettings);
+
+                return ushellUtils.promisify(oDeferred);
             });
 
-            return oDeferred.promise();
+            return ushellUtils.toDeferred(pResult);
         };
 
         /**
@@ -2146,18 +2118,17 @@ sap.ui.define([
          * @protected
          */
         this.resolveIntent = function (sHashFragment) {
-            const oDeferred = new jQuery.Deferred();
-
-            sap.ushell.Container.getServiceAsync("NavTargetResolutionInternal").then((NavTargetResolutionInternal) => {
-                NavTargetResolutionInternal.resolveHashFragment(sHashFragment)
-                    .then((oResult) => {
-                        oDeferred.resolve({ url: oResult.url });
-                    })
-                    .fail((sMessage) => {
-                        oDeferred.reject(sMessage);
-                    });
+            const pResult = Promise.resolve().then(async () => {
+                const NavTargetResolutionInternal = await Container.getServiceAsync("NavTargetResolutionInternal");
+                const oDeferred = NavTargetResolutionInternal.resolveHashFragment(sHashFragment);
+                const oResolvedHashFragment = await ushellUtils.promisify(oDeferred);
+
+                return {
+                    url: oResolvedHashFragment.url
+                };
             });
-            return oDeferred.promise();
+
+            return ushellUtils.toDeferred(pResult);
         };
     }