fix: Improves setting's title (#2864)

VirtoCommerce · Dec 2, 2024 · 19a6259 · 19a6259
1 parent e4ae8e4
commit 19a6259
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 3 deletions.
diff --git a/src/VirtoCommerce.Platform.Web/wwwroot/js/app/settings/blades/settingGroup-list.js b/src/VirtoCommerce.Platform.Web/wwwroot/js/app/settings/blades/settingGroup-list.js
@@ -92,7 +92,7 @@ angular.module('platformWebApp')
                             id: 'settingsSection',
                             data: selectedSettings,
                             headIcon: node.icon || '',
-                            title: node.name || 'platform.blades.settings-detail.title',
+                            title: node.groupName || 'platform.blades.settings-detail.title',
                             disableOpenAnimation: disableOpenAnimation,
                             controller: node.controller || 'platformWebApp.settingsDetailController',
                             template: node.template || '$(Platform)/Scripts/app/settings/blades/settings-detail.tpl.html',

diff --git a/...ce.Platform.Web/wwwroot/js/app/settings/blades/settings-detail-theme-login-screen-logo.js b/...ce.Platform.Web/wwwroot/js/app/settings/blades/settings-detail-theme-login-screen-logo.js
@@ -50,6 +50,14 @@ angular.module('platformWebApp')
             function initializeBlade() {
                 blade.isLoading = true;
 
+                // Resolve setting group name
+                var setting = Array.isArray(blade.data) && blade.data.length > 0 ? blade.data[0] : null;
+
+                if (setting && setting.groupName) {
+                    var paths = setting.groupName.split('|');
+                    blade.groupName = paths.pop();
+                }
+
                 settingsApi.getUiCustomizationSetting(function (uiCustomizationSetting) {
                     blade.isLoading = false;
                     blade.uiCustomizationSetting = uiCustomizationSetting;

diff --git a/...tform.Web/wwwroot/js/app/settings/blades/settings-detail-theme-login-screen-logo.tpl.html b/...tform.Web/wwwroot/js/app/settings/blades/settings-detail-theme-login-screen-logo.tpl.html
@@ -1,7 +1,7 @@
 <div class="blade-static __bottom" ng-if="blade.isSavingToParentObject" ng-include="'$(Platform)/Scripts/common/templates/ok-cancel2.tpl.html'"></div>
 <div class="themeSettingsBlade themeSettingsBlade__blade-content">
 
-    <legend class="themeSettingsBlade themeSettingsBlade__title">{{ blade.title }}</legend>
+    <legend class="themeSettingsBlade themeSettingsBlade__title">{{ blade.groupName }}</legend>
 
     <div class="themeSettingsBlade themeSettingsBlade__blade-inner">
         <div class="themeSettingsBlade themeSettingsBlade__inner-block">

diff --git a/src/VirtoCommerce.Platform.Web/wwwroot/js/app/settings/blades/settings-detail-theme-logo.js b/src/VirtoCommerce.Platform.Web/wwwroot/js/app/settings/blades/settings-detail-theme-logo.js
@@ -87,6 +87,14 @@ angular.module('platformWebApp')
             function initializeBlade() {
                 blade.isLoading = true;
 
+                // Resolve setting group name
+                var setting = Array.isArray(blade.data) && blade.data.length > 0 ? blade.data[0] : null;
+
+                if (setting && setting.groupName) {
+                    var paths = setting.groupName.split('|');
+                    blade.groupName = paths.pop();
+                }
+
                 settingsApi.getUiCustomizationSetting(function (uiCustomizationSetting) {
                     blade.isLoading = false;
                     blade.uiCustomizationSetting = uiCustomizationSetting;

diff --git a/...oCommerce.Platform.Web/wwwroot/js/app/settings/blades/settings-detail-theme-logo.tpl.html b/...oCommerce.Platform.Web/wwwroot/js/app/settings/blades/settings-detail-theme-logo.tpl.html
@@ -1,7 +1,7 @@
 <div class="blade-static __bottom" ng-if="blade.isSavingToParentObject" ng-include="'$(Platform)/Scripts/common/templates/ok-cancel2.tpl.html'"></div>
 <div class="themeSettingsBlade themeSettingsBlade__blade-content">
 
-    <legend class="themeSettingsBlade themeSettingsBlade__title">{{ blade.title }}</legend>
+    <legend class="themeSettingsBlade themeSettingsBlade__title">{{ blade.groupName }}</legend>
 
     <div class="themeSettingsBlade themeSettingsBlade__blade-inner">
         <div class="themeSettingsBlade themeSettingsBlade__inner-block">