feat: add settings, changed mock data

VirtoCommerce · Apr 17, 2024 · 241d4ba · 241d4ba
1 parent 0b51111
commit 241d4ba
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 18 deletions.
diff --git a/src/VirtoCommerce.WhiteLabeling.Core/ModuleConstants.cs b/src/VirtoCommerce.WhiteLabeling.Core/ModuleConstants.cs
@@ -1,3 +1,6 @@
+using System.Collections.Generic;
+using VirtoCommerce.Platform.Core.Settings;
+
 namespace VirtoCommerce.WhiteLabeling.Core;
 
 public static class ModuleConstants
@@ -20,4 +23,43 @@ public static class Permissions
             };
         }
     }
+
+    public static class Settings
+    {
+        public static class General
+        {
+            public static SettingDescriptor WhiteLabelingEnabled { get; } = new()
+            {
+                Name = "WhiteLabeling.WhiteLabelingEnabled",
+                GroupName = "WhiteLabeling|General",
+                ValueType = SettingValueType.Boolean,
+                IsPublic = true,
+                DefaultValue = true,
+            };
+
+            public static IEnumerable<SettingDescriptor> AllGeneralSettings
+            {
+                get
+                {
+                    yield return WhiteLabelingEnabled;
+                }
+            }
+        }
+
+        public static IEnumerable<SettingDescriptor> AllSettings
+        {
+            get
+            {
+                return General.AllGeneralSettings;
+            }
+        }
+
+        public static IEnumerable<SettingDescriptor> StoreLevelSettings
+        {
+            get
+            {
+                yield return General.WhiteLabelingEnabled;
+            }
+        }
+    }
 }
diff --git a/src/VirtoCommerce.WhiteLabeling.Core/VirtoCommerce.WhiteLabeling.Core.csproj b/src/VirtoCommerce.WhiteLabeling.Core/VirtoCommerce.WhiteLabeling.Core.csproj
@@ -8,5 +8,6 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
+    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.818.0" />
   </ItemGroup>
 </Project>
diff --git a/src/VirtoCommerce.WhiteLabeling.Data/Queries/GetWhiteLabelingSettingsQueryHandler.cs b/src/VirtoCommerce.WhiteLabeling.Data/Queries/GetWhiteLabelingSettingsQueryHandler.cs
@@ -21,8 +21,8 @@ public Task<WhiteLabelingSettings> Handle(GetWhiteLabelingSettingsQuery request,
                 {
                     UserId = "cfcec63a-faa5-4511-9aef-ee7672af6710",
                     OrganizationId = "f081c52234754c9c8229aa42d6a19220",
-                    LogoUrl = "/static/images/common/logo-1.svg",
-                    SecondaryLogoUrl = "/static/images/common/logo-white-1.svg",
+                    LogoUrl = "https://vcst-dev.govirto.com/cms-content/assets/b2b-store-assets/logo-white-labeling-test.svg",
+                    SecondaryLogoUrl = "https://vcst-dev.govirto.com/cms-content/assets/b2b-store-assets/logo-inverted-white-labeling-test.svg",
                     FaviconUrl = "/static/icons/favicon-1.svg",
                     FooterLinks = new List<FooterLink>()
                     {
@@ -63,14 +63,6 @@ public Task<WhiteLabelingSettings> Handle(GetWhiteLabelingSettingsQuery request,
                             }
                         }
                     }
-                },
-                new WhiteLabelingSettings()
-                {
-                    UserId = "07e6a601-b90e-4dbd-a7d0-0f1f89db4f2e",
-                    OrganizationId = "",
-                    LogoUrl = "/static/images/common/logo.svg",
-                    SecondaryLogoUrl = "/static/images/common/logo-white.svg",
-                    FaviconUrl = "/static/icons/favicon.svg",
                 }
             };
 

diff --git a/src/VirtoCommerce.WhiteLabeling.Data/VirtoCommerce.WhiteLabeling.Data.csproj b/src/VirtoCommerce.WhiteLabeling.Data/VirtoCommerce.WhiteLabeling.Data.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     <PackageReference Include="VirtoCommerce.ExperienceApiModule.Core" Version="3.800.0" />
-    <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.818.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.WhiteLabeling.Core\VirtoCommerce.WhiteLabeling.Core.csproj" />

diff --git a/src/VirtoCommerce.WhiteLabeling.Web/Module.cs b/src/VirtoCommerce.WhiteLabeling.Web/Module.cs
@@ -7,6 +7,8 @@
 using VirtoCommerce.ExperienceApiModule.Core.Infrastructure;
 using VirtoCommerce.Platform.Core.Modularity;
 using VirtoCommerce.Platform.Core.Security;
+using VirtoCommerce.Platform.Core.Settings;
+using VirtoCommerce.StoreModule.Core.Model;
 using VirtoCommerce.WhiteLabeling.Core;
 using VirtoCommerce.WhiteLabeling.Data;
 
@@ -25,13 +27,6 @@ public void Initialize(IServiceCollection serviceCollection)
         serviceCollection.AddMediatR(assemblyMarker);
         serviceCollection.AddAutoMapper(assemblyMarker);
         serviceCollection.AddSchemaBuilders(assemblyMarker);
-
-        // Override models
-        //AbstractTypeFactory<OriginalModel>.OverrideType<OriginalModel, ExtendedModel>().MapToType<ExtendedEntity>();
-        //AbstractTypeFactory<OriginalEntity>.OverrideType<OriginalEntity, ExtendedEntity>();
-
-        // Register services
-        //serviceCollection.AddTransient<IMyService, MyService>();
     }
 
     public void PostInitialize(IApplicationBuilder appBuilder)
@@ -41,6 +36,11 @@ public void PostInitialize(IApplicationBuilder appBuilder)
         // Register permissions
         var permissionsRegistrar = serviceProvider.GetRequiredService<IPermissionsRegistrar>();
         permissionsRegistrar.RegisterPermissions(ModuleInfo.Id, "WhiteLabeling", ModuleConstants.Security.Permissions.AllPermissions);
+
+        // Register settings
+        var settingsRegistrar = serviceProvider.GetRequiredService<ISettingsRegistrar>();
+        settingsRegistrar.RegisterSettings(ModuleConstants.Settings.AllSettings, ModuleInfo.Id);
+        settingsRegistrar.RegisterSettingsForType(ModuleConstants.Settings.StoreLevelSettings, nameof(Store));
     }
 
     public void Uninstall()