Save Shell Config SubSections

src/OrchardCore/OrchardCore/Shell/Configuration/ShellConfigurationSources.cs

@@ -1,11 +1,15 @@
+using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration.Json;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using OrchardCore.Environment.Shell.Configuration.Internal;
 
 namespace OrchardCore.Environment.Shell.Configuration
 {
@@ -35,35 +39,41 @@ public async Task SaveAsync(string tenant, IDictionary<string, string> data)
             var tenantFolder = Path.Combine(_container, tenant);
             var appsettings = Path.Combine(tenantFolder, "appsettings.json");
 
-            JObject config;
+            IDictionary<string, string> configData;
             if (File.Exists(appsettings))
             {
-                using var streamReader = File.OpenText(appsettings);
-                using var jsonReader = new JsonTextReader(streamReader);
-                config = await JObject.LoadAsync(jsonReader);
+                using var streamReader = File.OpenRead(appsettings);
+                configData = JsonConfigurationFileParser.Parse(streamReader);
             }
             else
             {
-                config = new JObject();
+                configData = new Dictionary<string, string>();
             }
 
             foreach (var key in data.Keys)
             {
                 if (data[key] != null)
                 {
-                    config[key] = data[key];
+                    configData[key] = data[key];
                 }
                 else
                 {
-                    config.Remove(key);
+                    configData.Remove(key);
                 }
             }
 
+            var configuration = new ConfigurationBuilder()
+                .Add(new UpdatableDataProvider(configData))
+                .Build();
+
+            using var disposable = configuration as IDisposable;
+            var jConfiguration = ConfigToJObject(configuration);
+
             Directory.CreateDirectory(tenantFolder);
 
             using var streamWriter = File.CreateText(appsettings);
             using var jsonWriter = new JsonTextWriter(streamWriter) { Formatting = Formatting.Indented };
-            await config.WriteToAsync(jsonWriter);
+            await jConfiguration.WriteToAsync(jsonWriter);
         }
 
         public Task RemoveAsync(string tenant)
@@ -87,5 +97,51 @@ public Task RemoveAsync(string tenant)
 
             return Task.CompletedTask;
         }
+
+        private static JToken ConfigToJObject(IConfiguration configuration)
+        {
+            JArray jArray = null;
+            JObject jObject = null;
+
+            foreach (var child in configuration.GetChildren())
+            {
+                if (int.TryParse(child.Key, out _))
+                {
+                    jArray ??= new JArray();
+                    if (child.GetChildren().Any())
+                    {
+                        jArray.Add(ConfigToJObject(child));
+                    }
+                    else
+                    {
+                        jArray.Add(child.Value);
+                    }
+                }
+                else
+                {
+                    jObject ??= new JObject();
+                    if (child.GetChildren().Any())
+                    {
+                        jObject.Add(child.Key, ConfigToJObject(child));
+                    }
+                    else
+                    {
+                        jObject.Add(child.Key, child.Value);
+                    }
+                }
+            }
+
+            if (jArray is not null)
+            {
+                if (jObject is not null)
+                {
+                    throw new InvalidOperationException("Can't use a numeric key inside an object.");
+                }
+
+                return jArray;
+            }
+
+            return jObject ?? new JObject();
+        }
     }
 }

src/OrchardCore/OrchardCore/Shell/ShellSettingsManager.cs

@@ -179,21 +179,21 @@ public async Task SaveSettingsAsync(ShellSettings settings)
 
                 await _tenantsSettingsSources.SaveAsync(settings.Name, tenantSettings.ToObject<Dictionary<string, string>>());
 
-                var tenantConfig = new JObject();
-
-                var sections = settings.ShellConfiguration.GetChildren()
-                    .Where(s => !s.GetChildren().Any())
-                    .ToArray();
-
-                foreach (var section in sections)
+                var tenantConfig = new Dictionary<string, string>();
+                foreach (var config in settings.ShellConfiguration.AsEnumerable())
                 {
-                    if (settings[section.Key] != configuration[section.Key])
+                    if (settings.ShellConfiguration.GetSection(config.Key).GetChildren().Any())
+                    {
+                        continue;
+                    }
+
+                    if (settings[config.Key] != configuration[config.Key])
                     {
-                        tenantConfig[section.Key] = settings[section.Key];
+                        tenantConfig[config.Key] = settings[config.Key];
                     }
                     else
                     {
-                        tenantConfig[section.Key] = null;
+                        tenantConfig[config.Key] = null;
                     }
                 }
 
@@ -202,7 +202,7 @@ public async Task SaveSettingsAsync(ShellSettings settings)
                 await _tenantConfigSemaphore.WaitAsync();
                 try
                 {
-                    await _tenantConfigSources.SaveAsync(settings.Name, tenantConfig.ToObject<Dictionary<string, string>>());
+                    await _tenantConfigSources.SaveAsync(settings.Name, tenantConfig);
                 }
                 finally
                 {