npm - @sapui5/sap.ushell - Versions diffs - 1.132.0 → 1.133.0 - Mend

@sapui5/sap.ushell 1.132.0 → 1.133.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (1062) hide show

package/src/main/js/sap/ushell/components/shell/Search/ESearch.js CHANGED Viewed

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2024 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/ui/core/Element",

package/src/main/js/sap/ushell/components/shell/Search/manifest.json CHANGED Viewed

@@ -4,7 +4,7 @@
         "id": "sap.ushell.components.shell.Search",
         "applicationVersion": {
-            "version": "1.132.0"
+            "version": "1.133.0"
         },
         "i18n": {
             "bundleUrl": "../../../renderer/resources/resources.properties",

package/src/main/js/sap/ushell/components/shell/SearchCEP/Component.js CHANGED Viewed

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2024 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/ui/core/Element",
@@ -31,7 +31,7 @@ sap.ui.define([
     return UIComponent.extend("sap.ushell.components.shell.SearchCEP.Component", {
         metadata: {
-            version: "1.132.0",
+            version: "1.133.0",
             library: ["sap.ushell", "sap.ushell.components.shell"],
             dependencies: {
                 libs: ["sap.m"]

package/src/main/js/sap/ushell/components/shell/SearchCEP/ProvidersExecuter.js CHANGED Viewed

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2024 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/ushell/components/shell/SearchCEP/SearchProviders/SearchProvider",

package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchCEP.controller.js CHANGED Viewed

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2024 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/base/i18n/Localization",

package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchProviders/FrequentActivityProvider.js CHANGED Viewed

@@ -1,8 +1,8 @@
-// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2024 SAP SE, All Rights Reserved
 /**
  * @fileOverview
- * @version 1.132.0
+ * @version 1.133.0
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchProviders/RecentSearchProvider.js CHANGED Viewed

@@ -1,8 +1,8 @@
-// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2024 SAP SE, All Rights Reserved
 /**
  * @fileOverview
- * @version 1.132.0
+ * @version 1.133.0
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchProviders/SearchProvider.js CHANGED Viewed

@@ -1,8 +1,8 @@
-// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2024 SAP SE, All Rights Reserved
 /**
  * @fileOverview This module is the search provider main interface
- * @version 1.132.0
+ * @version 1.133.0
  */
 sap.ui.define([
     "sap/ushell/resources",

package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchProviders/SearchServiceProvider.js CHANGED Viewed

@@ -1,8 +1,8 @@
-// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2024 SAP SE, All Rights Reserved
 /**
  * @fileOverview This module handles the navigation service search actions
- * @version 1.132.0
+ * @version 1.133.0
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/components/shell/Settings/Component.js CHANGED Viewed

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2024 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/ui/core/Element",
@@ -49,7 +49,7 @@ sap.ui.define([
     return UIComponent.extend("sap.ushell.components.shell.Settings.Component", {
         metadata: {
-            version: "1.132.0",
+            version: "1.133.0",
             library: "sap.ushell",
             dependencies: {
                 libs: {

package/src/main/js/sap/ushell/components/shell/Settings/ErrorMessageHelper.js CHANGED Viewed

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2024 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/ui/core/Messaging"

package/src/main/js/sap/ushell/components/shell/Settings/UserSettings.controller.js CHANGED Viewed

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2024 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/base/Log",
@@ -13,8 +13,8 @@ sap.ui.define([
     "sap/ushell/utils/WindowUtils",
     "sap/ushell/components/shell/Settings/ErrorMessageHelper",
     "sap/ui/core/message/Message",
+    "sap/ui/core/message/MessageType",
     "sap/ui/base/Object",
-    "sap/ui/core/library",
     "sap/base/util/deepClone",
     "sap/ushell/Container"
 ], function (
@@ -30,16 +30,13 @@ sap.ui.define([
     windowUtils,
     ErrorMessageHelper,
     Message,
+    MessageType,
     BaseObject,
-    coreLibrary,
     deepClone,
     Container
 ) {
     "use strict";
-    // shortcut for sap.ui.core.MessageType
-    var MessageType = coreLibrary.MessageType;
     return Controller.extend("sap.ushell.components.shell.Settings.UserSettings", {
         /**
          * Initializes the user settings dialog.

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2024 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/base/Log",
@@ -6,8 +6,8 @@ sap.ui.define([
     "sap/ui/core/Component",
     "sap/ui/core/Theming",
     "sap/ui/core/EventBus",
-    "sap/ui/core/library",
     "sap/ui/core/message/Message",
+    "sap/ui/core/message/MessageType",
     "sap/ui/core/mvc/Controller",
     "sap/ui/Device",
     "sap/ui/model/json/JSONModel",
@@ -17,7 +17,7 @@ sap.ui.define([
     "sap/ushell/EventHub",
     "sap/ushell/resources",
     "sap/ushell/User",
-    "sap/ushell/utils",
+    "sap/ushell/services/DarkModeSupport",
     "sap/ushell/Container"
 ], function (
     Log,
@@ -25,8 +25,8 @@ sap.ui.define([
     Component,
     Theming,
     EventBus,
-    coreLibrary,
     Message,
+    MessageType,
     Controller,
     Device,
     JSONModel,
@@ -36,14 +36,11 @@ sap.ui.define([
     EventHub,
     ushellResources,
     User,
-    ushellUtils,
+    DarkModeSupport,
     Container
 ) {
     "use strict";
-    // shortcut for sap.ui.core.MessageType
-    var MessageType = coreLibrary.MessageType;
     return Controller.extend("sap.ushell.components.shell.Settings.appearance.Appearance", {
         TILE_SIZE: {
             Small: 0,
@@ -100,12 +97,16 @@ sap.ui.define([
             return new GroupHeaderListItem({title: sGroupTitle});
         },
+        // Return the theme set of the currently selected theme in the list.
+        _getSelectedThemeData: function () {
+            const oSelectedItem = this.getView().byId("themeList").getSelectedItem();
+            return oSelectedItem?.getBindingContext()?.getProperty?.();
+        },
         // Return the ID of the currently selected theme in the theme list.
         // If no selection, return the current user theme.
         _getSelectedTheme: function () {
-            var oSelectedItem = this.getView().byId("themeList").getSelectedItem();
-            var oBindingContext = oSelectedItem ? oSelectedItem.getBindingContext() : null;
-            return oBindingContext ? oBindingContext.getProperty("id") : this.oUser.getTheme();
+            return this._getSelectedThemeData()?.id || this.oUser.getTheme();
         },
         // The main function. Builds the list of themes. Items are grouped by setId.
@@ -115,8 +116,9 @@ sap.ui.define([
             const aListData = [];
             const sThemeRoot = this.sThemeRoot;
-            function _getThemeSet (sId) {
-                return aSets.find((set) => !!set.set.themes?.find?.((theme) => theme?.id === sId));
+            // Find all theme sets that include the theme with the given id
+            function _getThemeSets (sId) {
+                return aSets.filter((set) => !!set.set.themes?.find?.((theme) => theme?.id === sId));
             }
             function _getAvatarUrl (oTheme) {
@@ -162,29 +164,47 @@ sap.ui.define([
             // add themes from the server list
             aThemes.forEach((theme) => {
-                const oThemeSet = _getThemeSet(theme?.id) || {};
-                const oItemData = {
-                    id: theme?.id,
-                    name: theme?.name || theme?.id || "",
-                    icon: "sap-icon://palette",
-                    avatar: _getAvatarUrl(theme),
-                    mode: "Image", // specific theme svg can be displayed with an img tag
-                    deprecated: theme?.deprecated === true,
-                    setId: oThemeSet.id,
-                    isSelected: false
-                };
-                aListData.push(oItemData);
+                const aThemeSets = _getThemeSets(theme?.id);
+                if (aThemeSets.length === 0) {
+                    aThemeSets.push({}); // a theme that doesn't belong to a set has to be added without a set id
+                }
+                aThemeSets.forEach((set) => {
+                    const oThemeInSet = set?.set?.themes?.find?.((themeInSet) => themeInSet.id === theme?.id);
+                    const oItemData = {
+                        id: theme?.id,
+                        name: theme?.name || theme?.id || "",
+                        contrast: oThemeInSet?.contrast, // for sorting, low contrast first
+                        colorScheme: oThemeInSet?.colorScheme, // for sorting, light before dark
+                        icon: "sap-icon://palette",
+                        avatar: _getAvatarUrl(theme),
+                        mode: "Image", // specific theme svg can be displayed with an img tag
+                        deprecated: theme?.deprecated === true,
+                        setId: set.id,
+                        isSelected: false
+                    };
+                    aListData.push(oItemData);
+                });
             });
             // set selection: either the "set automatically" or individual theme
-            let sSelectedId = sCurrentThemeId;
-            if (this._isDarkModeActive()) {
-                const oSet = _getThemeSet(sCurrentThemeId);
+            // note that the same theme may be listed several times in different sets and
+            // we need to find the correct occurence of the theme
+            const sCurrentUserSet = this.oUser.getThemeSet(); // the last selected theme set as in the user profile
+            let oSelectedItem;
+            if (sCurrentUserSet) {
+                oSelectedItem = aListData.find((theme) => theme.id === sCurrentThemeId && theme.setId === sCurrentUserSet);
+            }
+            if (!oSelectedItem) { // the set is unknowwn or the theme is not in the set; select the first occurence:
+                oSelectedItem = aListData.find((theme) => theme.id === sCurrentThemeId);
+            }
+            // with the dark mode active, select the "automatic" entry instead of the individual theme
+            if (this._isDarkModeActive() && oSelectedItem?.setId) {
+                const oSet = aListData.find((item) => item.id === oSelectedItem.setId);
                 if (oSet) {
-                    sSelectedId = oSet.id;
+                    oSelectedItem = oSet;
                 }
             }
-            const oSelectedItem = aListData.find((item) => item.id === sSelectedId);
             if (oSelectedItem) {
                 oSelectedItem.isSelected = true;
                 this.bShowDeprecationMsg = oSelectedItem.deprecated;
@@ -328,27 +348,49 @@ sap.ui.define([
         onSaveThemesSuccess: function (oUser) {
             oUser.resetChangedProperty("theme");
+            oUser.resetChangedProperty("themeSet");
             return this._applyDarkMode(); // make sure that the dark mode is applied after the theme change
         },
         // If the user selects automatic entry in a set, set a theme from the set and enable dark mode automation.
         // Otherwise (if a specific theme is selected), save this specific theme and disable automation.
         onSaveThemes: function () {
-            let sNewThemeId = this._getSelectedTheme();
+            const oTheme = this._getSelectedThemeData();
+            let sNewThemeId = oTheme?.id;
+            const sNewSetId = oTheme?.setId;
             const oUser = this.oUser;
             const sOriginalThemeId = oUser.getTheme(User.prototype.constants.themeFormat.ORIGINAL_THEME);
+            const sOriginalSetId = oUser.getThemeSet();
             // If the set entry is selected, instead of an individual theme
             const oSet = (this.aThemeSets || []).find((set) => set.id === sNewThemeId);
             if (oSet) {
-                // Set any theme from the set. The DarkModesupport will find a suitable theme anyway.
-                sNewThemeId = oSet.set.themes[0].id;
+                // don't use Container.getServiceAsync("DarkModeSupport") here because
+                // the related specific logic in updateUserPreferences is broken with the additional promise
+                const sColorScheme = DarkModeSupport.prototype.prefersDark() ? "DARK" : "LIGHT";
+                const sContrast = DarkModeSupport.prototype.prefersContrast() ? "HIGH" : "LOW";
+                // find the theme that corresponds to the browser preference
+                // fallback: if not found, select the first theme from the set
+                const oNewTheme = oSet.set.themes.find(
+                    (theme) => theme.colorScheme === sColorScheme && theme.contrast === sContrast
+                );
+                sNewThemeId = oNewTheme?.id || oSet.set.themes[0].id;
             }
             // if a set is selected, the user has enabled detection, else disabled it
             this._oDarkModeModel.setProperty("/detectionEnabled", !!oSet);
+            let bSaveSettings = false;
             if (sNewThemeId && sNewThemeId !== sOriginalThemeId) {
                 oUser.setTheme(sNewThemeId);
+                bSaveSettings = true;
+            }
+            if (sNewSetId !== sOriginalSetId) {
+                oUser.setThemeSet(sNewSetId);
+                bSaveSettings = true;
+            }
+            if (bSaveSettings) {
                 return this._updateUserPreferences(oUser)
                     .then(function () {
                         return this.onSaveThemesSuccess(oUser);
@@ -359,6 +401,8 @@ sap.ui.define([
                         }
                         oUser.setTheme(sOriginalThemeId);
                         oUser.resetChangedProperty("theme");
+                        oUser.setThemeSet(sOriginalSetId);
+                        oUser.resetChangedProperty("themeSet");
                         Log.error("Can not save selected theme", sErrorMessage);
                         throw new Message({
                             type: MessageType.Error,

package/src/main/js/sap/ushell/components/shell/Settings/appearance/Appearance.view.xml CHANGED Viewed

@@ -16,11 +16,20 @@
                 <List
                     items="{
                         path: '/options',
-                        sorter: {
+                        sorter: [{
                             path: 'setId',
                             descending: false,
                             group: true
-                        },
+                        }, {
+                            path: 'contrast',
+                            descending: true
+                        }, {
+                            path: 'colorScheme',
+                            descending: true
+                        }, {
+                            path: 'name',
+                            descending: false
+                        }],
                         groupHeaderFactory: '.getThemeSetHeader'
                     }"
                     includeItemInSelection="true"

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2024 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/ui/core/mvc/XMLView",

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2024 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/base/Log",

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2024 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/ui/core/mvc/XMLView",

package/src/main/js/sap/ushell/components/shell/Settings/notifications/NotificationsSetting.controller.js CHANGED Viewed

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2024 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/ui/core/mvc/Controller",

package/src/main/js/sap/ushell/components/shell/Settings/search/Search.controller.js CHANGED Viewed

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2024 SAP SE, All Rights Reserved
 sap.ui.define(["sap/ui/core/mvc/View", "sap/ui/core/mvc/Controller"], function (View, Controller) {
     "use strict";

package/src/main/js/sap/ushell/components/shell/Settings/search/SearchEntry.js CHANGED Viewed

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2024 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/components/shell/Settings/spaces/SpacesEntry.js CHANGED Viewed

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2024 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/components/shell/Settings/spaces/SpacesSetting.controller.js CHANGED Viewed

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2024 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/ui/core/mvc/Controller",

package/src/main/js/sap/ushell/components/shell/Settings/userAccount/UserAccountEntry.js CHANGED Viewed

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2024 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/ui/core/mvc/XMLView",

package/src/main/js/sap/ushell/components/shell/Settings/userAccount/UserAccountSelector.controller.js CHANGED Viewed

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2024 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/ui/core/mvc/Controller",

package/src/main/js/sap/ushell/components/shell/Settings/userActivities/UserActivitiesEntry.js CHANGED Viewed

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2024 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/ui/core/mvc/XMLView",

package/src/main/js/sap/ushell/components/shell/Settings/userActivities/UserActivitiesSetting.controller.js CHANGED Viewed

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2024 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/ui/core/mvc/Controller",

package/src/main/js/sap/ushell/components/shell/Settings/userDefaults/Component.js CHANGED Viewed

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2024 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/ui/core/mvc/XMLView",

package/src/main/js/sap/ushell/components/shell/Settings/userDefaults/UserDefaultsEntry.js CHANGED Viewed

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2024 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/components/shell/Settings/userDefaults/UserDefaultsForm.js CHANGED Viewed

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2024 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/base/util/deepExtend",

package/src/main/js/sap/ushell/components/shell/Settings/userDefaults/controller/ExtendedValueDialog.controller.js CHANGED Viewed

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2024 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/m/Token",

package/src/main/js/sap/ushell/components/shell/Settings/userDefaults/controller/UserDefaultsSetting.controller.js CHANGED Viewed

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2024 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/components/shell/Settings/userLanguageRegion/LanguageRegionSelector.controller.js CHANGED Viewed

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2024 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/components/shell/Settings/userLanguageRegion/UserLanguageRegionEntry.js CHANGED Viewed

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2024 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/base/Log",