From 0ae404ce037b582854101dffc419aff262768b23 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Thu, 20 Jul 2023 13:51:05 +0200
Subject: [PATCH] Extends JSON schema/Intellisense to full details of
 InstallDefaultData settings. (#14568)

* Fixes an incorrect property name used for generating JSON schema.

* Added JSON schema/intellisense for default data dictionary keys.

* Renamed private variable to match setting name.
---
 src/JsonSchema/AppSettings.cs                    | 16 +++++++++++++++-
 .../Migrations/Install/DatabaseSchemaCreator.cs  |  8 ++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/JsonSchema/AppSettings.cs b/src/JsonSchema/AppSettings.cs
index 717f826859..b491ed2052 100644
--- a/src/JsonSchema/AppSettings.cs
+++ b/src/JsonSchema/AppSettings.cs
@@ -88,13 +88,27 @@ namespace JsonSchema
 
                 public HelpPageSettings? HelpPage { get; set; }
 
-                public InstallDefaultDataSettings? InstallDefaultData { get; set; }
+                public InstallDefaultData? InstallDefaultData { get; set; }
 
                 public DataTypesSettings? DataTypes { get; set; }
 
                 public MarketplaceSettings? Marketplace { get; set; }
             }
 
+            /// <summary>
+            ///     Configurations for the Umbraco CMS InstallDefaultData configuration.
+            /// </summary>
+            public class InstallDefaultData
+            {
+                public InstallDefaultDataSettings? Languages { get; set; }
+
+                public InstallDefaultDataSettings? DataTypes { get; set; }
+
+                public InstallDefaultDataSettings? MediaTypes { get; set; }
+
+                public InstallDefaultDataSettings? MemberTypes { get; set; }
+            }
+
             /// <summary>
             ///     Configurations for the Umbraco Forms package to Umbraco CMS
             /// </summary>
diff --git a/src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs b/src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs
index 3f12fd7d0d..a2f7374b48 100644
--- a/src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs
+++ b/src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs
@@ -87,7 +87,7 @@ public class DatabaseSchemaCreator
     };
 
     private readonly IUmbracoDatabase _database;
-    private readonly IOptionsMonitor<InstallDefaultDataSettings> _defaultDataCreationSettings;
+    private readonly IOptionsMonitor<InstallDefaultDataSettings> _installDefaultDataSettings;
     private readonly IEventAggregator _eventAggregator;
     private readonly ILogger<DatabaseSchemaCreator> _logger;
     private readonly ILoggerFactory _loggerFactory;
@@ -118,7 +118,7 @@ public class DatabaseSchemaCreator
         _loggerFactory = loggerFactory ?? throw new ArgumentNullException(nameof(loggerFactory));
         _umbracoVersion = umbracoVersion ?? throw new ArgumentNullException(nameof(umbracoVersion));
         _eventAggregator = eventAggregator;
-        _defaultDataCreationSettings = defaultDataCreationSettings;
+        _installDefaultDataSettings = defaultDataCreationSettings;  // TODO (V13): Rename this parameter to installDefaultDataSettings.
 
         if (_database?.SqlContext?.SqlSyntax == null)
         {
@@ -178,7 +178,7 @@ public class DatabaseSchemaCreator
             var dataCreation = new DatabaseDataCreator(
                 _database, _loggerFactory.CreateLogger<DatabaseDataCreator>(),
                 _umbracoVersion,
-                _defaultDataCreationSettings);
+                _installDefaultDataSettings);
             foreach (Type table in _orderedTables)
             {
                 CreateTable(false, table, dataCreation);
@@ -455,7 +455,7 @@ public class DatabaseSchemaCreator
                 _database,
                 _loggerFactory.CreateLogger<DatabaseDataCreator>(),
                 _umbracoVersion,
-                _defaultDataCreationSettings));
+                _installDefaultDataSettings));
     }
 
     /// <summary>