Skip to content

Commit

Permalink
refactor: Changed naming of picker models to have similar naming
Browse files Browse the repository at this point in the history 
BREAKING CHANGE:
BasicMember --> BasicMemberItem
CreteMember --> CreateMemberPickerItem
Member --> MemberItem
CreateLink --> CreateLinkPickerItem
BasicLink ..> BasicLinkItem
Link --> LinkItem
  • Loading branch information
@nikcio
nikcio committed Apr 26, 2022
1 parent befc3ab commit 3dbbc43
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 19 deletions.
4 changes: 2 additions & 2 deletions ...Values/MemberPicker/Models/BasicMember.cs → ...es/MemberPicker/Models/BasicMemberItem.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
namespace Nikcio.UHeadless.UmbracoElements.Properties.EditorsValues.MemberPicker.Models {
/// <inheritdoc/>
[GraphQLDescription("Represents a member item.")]
public class BasicMember<TProperty> : Member<TProperty>
public class BasicMemberItem<TProperty> : MemberItem<TProperty>
where TProperty : IProperty {
/// <inheritdoc/>
public BasicMember(CreateMember<TProperty> createMember, IPropertyFactory<TProperty> propertyFactory) : base(createMember) {
public BasicMemberItem(CreateMemberPickerItem<TProperty> createMember, IPropertyFactory<TProperty> propertyFactory) : base(createMember) {
if (createMember.Member == null) {
return;
}
Expand Down
6 changes: 3 additions & 3 deletions ...eadless/UmbracoElements/Properties/EditorsValues/MemberPicker/Models/BasicMemberPicker.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace Nikcio.UHeadless.UmbracoElements.Properties.EditorsValues.MemberPicker
/// </summary>
/// <typeparam name="TProperty"></typeparam>
[GraphQLDescription("Represents a member picker.")]
public class BasicMemberPicker<TProperty> : BasicMemberPicker<BasicMember<TProperty>, TProperty>
public class BasicMemberPicker<TProperty> : BasicMemberPicker<BasicMemberItem<TProperty>, TProperty>
where TProperty : IProperty {
/// <inheritdoc/>
public BasicMemberPicker(CreatePropertyValue createPropertyValue, IDependencyReflectorFactory dependencyReflectorFactory) : base(createPropertyValue, dependencyReflectorFactory) {
Expand All @@ -27,7 +27,7 @@ public BasicMemberPicker(CreatePropertyValue createPropertyValue, IDependencyRef
/// <typeparam name="TProperty"></typeparam>
[GraphQLDescription("Represents a member picker.")]
public class BasicMemberPicker<TMember, TProperty> : PropertyValue
where TMember : Member<TProperty>
where TMember : MemberItem<TProperty>
where TProperty : IProperty {
/// <summary>
/// Gets the members
Expand Down Expand Up @@ -58,7 +58,7 @@ public BasicMemberPicker(CreatePropertyValue createPropertyValue, IDependencyRef
/// <param name="createPropertyValue"></param>
/// <param name="member"></param>
protected virtual void AddMemberPickerItem(IDependencyReflectorFactory dependencyReflectorFactory, CreatePropertyValue createPropertyValue, IPublishedContent member) {
var memberItem = dependencyReflectorFactory.GetReflectedType<TMember>(typeof(TMember), new object[] { new CreateMember<TProperty>(createPropertyValue, member) });
var memberItem = dependencyReflectorFactory.GetReflectedType<TMember>(typeof(TMember), new object[] { new CreateMemberPickerItem<TProperty>(createPropertyValue, member) });
if (memberItem != null) {
Members.Add(memberItem);
}
Expand Down
4 changes: 2 additions & 2 deletions ...berPicker/Models/Commands/CreateMember.cs → ...Models/Commands/CreateMemberPickerItem.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ namespace Nikcio.UHeadless.UmbracoElements.Properties.EditorsValues.MemberPicker
/// A command to create a member
/// </summary>
/// <typeparam name="TProperty"></typeparam>
public class CreateMember<TProperty>
public class CreateMemberPickerItem<TProperty>
where TProperty : IProperty {
/// <inheritdoc/>
public CreateMember(CreatePropertyValue createPropertyValue, IPublishedContent member) {
public CreateMemberPickerItem(CreatePropertyValue createPropertyValue, IPublishedContent member) {
CreatePropertyValue = createPropertyValue;
Member = member;
}
Expand Down
4 changes: 2 additions & 2 deletions ...itorsValues/MemberPicker/Models/Member.cs → ...sValues/MemberPicker/Models/MemberItem.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ namespace Nikcio.UHeadless.UmbracoElements.Properties.EditorsValues.MemberPicker
/// A member for a member picker
/// </summary>
/// <typeparam name="TProperty"></typeparam>
public class Member<TProperty>
public class MemberItem<TProperty>
where TProperty : IProperty {
/// <inheritdoc/>
public Member(CreateMember<TProperty> _) {
public MemberItem(CreateMemberPickerItem<TProperty> _) {

}
}
Expand Down
4 changes: 2 additions & 2 deletions ...ues/MultiUrlPicker/Commands/CreateLink.cs → ...rlPicker/Commands/CreateLinkPickerItem.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ namespace Nikcio.UHeadless.UmbracoElements.Properties.EditorsValues.MultiUrlPick
/// <summary>
/// A command to create a link for a multi url picker
/// </summary>
public class CreateLink {
public class CreateLinkPickerItem {
/// <inheritdoc/>
public CreateLink(Link umbracoLink) {
public CreateLinkPickerItem(Link umbracoLink) {
UmbracoLink = umbracoLink;
}

Expand Down
4 changes: 2 additions & 2 deletions ...Values/MultiUrlPicker/Models/BasicLink.cs → ...es/MultiUrlPicker/Models/BasicLinkItem.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace Nikcio.UHeadless.UmbracoElements.Properties.EditorsValues.MultiUrlPick
/// Represents a link item
/// </summary>
[GraphQLDescription("Represents a link item.")]
public class BasicLink : Link {
public class BasicLinkItem : LinkItem {
/// <summary>
/// Gets the name of the lin
/// </summary>
Expand All @@ -33,7 +33,7 @@ public class BasicLink : Link {
public virtual string Url { get; set; }

/// <inheritdoc/>
public BasicLink(CreateLink createLink) : base(createLink) {
public BasicLinkItem(CreateLinkPickerItem createLink) : base(createLink) {
Name = createLink.UmbracoLink.Name;
Target = createLink.UmbracoLink.Target;
Type = createLink.UmbracoLink.Type;
Expand Down
9 changes: 5 additions & 4 deletions ...ess/UmbracoElements/Properties/EditorsValues/MultiUrlPicker/Models/BasicMultiUrlPicker.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
/// <summary>
/// Represents a multi url picker
/// </summary>
[GraphQLDescription("Represents a multi url picker.")]
public class BasicMultiUrlPicker : BasicMultiUrlPicker<BasicLink> {
public class BasicMultiUrlPicker : BasicMultiUrlPicker<BasicLinkItem> {
/// <inheritdoc/>
public BasicMultiUrlPicker(CreatePropertyValue createPropertyValue, IDependencyReflectorFactory dependencyReflectorFactory) : base(createPropertyValue, dependencyReflectorFactory) {
}
Expand All @@ -20,7 +21,7 @@ public BasicMultiUrlPicker(CreatePropertyValue createPropertyValue, IDependencyR
/// </summary>
[GraphQLDescription("Represents a multi url picker.")]
public class BasicMultiUrlPicker<TLink> : PropertyValue
where TLink : Link {
where TLink : LinkItem {
/// <summary>
/// Gets the links
/// </summary>
Expand All @@ -30,7 +31,7 @@ public class BasicMultiUrlPicker<TLink> : PropertyValue
/// <inheritdoc/>
public BasicMultiUrlPicker(CreatePropertyValue createPropertyValue, IDependencyReflectorFactory dependencyReflectorFactory) : base(createPropertyValue) {
var value = createPropertyValue.Property.GetValue(createPropertyValue.Culture);
if (value is IEnumerable<Umbraco.Cms.Core.Models.Link> links) {
if (value is IEnumerable<Link> links) {
foreach (var link in links) {
AddLinkPickerItem(dependencyReflectorFactory, link);
}
Expand All @@ -42,7 +43,7 @@ public BasicMultiUrlPicker(CreatePropertyValue createPropertyValue, IDependencyR
/// </summary>
/// <param name="dependencyReflectorFactory"></param>
/// <param name="link"></param>
protected virtual void AddLinkPickerItem(IDependencyReflectorFactory dependencyReflectorFactory, Umbraco.Cms.Core.Models.Link link) {
protected virtual void AddLinkPickerItem(IDependencyReflectorFactory dependencyReflectorFactory, Link link) {
var linkItem = dependencyReflectorFactory.GetReflectedType<TLink>(typeof(TLink), new object[] { link });
if (linkItem != null) {
Links.Add(linkItem);
Expand Down
4 changes: 2 additions & 2 deletions ...itorsValues/MultiUrlPicker/Models/Link.cs → ...sValues/MultiUrlPicker/Models/LinkItem.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ namespace Nikcio.UHeadless.UmbracoElements.Properties.EditorsValues.MultiUrlPick
/// <summary>
/// A base model for a link
/// </summary>
public class Link {
public class LinkItem {
/// <inheritdoc/>
public Link(CreateLink _) {
public LinkItem(CreateLinkPickerItem _) {

}
}
Expand Down

0 comments on commit 3dbbc43

Please sign in to comment.