@sapui5/sap.ushell 1.140.0 → 1.141.0

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.140.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/ushell/services/CommonDataModel/PersonalizationProcessor",
@@ -119,8 +119,8 @@ sap.ui.define([
 
                 return oSite;
             })
-            .fail((error) => {
-                this._oSiteDeferred.reject(error);
+            .fail((oError) => {
+                this._oSiteDeferred.reject(oError);
                 this._bLoadPersonalizationForCDMVersion30Late = false;
             });
     }
@@ -139,8 +139,8 @@ sap.ui.define([
             const oPersonalization = await this._getPersonalization(oSite._version);
             this._oPersonalizedSiteForCDMVersion30 = await this._triggerMixinPersonalizationInSite(oSite, oPersonalization);
             this._oSiteDeferred.resolve(this._oPersonalizedSiteForCDMVersion30);
-        } catch (error) {
-            this._oSiteDeferred.reject(error);
+        } catch (oError) {
+            this._oSiteDeferred.reject(oError);
         }
     };
 
@@ -309,7 +309,7 @@ sap.ui.define([
             if (oGroup) {
                 oDeferred.resolve(oGroup);
             } else {
-                oDeferred.reject(`Group ${sId} not found`);
+                oDeferred.reject(new Error(`Group ${sId} not found`));
             }
         });
         return oDeferred.promise();
@@ -387,13 +387,15 @@ sap.ui.define([
                 oPage = await this._getPageFromAdapter(sPageId);
                 oPersonalization = await this._getPersonalization(this._oOriginalSite._version);
             } catch (oError) {
-                return Promise.reject(`CommonDataModel Service: Cannot get page ${sPageId}`);
+                Log.error(`CommonDataModel Service: Cannot get page ${sPageId}`, oError);
+                throw oError;
             }
 
             try {
                 oPersonalizedPage = await this._applyPagePersonalization(oPage, oPersonalization);
             } catch (oError) {
-                return Promise.reject("Personalization Processor: Cannot mixin the personalization.");
+                Log.error("CommonDataModel Service: Cannot mixin the personalization", oError);
+                throw oError;
             }
 
             const aMigratedPages = await this._migratePersonalizedPages([oPersonalizedPage]);
@@ -464,8 +466,9 @@ sap.ui.define([
                         this._getPagesFromAdapter(aPageIds),
                         this._getPersonalization(this._oOriginalSite._version)
                     ])
-                        .catch(() => {
-                            return Promise.reject("CommonDataModel Service: Cannot get pages");
+                        .catch((oError) => {
+                            Log.error("CommonDataModel Service: Cannot get pages", oError);
+                            throw new Error("CommonDataModel Service: Cannot get pages");
                         })
                         .then((aResults) => {
                             const oPages = aResults[0];
@@ -480,8 +483,9 @@ sap.ui.define([
                                     return Promise.resolve(oPages[sPageId]);
                                 }
                                 return this._applyPagePersonalization(oPages[sPageId], oPersonalization)
-                                    .catch(() => {
-                                        return Promise.reject("Personalization Processor: Cannot mixin the personalization.");
+                                    .catch((oError) => {
+                                        Log.error("Personalization Processor: Cannot mixin the personalization.", oError);
+                                        throw new Error("Personalization Processor: Cannot mixin the personalization.");
                                     });
                             }))
                                 .then((aPersonalizedPages) => {
@@ -652,7 +656,7 @@ sap.ui.define([
                     if (oApplications) {
                         resolve(oApplications);
                     } else {
-                        reject("CDM applications not found.");
+                        reject(new Error("CDM applications not found."));
                     }
                 })
                 .fail(reject);
@@ -800,7 +804,7 @@ sap.ui.define([
                         resolve(vProperty);
                     } else {
                         const sProperty = vObjectPath.toString();
-                        reject(`CDM ${sProperty} not found.`);
+                        reject(new Error(`CDM ${sProperty} not found.`));
                     }
                 })
                 .fail(reject);
@@ -829,7 +833,7 @@ sap.ui.define([
             this._oOriginalSite.groups[sGroupId]) {
             oDeferred.resolve(deepExtend({}, this._oOriginalSite.groups[sGroupId]));
         } else {
-            oDeferred.reject("Group does not exist in original site.");
+            oDeferred.reject(new Error("Group does not exist in original site."));
         }
 
         return oDeferred.promise();
@@ -868,13 +872,13 @@ sap.ui.define([
             // would be overkill for this rare case.
             const 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);
+            oDeferred.reject(new Error(sErrorMessage));
             return oDeferred.promise();
         }
 
         if (this._oOriginalSite._version === "3.1.0") {
             if (!pageId) {
-                return oDeferred.reject("No page id was provided").promise();
+                return oDeferred.reject(new Error("No page id was provided")).promise();
             }
             if (typeof pageId === "string") {
                 pageId = [pageId];
@@ -908,8 +912,9 @@ sap.ui.define([
                 .done(resolve)
                 .fail(reject);
         })
-            .catch(() => {
-                return Promise.reject("Personalization Processor: Cannot extract personalization.");
+            .catch((oError) => {
+                Log.error("Personalization Processor: Cannot extract personalization.", oError, S_COMPONENT_NAME);
+                throw new Error("Personalization Processor: Cannot extract personalization.");
             })
             .then((oPersonalization) => {
                 if (isEmptyObject(oPersonalization)) {
@@ -941,8 +946,8 @@ sap.ui.define([
                             personalization: oPersonalization
                         });
                     })
-                    .fail((sError) => {
-                        Log.error(`Cannot extract personalization of page ${sPageId}: ${sError}`, null, S_COMPONENT_NAME);
+                    .fail((oError) => {
+                        Log.error(`Cannot extract personalization of page ${sPageId}:`, oError, S_COMPONENT_NAME);
                         resolve();
                     });
             });
@@ -1216,67 +1221,66 @@ sap.ui.define([
 
             oPluginSets = {};
 
-            return this.getSiteWithoutPersonalization().then((oSite) => {
-                const oApplications = oSite.applications || {};
-
-                Object.keys(oApplications).filter(function (sAppName) {
-                    return ObjectPath.get("type", this[sAppName]["sap.flp"]) === "plugin";
-                }, oApplications).forEach(function (sPluginName) {
-                    const oPlugin = this[sPluginName];
-                    let oComponentProperties = {};
-
-                    if (!isPlainObject(oPlugin["sap.platform.runtime"])) {
-                        Log.error(`Cannot find 'sap.platform.runtime' section for plugin '${sPluginName}'`,
-                            "plugin might not be started correctly",
-                            "sap.ushell.services.CommonDataModel");
-                    } else if (!isPlainObject(oPlugin["sap.platform.runtime"].componentProperties)) {
-                        Log.error(`Cannot find 'sap.platform.runtime/componentProperties' section for plugin '${sPluginName}'`,
-                            "plugin might not be started correctly",
-                            "sap.ushell.services.CommonDataModel");
-                    } else {
-                        oComponentProperties = oPlugin["sap.platform.runtime"].componentProperties;
-                    }
+            return this.getSiteWithoutPersonalization()
+                .then((oSite) => {
+                    const oApplications = oSite.applications || {};
+
+                    Object.keys(oApplications).filter(function (sAppName) {
+                        return ObjectPath.get("type", this[sAppName]["sap.flp"]) === "plugin";
+                    }, oApplications).forEach(function (sPluginName) {
+                        const oPlugin = this[sPluginName];
+                        let oComponentProperties = {};
+
+                        if (!isPlainObject(oPlugin["sap.platform.runtime"])) {
+                            Log.error(`Cannot find 'sap.platform.runtime' section for plugin '${sPluginName}'`,
+                                "plugin might not be started correctly",
+                                "sap.ushell.services.CommonDataModel");
+                        } else if (!isPlainObject(oPlugin["sap.platform.runtime"].componentProperties)) {
+                            Log.error(`Cannot find 'sap.platform.runtime/componentProperties' section for plugin '${sPluginName}'`,
+                                "plugin might not be started correctly",
+                                "sap.ushell.services.CommonDataModel");
+                        } else {
+                            oComponentProperties = oPlugin["sap.platform.runtime"].componentProperties;
+                        }
 
-                    oPluginSets[sPluginName] = {
-                        url: oComponentProperties.url,
-                        component: oPlugin["sap.ui5"].componentName
-                    };
-
-                    //
-                    // define plugin configuration
-                    //
-                    const oSignatureInbounds = ObjectPath.get(
-                        "crossNavigation.inbounds", oPlugin["sap.app"]
-                    ) || {};
-
-                    const oConfigFromInboundSignature = fnExtractPluginConfigFromInboundSignature(
-                        sPluginName,
-                        oSignatureInbounds
-                    );
-
-                    const oPluginConfig = extend(
-                        oComponentProperties.config || {},
-                        oConfigFromInboundSignature // has precedence
-                    );
-
-                    if (oPluginConfig) {
-                        oPluginSets[sPluginName].config = oPluginConfig;
-                    }
+                        oPluginSets[sPluginName] = {
+                            url: oComponentProperties.url,
+                            component: oPlugin["sap.ui5"].componentName
+                        };
+
+                        //
+                        // define plugin configuration
+                        //
+                        const oSignatureInbounds = ObjectPath.get(
+                            "crossNavigation.inbounds", oPlugin["sap.app"]
+                        ) || {};
+
+                        const oConfigFromInboundSignature = fnExtractPluginConfigFromInboundSignature(
+                            sPluginName,
+                            oSignatureInbounds
+                        );
 
-                    if (oComponentProperties.asyncHints) {
-                        oPluginSets[sPluginName].asyncHints = oComponentProperties.asyncHints;
-                    }
+                        const oPluginConfig = extend(
+                            oComponentProperties.config || {},
+                            oConfigFromInboundSignature // has precedence
+                        );
 
-                    const oDeviceTypes = ObjectPath.get("deviceTypes", oPlugin["sap.ui"]);
-                    if (oDeviceTypes) {
-                        oPluginSets[sPluginName].deviceTypes = oDeviceTypes;
-                    }
-                }, oApplications);
+                        if (oPluginConfig) {
+                            oPluginSets[sPluginName].config = oPluginConfig;
+                        }
 
-                return ushellUtils.deepFreeze(oPluginSets);
-            }, (vError) => {
-                return vError;
-            });
+                        if (oComponentProperties.asyncHints) {
+                            oPluginSets[sPluginName].asyncHints = oComponentProperties.asyncHints;
+                        }
+
+                        const oDeviceTypes = ObjectPath.get("deviceTypes", oPlugin["sap.ui"]);
+                        if (oDeviceTypes) {
+                            oPluginSets[sPluginName].deviceTypes = oDeviceTypes;
+                        }
+                    }, oApplications);
+
+                    return ushellUtils.deepFreeze(oPluginSets);
+                });
         };
     })();
 

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.140.0
+ * @version 1.141.0
  */
 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.140.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/base/Log",

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

@@ -4,7 +4,7 @@
  * @fileOverview Creates an adapter factory for data not handled by the default adapter.
  * Once instantiated, returns a map of adapters to be used by the LaunchPage Service
  *
- * @version 1.140.0
+ * @version 1.141.0
  * @deprecated since 1.120
  */
 sap.ui.define([