@sapui5/sap.ushell 1.138.1 → 1.139.1

package/src/main/js/sap/ushell/components/shell/Settings/appearance/Appearance.controller.js

@@ -116,11 +116,11 @@ sap.ui.define([
             const sThemeRoot = this.sThemeRoot;
 
             // Find all theme sets that include the theme with the given id
-            function _getThemeSets(sId) {
+            function _getThemeSets (sId) {
                 return aSets.filter((set) => !!set.set.themes?.find?.((theme) => theme?.id === sId));
             }
 
-            function _getAvatarUrl(oTheme) {
+            function _getAvatarUrl (oTheme) {
                 if (sThemeRoot && oTheme?.avatarRuntimeUrl) {
                     return sThemeRoot + oTheme.avatarRuntimeUrl;
                 }
@@ -256,16 +256,16 @@ sap.ui.define([
         },
 
         onAfterRendering: function () {
-            var isListSelected = this.getView().getModel("config").getProperty("/themeConfigurable");
-            var oList = this.getView().byId("themeList");
+            const isListSelected = this.getView().getModel("config").getProperty("/themeConfigurable");
+            const oList = this.getView().byId("themeList");
             oList.toggleStyleClass("sapUshellThemeListDisabled", !isListSelected);
         },
 
         _handleThemeApplied: function () {
-            var oConfigModel = this.getView().getModel("config");
+            const oConfigModel = this.getView().getModel("config");
             if (oConfigModel) {
                 // readjusts the theme list after the dark mode change
-                var aThemeListData = this._getThemeListData(this.oUser.getTheme());
+                const aThemeListData = this._getThemeListData(this.oUser.getTheme());
                 const oViewModel = this.getView().getModel();
                 oViewModel.setProperty("/options", aThemeListData);
                 oViewModel.setProperty("/deprecatedThemeSelected", this.bShowDeprecationMsg);
@@ -273,12 +273,12 @@ sap.ui.define([
         },
 
         onCancel: function () {
-            var oConfigModel = this.getView().getModel("config");
+            const oConfigModel = this.getView().getModel("config");
 
             if (oConfigModel.getProperty("/themeConfigurable")) {
-                var sUserTheme = this.oUser.getTheme();
-                var aThemeOptions = this.getView().getModel().getProperty("/options");
-                aThemeOptions.forEach(function (oThemeOption) {
+                const sUserTheme = this.oUser.getTheme();
+                const aThemeOptions = this.getView().getModel().getProperty("/options");
+                aThemeOptions.forEach((oThemeOption) => {
                     oThemeOption.isSelected = sUserTheme === oThemeOption.id;
                 });
                 this.getView().getModel().setProperty("/options", aThemeOptions);
@@ -311,12 +311,12 @@ sap.ui.define([
          */
         onSave: function (fnUpdateUserPreferences) {
             this._updateUserPreferences = fnUpdateUserPreferences;
-            var oConfigModel = this.getView().getModel("config");
-            var aSavePromises = [];
+            const oConfigModel = this.getView().getModel("config");
+            const aSavePromises = [];
 
             // onSaveThemes may switch dark mode on and off, therefore, the order of calls is important here
             if (oConfigModel.getProperty("/themeConfigurable")) {
-                aSavePromises.push(this.onSaveThemes().then(function () {
+                aSavePromises.push(this.onSaveThemes().then(() => {
                     EventHub.emit("themeChanged", Date.now());
                 }));
             }
@@ -334,9 +334,9 @@ sap.ui.define([
             }
 
             return Promise.all(aSavePromises)
-                .then(function (aResults) {
-                    var aMessages = [];
-                    aResults.forEach(function (sResult) {
+                .then((aResults) => {
+                    const aMessages = [];
+                    aResults.forEach((sResult) => {
                         if (sResult && BaseObject.isObjectA(sResult, "sap.ui.core.message.Message")) {
                             aMessages.push(sResult);
                         }
@@ -381,6 +381,9 @@ sap.ui.define([
 
             let bSaveSettings = false;
             if (sNewThemeId && sNewThemeId !== sOriginalThemeId) {
+                Container.getServiceAsync("UserInfo").then((UserInfo) => {
+                    UserInfo.updateThemeRoot(sNewThemeId);
+                });
                 oUser.setTheme(sNewThemeId);
                 bSaveSettings = true;
             }
@@ -391,10 +394,10 @@ sap.ui.define([
 
             if (bSaveSettings) {
                 return this._updateUserPreferences(oUser)
-                    .then(function () {
+                    .then(() => {
                         return this.onSaveThemesSuccess(oUser);
-                    }.bind(this))
-                    .catch(function (sErrorMessage) {
+                    })
+                    .catch((sErrorMessage) => {
                         if (!sErrorMessage.includes("THEME")) {
                             return this.onSaveThemesSuccess(oUser);
                         }
@@ -407,13 +410,13 @@ sap.ui.define([
                             type: MessageType.Error,
                             description: sErrorMessage
                         });
-                    }.bind(this));
+                    });
             }
             return Promise.resolve();
         },
 
         _onSaveContentDensitySuccess: function (sNewContentDensity) {
-            var oUser = this.oUser;
+            const oUser = this.oUser;
             oUser.resetChangedProperty("contentDensity");
             EventBus.getInstance().publish("launchpad", "toggleContentDensity", {
                 contentDensity: sNewContentDensity
@@ -421,29 +424,29 @@ sap.ui.define([
             EventHub.emit("toggleContentDensity", {
                 contentDensity: sNewContentDensity
             });
-            return new Promise(function (resolve) {
+            return new Promise((resolve) => {
                 // resolve the promise _after_ the event has been processed;
                 // we need to do this in an event handler, as the EventHub is asynchronous.
-                EventHub.once("toggleContentDensity").do(function () {
+                EventHub.once("toggleContentDensity").do(() => {
                     resolve();
                 });
             });
         },
 
         onSaveContentDensity: function () {
-            var oConfigModel = this.getView().getModel("config");
-            var oUser = this.oUser;
-            var sNewContentDensity = oConfigModel.getProperty("/isCozyContentMode") ? "cozy" : "compact";
-            var sUserContentDensity = oUser.getContentDensity();
+            const oConfigModel = this.getView().getModel("config");
+            const oUser = this.oUser;
+            const sNewContentDensity = oConfigModel.getProperty("/isCozyContentMode") ? "cozy" : "compact";
+            const sUserContentDensity = oUser.getContentDensity();
             Log.debug("[000] onSaveContentDensity", "Appearance.controller");
             if (sNewContentDensity !== sUserContentDensity && oConfigModel.getProperty("/contentDensityConfigurable")) {
                 oUser.setContentDensity(sNewContentDensity);
                 Log.debug("[000] onSaveContentDensity: sNewContentDensity", sNewContentDensity, "Appearance.controller");
                 return this._updateUserPreferences(oUser)
-                    .then(function () {
+                    .then(() => {
                         return this._onSaveContentDensitySuccess(sNewContentDensity);
-                    }.bind(this))
-                    .catch(function (sErrorMessage) {
+                    })
+                    .catch((sErrorMessage) => {
                         if (!sErrorMessage.includes("CONTENT_DENSITY")) {
                             return this._onSaveContentDensitySuccess();
                         }
@@ -454,30 +457,30 @@ sap.ui.define([
                             type: MessageType.Error,
                             message: sErrorMessage
                         });
-                    }.bind(this));
+                    });
             }
             return Promise.resolve();
         },
 
         onSaveTileSize: function () {
-            var oConfigModel = this.getView().getModel("config");
-            var sNewSizeBehavior = this.TILE_SIZE.getName(oConfigModel.getProperty("/tileSize")); // take string value, not index
-            var sCurrentSizeBehavior = Config.last("/core/home/sizeBehavior");
+            const oConfigModel = this.getView().getModel("config");
+            const sNewSizeBehavior = this.TILE_SIZE.getName(oConfigModel.getProperty("/tileSize")); // take string value, not index
+            const sCurrentSizeBehavior = Config.last("/core/home/sizeBehavior");
             if (sNewSizeBehavior && sNewSizeBehavior !== sCurrentSizeBehavior && oConfigModel.getProperty("/sizeBehaviorConfigurable")) {
-                return new Promise(function (resolve, reject) {
+                return new Promise((resolve, reject) => {
                     this.writeToPersonalization("flp.settings.FlpSettings", "sizeBehavior", sNewSizeBehavior)
-                        .done(function () {
+                        .done(() => {
                             Config.emit("/core/home/sizeBehavior", sNewSizeBehavior);
                             // todo move to other place?
-                            var aTiles = document.getElementsByClassName(".sapUshellTile");
-                            for (var i = 0; i < aTiles.length; i++) {
+                            const aTiles = document.getElementsByClassName(".sapUshellTile");
+                            for (let i = 0; i < aTiles.length; i++) {
                                 aTiles[i].classList.toggle("sapUshellSmall", sNewSizeBehavior !== "Responsive");
                             }
                             resolve();
                         })
-                        .fail(function (sErrorMessage, parsedErrorInformation) {
+                        .fail((sErrorMessage, parsedErrorInformation) => {
                             Log.error("Cannot save tile size configuration", sErrorMessage);
-                            var oMessage = new Message({
+                            const oMessage = new Message({
                                 type: MessageType.Error,
                                 description: sErrorMessage,
                                 message: parsedErrorInformation.message.value,
@@ -486,7 +489,7 @@ sap.ui.define([
                             });
                             reject(oMessage);
                         });
-                }.bind(this));
+                });
             }
             return Promise.resolve();
         },
@@ -499,18 +502,18 @@ sap.ui.define([
 
         // Save the value of the Enable Auto Dark Mode Detection switch
         onSaveDarkModeEnabled: function () {
-            var sNewDarkModeEnabled = this._oDarkModeModel.getProperty("/detectionEnabled");
-            var sOldDarkModeEnabled = this.oUser.getDetectDarkMode();
-            var oUser = this.oUser;
+            const sNewDarkModeEnabled = this._oDarkModeModel.getProperty("/detectionEnabled");
+            const sOldDarkModeEnabled = this.oUser.getDetectDarkMode();
+            const oUser = this.oUser;
 
             if (sNewDarkModeEnabled !== sOldDarkModeEnabled) {
                 Log.debug("[000] onSaveDarkModeEnabled: setDetectDarkModeEnabled", sNewDarkModeEnabled, "Appearance.controller");
                 oUser.setDetectDarkMode(sNewDarkModeEnabled);
                 return this._updateUserPreferences(this.oUser)
-                    .then(function () {
+                    .then(() => {
                         return this.onSaveDarkModeEnabledSuccess(oUser, sNewDarkModeEnabled);
-                    }.bind(this))
-                    .catch(function (sErrorMessage) {
+                    })
+                    .catch((sErrorMessage) => {
                         if (!sErrorMessage.includes("THEME_DARKMODE_AUTO_DETECTION")) {
                             return this.onSaveDarkModeEnabledSuccess(oUser, sNewDarkModeEnabled);
                         }
@@ -520,26 +523,26 @@ sap.ui.define([
                         throw new Message({
                             message: sErrorMessage
                         });
-                    }.bind(this));
+                    });
             }
             return Promise.resolve();
         },
 
         onSaveShowContentProviderInfoOnVisualizations: function () {
-            var bOldValue = Config.last("/core/contentProviders/providerInfo/showContentProviderInfoOnVisualizations");
-            var bCurrentValue = this.getView().getModel("config").getProperty("/showContentProviderInfoOnVisualizationsSelected");
+            const bOldValue = Config.last("/core/contentProviders/providerInfo/showContentProviderInfoOnVisualizations");
+            const bCurrentValue = this.getView().getModel("config").getProperty("/showContentProviderInfoOnVisualizationsSelected");
             if (bCurrentValue === bOldValue) {
                 return Promise.resolve();
             }
-            return new Promise(function (resolve, reject) {
+            return new Promise((resolve, reject) => {
                 this.writeToPersonalization("flp.settings.FlpSettings", "showContentProviderInfoOnVisualizations", bCurrentValue)
-                    .done(function () {
+                    .done(() => {
                         Config.emit("/core/contentProviders/providerInfo/showContentProviderInfoOnVisualizations", bCurrentValue);
                         resolve();
                     })
-                    .fail(function (sErrorMessage, parsedErrorInformation) {
+                    .fail((sErrorMessage, parsedErrorInformation) => {
                         Log.error("Cannot save system info on tiles configuration", sErrorMessage);
-                        var oMessage = new Message({
+                        const oMessage = new Message({
                             type: MessageType.Error,
                             description: sErrorMessage,
                             message: parsedErrorInformation.message.value,
@@ -548,7 +551,7 @@ sap.ui.define([
                         });
                         reject(oMessage);
                     });
-            }.bind(this));
+            });
         },
 
         /**
@@ -562,12 +565,12 @@ sap.ui.define([
          */
         writeToPersonalization: function (sContainer, sItem, vValue) {
             return jQuery.when(
-                this.getPersonalizer(sContainer, sItem).then(function (oPersonalizer) {
+                this.getPersonalizer(sContainer, sItem).then((oPersonalizer) => {
                     return oPersonalizer.setPersData(vValue);
                 })
-            ).catch(function (oError) {
+            ).catch((oError) => {
                 Log.error("Personalization service does not work:");
-                Log.error(oError.name + ": " + oError.message);
+                Log.error(`${oError.name}: ${oError.message}`);
             });
         },
 
@@ -579,16 +582,16 @@ sap.ui.define([
          * @returns {Promise<object>} Resolves with a new or cached Personalizer instance.
          */
         getPersonalizer: function (sContainer, sItem) {
-            var sKey = sContainer + "-" + sItem;
+            const sKey = `${sContainer}-${sItem}`;
 
             if (this.oPersonalizers[sKey]) {
                 return Promise.resolve(this.oPersonalizers[sKey]);
             }
 
             return Container.getServiceAsync("Personalization")
-                .then(function (oPersonalizationService) {
-                    var oComponent = Component.getOwnerComponentFor(this.getView());
-                    var oScope = {
+                .then((oPersonalizationService) => {
+                    const oComponent = Component.getOwnerComponentFor(this.getView());
+                    const oScope = {
                         keyCategory: oPersonalizationService.constants.keyCategory.FIXED_KEY,
                         writeFrequency: oPersonalizationService.constants.writeFrequency.LOW,
                         clientStorageAllowed: true
@@ -602,7 +605,7 @@ sap.ui.define([
                     }
 
                     return this.oPersonalizers[sKey];
-                }.bind(this));
+                });
         },
 
         // applies dark mode after the user has selected a new theme

package/src/main/js/sap/ushell/components/shell/Settings/appearance/AppearanceEntry.js

@@ -5,12 +5,12 @@ sap.ui.define([
     "sap/base/Log",
     "sap/ushell/resources",
     "sap/ushell/Container"
-], function (
+], (
     XMLView,
     Log,
     resources,
     Container
-) {
+) => {
     "use strict";
 
     let oThemeList;
@@ -20,15 +20,15 @@ sap.ui.define([
             return Promise.resolve(oThemeList);
         }
 
-        return Container.getServiceAsync("UserInfo").then(function (oUserInfoService) {
-            return new Promise(function (fnResolve) {
+        return Container.getServiceAsync("UserInfo").then((oUserInfoService) => {
+            return new Promise((fnResolve) => {
                 oUserInfoService.getThemeList()
-                    .done(function (oData) {
+                    .done((oData) => {
                         oThemeList = oData;
                         fnResolve(oThemeList);
                     })
-                    .fail(function () {
-                        //retrigger request the next time
+                    .fail(() => {
+                        // retrigger request the next time
                         Log.error("Failed to load theme list.");
                         fnResolve({});
                     });
@@ -37,9 +37,8 @@ sap.ui.define([
     }
 
     function getEntry () {
-
-        var oViewInstance;
-        var oEntry = {
+        let oViewInstance;
+        const oEntry = {
             id: "themes",
             entryHelpID: "themes",
             title: resources.i18n.getText("Appearance"),
@@ -47,7 +46,7 @@ sap.ui.define([
             contentResult: null,
             icon: "sap-icon://palette",
             valueArgument: function () {
-                return _loadThemeList().then(function (oThemes) {
+                return _loadThemeList().then((oThemes) => {
                     const aThemes = oThemes?.options || [];
                     const sUserThemeId = Container.getUser().getTheme();
                     const oTheme = aThemes.find((theme) => theme?.id === sUserThemeId);
@@ -56,7 +55,7 @@ sap.ui.define([
             },
             contentFunc: function () {
                 return _loadThemeList()
-                    .then(function (oThemes) {
+                    .then((oThemes) => {
                         return XMLView.create({
                             id: "userPrefThemeSelector",
                             viewName: "sap.ushell.components.shell.Settings.appearance.Appearance",
@@ -66,7 +65,7 @@ sap.ui.define([
                                 themeRoot: oThemes?.themeRoot
                             }
                         });
-                    }).then(function (oView) {
+                    }).then((oView) => {
                         oViewInstance = oView;
                         return oView;
                     });
@@ -77,7 +76,6 @@ sap.ui.define([
                 }
                 Log.warning("Save operation for appearance settings was not executed, because the userPrefThemeSelector view was not initialized");
                 return Promise.resolve();
-
             },
             onCancel: function () {
                 if (oViewInstance) {
@@ -96,5 +94,4 @@ sap.ui.define([
     return {
         getEntry: getEntry
     };
-
 });

package/src/main/js/sap/ushell/components/shell/Settings/homepage/HomepageEntry.js

@@ -8,7 +8,7 @@ sap.ui.define([
     "sap/ushell/Config",
     "sap/ushell/resources",
     "sap/ushell/Container"
-], function (
+], (
     Log,
     XMLView,
     JSONModel,
@@ -16,12 +16,12 @@ sap.ui.define([
     Config,
     resources,
     Container
-) {
+) => {
     "use strict";
 
-    var mDisplayModes = {
-        "scroll": 0,
-        "tabs": 1,
+    const mDisplayModes = {
+        scroll: 0,
+        tabs: 1,
 
         getName: function (iValue) {
             return Object.keys(this)[iValue];
@@ -30,8 +30,7 @@ sap.ui.define([
 
     return {
         getEntry: function () {
-
-            var oViewInstance;
+            let oViewInstance;
 
             return {
                 id: "homepageEntry",
@@ -42,46 +41,46 @@ sap.ui.define([
                 icon: "sap-icon://home",
                 valueArgument: null,
                 contentFunc: function () {
-                    var sDisplayMode;
+                    let sDisplayMode;
                     return SharedComponentUtils.getEffectiveHomepageSetting("/core/home/homePageGroupDisplay", "/core/home/enableHomePageSettings")
-                    .then(function (sDisplay) {
-                        sDisplayMode = sDisplay;
-                        return XMLView.create({
-                            id: "UserSettingsHomepageSettingsView",
-                            viewName: "sap.ushell.components.shell.Settings.homepage.HomepageSetting"
-                        });
-                    })
-                    .then(function (oView) {
-                        oViewInstance = oView;
-                        oViewInstance.setModel(new JSONModel({
-                            displayMode: mDisplayModes[sDisplayMode] || mDisplayModes.scroll,
-                            personalisationEnabled: Config.last("/core/shell/enablePersonalization")
-                        }));
-                        oViewInstance.setModel(resources.i18nModel, "i18n");
+                        .then((sDisplay) => {
+                            sDisplayMode = sDisplay;
+                            return XMLView.create({
+                                id: "UserSettingsHomepageSettingsView",
+                                viewName: "sap.ushell.components.shell.Settings.homepage.HomepageSetting"
+                            });
+                        })
+                        .then((oView) => {
+                            oViewInstance = oView;
+                            oViewInstance.setModel(new JSONModel({
+                                displayMode: mDisplayModes[sDisplayMode] || mDisplayModes.scroll,
+                                personalisationEnabled: Config.last("/core/shell/enablePersonalization")
+                            }));
+                            oViewInstance.setModel(resources.i18nModel, "i18n");
 
-                        return oViewInstance;
-                    })
-                    .catch(function (error) {
-                        Log.error("Failed to get effective hompage setting.", error,
-                            "sap.ushell.components.ushell.settings.homepage.HomepageEntry");
-                        return Promise.reject();
-                    });
+                            return oViewInstance;
+                        })
+                        .catch((error) => {
+                            Log.error("Failed to get effective hompage setting.", error,
+                                "sap.ushell.components.ushell.settings.homepage.HomepageEntry");
+                            return Promise.reject();
+                        });
                 },
                 onSave: function () {
                     if (oViewInstance) {
-                        var iCurrentMode = oViewInstance.getModel().getProperty("/displayMode"),
-                            sDisplay = mDisplayModes.getName(iCurrentMode),
-                            oRenderer = Container.getRendererInternal("fiori2");
+                        const iCurrentMode = oViewInstance.getModel().getProperty("/displayMode");
+                        const sDisplay = mDisplayModes.getName(iCurrentMode);
+                        const oRenderer = Container.getRendererInternal("fiori2");
 
                         // save anchor bar mode in personalization
                         return SharedComponentUtils.getPersonalizer("homePageGroupDisplay", oRenderer)
-                            .then(function (oPersonalizer) {
+                            .then((oPersonalizer) => {
                                 return oPersonalizer.setPersData(sDisplay);
                             })
-                            .then(function () {
+                            .then(() => {
                                 Config.emit("/core/home/homePageGroupDisplay", sDisplay);
                             })
-                            .catch(function (error) {
+                            .catch((error) => {
                                 // Log failure if occurs.
                                 Log.error("Failed to save the anchor bar mode in personalization", error,
                                     "sap.ushell.components.ushell.settings.homepage.HomepageEntry");
@@ -90,7 +89,6 @@ sap.ui.define([
                     }
                     Log.warning("Save operation for user account settings was not executed, because the homepage view was not initialized");
                     return Promise.resolve();
-
                 },
                 onCancel: function () {
                     if (oViewInstance) {
@@ -102,5 +100,4 @@ sap.ui.define([
             };
         }
     };
-
 });

package/src/main/js/sap/ushell/components/shell/Settings/notifications/NotificationsEntry.js

@@ -5,18 +5,18 @@ sap.ui.define([
     "sap/base/Log",
     "sap/ushell/Config",
     "sap/ushell/resources"
-], function (
+], (
     XMLView,
     Log,
     Config,
     resources
-) {
+) => {
     "use strict";
 
     function getEntry () {
-        var sViewId = "notificationsSetting",
-            sComponentNamespace = "sap.ushell.components.shell.Settings.notifications.NotificationsSetting",
-            oViewInstance;
+        const sViewId = "notificationsSetting";
+        const sComponentNamespace = "sap.ushell.components.shell.Settings.notifications.NotificationsSetting";
+        let oViewInstance;
 
         return {
             id: "notificationsEntry",
@@ -30,7 +30,7 @@ sap.ui.define([
                 return XMLView.create({
                     id: sViewId,
                     viewName: sComponentNamespace
-                }).then(function (oView) {
+                }).then((oView) => {
                     oViewInstance = oView;
                     return oView;
                 });
@@ -59,5 +59,4 @@ sap.ui.define([
     return {
         getEntry: getEntry
     };
-
 });