Skip to content

Commit

Permalink
add workflow to schema (#13349)
Browse files Browse the repository at this point in the history
* add workflow to schema

* add licenses to CMSDefinition - intentionally only adding to schema, not registered as options
  • Loading branch information
nathanwoulfe authored and nikolajlauridsen committed Nov 8, 2022
1 parent 0ed3121 commit 65803e2
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 3 deletions.
9 changes: 6 additions & 3 deletions src/JsonSchema/AppSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@ internal class AppSettings
public CmsDefinition? CMS { get; set; }

/// <summary>
/// Configurations for the Umbraco CMS
/// Configurations for the Umbraco CMS
/// </summary>
public class CmsDefinition
{
public ContentSettings? Content { get; set; }

public CoreDebugSettings? Debug { get; set; }

public ExceptionFilterSettings? ExceptionFilter { get; set; }
Expand All @@ -37,7 +38,7 @@ public class CmsDefinition

public LoggingSettings? Logging { get; set; }

public NuCacheSettings? NuCache { get; set; }
public NuCacheSettings? NuCache { get; set; }

public RequestHandlerSettings? RequestHandler { get; set; }

Expand All @@ -49,7 +50,7 @@ public class CmsDefinition

public TypeFinderSettings? TypeFinder { get; set; }

public WebRoutingSettings? WebRouting { get; set; }
public WebRoutingSettings? WebRouting { get; set; }

public UmbracoPluginSettings? Plugins { get; set; }

Expand All @@ -72,5 +73,7 @@ public class CmsDefinition
public InstallDefaultDataSettings? DefaultDataCreation { get; set; }

public DataTypesSettings? DataTypes { get; set; }

public LicensesSettings? Licenses { get; set; }
}
}
11 changes: 11 additions & 0 deletions src/JsonSchema/appsettings-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,17 @@
"$ref": "appsettings-schema.Umbraco.Deploy.json#/definitions/JsonSchemaDeployDefinition"
}
]
},
"Workflow": {
"description": "Configuration of Umbraco Workflow",
"oneOf": [
{
"type": "null"
},
{
"$ref": "appsettings-schema.Umbraco.Workflow.json#/definitions/JsonSchemaWorkflowDefinition"
}
]
}
}
}
Expand Down
11 changes: 11 additions & 0 deletions src/Umbraco.Core/Configuration/Models/LicensesSettings.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// Copyright (c) Umbraco.
// See LICENSE for more details.

namespace Umbraco.Cms.Core.Configuration.Models;

/// <summary>
/// Typed configuration options for license settings.
/// </summary>
public class LicensesSettings : Dictionary<string, string>
{
}

0 comments on commit 65803e2

Please sign in to comment.