@sapui5/sap.ushell 1.136.2 → 1.138.0

package/src/main/js/sap/ushell/adapters/cdm/ClientSideTargetResolutionAdapter.js

@@ -9,7 +9,7 @@
  * <li>provide the resolveHashFragment function, a fallback method called by ClientSideTargetResolution service.</li>
  * </ul>
  *
- * @version 1.136.2
+ * @version 1.138.0
  */
 sap.ui.define([
     "sap/base/util/Version",
@@ -17,13 +17,13 @@ sap.ui.define([
     "sap/base/util/deepExtend",
     "sap/base/Log",
     "sap/ushell/Container"
-], function (
+], (
     Version,
     jQuery,
     fnDeepExtend,
     Log,
     Container
-) {
+) => {
     "use strict";
 
     /**
@@ -42,9 +42,9 @@ sap.ui.define([
      * @private
      */
 
-    var ClientSideTargetResolutionAdapter = function (oSystem, sParameters, oAdapterConfig) {
+    function ClientSideTargetResolutionAdapter (oSystem, sParameters, oAdapterConfig) {
         this._oAdapterConfig = oAdapterConfig && oAdapterConfig.config;
-        var sProductName = "";
+        let sProductName = "";
 
         if (Container.isInitialized()) {
             sProductName = Container.getLogonSystem().getProductName() || "";
@@ -92,25 +92,25 @@ sap.ui.define([
          * @private
          */
         this.getInbounds = function () {
-            var that = this;
+            const that = this;
 
             if (!this._getInboundsDeferred) {
                 this._getInboundsDeferred = new jQuery.Deferred();
 
                 Container.getServiceAsync("CommonDataModel")
-                    .then(function (oService) {
+                    .then((oService) => {
                         return oService.getSiteWithoutPersonalization();
                     })
-                    .then(function (oSite) {
+                    .then((oSite) => {
                         // Process utilsCDM module version as needed by FLP site version
-                        var sUtilsCdmModule = (oSite._version && Version(oSite._version).getMajor() === 3) ?
+                        const sUtilsCdmModule = (oSite._version && Version(oSite._version).getMajor() === 3) ?
                             "sap/ushell/adapters/cdm/v3/utilsCdm" : "sap/ushell/utils/utilsCdm";
-                        sap.ui.require([sUtilsCdmModule], function (oUtilsCdm) {
+                        sap.ui.require([sUtilsCdmModule], (oUtilsCdm) => {
                             // Resolve inbounds
-                            var aInbounds = oUtilsCdm.formatSite(oSite) || [];
+                            const aInbounds = oUtilsCdm.formatSite(oSite) || [];
                             that._getInboundsDeferred.resolve(aInbounds);
                         });
-                    }, function (oErr) {
+                    }, (oErr) => {
                         that._getInboundsDeferred.reject(oErr);
                     });
             }
@@ -121,9 +121,9 @@ sap.ui.define([
         this._createSIDMap = function (oAliases) {
             return Object.keys(oAliases)
                 .sort()
-                .reduce(function (oSIDMapping, sId) {
-                    var oCurrentAlias = oAliases[sId];
-                    var sSid = "SID(" + oCurrentAlias.systemId + "." + oCurrentAlias.client + ")";
+                .reduce((oSIDMapping, sId) => {
+                    const oCurrentAlias = oAliases[sId];
+                    const sSid = `SID(${oCurrentAlias.systemId}.${oCurrentAlias.client})`;
                     if (!oSIDMapping.hasOwnProperty(sSid) && oCurrentAlias.hasOwnProperty("systemId") && oCurrentAlias.hasOwnProperty("client")) {
                         oSIDMapping[sSid] = sId;
                     }
@@ -132,25 +132,25 @@ sap.ui.define([
         };
 
         this._getSystemAliases = function () {
-            var that = this;
+            const that = this;
 
             if (!this.oSystemAliasesDeferred) {
                 this.oSystemAliasesDeferred = new jQuery.Deferred();
 
                 Container.getServiceAsync("CommonDataModel")
-                    .then(function (oService) {
+                    .then((oService) => {
                         return oService.getSiteWithoutPersonalization();
                     })
-                    .then(function (oSite) {
-                        var oSystemAliases = fnDeepExtend({}, oSite.systemAliases || {});
+                    .then((oSite) => {
+                        const oSystemAliases = fnDeepExtend({}, oSite.systemAliases || {});
 
                         // propagate id in system alias
-                        Object.keys(oSystemAliases).forEach(function (sId) {
+                        Object.keys(oSystemAliases).forEach((sId) => {
                             oSystemAliases[sId].id = sId;
                         });
 
                         that.oSystemAliasesDeferred.resolve(oSystemAliases);
-                    }, function (oErr) {
+                    }, (oErr) => {
                         that.oSystemAliasesDeferred.reject(oErr);
                     });
             }
@@ -196,11 +196,11 @@ sap.ui.define([
          * @private
          */
         this.resolveSystemAlias = function (sSystemAlias) {
-            var oDeferred = new jQuery.Deferred(),
-                that = this;
+            const oDeferred = new jQuery.Deferred();
+            const that = this;
 
-            this._getSystemAliases().done(function (oSystemAliases) {
-                var sMessage, oSystemAlias;
+            this._getSystemAliases().done((oSystemAliases) => {
+                let oSystemAlias;
                 // 1. check if system Alias is in the Map returned in the first place
                 if (oSystemAliases.hasOwnProperty(sSystemAlias)) {
                     oSystemAlias = oSystemAliases[sSystemAlias];
@@ -221,19 +221,19 @@ sap.ui.define([
                     that._oSIDMap = that._createSIDMap(oSystemAliases);
                 }
                 if (that._oSIDMap.hasOwnProperty(sSystemAlias)) {
-                    var oMatchedAlias = oSystemAliases[that._oSIDMap[sSystemAlias]];
+                    const oMatchedAlias = oSystemAliases[that._oSIDMap[sSystemAlias]];
                     oDeferred.resolve(oMatchedAlias);
                     return;
                 }
                 // Alias not found. Log and reject!
-                sMessage = "Cannot resolve system alias " + sSystemAlias;
+                const sMessage = `Cannot resolve system alias ${sSystemAlias}`;
                 Log.warning(
                     sMessage,
                     "The system alias cannot be found in the site response",
                     "sap.ushell.adapters.cdm.ClientSideTargetResolutionAdapter"
                 );
                 oDeferred.reject(sMessage);
-            }).fail(function (oErr) {
+            }).fail((oErr) => {
                 oDeferred.reject(oErr);
             });
 
@@ -250,28 +250,28 @@ sap.ui.define([
          *
          */
         this.getContentProviderDataOriginsLookup = function () {
-            var that = this;
+            const that = this;
 
             if (!this.oContentProviderDataOriginsDeferred) {
                 this.oContentProviderDataOriginsDeferred = new jQuery.Deferred();
 
                 Container.getServiceAsync("CommonDataModel")
-                    .then(function (oService) {
+                    .then((oService) => {
                         return oService.getSiteWithoutPersonalization();
                     })
-                    .then(function (oSite) {
-                        var oLookup = null;
+                    .then((oSite) => {
+                        let oLookup = null;
                         if (oSite.contentProviderDataOrigins) {
                             oLookup = fnDeepExtend({}, oSite.contentProviderDataOrigins);
                         }
                         that.oContentProviderDataOriginsDeferred.resolve(oLookup);
-                    }, function (oErr) {
+                    }, (oErr) => {
                         that.oContentProviderDataOriginsDeferred.reject(oErr);
                     });
             }
 
             return this.oContentProviderDataOriginsDeferred.promise();
         };
-    };
+    }
     return ClientSideTargetResolutionAdapter;
 }, /* bExport= */ false);

package/src/main/js/sap/ushell/adapters/cdm/CommonDataModelAdapter.js

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's sap.ushell.adapters.cdm.CommonDataModelAdapter for the 'CDM'
  *               platform.
  *
- * @version 1.136.2
+ * @version 1.138.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -13,14 +13,14 @@ sap.ui.define([
     "sap/ui/thirdparty/URI",
     "sap/ui/thirdparty/jquery",
     "sap/ushell/Container"
-], function (
+], (
     Log,
     extend,
     Version,
     URI,
     jQuery,
     Container
-) {
+) => {
     "use strict";
 
     /**
@@ -41,19 +41,19 @@ sap.ui.define([
      * @see {@link sap.ushell.adapters.cdm.CommonDataModelAdapter}
      */
 
-    var CommonDataModelAdapter = function (oUnused, sParameter, oAdapterConfiguration) {
+    function CommonDataModelAdapter (oUnused, sParameter, oAdapterConfiguration) {
         this.oAdapterConfiguration = oAdapterConfiguration;
         if (oAdapterConfiguration && oAdapterConfiguration.config && oAdapterConfiguration.config.siteData) {
             this.oCdmSiteDataRequestPromise = new jQuery.Deferred().resolve(oAdapterConfiguration.config.siteData);
         } else if (oAdapterConfiguration && oAdapterConfiguration.config && oAdapterConfiguration.config.siteDataPromise) {
             this.oCdmSiteDataRequestPromise = oAdapterConfiguration.config.siteDataPromise;
         } else {
-            var sSiteUrl = this._identifySiteUrlFromConfig(oAdapterConfiguration);
-            var sAbsoluteSiteUrl = this._normalizeUrl(sSiteUrl, location.href);
+            const sSiteUrl = this._identifySiteUrlFromConfig(oAdapterConfiguration);
+            const sAbsoluteSiteUrl = this._normalizeUrl(sSiteUrl, location.href);
 
             this.oCdmSiteDataRequestPromise = this._requestSiteData(sAbsoluteSiteUrl);
         }
-    };
+    }
 
     /**
      * Bundles the request logic for fetching the CDM site
@@ -64,7 +64,7 @@ sap.ui.define([
      * @private
      */
     CommonDataModelAdapter.prototype._requestSiteData = function (sUrl) {
-        var oSiteDataRequestDeferred = new jQuery.Deferred();
+        const oSiteDataRequestDeferred = new jQuery.Deferred();
 
         if (!sUrl) {
             return oSiteDataRequestDeferred.reject(
@@ -75,9 +75,9 @@ sap.ui.define([
             type: "GET",
             dataType: "json",
             url: sUrl
-        }).done(function (oResponseData) {
+        }).done((oResponseData) => {
             oSiteDataRequestDeferred.resolve(oResponseData);
-        }).fail(function (oError) {
+        }).fail((oError) => {
             Log.error(oError.responseText);
             oSiteDataRequestDeferred.reject("CDM Site was requested but could not be loaded.");
         });
@@ -111,11 +111,10 @@ sap.ui.define([
         // <base href=""> tags should be considered for the URI normalization
         // as per the HTML specification, there must not more than one base tag. If so,
         // only the first href which is found will be considered.
-        var oBaseTag = document.getElementsByTagName("base")[0];
+        const oBaseTag = document.getElementsByTagName("base")[0];
         return (new URI(sUrl, oBaseTag).absoluteTo(sCurrentURL)).toString();
     };
 
-
     /**
      * Retrieves the CDM site
      *
@@ -123,14 +122,14 @@ sap.ui.define([
      * @public
      */
     CommonDataModelAdapter.prototype.getSite = function () {
-        var oDeferred = new jQuery.Deferred();
+        const oDeferred = new jQuery.Deferred();
 
-        this.oCdmSiteDataRequestPromise.done(function (oSiteData) {
-            var oSiteWithoutPers = extend({}, oSiteData);
+        this.oCdmSiteDataRequestPromise.done((oSiteData) => {
+            const oSiteWithoutPers = extend({}, oSiteData);
 
             delete oSiteWithoutPers.personalization;
             oDeferred.resolve(oSiteWithoutPers);
-        }).fail(function (sMessage) {
+        }).fail((sMessage) => {
             oDeferred.reject(sMessage);
         });
 
@@ -144,13 +143,13 @@ sap.ui.define([
      * @public
      */
     CommonDataModelAdapter.prototype.getPersonalization = function () {
-        var oDeferred = new jQuery.Deferred(),
-            that = this;
+        const oDeferred = new jQuery.Deferred();
+        const that = this;
 
-        this.oCdmSiteDataRequestPromise.done(function (oSiteData) {
-            var oSiteDataCopy = extend({}, oSiteData),
-                sSiteVersion = oSiteDataCopy._version,
-                sPersonalizationVersion;
+        this.oCdmSiteDataRequestPromise.done((oSiteData) => {
+            const oSiteDataCopy = extend({}, oSiteData);
+            const sSiteVersion = oSiteDataCopy._version;
+            let sPersonalizationVersion;
 
             if (that.oAdapterConfiguration && that.oAdapterConfiguration.config && that.oAdapterConfiguration.config.ignoreSiteDataPersonalization) {
                 delete oSiteDataCopy.personalization;
@@ -159,28 +158,28 @@ sap.ui.define([
                 sPersonalizationVersion = oSiteDataCopy.personalization._version;
                 if (Object.keys(oSiteDataCopy.personalization).length > 0 && !that._isPersonalizationVersionValid(sSiteVersion, sPersonalizationVersion)) {
                     Log.error("Personalization version is not compatible to the site version and will not be loaded."
-                        + " Please proceed to personalize the homepage again if needed. Personalization version: " + sPersonalizationVersion + "; Site version: " + sSiteVersion);
+                        + ` Please proceed to personalize the homepage again if needed. Personalization version: ${sPersonalizationVersion}; Site version: ${sSiteVersion}`);
                     oDeferred.resolve();
                     return;
                 }
                 oDeferred.resolve(oSiteDataCopy.personalization);
             } else {
                 that._readPersonalizationDataFromStorage(sSiteVersion)
-                    .done(function (oPersonalizationData) {
+                    .done((oPersonalizationData) => {
                         sPersonalizationVersion = oPersonalizationData._version;
                         if (Object.keys(oPersonalizationData).length > 0 && !that._isPersonalizationVersionValid(sSiteVersion, sPersonalizationVersion)) {
                             Log.error("Personalization version is not compatible to the site version and will not be loaded."
-                                + " Please proceed to personalize the homepage again if needed. Personalization version: " + sPersonalizationVersion + "; Site version: " + sSiteVersion);
+                                + ` Please proceed to personalize the homepage again if needed. Personalization version: ${sPersonalizationVersion}; Site version: ${sSiteVersion}`);
                             oDeferred.resolve();
                             return;
                         }
                         oDeferred.resolve(oPersonalizationData);
                     })
-                    .fail(function (sMessage) {
+                    .fail((sMessage) => {
                         oDeferred.reject(sMessage);
                     });
             }
-        }).fail(function (sMessage) {
+        }).fail((sMessage) => {
             oDeferred.reject(sMessage);
         });
 
@@ -209,8 +208,8 @@ sap.ui.define([
             return false;
         }
 
-        var iSiteVersionMajor = new Version(siteVersion).getMajor(),
-            oPersonalizationVersion = new Version(personalizationVersion);
+        const iSiteVersionMajor = new Version(siteVersion).getMajor();
+        const oPersonalizationVersion = new Version(personalizationVersion);
 
         if (iSiteVersionMajor >= 3) {
             return oPersonalizationVersion.getMajor() === iSiteVersionMajor;
@@ -227,20 +226,20 @@ sap.ui.define([
      * @private
      */
     CommonDataModelAdapter.prototype.setPersonalization = function (oPersonalizationData) {
-        var oPersonalizationDeferred = new jQuery.Deferred();
-
-        Container.getServiceAsync("PersonalizationV2").then(async function (oPersonalizationService) {
-            var oComponent,
-                oScope = {
-                    keyCategory: oPersonalizationService.KeyCategory.FIXED_KEY,
-                    writeFrequency: oPersonalizationService.WriteFrequency.LOW,
-                    clientStorageAllowed: true
-                },
-                oPersId = {
-                    container: "sap.ushell.cdm.personalization",
-                    item: "data"
-                },
-                oCdmSiteVersion = new Version(oPersonalizationData.version);
+        const oPersonalizationDeferred = new jQuery.Deferred();
+
+        Container.getServiceAsync("PersonalizationV2").then(async (oPersonalizationService) => {
+            let oComponent;
+            const oScope = {
+                keyCategory: oPersonalizationService.KeyCategory.FIXED_KEY,
+                writeFrequency: oPersonalizationService.WriteFrequency.LOW,
+                clientStorageAllowed: true
+            };
+            let oPersId = {
+                container: "sap.ushell.cdm.personalization",
+                item: "data"
+            };
+            const oCdmSiteVersion = new Version(oPersonalizationData.version);
 
             if (oCdmSiteVersion.inRange("3.1.0", "4.0.0")) {
                 oPersId = {
@@ -248,14 +247,14 @@ sap.ui.define([
                     item: "data"
                 };
             }
-            var oPersonalizer = await oPersonalizationService.getPersonalizer(oPersId, oScope, oComponent);
+            const oPersonalizer = await oPersonalizationService.getPersonalizer(oPersId, oScope, oComponent);
 
             oPersonalizer.setPersData(oPersonalizationData)
-                .then(function () {
+                .then(() => {
                     Log.info("Personalization data has been stored successfully.");
                     oPersonalizationDeferred.resolve();
                 })
-                .catch(function () {
+                .catch(() => {
                     oPersonalizationDeferred.reject("Writing personalization data failed.");
                 });
         });
@@ -274,21 +273,21 @@ sap.ui.define([
      * @private
      */
     CommonDataModelAdapter.prototype._readPersonalizationDataFromStorage = function (cdmSiteVersion) {
-        var oPersonalizationDeferred = new jQuery.Deferred();
+        const oPersonalizationDeferred = new jQuery.Deferred();
 
-        Container.getServiceAsync("PersonalizationV2").then(async function (oPersonalizationService) {
-            var oScope = {
+        Container.getServiceAsync("PersonalizationV2").then(async (oPersonalizationService) => {
+            const oScope = {
                 keyCategory: oPersonalizationService.KeyCategory.FIXED_KEY,
                 writeFrequency: oPersonalizationService.WriteFrequency.LOW,
                 clientStorageAllowed: true
             };
-            var oPersId = {
+            let oPersId = {
                 container: "sap.ushell.cdm.personalization",
                 item: "data"
             };
 
             if (cdmSiteVersion) {
-                var oVersion = new Version(cdmSiteVersion);
+                const oVersion = new Version(cdmSiteVersion);
 
                 if (oVersion && oVersion.inRange("3.1.0", "4.0.0")) {
                     oPersId = {
@@ -301,10 +300,10 @@ sap.ui.define([
             const oPersonalizer = await oPersonalizationService.getPersonalizer(oPersId, oScope);
 
             oPersonalizer.getPersData()
-                .then(function (oPersonalizationData) {
+                .then((oPersonalizationData) => {
                     oPersonalizationDeferred.resolve(oPersonalizationData || {});
                 })
-                .catch(function () {
+                .catch(() => {
                     oPersonalizationDeferred.reject("Fetching personalization data failed.");
                 });
         });
@@ -325,9 +324,9 @@ sap.ui.define([
      * @private
      */
     CommonDataModelAdapter.prototype._identifySiteUrlFromConfig = function (oAdapterConfiguration) {
-        var oParams = new URLSearchParams(window.location.search);
-        var sSiteURL = oParams.get("sap-ushell-cdm-site-url");
-        var oConfig = oAdapterConfiguration && oAdapterConfiguration.config;
+        const oParams = new URLSearchParams(window.location.search);
+        let sSiteURL = oParams.get("sap-ushell-cdm-site-url");
+        const oConfig = oAdapterConfiguration && oAdapterConfiguration.config;
         // take the site URL from the url parameter "sap-ushell-cdm-site-url" preferred if provided
         // to enable the loading of a test site but only if explicitly set via configuration to allow this
         if ((oConfig && !oConfig.allowSiteSourceFromURLParameter) && sSiteURL) {
@@ -344,4 +343,4 @@ sap.ui.define([
     };
 
     return CommonDataModelAdapter;
-}, /*export=*/ false);
+}, /* export=*/ false);

package/src/main/js/sap/ushell/adapters/cdm/ConfigurationDefaultsAdapter.js

@@ -3,17 +3,16 @@
 /**
  * @fileOverview The ConfigurationDefaults adapter for the CDM platform.
  *
- * @version 1.136.2
+ * @version 1.138.0
  */
 sap.ui.define([
     "sap/ushell/bootstrap/cdm/cdm.constants",
     "sap/base/util/deepClone"
-], function (oCdmConstants, fnDeepClone) {
+], (oCdmConstants, fnDeepClone) => {
     "use strict";
 
     /**
-     *
-     * @returns {sap.ushell.adapters.cdm.ConfigurationDefaultsAdapter}
+     * Returns {sap.ushell.adapters.cdm.ConfigurationDefaultsAdapter} the configuration defaults adapter
      * @private
      */
     return function () {