Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

Admin panel - Theme list - use automapper

KrzysztofPajak7c1e4b69abb4
diff --git a/src/Web/Grand.Web.Admin/Controllers/SettingController.cs b/src/Web/Grand.Web.Admin/Controllers/SettingController.cs
index 498489e37..e30d4cf9c 100644
--- a/src/Web/Grand.Web.Admin/Controllers/SettingController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/SettingController.cs
@@ -101,7 +101,6 @@ namespace Grand.Web.Admin.Controllers
#region Utilities
-
protected async Task ClearCache()
{
await _cacheBase.Clear();
@@ -698,16 +697,7 @@ namespace Grand.Web.Admin.Controllers
model.StoreInformationSettings.AvailableStoreThemes = _themeProvider
.GetConfigurations()
- .Select(x => new GeneralCommonSettingsModel.StoreInformationSettingsModel.ThemeConfigurationModel {
- ThemeTitle = x.Title,
- ThemeName = x.Name,
- ThemeVersion = x.Version,
- PreviewImageUrl = x.PreviewImageUrl,
- PreviewText = x.PreviewText,
- SupportRtl = x.SupportRtl,
- Selected = x.Name.Equals(storeInformationSettings.DefaultStoreTheme, StringComparison.OrdinalIgnoreCase)
- })
- .ToList();
+ .Select(x => x.ToModel(storeInformationSettings.DefaultStoreTheme)).ToList();
//common
var commonSettings = _settingService.LoadSetting<CommonSettings>(storeScope);
@@ -864,7 +854,6 @@ namespace Grand.Web.Admin.Controllers
if (System.IO.File.Exists(oryginalFilePath))
{
string[] lines = System.IO.File.ReadAllLines(oryginalFilePath);
-
int i = 0;
foreach (var line in lines)
{
@@ -872,37 +861,30 @@ namespace Grand.Web.Admin.Controllers
{
lines[i] = "apiKey: \"" + model.PushApiKey + "\",";
}
-
if (line.Contains("authDomain"))
{
lines[i] = "authDomain: \"" + model.AuthDomain + "\",";
}
-
if (line.Contains("databaseURL"))
{
lines[i] = "databaseURL: \"" + model.DatabaseUrl + "\",";
}
-
if (line.Contains("projectId"))
{
lines[i] = "projectId: \"" + model.ProjectId + "\",";
}
-
if (line.Contains("storageBucket"))
{
lines[i] = "storageBucket: \"" + model.StorageBucket + "\",";
}
-
if (line.Contains("messagingSenderId"))
{
lines[i] = "messagingSenderId: \"" + model.SenderId + "\",";
}
-
if (line.Contains("appId"))
{
lines[i] = "appId: \"" + model.AppId + "\",";
}
-
i++;
}
System.IO.File.WriteAllLines(savedFilePath, lines);
@@ -939,13 +921,13 @@ namespace Grand.Web.Admin.Controllers
{
var settings = _settingService.LoadSetting<SystemSettings>();
- var model = new SystemSettingsModel();
-
- //order ident
- model.OrderIdent = await _mediator.Send(new MaxOrderNumberCommand());
- //system settings
- model.DaysToCancelUnpaidOrder = settings.DaysToCancelUnpaidOrder;
- model.DeleteGuestTaskOlderThanMinutes = settings.DeleteGuestTaskOlderThanMinutes;
+ var model = new SystemSettingsModel {
+ //order ident
+ OrderIdent = await _mediator.Send(new MaxOrderNumberCommand()),
+ //system settings
+ DaysToCancelUnpaidOrder = settings.DaysToCancelUnpaidOrder,
+ DeleteGuestTaskOlderThanMinutes = settings.DeleteGuestTaskOlderThanMinutes
+ };
//area admin settings
var adminsettings = _settingService.LoadSetting<AdminAreaSettings>();
@@ -976,7 +958,6 @@ namespace Grand.Web.Admin.Controllers
settings.DeleteGuestTaskOlderThanMinutes = model.DeleteGuestTaskOlderThanMinutes;
await _settingService.SaveSetting(settings);
-
//order ident
if (model.OrderIdent.HasValue && model.OrderIdent.Value > 0)
{
@@ -989,10 +970,8 @@ namespace Grand.Web.Admin.Controllers
adminAreaSettings.GridPageSizes = model.GridPageSizes;
adminAreaSettings.UseIsoDateTimeConverterInJson = model.UseIsoDateTimeConverterInJson;
adminAreaSettings.HideStoreColumn = model.HideStoreColumn;
-
await _settingService.SaveSetting(adminAreaSettings);
-
//language settings
var langsettings = _settingService.LoadSetting<LanguageSettings>();
langsettings.IgnoreRtlPropertyForAdminArea = model.IgnoreRtlPropertyForAdminArea;
@@ -1016,4 +995,4 @@ namespace Grand.Web.Admin.Controllers
#endregion
}
-}
+}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/Settings/ThemeConfigurationMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/Settings/ThemeConfigurationMappingExtensions.cs
new file mode 100644
index 000000000..3438107c7
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/Settings/ThemeConfigurationMappingExtensions.cs
@@ -0,0 +1,17 @@
+using Grand.Infrastructure.Mapper;
+using Grand.Web.Admin.Models.Settings;
+using Grand.Web.Common.Themes;
+using System;
+
+namespace Grand.Web.Admin.Extensions
+{
+ public static class ThemeConfigurationMappingExtensions
+ {
+ public static GeneralCommonSettingsModel.StoreInformationSettingsModel.ThemeConfigurationModel ToModel(this ThemeConfiguration entity, string defaultStoreTheme)
+ {
+ var result = entity.MapTo<ThemeConfiguration, GeneralCommonSettingsModel.StoreInformationSettingsModel.ThemeConfigurationModel>();
+ result.Selected = result.ThemeName.Equals(defaultStoreTheme, StringComparison.OrdinalIgnoreCase);
+ return result;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Mapper/ThemeConfigurationProfile.cs b/src/Web/Grand.Web.Admin/Mapper/ThemeConfigurationProfile.cs
new file mode 100644
index 000000000..f040dbd08
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Mapper/ThemeConfigurationProfile.cs
@@ -0,0 +1,20 @@
+using AutoMapper;
+using Grand.Infrastructure.Mapper;
+using Grand.Web.Admin.Models.Settings;
+using Grand.Web.Common.Themes;
+
+namespace Grand.Web.Admin.Mapper
+{
+ public class ThemeConfigurationProfile : Profile, IAutoMapperProfile
+ {
+ public ThemeConfigurationProfile()
+ {
+ CreateMap<ThemeConfiguration, GeneralCommonSettingsModel.StoreInformationSettingsModel.ThemeConfigurationModel>()
+ .ForMember(dest => dest.ThemeTitle, mo => mo.MapFrom(p => p.Title))
+ .ForMember(dest => dest.ThemeName, mo => mo.MapFrom(p => p.Name))
+ .ForMember(dest => dest.ThemeVersion, mo => mo.MapFrom(p => p.Version));
+ }
+
+ public int Order => 0;
+ }
+}
\ No newline at end of file