@sapui5/sap.ushell 1.120.6 → 1.120.7

package/src/main/js/sap/ushell/components/workPageRuntime/services/WorkPage.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module communicates with the content API graphql service to retrieve and save workpage and visualization data.
- * @version 1.120.6
+ * @version 1.120.7
  */
 sap.ui.define([
     "sap/ui/core/Configuration",

package/src/main/js/sap/ushell/designtime/ApplicationContainer.designtime.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview Provides the Design Time Metadata for the sap.ushell.components.container.ApplicationContainer control
- * @version 1.120.6
+ * @version 1.120.7
  */
 sap.ui.define([], function () {
     "use strict";

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

@@ -21,7 +21,7 @@ sap.ui.define([
      */
     var oUshellLibrary = Core.initLibrary({
         name: "sap.ushell",
-        version: "1.120.6",
+        version: "1.120.7",
         dependencies: [
             "sap.ui.core",
             "sap.m"

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

@@ -11,7 +11,7 @@
  * Method Compute is used by ClientSide TargetResolution and takes not only the
  * next application but also the current application into account.
  *
- * @version 1.120.6
+ * @version 1.120.7
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/performance/ShellAnalytics.js

@@ -3,7 +3,7 @@
  * @fileOverview Provides analytical data like duration for navigation steps in the shell, in FLP,
  *               in particular an array of all statistical records
  *
- * @version 1.120.6
+ * @version 1.120.7
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/performance/StatisticalRecord.js

@@ -3,7 +3,7 @@
  * @fileOverview Class for statistical record
  *               It should contain data like step, duration after a navigation in the shell, can have status open.
  *               The closing of a record is logged in debug mode
- * @version 1.120.6
+ * @version 1.120.7
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/plugins/appwarmup/Component.js

@@ -87,7 +87,7 @@ sap.ui.define(
         var sComponentName = "sap.ushell.plugins.appwarmup.Component";
         return Component.extend(sComponentName, {
             metadata: {
-                version: "1.120.6",
+                version: "1.120.7",
                 library: "sap.ushell"
             },
 

package/src/main/js/sap/ushell/renderer/Renderer.js

@@ -78,9 +78,9 @@ sap.ui.define([
      */
     var Renderer = UIComponent.extend("sap.ushell.renderer.Renderer", {
         metadata: {
-            version: "1.120.6",
+            version: "1.120.7",
             dependencies: {
-                version: "1.120.6",
+                version: "1.120.7",
                 libs: ["sap.ui.core", "sap.m"],
                 components: []
             },

package/src/main/js/sap/ushell/renderer/Shell.controller.js

@@ -551,10 +551,13 @@ sap.ui.define([
                 oModel.setProperty("/enableTrackingActivity", enableTrackingActivity);
                 EventHub.emit("StepDone", eventData.stepName);
             }).catch(function (error) {
-                EventHub.emit("StepFailed", eventData.stepName);
                 Log.error(
-                    "Failed to load tracking activities state from the personalization", error,
+                    "Failed to load tracking activities state from the personalization, tracking activities is disabled", error,
                     "sap.ushell.components.flp.settings.FlpSettings");
+                // if the personalization cannot be read disable the functionality
+                // but don't prevent the FLP scheduler from triggering further steps
+                oModel.setProperty("/enableTrackingActivity", false);
+                EventHub.emit("StepDone", eventData.stepName);
             });
         },
 
@@ -1271,8 +1274,11 @@ sap.ui.define([
                 that._openAppViaNWBC(oResolvedHashFragment).then(function (bOpenedViaNWBC) {
                     if (bOpenedViaNWBC === true) {
                         oResolvedHashFragment.sFixedShellHash = sFixedShellHash;
-                        that.logOpenAppAction(oResolvedHashFragment, sAppPart);
+                        that.logOpenAppAction(oResolvedHashFragment, sAppPart).catch(() => {
+                            Log.info("NWBC application was not logged.", undefined, "sap.ushell.renderer.Shell.controller");
+                        });
                         oDashboard = Core.byId("sapUshellDashboardPage");
+
                         if (oDashboard) {
                             oDashboard.setBlocked(false);
                             oDashboard.setBusy(false);
@@ -1286,7 +1292,9 @@ sap.ui.define([
                     if (bNewWindowNavigation) {
                         // add the app to application usage log
                         oResolvedHashFragment.sFixedShellHash = sFixedShellHash;
-                        that.logOpenAppAction(oResolvedHashFragment, sAppPart);
+                        that.logOpenAppAction(oResolvedHashFragment, sAppPart).catch(() => {
+                            Log.info("Application in new window was not logged.", undefined, "sap.ushell.renderer.Shell.controller");
+                        });
                         sap.ui.require(["sap/ushell/components/container/ApplicationContainer"], function (ApplicationContainer) {
                             oResolvedHashFragment.url = ApplicationContainer.prototype._checkNwbcUrlAdjustment(undefined, oResolvedHashFragment.applicationType, oResolvedHashFragment.url, true);
                             that._openAppInNewWindowAndRestore(oResolvedHashFragment);
@@ -2132,7 +2140,9 @@ sap.ui.define([
             var sAppHash = this.oShellNavigation.hashChanger.getAppHash();
             var sAppPart = sAppHash ? "&/" + sAppHash : null;
 
-            this.logOpenAppAction(oResolvedHashFragment, sAppPart);
+            this.logOpenAppAction(oResolvedHashFragment, sAppPart).catch(() => {
+                Log.info("Opened application was not logged.", undefined, "sap.ushell.renderer.Shell.controller");
+            });
 
             this._notifyUITracer(oResolvedHashFragment);
         },
@@ -2276,6 +2286,8 @@ sap.ui.define([
                     appType: AppType.SEARCH,
                     title: sTitle,
                     url: "#" + window.hasher.getHash()
+                }).catch(() => {
+                    Log.info("Search activity was not logged.", undefined, "sap.ushell.renderer.Shell.controller");
                 });
             }
         },

package/src/main/js/sap/ushell/renderer/search/searchComponent/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.renderer.search.searchComponent",
         "applicationVersion": {
-            "version": "1.120.6"
+            "version": "1.120.7"
         },
         "type": "component"
     },

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

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's AppLifeCycle service enables plug-ins to enquire the which
  *    application is currently displayed and listen to life cycle events.
  *
- * @version 1.120.6
+ * @version 1.120.7
  */
 sap.ui.define([
     "sap/base/Log",

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

@@ -6,7 +6,7 @@
  * This is *not* an application facing service, but for Shell Internal usage.
  * This service should be accessed by the application via the CrossApplicationNavigation service.
  *
- * @version 1.120.6
+ * @version 1.120.7
  */
 sap.ui.define([
     "sap/ui/base/Object",

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

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's bookmark service. Allows creating shortcuts on the user's home page.
  *
- * @version 1.120.6
+ * @version 1.120.7
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery",

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

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's bookmark service. Allows creating shortcuts on the user's home page.
  *
- * @version 1.120.6
+ * @version 1.120.7
  */
 sap.ui.define([
     "sap/ushell/Config",

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

@@ -29,7 +29,7 @@
  * In the future, the custom resolver mechanism should be probably moved towards modifying (or only adding to the list of Inbounds),
  * this way a single data source has to be altered to support consistently getLinks, isIntentSupported.
  *
- * @version 1.120.6
+ * @version 1.120.7
  */
 sap.ui.define([
     "sap/base/Log",

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

@@ -2,7 +2,7 @@
 
 /**
  * @file Exposes a CommonDataModel-based site document in a platform-neutral format to it's clients
- * @version 1.120.6
+ * @version 1.120.7
  */
 sap.ui.define([
     "sap/ushell/services/_CommonDataModel/PersonalizationProcessor",
@@ -93,6 +93,7 @@ sap.ui.define([
         this._oPersonalizationDeltas = {};
         this._bLoadPersonalization = ushellUtils.isFlpHomeIntent();
         this._oManifestCache = {};
+        this._bPersonalizationLoadingFailed = false;
 
         // load site and personalization as early as possible in case of homepage loading
         this._oGetSitePromise = oAdapter.getSite()
@@ -112,7 +113,7 @@ sap.ui.define([
     CommonDataModel.prototype._loadAndApplyPersonalization = function (oSite) {
         var oCDMSiteVersion = new Version(oSite._version);
         if (oCDMSiteVersion.compareTo("3.1.0") < 0) {
-            this._oAdapter.getPersonalization(oCDMSiteVersion)
+            this._getPersonalization(oCDMSiteVersion)
                 .then(function (oPers) {
                     if (oPers) {
                         this._oPersonalizationDeltas = deepClone(oPers);
@@ -121,7 +122,7 @@ sap.ui.define([
                     }
                     this._triggerMixinPersonalisationInSite(oSite, oPers);
                 }.bind(this))
-                .fail(this._oSiteDeferred.reject); // mixinPersonalization
+                .catch(this._oSiteDeferred.reject); // mixinPersonalization
         } else {
             this._oPersonalizedPages = {};
             this._ensureStandardVizTypesPresent(this._oOriginalSite).then(function (_oOriginalSite) {
@@ -366,7 +367,7 @@ sap.ui.define([
                 if (bEnablePersonalization || (bEnableMyHome && sPageId === sMyHomePageId)) {
                     return Promise.all([
                         this._getPageFromAdapter(sPageId),
-                        this._oAdapter.getPersonalization(this._oOriginalSite._version)
+                        this._getPersonalization(this._oOriginalSite._version)
                     ])
                         .catch(function () {
                             return Promise.reject("CommonDataModel Service: Cannot get page " + sPageId);
@@ -457,8 +458,7 @@ sap.ui.define([
                 if (bEnablePersonalization || bEnableMyHome) {
                     return Promise.all([
                         this._getPagesFromAdapter(aPageIds),
-                        /* jquery promise is ok here*/
-                        this._oAdapter.getPersonalization(this._oOriginalSite._version)
+                        this._getPersonalization(this._oOriginalSite._version)
                     ])
                         .catch(function () {
                             return Promise.reject("CommonDataModel Service: Cannot get pages");
@@ -619,11 +619,7 @@ sap.ui.define([
             .then(function () {
                 return Promise.all([
                     this._getAssignedPageIds(),
-                    new Promise(function (resolve, reject) {
-                        this._oAdapter.getPersonalization(this._oOriginalSite._version)
-                            .done(resolve)
-                            .catch(reject);
-                    }.bind(this))
+                    this._getPersonalization(this._oOriginalSite._version)
                 ]);
             }.bind(this))
             .then(function (aResults) {
@@ -900,6 +896,15 @@ sap.ui.define([
     CommonDataModel.prototype.save = function (pageId) {
         var oDeferred = new jQuery.Deferred();
 
+        if (this._bPersonalizationLoadingFailed) {
+            // There is no way to recover from this except reloading the FLP as a more complex recovery logic
+            // would be overkill for this rare case.
+            var sErrorMessage = "Prior personalization loading failed, cancelling save to prevent data loss. Saving this personalization will only be possible after reloading the FLP again.";
+            Log.error(sErrorMessage, null, S_COMPONENT_NAME);
+            oDeferred.reject(sErrorMessage);
+            return oDeferred.promise();
+        }
+
         if (this._oOriginalSite._version === "3.1.0") {
             if (!pageId) {
                 return oDeferred.reject("No page id was provided").promise();
@@ -1017,6 +1022,23 @@ sap.ui.define([
             }.bind(this));
     };
 
+    /**
+     * Get the CDM personalization from the adapter.
+     *
+     * @param {string} sCDMVersion The CDM version
+     * @returns {Promise<object>} The personalization for the given CDM version or an empty object if the personalization could not be loaded
+     */
+    CommonDataModel.prototype._getPersonalization = function (sCDMVersion) {
+        return ushellUtils.promisify(this._oAdapter.getPersonalization(sCDMVersion))
+            .catch(function (oError) {
+                Log.error("Could not get page personalization", oError, S_COMPONENT_NAME);
+                // Do not prevent the page from loading if the personalization could not be loaded
+                // but prevent saving the personalization to prevent data loss
+                this._bPersonalizationLoadingFailed = true;
+                return {};
+            }.bind(this));
+    };
+
     /**
      * Sets the personalization based on the provided delta and page id.
      * Also prevents multiple requests and instead queries a later delta to be persisted until the currently active request is finished.

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

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's Configuration service enables Components of any kind to consume parts of Configuration
  * provided by the shell. It allows to attach on updates and receive the current values
  *
- * @version 1.120.6
+ * @version 1.120.7
  */
 sap.ui.define([
     "sap/ushell/Config",

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

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's Configuration Defaults service exposes default configurations set in the code base.
  *
- * @version 1.120.6
+ * @version 1.120.7
  */
 sap.ui.define([
     "sap/base/Log",

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

@@ -4,7 +4,7 @@
  * default adapter.
  * Once instantiated, returns a map of adapters to be used by the LaunchPage Service
  *
- * @version 1.120.6
+ * @version 1.120.7
  */
 sap.ui.define([
     "sap/ushell/Config",

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.120.6
+ * @version 1.120.7
  */
 sap.ui.define([
     "sap/ushell/services/AppConfiguration",

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

@@ -5,7 +5,7 @@
  *
  * The service provide dark mode support functionality
  *
- * @version 1.120.6
+ * @version 1.120.7
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/services/Extension/FloatingContainer.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Defines the interface for extensions in the FloatingContainer ShellArea.
  *
- * @version 1.120.6
+ * @version 1.120.7
  */
 sap.ui.define([
     "sap/ushell/Container"

package/src/main/js/sap/ushell/services/Extension/Footer.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Defines the interface for extensions in the Footer ShellArea.
  *
- * @version 1.120.6
+ * @version 1.120.7
  */
 sap.ui.define([
     "sap/ushell/Container"

package/src/main/js/sap/ushell/services/Extension/Header.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Defines the interface for extensions in the ShellHeader ShellArea.
  *
- * @version 1.120.6
+ * @version 1.120.7
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/services/Extension/Item.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Defines a generic interface for extension items in ShellAreas.
  *
- * @version 1.120.6
+ * @version 1.120.7
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/services/Extension/SidePane.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Defines the interface for extensions in the SidePane ShellArea.
  *
- * @version 1.120.6
+ * @version 1.120.7
  */
 sap.ui.define([
     "./Item",

package/src/main/js/sap/ushell/services/Extension/ToolArea.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Defines the interface for extensions in the ToolArea ShellArea.
  *
- * @version 1.120.6
+ * @version 1.120.7
  */
 sap.ui.define([
     "./Item",

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

@@ -5,7 +5,7 @@
  * This files exposes an API to extend the launchpad with new elements.
  * It is exposed publicly and meant to be used by apps and plugins.
  *
- * @version 1.120.6
+ * @version 1.120.7
  */
 sap.ui.define([
     "./Extension/FloatingContainer",

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

@@ -2,7 +2,7 @@
 
 /**
  * @file The Unified Shell's page builder service providing the data for the Fiori launchpad's classic Homepage.
- * @version 1.120.6
+ * @version 1.120.7
  */
 sap.ui.define([
     "sap/base/Log",

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The menu service provides the entries for the menu bar
- * @version 1.120.6
+ * @version 1.120.7
  */
 sap.ui.define([
     "sap/ushell/Config",

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The Unified Shell's message service.
- * @version 1.120.6
+ * @version 1.120.7
  */
 sap.ui.define([
     "sap/base/Log",

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module exposes API enpoints for Generic Communication
- * @version 1.120.6
+ * @version 1.120.7
  */
 sap.ui.define([
     "sap/ushell/services/_MessageBroker/MessageBrokerEngine",

package/src/main/js/sap/ushell/services/Navigation/utils.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview Navigation utility functions
  *
- * @version 1.120.6
+ * @version 1.120.7
  */
 
 

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

@@ -5,7 +5,7 @@
  * This file exposes an API to perform (invoke) Navigation for applications.
  * It exposes interfaces to perform a hash change and trigger a navigation.
  *
- * @version 1.120.6
+ * @version 1.120.7
  */
 sap.ui.define([
     "sap/base/Log",

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

@@ -8,7 +8,7 @@
  *
  * Configured with the ClientSideTargetResolutionAdapter.
  *
- * @version 1.120.6
+ * @version 1.120.7
  */
 sap.ui.define([
     "sap/ushell/resources"

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

@@ -651,13 +651,17 @@ sap.ui.define([
         };
 
         /**
-         * @returns {Promise} promise with the user settings flags
+         * @returns {Promise<object>} Resolves with the user settings flags
          * @private
          */
-        this.getUserSettingsFlags = function () {
-            return oUserFlagsReadFromPersonalizationPromise.then(() => {
-                return { highPriorityBannerEnabled: bHighPriorityBannerEnabled };
-            });
+        this.getUserSettingsFlags = async function () {
+            try {
+                await ushellUtils.promisify(oUserFlagsReadFromPersonalizationPromise);
+            } catch (oError) {
+                // if reading the personalization fails the default is returned
+            }
+
+            return { highPriorityBannerEnabled: bHighPriorityBannerEnabled };
         };
 
         this.setUserSettingsFlags = function (oFlags) {
@@ -1706,6 +1710,7 @@ sap.ui.define([
                         })
                         .catch(() => {
                             Log.error("Reading User Settings flags from Personalization service failed");
+                            oUserFlagsReadFromPersonalizationDeferred.reject();
                         });
                 })
                 .catch((error) => {

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

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's page building service.
  *
- * @version 1.120.6
+ * @version 1.120.7
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery"

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

@@ -6,7 +6,7 @@
  * It provides the layout and tile data of pages in the pages runtime.
  * Only used on the ABAP platform and on local for testing.
  *
- * @version 1.120.6
+ * @version 1.120.7
  */
 sap.ui.define([], function () {
     "use strict";

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module deals with page related referencing and dereferencing.
- * @version 1.120.6
+ * @version 1.120.7
  */
 sap.ui.define([
     "sap/ushell/services/_PageReferencing/PageReferencer"

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module exposes a model containing the pages hierarchy to its clients.
- * @version 1.120.6
+ * @version 1.120.7
  */
 sap.ui.define([
     "sap/base/Log",

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

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's personalization service, which provides generic read and write access to the currently logged on user's
  * personalization settings for the app currently executed in the shell.
  *
- * @version 1.120.6
+ * @version 1.120.7
  * @deprecated since 1.120 Please use {@link sap.ushell.services.PersonalizationV2} instead
  */
 sap.ui.define([

package/src/main/js/sap/ushell/services/PersonalizationV2/ContextContainer.js

@@ -90,7 +90,7 @@ sap.ui.define([
     * Synchronous read and write operations before the load is done have undefined
     * effects.
     *
-    * @returns {Promise<object>} Promise object
+    * @returns {Promise<undefined>} Resolves with undefined on success or rejects on failure
     *
     * @since 1.120.0
     * @public

package/src/main/js/sap/ushell/services/PersonalizationV2/Personalizer.js

@@ -49,7 +49,7 @@ sap.ui.define([
     /**
      * Gets a personalization data value.
      *
-     * @returns {Promise<object>} Resolves the data
+     * @returns {Promise<object>} Resolves with the personalization data or rejects on failure
      *
      * @since 1.120.0
      * @public
@@ -60,7 +60,7 @@ sap.ui.define([
                 return oContainer.getItemValue(this._sPersItem);
             })
             .catch((oError)=> {
-                Log.error("Fail to get Personalization data for Personalizer container: " + this._sPersContainer, oError);
+                Log.error("Failed to get personalization data for Personalizer container: " + this._sPersContainer, oError);
                 return Promise.reject();
             });
     };
@@ -81,7 +81,7 @@ sap.ui.define([
                 return ushellUtils.promisify(oContainer.save());
             })
             .catch((oError)=> {
-                Log.error("Fail to get Personalization data for Personalizer container: " + this._sPersContainer, oError);
+                Log.error("Failed to get personalization data for Personalizer container: " + this._sPersContainer, oError);
                 return Promise.reject();
             });
     };

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

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's personalization service, which provides generic read and write access to the currently logged on user's
  * personalization settings for the app currently executed in the shell.
  *
- * @version 1.120.6
+ * @version 1.120.7
  */
 sap.ui.define([
     "sap/base/Log",

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The Unified Shell's PluginManager service. Allows handling the loading of Fiori Launchpad plugins.
- * @version 1.120.6
+ * @version 1.120.7
  */
 sap.ui.define([
     "sap/base/Log",