From 3dbbc43f8c656adda4553f15d0f390f6ced92bee Mon Sep 17 00:00:00 2001 From: Nikcio Date: Tue, 26 Apr 2022 19:54:40 +0200 Subject: [PATCH] refactor: Changed naming of picker models to have similar naming BREAKING CHANGE: BasicMember --> BasicMemberItem CreteMember --> CreateMemberPickerItem Member --> MemberItem CreateLink --> CreateLinkPickerItem BasicLink ..> BasicLinkItem Link --> LinkItem --- .../Models/{BasicMember.cs => BasicMemberItem.cs} | 4 ++-- .../MemberPicker/Models/BasicMemberPicker.cs | 6 +++--- .../{CreateMember.cs => CreateMemberPickerItem.cs} | 4 ++-- .../MemberPicker/Models/{Member.cs => MemberItem.cs} | 4 ++-- .../Commands/{CreateLink.cs => CreateLinkPickerItem.cs} | 4 ++-- .../Models/{BasicLink.cs => BasicLinkItem.cs} | 4 ++-- .../MultiUrlPicker/Models/BasicMultiUrlPicker.cs | 9 +++++---- .../MultiUrlPicker/Models/{Link.cs => LinkItem.cs} | 4 ++-- 8 files changed, 20 insertions(+), 19 deletions(-) rename src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MemberPicker/Models/{BasicMember.cs => BasicMemberItem.cs} (87%) rename src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MemberPicker/Models/Commands/{CreateMember.cs => CreateMemberPickerItem.cs} (84%) rename src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MemberPicker/Models/{Member.cs => MemberItem.cs} (81%) rename src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MultiUrlPicker/Commands/{CreateLink.cs => CreateLinkPickerItem.cs} (81%) rename src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MultiUrlPicker/Models/{BasicLink.cs => BasicLinkItem.cs} (91%) rename src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MultiUrlPicker/Models/{Link.cs => LinkItem.cs} (79%) diff --git a/src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MemberPicker/Models/BasicMember.cs b/src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MemberPicker/Models/BasicMemberItem.cs similarity index 87% rename from src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MemberPicker/Models/BasicMember.cs rename to src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MemberPicker/Models/BasicMemberItem.cs index 7e1ec492..9619bcb4 100644 --- a/src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MemberPicker/Models/BasicMember.cs +++ b/src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MemberPicker/Models/BasicMemberItem.cs @@ -7,10 +7,10 @@ namespace Nikcio.UHeadless.UmbracoElements.Properties.EditorsValues.MemberPicker.Models { /// [GraphQLDescription("Represents a member item.")] - public class BasicMember : Member + public class BasicMemberItem : MemberItem where TProperty : IProperty { /// - public BasicMember(CreateMember createMember, IPropertyFactory propertyFactory) : base(createMember) { + public BasicMemberItem(CreateMemberPickerItem createMember, IPropertyFactory propertyFactory) : base(createMember) { if (createMember.Member == null) { return; } diff --git a/src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MemberPicker/Models/BasicMemberPicker.cs b/src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MemberPicker/Models/BasicMemberPicker.cs index add22734..ce10d996 100644 --- a/src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MemberPicker/Models/BasicMemberPicker.cs +++ b/src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MemberPicker/Models/BasicMemberPicker.cs @@ -13,7 +13,7 @@ namespace Nikcio.UHeadless.UmbracoElements.Properties.EditorsValues.MemberPicker /// /// [GraphQLDescription("Represents a member picker.")] - public class BasicMemberPicker : BasicMemberPicker, TProperty> + public class BasicMemberPicker : BasicMemberPicker, TProperty> where TProperty : IProperty { /// public BasicMemberPicker(CreatePropertyValue createPropertyValue, IDependencyReflectorFactory dependencyReflectorFactory) : base(createPropertyValue, dependencyReflectorFactory) { @@ -27,7 +27,7 @@ public BasicMemberPicker(CreatePropertyValue createPropertyValue, IDependencyRef /// [GraphQLDescription("Represents a member picker.")] public class BasicMemberPicker : PropertyValue - where TMember : Member + where TMember : MemberItem where TProperty : IProperty { /// /// Gets the members @@ -58,7 +58,7 @@ public BasicMemberPicker(CreatePropertyValue createPropertyValue, IDependencyRef /// /// protected virtual void AddMemberPickerItem(IDependencyReflectorFactory dependencyReflectorFactory, CreatePropertyValue createPropertyValue, IPublishedContent member) { - var memberItem = dependencyReflectorFactory.GetReflectedType(typeof(TMember), new object[] { new CreateMember(createPropertyValue, member) }); + var memberItem = dependencyReflectorFactory.GetReflectedType(typeof(TMember), new object[] { new CreateMemberPickerItem(createPropertyValue, member) }); if (memberItem != null) { Members.Add(memberItem); } diff --git a/src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MemberPicker/Models/Commands/CreateMember.cs b/src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MemberPicker/Models/Commands/CreateMemberPickerItem.cs similarity index 84% rename from src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MemberPicker/Models/Commands/CreateMember.cs rename to src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MemberPicker/Models/Commands/CreateMemberPickerItem.cs index 630f69f4..843a9e67 100644 --- a/src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MemberPicker/Models/Commands/CreateMember.cs +++ b/src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MemberPicker/Models/Commands/CreateMemberPickerItem.cs @@ -7,10 +7,10 @@ namespace Nikcio.UHeadless.UmbracoElements.Properties.EditorsValues.MemberPicker /// A command to create a member /// /// - public class CreateMember + public class CreateMemberPickerItem where TProperty : IProperty { /// - public CreateMember(CreatePropertyValue createPropertyValue, IPublishedContent member) { + public CreateMemberPickerItem(CreatePropertyValue createPropertyValue, IPublishedContent member) { CreatePropertyValue = createPropertyValue; Member = member; } diff --git a/src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MemberPicker/Models/Member.cs b/src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MemberPicker/Models/MemberItem.cs similarity index 81% rename from src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MemberPicker/Models/Member.cs rename to src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MemberPicker/Models/MemberItem.cs index c733361e..0f45b3b9 100644 --- a/src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MemberPicker/Models/Member.cs +++ b/src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MemberPicker/Models/MemberItem.cs @@ -6,10 +6,10 @@ namespace Nikcio.UHeadless.UmbracoElements.Properties.EditorsValues.MemberPicker /// A member for a member picker /// /// - public class Member + public class MemberItem where TProperty : IProperty { /// - public Member(CreateMember _) { + public MemberItem(CreateMemberPickerItem _) { } } diff --git a/src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MultiUrlPicker/Commands/CreateLink.cs b/src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MultiUrlPicker/Commands/CreateLinkPickerItem.cs similarity index 81% rename from src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MultiUrlPicker/Commands/CreateLink.cs rename to src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MultiUrlPicker/Commands/CreateLinkPickerItem.cs index db305eb9..021c733c 100644 --- a/src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MultiUrlPicker/Commands/CreateLink.cs +++ b/src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MultiUrlPicker/Commands/CreateLinkPickerItem.cs @@ -4,9 +4,9 @@ namespace Nikcio.UHeadless.UmbracoElements.Properties.EditorsValues.MultiUrlPick /// /// A command to create a link for a multi url picker /// - public class CreateLink { + public class CreateLinkPickerItem { /// - public CreateLink(Link umbracoLink) { + public CreateLinkPickerItem(Link umbracoLink) { UmbracoLink = umbracoLink; } diff --git a/src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MultiUrlPicker/Models/BasicLink.cs b/src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MultiUrlPicker/Models/BasicLinkItem.cs similarity index 91% rename from src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MultiUrlPicker/Models/BasicLink.cs rename to src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MultiUrlPicker/Models/BasicLinkItem.cs index 7c1e265f..3d720ecd 100644 --- a/src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MultiUrlPicker/Models/BasicLink.cs +++ b/src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MultiUrlPicker/Models/BasicLinkItem.cs @@ -7,7 +7,7 @@ namespace Nikcio.UHeadless.UmbracoElements.Properties.EditorsValues.MultiUrlPick /// Represents a link item /// [GraphQLDescription("Represents a link item.")] - public class BasicLink : Link { + public class BasicLinkItem : LinkItem { /// /// Gets the name of the lin /// @@ -33,7 +33,7 @@ public class BasicLink : Link { public virtual string Url { get; set; } /// - public BasicLink(CreateLink createLink) : base(createLink) { + public BasicLinkItem(CreateLinkPickerItem createLink) : base(createLink) { Name = createLink.UmbracoLink.Name; Target = createLink.UmbracoLink.Target; Type = createLink.UmbracoLink.Type; diff --git a/src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MultiUrlPicker/Models/BasicMultiUrlPicker.cs b/src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MultiUrlPicker/Models/BasicMultiUrlPicker.cs index 61a7e4cb..4c60faef 100644 --- a/src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MultiUrlPicker/Models/BasicMultiUrlPicker.cs +++ b/src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MultiUrlPicker/Models/BasicMultiUrlPicker.cs @@ -3,13 +3,14 @@ using Nikcio.UHeadless.Reflection.Factories; using Nikcio.UHeadless.UmbracoElements.Properties.Bases.Models; using Nikcio.UHeadless.UmbracoElements.Properties.Commands; +using Umbraco.Cms.Core.Models; namespace Nikcio.UHeadless.UmbracoElements.Properties.EditorsValues.MultiUrlPicker.Models { /// /// Represents a multi url picker /// [GraphQLDescription("Represents a multi url picker.")] - public class BasicMultiUrlPicker : BasicMultiUrlPicker { + public class BasicMultiUrlPicker : BasicMultiUrlPicker { /// public BasicMultiUrlPicker(CreatePropertyValue createPropertyValue, IDependencyReflectorFactory dependencyReflectorFactory) : base(createPropertyValue, dependencyReflectorFactory) { } @@ -20,7 +21,7 @@ public BasicMultiUrlPicker(CreatePropertyValue createPropertyValue, IDependencyR /// [GraphQLDescription("Represents a multi url picker.")] public class BasicMultiUrlPicker : PropertyValue - where TLink : Link { + where TLink : LinkItem { /// /// Gets the links /// @@ -30,7 +31,7 @@ public class BasicMultiUrlPicker : PropertyValue /// public BasicMultiUrlPicker(CreatePropertyValue createPropertyValue, IDependencyReflectorFactory dependencyReflectorFactory) : base(createPropertyValue) { var value = createPropertyValue.Property.GetValue(createPropertyValue.Culture); - if (value is IEnumerable links) { + if (value is IEnumerable links) { foreach (var link in links) { AddLinkPickerItem(dependencyReflectorFactory, link); } @@ -42,7 +43,7 @@ public BasicMultiUrlPicker(CreatePropertyValue createPropertyValue, IDependencyR /// /// /// - protected virtual void AddLinkPickerItem(IDependencyReflectorFactory dependencyReflectorFactory, Umbraco.Cms.Core.Models.Link link) { + protected virtual void AddLinkPickerItem(IDependencyReflectorFactory dependencyReflectorFactory, Link link) { var linkItem = dependencyReflectorFactory.GetReflectedType(typeof(TLink), new object[] { link }); if (linkItem != null) { Links.Add(linkItem); diff --git a/src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MultiUrlPicker/Models/Link.cs b/src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MultiUrlPicker/Models/LinkItem.cs similarity index 79% rename from src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MultiUrlPicker/Models/Link.cs rename to src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MultiUrlPicker/Models/LinkItem.cs index d9a40bf0..4452361a 100644 --- a/src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MultiUrlPicker/Models/Link.cs +++ b/src/Nikcio.UHeadless/UmbracoElements/Properties/EditorsValues/MultiUrlPicker/Models/LinkItem.cs @@ -4,9 +4,9 @@ namespace Nikcio.UHeadless.UmbracoElements.Properties.EditorsValues.MultiUrlPick /// /// A base model for a link /// - public class Link { + public class LinkItem { /// - public Link(CreateLink _) { + public LinkItem(CreateLinkPickerItem _) { } }