Skip to content

Remove all RTE config from appsettings #16140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bergmania merged 1 commit into from
Apr 25, 2024
Merged

Remove all RTE config from appsettings #16140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions src/Umbraco.Cms.Api.Management/Factories/ConfigurationPresentationFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,15 @@ namespace Umbraco.Cms.Api.Management.Factories;
public class ConfigurationPresentationFactory : IConfigurationPresentationFactory
{
private readonly IReservedFieldNamesService _reservedFieldNamesService;
private readonly GlobalSettings _globalSettings;
private readonly ContentSettings _contentSettings;
private readonly SegmentSettings _segmentSettings;

public ConfigurationPresentationFactory(
IReservedFieldNamesService reservedFieldNamesService,
IOptions<GlobalSettings> globalSettings,
IOptions<ContentSettings> contentSettings,
IOptions<SegmentSettings> segmentSettings)
{
_reservedFieldNamesService = reservedFieldNamesService;
_globalSettings = globalSettings.Value;
_contentSettings = contentSettings.Value;
_segmentSettings = segmentSettings.Value;
}
Expand All @@ -31,7 +28,6 @@ public DocumentConfigurationResponseModel CreateDocumentConfigurationResponseMod
{
DisableDeleteWhenReferenced = _contentSettings.DisableDeleteWhenReferenced,
DisableUnpublishWhenReferenced = _contentSettings.DisableUnpublishWhenReferenced,
SanitizeTinyMce = _globalSettings.SanitizeTinyMce,
AllowEditInvariantFromNonDefault = _contentSettings.AllowEditInvariantFromNonDefault,
AllowNonExistingSegmentsCreation = _segmentSettings.AllowCreation,
ReservedFieldNames = _reservedFieldNamesService.GetDocumentReservedFieldNames(),
Expand All @@ -48,7 +44,6 @@ public MediaConfigurationResponseModel CreateMediaConfigurationResponseModel() =
{
DisableDeleteWhenReferenced = _contentSettings.DisableDeleteWhenReferenced,
DisableUnpublishWhenReferenced = _contentSettings.DisableUnpublishWhenReferenced,
SanitizeTinyMce = _globalSettings.SanitizeTinyMce,
ReservedFieldNames = _reservedFieldNamesService.GetMediaReservedFieldNames(),
};
}
14 changes: 3 additions & 11 deletions src/Umbraco.Cms.Api.Management/OpenApi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34924,14 +34924,10 @@
"allowNonExistingSegmentsCreation",
"disableDeleteWhenReferenced",
"disableUnpublishWhenReferenced",
"reservedFieldNames",
"sanitizeTinyMce"
"reservedFieldNames"
],
"type": "object",
"properties": {
"sanitizeTinyMce": {
"type": "boolean"
},
"disableDeleteWhenReferenced": {
"type": "boolean"
},
Expand Down Expand Up @@ -36979,8 +36975,7 @@
"required": [
"disableDeleteWhenReferenced",
"disableUnpublishWhenReferenced",
"reservedFieldNames",
"sanitizeTinyMce"
"reservedFieldNames"
],
"type": "object",
"properties": {
Expand All @@ -36990,9 +36985,6 @@
"disableUnpublishWhenReferenced": {
"type": "boolean"
},
"sanitizeTinyMce": {
"type": "boolean"
},
"reservedFieldNames": {
"uniqueItems": true,
"type": "array",
Expand Down Expand Up @@ -43679,4 +43671,4 @@
}
}
}
}
}
2 changes: 0 additions & 2 deletions src/Umbraco.Cms.Api.Management/ViewModels/Document/DocumentConfigurationResponseModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

public class DocumentConfigurationResponseModel
{
public required bool SanitizeTinyMce { get; set; }

public required bool DisableDeleteWhenReferenced { get; set; }

public required bool DisableUnpublishWhenReferenced { get; set; }
Expand Down
2 changes: 0 additions & 2 deletions src/Umbraco.Cms.Api.Management/ViewModels/Media/MediaConfigurationResponseModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,5 @@ public class MediaConfigurationResponseModel

public required bool DisableUnpublishWhenReferenced { get; set; }

public required bool SanitizeTinyMce { get; set; }

public required ISet<string> ReservedFieldNames { get; set; }
}
7 changes: 0 additions & 7 deletions src/Umbraco.Core/Configuration/Models/GlobalSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ internal const string
internal const string StaticNoNodesViewPath = "~/umbraco/UmbracoWebsite/NoNodes.cshtml";
internal const string StaticDistributedLockingReadLockDefaultTimeout = "00:01:00";
internal const string StaticDistributedLockingWriteLockDefaultTimeout = "00:00:05";
internal const bool StaticSanitizeTinyMce = false;
internal const int StaticMainDomReleaseSignalPollingInterval = 2000;
private const bool StaticForceCombineUrlPathLeftToRight = true;
private const bool StaticShowMaintenancePageWhenInUpgradeState = true;
Expand Down Expand Up @@ -204,12 +203,6 @@ public string UmbracoPath
/// </summary>
public bool IsPickupDirectoryLocationConfigured => !string.IsNullOrWhiteSpace(Smtp?.PickupDirectoryLocation);

/// <summary>
/// Gets or sets a value indicating whether TinyMCE scripting sanitization should be applied.
/// </summary>
[DefaultValue(StaticSanitizeTinyMce)]
public bool SanitizeTinyMce { get; set; } = StaticSanitizeTinyMce;

/// <summary>
/// Gets or sets a value representing the maximum time to wait whilst attempting to obtain a distributed read lock.
/// </summary>
Expand Down
164 changes: 0 additions & 164 deletions src/Umbraco.Core/Configuration/Models/RichTextEditorSettings.cs
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Configuration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ public static IUmbracoBuilder AddConfiguration(this IUmbracoBuilder builder)
.AddUmbracoOptions<WebRoutingSettings>()
.AddUmbracoOptions<UmbracoPluginSettings>()
.AddUmbracoOptions<UnattendedSettings>()
.AddUmbracoOptions<RichTextEditorSettings>()
.AddUmbracoOptions<BasicAuthSettings>()
.AddUmbracoOptions<RuntimeMinificationSettings>()
.AddUmbracoOptions<LegacyPasswordMigrationSettings>()
Expand Down
2 changes: 0 additions & 2 deletions tools/Umbraco.JsonSchema/UmbracoCmsSchema.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@ public class UmbracoCmsDefinition

public required UnattendedSettings Unattended { get; set; }

public required RichTextEditorSettings RichTextEditor { get; set; }

[Obsolete("Runtime minification is no longer supported. Will be removed entirely in V16.")]
public required RuntimeMinificationSettings RuntimeMinification { get; set; }

Expand Down