fix create new theme on import app

mixcore · Nov 9, 2023 · 7269f0b · 7269f0b
1 parent fa2184a
commit 7269f0b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/src/modules/mix.portal/Domain/Services/MixApplicationService.cs b/src/modules/mix.portal/Domain/Services/MixApplicationService.cs
@@ -149,6 +149,7 @@ private async Task ImportSchema(string schemaFolder, CancellationToken cancellat
             if (Directory.Exists(schemaFolder))
             {
                 var schema = await _importService.LoadSchema(schemaFolder);
+                schema.ThemeId = CurrentTenant.Themes.FirstOrDefault().Id;
                 if (schema != null && schema.IsValid)
                 {
                     await _importService.ImportSelectedItemsAsync(schema);

diff --git a/src/platform/mix.library/Services/MixTenantService.cs b/src/platform/mix.library/Services/MixTenantService.cs
@@ -11,6 +11,7 @@ public sealed class MixTenantService : IMixTenantService
         public List<MixTenantSystemModel> AllTenants { get; set; }
 
         public List<MixCulture> AllCultures { get; set; }
+        public List<MixTheme> AllThemes { get; set; }
 
         public MixTenantService(DatabaseService databaseService)
         {
@@ -29,6 +30,7 @@ public async Task Reload(CancellationToken cancellationToken = default)
 
                     var domains = await dbContext.MixDomain.Where(p => tenantIds.Contains(p.MixTenantId)).ToListAsync(cancellationToken);
                     AllCultures = await dbContext.MixCulture.ToListAsync(cancellationToken);
+                    AllThemes = await dbContext.MixTheme.ToListAsync(cancellationToken);
 
                     var tenants = mixTenants
                         .Select(p => new MixTenantSystemModel
@@ -41,6 +43,7 @@ public async Task Reload(CancellationToken cancellationToken = default)
                             Configurations = new TenantConfigService(p.SystemName).AppSettings,
                             Domains = domains.Where(d => d.MixTenantId == p.Id).ToList(),
                             Cultures = AllCultures.Where(c => c.MixTenantId == p.Id).ToList(),
+                            Themes = AllThemes.Where(c => c.MixTenantId == p.Id).ToList(),
                         })
                         .ToList();
 

diff --git a/src/platform/mix.service/Models/MixTenantSystemModel.cs b/src/platform/mix.service/Models/MixTenantSystemModel.cs
@@ -17,6 +17,7 @@ public class MixTenantSystemModel
         public List<MixDomain> Domains { get; set; }
 
         public List<MixCulture> Cultures { get; set; } = new();
+        public List<MixTheme> Themes { get; set; } = new();
 
         public TenantConfigurationModel Configurations { get; set; }
     }