@sapui5/sap.ushell 1.139.0 → 1.141.0

package/src/main/js/sap/ushell/appRuntime/ui5/services/ShellNavigationInternal.js

@@ -3,18 +3,18 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.ShellNavigationInternal}.
  *
- * @version 1.139.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/ushell/services/ShellNavigationInternal",
     "sap/ushell/appRuntime/ui5/services/Container",
-    "sap/ushell/appRuntime/ui5/AppRuntimeService",
+    "sap/ushell/appRuntime/ui5/AppCommunicationMgr",
     "sap/ushell/appRuntime/ui5/AppRuntimeContext",
     "sap/ushell/utils/UrlParsing"
 ], (
     ShellNavigationInternal,
     Container,
-    AppRuntimeService,
+    AppCommunicationMgr,
     AppRuntimeContext,
     UrlParsing
 ) => {
@@ -61,19 +61,19 @@ sap.ui.define([
                             oArgs.target.action = "startIntent";
                         }
 
-                        AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.CrossApplicationNavigation.toExternal", {
+                        AppCommunicationMgr.sendMessageToOuterShell("sap.ushell.services.CrossApplicationNavigation.toExternal", {
                             oArgs: oArgs
                         });
                     });
                 });
             }
-            AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.CrossApplicationNavigation.toExternal", {
+            AppCommunicationMgr.sendMessageToOuterShell("sap.ushell.services.CrossApplicationNavigation.toExternal", {
                 oArgs: oArgs
             });
         };
 
         this.toAppHash = function (sAppHash, bWriteHistory) {
-            AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.ShellNavigationInternal.toExternal", {
+            AppCommunicationMgr.sendMessageToOuterShell("sap.ushell.services.ShellNavigationInternal.toExternal", {
                 sAppHash: sAppHash,
                 bWriteHistory: bWriteHistory
             });

package/src/main/js/sap/ushell/appRuntime/ui5/services/ShellUIService.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.ui5service.ShellUIService}.
  *
- * @version 1.139.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/ui/core/EventBus",
@@ -11,7 +11,6 @@ sap.ui.define([
     "sap/ui/core/service/ServiceFactory",
     "sap/ushell/ui5service/ShellUIService",
     "sap/ushell/appRuntime/ui5/AppCommunicationMgr",
-    "sap/ushell/appRuntime/ui5/AppRuntimeService",
     "sap/ushell/appRuntime/ui5/AppRuntimeContext",
     "sap/ushell/services/AppConfiguration",
     "sap/ui/thirdparty/jquery"
@@ -21,7 +20,6 @@ sap.ui.define([
     ServiceFactory,
     ShellUIService,
     AppCommunicationMgr,
-    AppRuntimeService,
     AppRuntimeContext,
     AppConfiguration,
     jQuery
@@ -43,11 +41,11 @@ sap.ui.define([
      */
     const ShellUIServiceProxy = ShellUIService.extend("sap.ushell.appRuntime.services.ShellUIService", {
         setTitle: function (sTitle, oAdditionalInformation) {
-            if (!sTitle) {
-                return;
+            if (typeof sTitle !== "undefined" && typeof sTitle !== "string") {
+                throw new Error("'setTitle' was called with invalid arguments. The parameter should be a string");
             }
-            sLastSetTitle = sTitle;
-            AppRuntimeService.postMessageToFLP("sap.ushell.services.ShellUIService.setTitle", {
+            sLastSetTitle = sTitle === undefined ? sLastSetTitle : sTitle;
+            AppCommunicationMgr.postMessageToFLP("sap.ushell.services.ShellUIService.setTitle", {
                 sTitle: sTitle,
                 oAdditionalInformation: oAdditionalInformation
             });
@@ -59,7 +57,7 @@ sap.ui.define([
 
         setHierarchy: function (aHierarchyLevels) {
             return AppRuntimeContext.checkIntentsConversionForScube(aHierarchyLevels).then((aNewHierarchyLevels) => {
-                return AppRuntimeService.postMessageToFLP("sap.ushell.services.ShellUIService.setHierarchy", {
+                return AppCommunicationMgr.postMessageToFLP("sap.ushell.services.ShellUIService.setHierarchy", {
                     aHierarchyLevels: aNewHierarchyLevels
                 });
             });
@@ -67,7 +65,7 @@ sap.ui.define([
 
         setRelatedApps: function (aRelatedApps) {
             return AppRuntimeContext.checkIntentsConversionForScube(aRelatedApps).then((aNewRelatedApps) => {
-                return AppRuntimeService.postMessageToFLP("sap.ushell.services.ShellUIService.setRelatedApps", {
+                return AppCommunicationMgr.postMessageToFLP("sap.ushell.services.ShellUIService.setRelatedApps", {
                     aRelatedApps: aNewRelatedApps
                 });
             });
@@ -76,26 +74,26 @@ sap.ui.define([
         setBackNavigation: function (fnCallback) {
             if (!bRegistered) {
                 bRegistered = true;
-                AppCommunicationMgr.registerCommHandlers({
-                    "sap.ushell.appRuntime": {
-                        oServiceCalls: {
-                            handleBackNavigation: {
-                                executeServiceCallFn: function (oServiceParams) {
-                                    if (fnBackNavigationCallback) {
-                                        fnBackNavigationCallback();
-                                    } else if (AppRuntimeContext.checkDataLossAndContinue()) {
-                                        window.history.back();
-                                    }
-                                    return new jQuery.Deferred().resolve().promise();
-                                }
+                const oRequestHandlers = {
+                    "sap.ushell.appRuntime.handleBackNavigation": {
+                        async handler (oMessageBody, oMessageEvent) {
+                            if (fnBackNavigationCallback) {
+                                fnBackNavigationCallback();
+                            } else if (AppRuntimeContext.checkDataLossAndContinue()) {
+                                window.history.back();
                             }
+                            return new jQuery.Deferred().resolve().promise();
                         }
                     }
+                };
+
+                Object.keys(oRequestHandlers).forEach((sServiceRequest) => {
+                    AppCommunicationMgr.setRequestHandler(sServiceRequest, oRequestHandlers[sServiceRequest].handler);
                 });
             }
 
             fnBackNavigationCallback = fnCallback;
-            AppRuntimeService.postMessageToFLP("sap.ushell.ui5service.ShellUIService.setBackNavigation", {
+            AppCommunicationMgr.postMessageToFLP("sap.ushell.ui5service.ShellUIService.setBackNavigation", {
                 callbackMessage: {
                     service: "sap.ushell.appRuntime.handleBackNavigation"
                 }

package/src/main/js/sap/ushell/appRuntime/ui5/services/UserDefaultParameters.js

@@ -2,9 +2,13 @@
 
 sap.ui.define([
     "sap/ushell/services/UserDefaultParameters",
-    "sap/ushell/appRuntime/ui5/AppRuntimeService",
+    "sap/ushell/appRuntime/ui5/AppCommunicationMgr",
     "sap/base/util/ObjectPath"
-], (UserDefaultParameters, AppRuntimeService, ObjectPath) => {
+], (
+    UserDefaultParameters,
+    AppCommunicationMgr,
+    ObjectPath
+) => {
     "use strict";
 
     function UserDefaultParametersProxy (oAdapter, oContainerInterface) {
@@ -19,7 +23,7 @@ sap.ui.define([
          * @returns {Promise} A promise that resolves with the return value from the postMessage call.
          */
         this.getValue = function (sParameterName) {
-            return AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.UserDefaultParameters.getValue", {
+            return AppCommunicationMgr.sendMessageToOuterShell("sap.ushell.services.UserDefaultParameters.getValue", {
                 sParameterName: sParameterName
             });
         };

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

@@ -3,17 +3,17 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.UserInfo}.
  *
- * @version 1.139.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery",
     "sap/ushell/services/UserInfo",
-    "sap/ushell/appRuntime/ui5/AppRuntimeService",
+    "sap/ushell/appRuntime/ui5/AppCommunicationMgr",
     "sap/base/util/ObjectPath"
 ], (
     jQuery,
     UserInfo,
-    AppRuntimeService,
+    AppCommunicationMgr,
     ObjectPath
 ) => {
     "use strict";
@@ -34,27 +34,27 @@ sap.ui.define([
         UserInfo.call(this, oAdapter, oContainerInterface);
 
         this.getThemeList = function () {
-            return AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.UserInfo.getThemeList");
+            return AppCommunicationMgr.sendMessageToOuterShell("sap.ushell.services.UserInfo.getThemeList");
         };
 
         this.updateUserPreferences = function () {
             const oDeferred = new jQuery.Deferred();
 
             sap.ui.require(["sap/ushell/appRuntime/ui5/services/Container"], (Container) => {
-                AppRuntimeService.postMessageToFLP("sap.ushell.services.UserInfo.updateUserPreferences", {
+                AppCommunicationMgr.postMessageToFLP("sap.ushell.services.UserInfo.updateUserPreferences", {
                     language: Container.getUser().getLanguage()
-                }).then(oDeferred.resolve, oDeferred.reject);
+                }).then(oDeferred.resolve).catch(oDeferred.reject);
             });
 
             return oDeferred.promise();
         };
 
         this.getLanguageList = function () {
-            return AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.UserInfo.getLanguageList");
+            return AppCommunicationMgr.sendMessageToOuterShell("sap.ushell.services.UserInfo.getLanguageList");
         };
 
         this.getShellUserInfo = function () {
-            return AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.UserInfo.getShellUserInfo");
+            return AppCommunicationMgr.sendMessageToOuterShell("sap.ushell.services.UserInfo.getShellUserInfo");
         };
     }
 

package/src/main/js/sap/ushell/appRuntime/ui5/services/adapters/ContainerAdapter.js

@@ -120,11 +120,12 @@ sap.ui.define([
                     } else {
                         oDeferred.resolve();
                     }
-                } catch (e) {
+                } catch (oError) {
                     Log.error(
                         `logout from iframe ${document.URL} failed`,
-                        e,
-                        "sap.ushell.appRuntime.ui5.SessionHandlerAgent");
+                        oError,
+                        "sap.ushell.appRuntime.ui5.SessionHandlerAgent"
+                    );
                     oDeferred.resolve();
                 }
             }

package/src/main/js/sap/ushell/appRuntime/ui5/services/adapters/Ui5ComponentLoaderAdapter.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview The Unified Shell's Ui5ComponentLoaderAdapter for the application runtime platform
  *
- * @version 1.139.0
+ * @version 1.141.0
  */
 sap.ui.define([
 ], () => {

package/src/main/js/sap/ushell/bootstrap/SchedulingAgent/FLPLoader.js

@@ -35,9 +35,7 @@ sap.ui.define([
          */
         loadComponentByComponentCreate: function (oStepConfig) {
             return Component.create(oStepConfig.oData).then(() => {
-                return Promise.resolve(oStepConfig.sStepName);
-            }, () => {
-                return Promise.reject(oStepConfig.sStepName);
+                return oStepConfig.sStepName;
             });
         },
 

package/src/main/js/sap/ushell/bootstrap/SchedulingAgent/logger.js

@@ -45,7 +45,7 @@
  * }, false);
  * </pre>
  *
- * @version 1.139.0
+ * @version 1.141.0
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/bootstrap/SchedulingAgent/state.js

@@ -71,7 +71,7 @@
  * }, false);
  * </pre>
  *
- * @version 1.139.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/ushell/bootstrap/SchedulingAgent/logger",

package/src/main/js/sap/ushell/bootstrap/SchedulingAgent.js

@@ -230,38 +230,37 @@ sap.ui.define([
                         this.oPathsLoading[oStepConfig.sStepName] = oPathLoadingPromise;
                         state.setForLoadingStep(oStepConfig.sStepName, state.id.loadingStep.InProgress, oStepConfig.oData.sPath, "byRequire step sent to FLP Loader");
                         const sStepName = oStepConfig.sStepName;
-                        oPathLoadingPromise.then(
-                            () => {
+                        oPathLoadingPromise
+                            .then(() => {
                                 /* eslint-disable */
                                 state.setForLoadingStep(sStepName, state.id.loadingStep.InProgress, "", "Step's promise has resolved");
                                 /* eslint-enable */
                                 delete this.oPathsLoading[sStepName];
                                 EventHub.emit("StepDone", sStepName);
-                            },
-                            () => {
+                            })
+                            .catch(() => {
                                 /* eslint-disable */
-                                state.setForLoadingStep(sStepName, state.id.loadingStep.FatalError, "", "Step's promise failed");
-                                /* eslint-enable */
+                                    state.setForLoadingStep(sStepName, state.id.loadingStep.FatalError, "", "Step's promise failed");
+                                    /* eslint-enable */
                                 delete this.oPathsLoading[sStepName];
                                 EventHub.emit("StepFailed", sStepName);
-                            }
-                        );
+                            });
                     } else if (oStepConfig.sStepType === oLoadingModes.BY_COMPONENT_CREATE) {
                         const oPromise = FLPLoader.loadComponentByComponentCreate(oStepConfig);
-                        this.oComponentsLoading[oStepConfig.sStepName] = oPromise;
-                        state.setForLoadingStep(oStepConfig.sStepName, state.id.loadingStep.InProgress, oStepConfig.oData, "byComponentCreate step sent to FLP Loader");
-                        oPromise.then(
-                            (sLoadedStepName) => {
-                                state.setForLoadingStep(sLoadedStepName, state.id.loadingStep.InProgress, "", "Step's promise has resolved");
-                                delete this.oComponentsLoading[sLoadedStepName];
-                                EventHub.emit("StepDone", sLoadedStepName);
-                            },
-                            (sLoadedStepName) => {
-                                state.setForLoadingStep(sLoadedStepName, state.id.loadingStep.FatalError, "", "Step's promise failed");
-                                delete this.oComponentsLoading[sLoadedStepName];
-                                EventHub.emit("StepFailed", sLoadedStepName);
-                            }
-                        );
+                        const sStepName = oStepConfig.sStepName;
+                        this.oComponentsLoading[sStepName] = oPromise;
+                        state.setForLoadingStep(sStepName, state.id.loadingStep.InProgress, oStepConfig.oData, "byComponentCreate step sent to FLP Loader");
+                        oPromise
+                            .then(() => {
+                                state.setForLoadingStep(sStepName, state.id.loadingStep.InProgress, "", "Step's promise has resolved");
+                                delete this.oComponentsLoading[sStepName];
+                                EventHub.emit("StepDone", sStepName);
+                            })
+                            .catch(() => {
+                                state.setForLoadingStep(sStepName, state.id.loadingStep.FatalError, "", "Step's promise failed");
+                                delete this.oComponentsLoading[sStepName];
+                                EventHub.emit("StepFailed", sStepName);
+                            });
                     }
                 }
             } while (oNextStep.sStatus !== oStatusDefinitions.WAIT);

package/src/main/js/sap/ushell/bootstrap/common/common.configure.ui5datetimeformat.js

@@ -4,7 +4,7 @@
  * @fileOverview Configure the UI5Settings for Date and Time Format for the 'CDM'
  *               platform.
  *
- * @version 1.139.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/base/i18n/Formatting",
@@ -33,15 +33,15 @@ sap.ui.define([
         try {
             const sSapDateFormat = oUserProfileDefaults && oUserProfileDefaults.sapDateFormat;
             Formatting.setABAPDateFormat(sSapDateFormat);
-        } catch (e) {
-            Log.error(sMessageDate, e.stack, "sap/ushell/bootstrap/common/common.configure.ui5datetimeformat");
+        } catch (oError) {
+            Log.error(sMessageDate, oError, "sap/ushell/bootstrap/common/common.configure.ui5datetimeformat");
         }
 
         try {
             const sSapTimeFormat = oUserProfileDefaults && oUserProfileDefaults.sapTimeFormat;
             Formatting.setABAPTimeFormat(sSapTimeFormat);
-        } catch (e) {
-            Log.error(sMessageTime, e.stack, "sap/ushell/bootstrap/common/common.configure.ui5datetimeformat");
+        } catch (oError) {
+            Log.error(sMessageTime, oError, "sap/ushell/bootstrap/common/common.configure.ui5datetimeformat");
         }
     }
 

package/src/main/js/sap/ushell/bootstrap/common/common.create.configcontract.core.js

@@ -174,6 +174,15 @@ sap.ui.define([
             return JSON.stringify(oConfig);
         }
 
+        /**
+         * Gets the menu personalization enabled state.
+         *
+         * @returns {boolean} whether the personalization is enabled
+         */
+        function getMenuPersonalizationEnabled () {
+            return getConfigValue("ushell/menu/personalization/enabled", false);
+        }
+
         /**
          * Gets the default fixed side navigation configuration.
          *
@@ -204,15 +213,6 @@ sap.ui.define([
             return getConfigValue("ushell/sideNavigation/enabled", false) || getConfigValue("ushell/menu/position") === "Side";
         }
 
-        /**
-         * Gets the menu personalization enabled state.
-         *
-         * @returns {boolean} whether the personalization is enabled
-         */
-        function getMenuPersonalizationEnabled () {
-            return getConfigValue("ushell/menu/personalization/enabled", false);
-        }
-
         const oConfigDefinition = {
             core: { // the unified shell core
                 site: {

package/src/main/js/sap/ushell/bootstrap/common/common.debug.mode.js

@@ -15,7 +15,7 @@ sap.ui.define([
         try {
             sStoredSapUiDebugValue = window.localStorage.getItem(oConstants.uiDebugKey);
             bDebugSources = !!sStoredSapUiDebugValue && /^(true|x|X)$/.test(sStoredSapUiDebugValue);
-        } catch (e) {
+        } catch {
             // comment just to benefit eslint
         }
     }

package/src/main/js/sap/ushell/bootstrap/common/common.load.core-min.js

@@ -4,9 +4,14 @@
  * Besides that <code>loaded</code> indicates if core-min bundles have been loaded - or not.
  */
 sap.ui.define([
+    "sap/base/Log",
     "./common.debug.mode",
     "./common.load.script"
-], (oDebugMode, oScriptLoader) => {
+], (
+    Log,
+    oDebugMode,
+    oScriptLoader
+) => {
     "use strict";
 
     const coreMinLoader = {};
@@ -30,13 +35,20 @@ sap.ui.define([
             throw new Error("Mandatory preload bundle configuration is not provided");
         }
 
-        if (oDebugMode.isDebug()) {
+        if (oDebugMode.isDebug() || oPreloadBundleConfig.enabled === false) {
+            if (oPreloadBundleConfig.enabled === false) {
+                Log.error("Disabling the custom preload bundles is not yet supported and might fail.");
+            }
+
             // If pure debug mode is turned on (sap-ui-debug=(true|x|X)), it's only
             // needed to require the Core and boot the core because the minified preload
             // modules should be loaded with the single -dbg versions.
             sap.ui.require(["sap/ui/core/Core"], (core) => {
                 core.boot();
             });
+
+            // do not continue with bundle loading
+            return;
         }
 
         if (oPreloadBundleConfig.enabled === false) {

package/src/main/js/sap/ushell/bootstrap/common/common.load.script.js

@@ -22,7 +22,7 @@ sap.ui.define([], () => {
                 oEvent.target.removeEventListener("load", listener);
                 oEvent.target.removeEventListener("error", listener);
                 if (oEvent.type === "error") {
-                    reject();
+                    reject(new Error(`Failed to load script: ${sFilePath}`));
                 }
                 resolve();
             }

package/src/main/js/sap/ushell/bootstrap/common/common.read.metatags.js

@@ -18,8 +18,8 @@ sap.ui.define(["sap/base/Log"], (Log) => {
         Array.prototype.forEach.call(oMetaNodeList, (oMetaNode) => {
             try {
                 aItems.push(fnParse(oMetaNode.content));
-            } catch (e) {
-                Log.error(e.message, e.stack, S_COMPONENT);
+            } catch (oError) {
+                Log.error("Metatag Read failed", oError, S_COMPONENT);
             }
         });
 

package/src/main/js/sap/ushell/bootstrap/common/common.util.js

@@ -119,10 +119,10 @@ sap.ui.define([
             try {
                 // UI5's config cannot be used here, so check local storage
                 bSapStatistics = window.localStorage.getItem("sap-ui-statistics") === "X";
-            } catch (e) {
+            } catch (oError) {
                 Log.warning(
                     "failed to read sap-statistics setting from local storage",
-                    null,
+                    oError,
                     "sap.ushell.bootstrap.common.common.util"
                 );
             }

package/src/main/js/sap/ushell/bootstrap/sandbox2/sandbox.js

@@ -31,7 +31,7 @@ sap.ui.define([
                     return oData;
                 }
                 logError();
-            } catch (e) {
+            } catch {
                 logError();
             }
         },

package/src/main/js/sap/ushell/bootstrap/sandbox2.js

@@ -7,7 +7,7 @@
  * @fileOverview The Unified Shell's bootstrap code for development sandbox scenarios.
  * This is the version that creates spaces/pages runtime environment.
  *
- * @version 1.139.0
+ * @version 1.141.0
  */
 
 (function () {

package/src/main/js/sap/ushell/components/CatalogsManager.js

@@ -354,9 +354,9 @@ sap.ui.define([
                             oCatalogModel: oCatalogModel
                         });
                     })
-                    .fail((sError) => {
+                    .fail((oError) => {
                         MessagingHelper.showLocalizedErrorHelper("fail_to_load_catalog_tiles_msg");
-                        reject(sError);
+                        reject(oError);
                     });
             });
         },
@@ -727,7 +727,7 @@ sap.ui.define([
             const that = this;
             const oDeferred = new jQuery.Deferred();
             if (!ushellUtils.validHash(sTitle)) {
-                return oDeferred.reject({ status: 0, action: "createNewGroup" }); // 0 - failure
+                return oDeferred.reject(new Error("Invalid group title"));
             }
 
             const oResultPromise = this.oLaunchPageService.addGroup(sTitle);