From 6d23075d9a84e827117bbebd818b4f4e65e7941c Mon Sep 17 00:00:00 2001 From: Elitsa Marinovska Date: Tue, 3 Nov 2020 16:36:59 +0100 Subject: [PATCH] Migrating the rest of the files from ContentEditing\ --- .../Models/ContentEditing/ContentBaseSave.cs | 8 +++++++- .../Models/ContentEditing/ContentItemBasic.cs | 5 ----- .../Models/ContentEditing/ContentItemDisplay.cs | 0 .../Models/ContentEditing/ContentItemDisplayBase.cs | 0 .../Models/ContentEditing/ContentVariationDisplay.cs | 7 +------ .../ListViewAwareContentItemDisplayBase.cs | 1 - .../Models/ContentEditing/MediaItemDisplay.cs | 4 +--- .../Models/ContentEditing/MediaItemSave.cs | 0 .../Models/ContentEditing/MemberBasic.cs | 11 +++++++++-- .../Models/ContentEditing/MemberDisplay.cs | 2 -- .../Models/ContentEditing/MemberListDisplay.cs | 1 - .../Models/ContentEditing/MemberSave.cs | 2 +- .../Models/ContentEditing/PublicAccess.cs | 0 .../Models/ContentEditing/RichTextEditorCommand.cs | 10 +--------- .../ContentEditing/RichTextEditorConfiguration.cs | 6 +----- .../Models/ContentEditing/TabbedContentItem.cs | 12 ------------ 16 files changed, 21 insertions(+), 48 deletions(-) rename src/{Umbraco.Infrastructure => Umbraco.Core}/Models/ContentEditing/ContentBaseSave.cs (91%) rename src/{Umbraco.Infrastructure => Umbraco.Core}/Models/ContentEditing/ContentItemBasic.cs (95%) rename src/{Umbraco.Infrastructure => Umbraco.Core}/Models/ContentEditing/ContentItemDisplay.cs (100%) rename src/{Umbraco.Infrastructure => Umbraco.Core}/Models/ContentEditing/ContentItemDisplayBase.cs (100%) rename src/{Umbraco.Infrastructure => Umbraco.Core}/Models/ContentEditing/ContentVariationDisplay.cs (94%) rename src/{Umbraco.Infrastructure => Umbraco.Core}/Models/ContentEditing/ListViewAwareContentItemDisplayBase.cs (97%) rename src/{Umbraco.Infrastructure => Umbraco.Core}/Models/ContentEditing/MediaItemDisplay.cs (91%) rename src/{Umbraco.Infrastructure => Umbraco.Core}/Models/ContentEditing/MediaItemSave.cs (100%) rename src/{Umbraco.Infrastructure => Umbraco.Core}/Models/ContentEditing/MemberBasic.cs (56%) rename src/{Umbraco.Infrastructure => Umbraco.Core}/Models/ContentEditing/MemberDisplay.cs (96%) rename src/{Umbraco.Infrastructure => Umbraco.Core}/Models/ContentEditing/MemberListDisplay.cs (95%) rename src/{Umbraco.Infrastructure => Umbraco.Core}/Models/ContentEditing/MemberSave.cs (100%) rename src/{Umbraco.Infrastructure => Umbraco.Core}/Models/ContentEditing/PublicAccess.cs (100%) rename src/{Umbraco.Infrastructure => Umbraco.Core}/Models/ContentEditing/RichTextEditorCommand.cs (66%) rename src/{Umbraco.Infrastructure => Umbraco.Core}/Models/ContentEditing/RichTextEditorConfiguration.cs (86%) rename src/{Umbraco.Infrastructure => Umbraco.Core}/Models/ContentEditing/TabbedContentItem.cs (62%) diff --git a/src/Umbraco.Infrastructure/Models/ContentEditing/ContentBaseSave.cs b/src/Umbraco.Core/Models/ContentEditing/ContentBaseSave.cs similarity index 91% rename from src/Umbraco.Infrastructure/Models/ContentEditing/ContentBaseSave.cs rename to src/Umbraco.Core/Models/ContentEditing/ContentBaseSave.cs index 47eb1852e7..a949aa2bd3 100644 --- a/src/Umbraco.Infrastructure/Models/ContentEditing/ContentBaseSave.cs +++ b/src/Umbraco.Core/Models/ContentEditing/ContentBaseSave.cs @@ -24,6 +24,13 @@ namespace Umbraco.Web.Models.ContentEditing [Required] public ContentSaveAction Action { get; set; } + [DataMember(Name = "properties")] + public override IEnumerable Properties + { + get => base.Properties; + set => base.Properties = value; + } + [IgnoreDataMember] public List UploadedFiles { get; } @@ -52,6 +59,5 @@ namespace Umbraco.Web.Models.ContentEditing public ContentPropertyCollectionDto PropertyCollectionDto { get; set; } #endregion - } } diff --git a/src/Umbraco.Infrastructure/Models/ContentEditing/ContentItemBasic.cs b/src/Umbraco.Core/Models/ContentEditing/ContentItemBasic.cs similarity index 95% rename from src/Umbraco.Infrastructure/Models/ContentEditing/ContentItemBasic.cs rename to src/Umbraco.Core/Models/ContentEditing/ContentItemBasic.cs index d4156d6db5..6689e133fc 100644 --- a/src/Umbraco.Infrastructure/Models/ContentEditing/ContentItemBasic.cs +++ b/src/Umbraco.Core/Models/ContentEditing/ContentItemBasic.cs @@ -3,8 +3,6 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; using System.Runtime.Serialization; -using Newtonsoft.Json; -using Newtonsoft.Json.Converters; namespace Umbraco.Web.Models.ContentEditing { @@ -54,7 +52,6 @@ namespace Umbraco.Web.Models.ContentEditing /// This is nullable since it's only relevant for content (non-content like media + members will be null) /// [DataMember(Name = "state")] - [JsonConverter(typeof(StringEnumConverter))] public ContentSavedState? State { get; set; } [DataMember(Name = "variesByCulture")] @@ -94,12 +91,10 @@ namespace Umbraco.Web.Models.ContentEditing private IEnumerable _properties; - [DataMember(Name = "properties")] public virtual IEnumerable Properties { get => _properties; set => _properties = value; } - } } diff --git a/src/Umbraco.Infrastructure/Models/ContentEditing/ContentItemDisplay.cs b/src/Umbraco.Core/Models/ContentEditing/ContentItemDisplay.cs similarity index 100% rename from src/Umbraco.Infrastructure/Models/ContentEditing/ContentItemDisplay.cs rename to src/Umbraco.Core/Models/ContentEditing/ContentItemDisplay.cs diff --git a/src/Umbraco.Infrastructure/Models/ContentEditing/ContentItemDisplayBase.cs b/src/Umbraco.Core/Models/ContentEditing/ContentItemDisplayBase.cs similarity index 100% rename from src/Umbraco.Infrastructure/Models/ContentEditing/ContentItemDisplayBase.cs rename to src/Umbraco.Core/Models/ContentEditing/ContentItemDisplayBase.cs diff --git a/src/Umbraco.Infrastructure/Models/ContentEditing/ContentVariationDisplay.cs b/src/Umbraco.Core/Models/ContentEditing/ContentVariationDisplay.cs similarity index 94% rename from src/Umbraco.Infrastructure/Models/ContentEditing/ContentVariationDisplay.cs rename to src/Umbraco.Core/Models/ContentEditing/ContentVariationDisplay.cs index 47ede6ebce..64491e2270 100644 --- a/src/Umbraco.Infrastructure/Models/ContentEditing/ContentVariationDisplay.cs +++ b/src/Umbraco.Core/Models/ContentEditing/ContentVariationDisplay.cs @@ -1,10 +1,8 @@ -using Newtonsoft.Json; -using System; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Linq; using System.Runtime.Serialization; -using Newtonsoft.Json.Converters; namespace Umbraco.Web.Models.ContentEditing { @@ -36,7 +34,6 @@ namespace Umbraco.Web.Models.ContentEditing /// Internal property used for tests to get all properties from all tabs /// [IgnoreDataMember] - [JsonIgnore] IEnumerable IContentProperties.Properties => Tabs.SelectMany(x => x.Properties); /// @@ -52,7 +49,6 @@ namespace Umbraco.Web.Models.ContentEditing public string Segment { get; set; } [DataMember(Name = "state")] - [JsonConverter(typeof(StringEnumConverter))] public ContentSavedState State { get; set; } [DataMember(Name = "updateDate")] @@ -79,6 +75,5 @@ namespace Umbraco.Web.Models.ContentEditing [DataMember(Name = "notifications")] [ReadOnly(true)] public List Notifications { get; private set; } - } } diff --git a/src/Umbraco.Infrastructure/Models/ContentEditing/ListViewAwareContentItemDisplayBase.cs b/src/Umbraco.Core/Models/ContentEditing/ListViewAwareContentItemDisplayBase.cs similarity index 97% rename from src/Umbraco.Infrastructure/Models/ContentEditing/ListViewAwareContentItemDisplayBase.cs rename to src/Umbraco.Core/Models/ContentEditing/ListViewAwareContentItemDisplayBase.cs index 6ec1a0c96a..250ec3f633 100644 --- a/src/Umbraco.Infrastructure/Models/ContentEditing/ListViewAwareContentItemDisplayBase.cs +++ b/src/Umbraco.Core/Models/ContentEditing/ListViewAwareContentItemDisplayBase.cs @@ -1,5 +1,4 @@ using System.Runtime.Serialization; -using Umbraco.Core.Models; namespace Umbraco.Web.Models.ContentEditing { diff --git a/src/Umbraco.Infrastructure/Models/ContentEditing/MediaItemDisplay.cs b/src/Umbraco.Core/Models/ContentEditing/MediaItemDisplay.cs similarity index 91% rename from src/Umbraco.Infrastructure/Models/ContentEditing/MediaItemDisplay.cs rename to src/Umbraco.Core/Models/ContentEditing/MediaItemDisplay.cs index a5d538c6ac..a1d2a3696f 100644 --- a/src/Umbraco.Infrastructure/Models/ContentEditing/MediaItemDisplay.cs +++ b/src/Umbraco.Core/Models/ContentEditing/MediaItemDisplay.cs @@ -1,7 +1,5 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Runtime.Serialization; -using Umbraco.Core.Models; using Umbraco.Core.Models.ContentEditing; namespace Umbraco.Web.Models.ContentEditing diff --git a/src/Umbraco.Infrastructure/Models/ContentEditing/MediaItemSave.cs b/src/Umbraco.Core/Models/ContentEditing/MediaItemSave.cs similarity index 100% rename from src/Umbraco.Infrastructure/Models/ContentEditing/MediaItemSave.cs rename to src/Umbraco.Core/Models/ContentEditing/MediaItemSave.cs diff --git a/src/Umbraco.Infrastructure/Models/ContentEditing/MemberBasic.cs b/src/Umbraco.Core/Models/ContentEditing/MemberBasic.cs similarity index 56% rename from src/Umbraco.Infrastructure/Models/ContentEditing/MemberBasic.cs rename to src/Umbraco.Core/Models/ContentEditing/MemberBasic.cs index 00d2df0020..2352fd46ca 100644 --- a/src/Umbraco.Infrastructure/Models/ContentEditing/MemberBasic.cs +++ b/src/Umbraco.Core/Models/ContentEditing/MemberBasic.cs @@ -1,5 +1,5 @@ -using System.Runtime.Serialization; -using Umbraco.Core.Models; +using System.Collections.Generic; +using System.Runtime.Serialization; namespace Umbraco.Web.Models.ContentEditing { @@ -13,5 +13,12 @@ namespace Umbraco.Web.Models.ContentEditing [DataMember(Name = "email")] public string Email { get; set; } + + [DataMember(Name = "properties")] + public override IEnumerable Properties + { + get => base.Properties; + set => base.Properties = value; + } } } diff --git a/src/Umbraco.Infrastructure/Models/ContentEditing/MemberDisplay.cs b/src/Umbraco.Core/Models/ContentEditing/MemberDisplay.cs similarity index 96% rename from src/Umbraco.Infrastructure/Models/ContentEditing/MemberDisplay.cs rename to src/Umbraco.Core/Models/ContentEditing/MemberDisplay.cs index 8c97925403..0a5caeccc7 100644 --- a/src/Umbraco.Infrastructure/Models/ContentEditing/MemberDisplay.cs +++ b/src/Umbraco.Core/Models/ContentEditing/MemberDisplay.cs @@ -1,8 +1,6 @@ using System.Collections.Generic; using System.Runtime.Serialization; -using Umbraco.Core.Models; using Umbraco.Core.Models.ContentEditing; -using Umbraco.Core.Models.Membership; namespace Umbraco.Web.Models.ContentEditing { diff --git a/src/Umbraco.Infrastructure/Models/ContentEditing/MemberListDisplay.cs b/src/Umbraco.Core/Models/ContentEditing/MemberListDisplay.cs similarity index 95% rename from src/Umbraco.Infrastructure/Models/ContentEditing/MemberListDisplay.cs rename to src/Umbraco.Core/Models/ContentEditing/MemberListDisplay.cs index 592bd14df5..4783e2b992 100644 --- a/src/Umbraco.Infrastructure/Models/ContentEditing/MemberListDisplay.cs +++ b/src/Umbraco.Core/Models/ContentEditing/MemberListDisplay.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using System.Runtime.Serialization; -using Umbraco.Core.Models; using Umbraco.Core.Models.ContentEditing; namespace Umbraco.Web.Models.ContentEditing diff --git a/src/Umbraco.Infrastructure/Models/ContentEditing/MemberSave.cs b/src/Umbraco.Core/Models/ContentEditing/MemberSave.cs similarity index 100% rename from src/Umbraco.Infrastructure/Models/ContentEditing/MemberSave.cs rename to src/Umbraco.Core/Models/ContentEditing/MemberSave.cs index b9ec6fad67..8bba20f7bd 100644 --- a/src/Umbraco.Infrastructure/Models/ContentEditing/MemberSave.cs +++ b/src/Umbraco.Core/Models/ContentEditing/MemberSave.cs @@ -2,9 +2,9 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Runtime.Serialization; +using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Models.Validation; -using Umbraco.Core; namespace Umbraco.Web.Models.ContentEditing { diff --git a/src/Umbraco.Infrastructure/Models/ContentEditing/PublicAccess.cs b/src/Umbraco.Core/Models/ContentEditing/PublicAccess.cs similarity index 100% rename from src/Umbraco.Infrastructure/Models/ContentEditing/PublicAccess.cs rename to src/Umbraco.Core/Models/ContentEditing/PublicAccess.cs diff --git a/src/Umbraco.Infrastructure/Models/ContentEditing/RichTextEditorCommand.cs b/src/Umbraco.Core/Models/ContentEditing/RichTextEditorCommand.cs similarity index 66% rename from src/Umbraco.Infrastructure/Models/ContentEditing/RichTextEditorCommand.cs rename to src/Umbraco.Core/Models/ContentEditing/RichTextEditorCommand.cs index f304b0ef68..9eb7b57bba 100644 --- a/src/Umbraco.Infrastructure/Models/ContentEditing/RichTextEditorCommand.cs +++ b/src/Umbraco.Core/Models/ContentEditing/RichTextEditorCommand.cs @@ -1,11 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Runtime.Serialization; -using System.Text; -using System.Threading.Tasks; -using Newtonsoft.Json; -using Newtonsoft.Json.Converters; +using System.Runtime.Serialization; namespace Umbraco.Web.Models.ContentEditing { @@ -18,7 +11,6 @@ namespace Umbraco.Web.Models.ContentEditing [DataMember(Name = "alias")] public string Alias { get; set; } - [JsonConverter(typeof(StringEnumConverter))] [DataMember(Name = "mode")] public RichTextEditorCommandMode Mode { get; set; } } diff --git a/src/Umbraco.Infrastructure/Models/ContentEditing/RichTextEditorConfiguration.cs b/src/Umbraco.Core/Models/ContentEditing/RichTextEditorConfiguration.cs similarity index 86% rename from src/Umbraco.Infrastructure/Models/ContentEditing/RichTextEditorConfiguration.cs rename to src/Umbraco.Core/Models/ContentEditing/RichTextEditorConfiguration.cs index 380780b6d8..65ed5a2f7a 100644 --- a/src/Umbraco.Infrastructure/Models/ContentEditing/RichTextEditorConfiguration.cs +++ b/src/Umbraco.Core/Models/ContentEditing/RichTextEditorConfiguration.cs @@ -1,9 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; +using System.Collections.Generic; using System.Runtime.Serialization; -using System.Text; -using System.Threading.Tasks; namespace Umbraco.Web.Models.ContentEditing { diff --git a/src/Umbraco.Infrastructure/Models/ContentEditing/TabbedContentItem.cs b/src/Umbraco.Core/Models/ContentEditing/TabbedContentItem.cs similarity index 62% rename from src/Umbraco.Infrastructure/Models/ContentEditing/TabbedContentItem.cs rename to src/Umbraco.Core/Models/ContentEditing/TabbedContentItem.cs index db7d1df7bc..60b282ecac 100644 --- a/src/Umbraco.Infrastructure/Models/ContentEditing/TabbedContentItem.cs +++ b/src/Umbraco.Core/Models/ContentEditing/TabbedContentItem.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using System.Runtime.Serialization; -using Newtonsoft.Json; namespace Umbraco.Web.Models.ContentEditing { @@ -19,16 +18,6 @@ namespace Umbraco.Web.Models.ContentEditing [DataMember(Name = "tabs")] public IEnumerable> Tabs { get; set; } - // note - // once a [DataContract] has been defined on a class, with a [DataMember] property, - // one simply cannot ignore that property anymore - [IgnoreDataMember] on an overridden - // property is ignored, and 'newing' the property means that it's the base property - // which is used - // - // OTOH, Json.NET is happy having [JsonIgnore] on overrides, even though the base - // property is [JsonProperty]. so, forcing [JsonIgnore] here, but really, we should - // rethink the whole thing. - /// /// Override the properties property to ensure we don't serialize this /// and to simply return the properties based on the properties in the tabs collection @@ -37,7 +26,6 @@ namespace Umbraco.Web.Models.ContentEditing /// This property cannot be set /// [IgnoreDataMember] - [JsonIgnore] // see note above on IgnoreDataMember vs JsonIgnore public override IEnumerable Properties { get => Tabs.SelectMany(x => x.Properties);