diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec index 11b1870b90..426df0c341 100644 --- a/build/NuSpecs/UmbracoCms.Core.nuspec +++ b/build/NuSpecs/UmbracoCms.Core.nuspec @@ -22,7 +22,6 @@ the latter would pick anything below 3.0.0 and that includes prereleases such as 3.0.0-alpha, and we do not want this to happen as the alpha of the next major is, really, the next major already. --> - diff --git a/src/Umbraco.Core/BindingRedirects.cs b/src/Umbraco.Core/BindingRedirects.cs index 17e187b7ae..e698ffa646 100644 --- a/src/Umbraco.Core/BindingRedirects.cs +++ b/src/Umbraco.Core/BindingRedirects.cs @@ -1,10 +1,10 @@ using System; using System.Reflection; -using System.Text.RegularExpressions; using System.Web; using Umbraco.Core; -[assembly: PreApplicationStartMethod(typeof(BindingRedirects), "Initialize")] +// no binding redirect for now = de-activate +//[assembly: PreApplicationStartMethod(typeof(BindingRedirects), "Initialize")] namespace Umbraco.Core { @@ -18,7 +18,7 @@ namespace Umbraco.Core // this only gets called when an assembly can't be resolved AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve; } - + /// /// This is used to do an assembly binding redirect via code - normally required due to signature changes in assemblies /// @@ -27,14 +27,19 @@ namespace Umbraco.Core /// private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args) { + // When an assembly can't be resolved. In here we can do magic with the assembly name and try loading another. + + // keep here for reference - we don't use AutoMapper + /* //AutoMapper: + // this is used for loading a signed assembly of AutoMapper (v. 3.1+) without having to recompile old code. // ensure the assembly is indeed AutoMapper and that the PublicKeyToken is null before trying to Load again // do NOT just replace this with 'return Assembly', as it will cause an infinite loop -> stackoverflow if (args.Name.StartsWith("AutoMapper") && args.Name.EndsWith("PublicKeyToken=null")) return Assembly.Load(args.Name.Replace(", PublicKeyToken=null", ", PublicKeyToken=be96cd2c38ef1005")); + */ return null; - } } } diff --git a/src/Umbraco.Core/Cache/NoCacheRepositoryCachePolicy.cs b/src/Umbraco.Core/Cache/NoCacheRepositoryCachePolicy.cs index b1a12ec411..fecab66d84 100644 --- a/src/Umbraco.Core/Cache/NoCacheRepositoryCachePolicy.cs +++ b/src/Umbraco.Core/Cache/NoCacheRepositoryCachePolicy.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using Umbraco.Core.Models.Entities; -using Umbraco.Core.Scoping; namespace Umbraco.Core.Cache { @@ -13,11 +12,6 @@ namespace Umbraco.Core.Cache public static NoCacheRepositoryCachePolicy Instance { get; } = new NoCacheRepositoryCachePolicy(); - public IRepositoryCachePolicy Scoped(IAppPolicyCache runtimeCache, IScope scope) - { - throw new NotImplementedException(); - } - public TEntity Get(TId id, Func performGet, Func> performGetAll) { return performGet(id); diff --git a/src/Umbraco.Core/Composing/CompositionExtensions/CoreMappingProfiles.cs b/src/Umbraco.Core/Composing/CompositionExtensions/CoreMappingProfiles.cs index ed875ec973..165fa10be7 100644 --- a/src/Umbraco.Core/Composing/CompositionExtensions/CoreMappingProfiles.cs +++ b/src/Umbraco.Core/Composing/CompositionExtensions/CoreMappingProfiles.cs @@ -1,4 +1,4 @@ -using AutoMapper; +using Umbraco.Core.Mapping; using Umbraco.Core.Models.Identity; namespace Umbraco.Core.Composing.CompositionExtensions @@ -8,7 +8,9 @@ namespace Umbraco.Core.Composing.CompositionExtensions { public static Composition ComposeCoreMappingProfiles(this Composition composition) { - composition.Register(); + composition.RegisterUnique(); + composition.WithCollectionBuilder() + .Add(); return composition; } } diff --git a/src/Umbraco.Core/Composing/CompositionExtensions/Repositories.cs b/src/Umbraco.Core/Composing/CompositionExtensions/Repositories.cs index 03f13f96cb..23dc9e67c6 100644 --- a/src/Umbraco.Core/Composing/CompositionExtensions/Repositories.cs +++ b/src/Umbraco.Core/Composing/CompositionExtensions/Repositories.cs @@ -46,6 +46,7 @@ namespace Umbraco.Core.Composing.CompositionExtensions composition.RegisterUnique(); composition.RegisterUnique(); composition.RegisterUnique(); + composition.RegisterUnique(); return composition; } diff --git a/src/Umbraco.Core/Composing/Current.cs b/src/Umbraco.Core/Composing/Current.cs index 1b16ad2b8e..f12bf0dd63 100644 --- a/src/Umbraco.Core/Composing/Current.cs +++ b/src/Umbraco.Core/Composing/Current.cs @@ -4,6 +4,7 @@ using Umbraco.Core.Configuration; using Umbraco.Core.Dictionary; using Umbraco.Core.IO; using Umbraco.Core.Logging; +using Umbraco.Core.Mapping; using Umbraco.Core.Models.PublishedContent; using Umbraco.Core.PackageActions; using Umbraco.Core.Packaging; @@ -103,6 +104,9 @@ namespace Umbraco.Core.Composing #region Getters + public static UmbracoMapper Mapper + => _factory.GetInstance(); + public static IShortStringHelper ShortStringHelper => _shortStringHelper ?? (_shortStringHelper = _factory?.TryGetInstance() ?? new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(Configs.Settings()))); diff --git a/src/Umbraco.Core/Composing/SetCollectionBuilderBase.cs b/src/Umbraco.Core/Composing/SetCollectionBuilderBase.cs index 3698b7e801..9261423bbc 100644 --- a/src/Umbraco.Core/Composing/SetCollectionBuilderBase.cs +++ b/src/Umbraco.Core/Composing/SetCollectionBuilderBase.cs @@ -9,6 +9,10 @@ namespace Umbraco.Core.Composing /// The type of the builder. /// The type of the collection. /// The type of the items. + /// + /// A set collection builder is the most basic collection builder, + /// where items are not ordered. + /// public abstract class SetCollectionBuilderBase : CollectionBuilderBase where TBuilder : SetCollectionBuilderBase where TCollection : class, IBuilderCollection diff --git a/src/Umbraco.Core/Mapping/IMapDefinition.cs b/src/Umbraco.Core/Mapping/IMapDefinition.cs new file mode 100644 index 0000000000..ffea07c3eb --- /dev/null +++ b/src/Umbraco.Core/Mapping/IMapDefinition.cs @@ -0,0 +1,13 @@ +namespace Umbraco.Core.Mapping +{ + /// + /// Defines maps for . + /// + public interface IMapDefinition + { + /// + /// Defines maps. + /// + void DefineMaps(UmbracoMapper mapper); + } +} diff --git a/src/Umbraco.Core/Mapping/MapDefinitionCollection.cs b/src/Umbraco.Core/Mapping/MapDefinitionCollection.cs new file mode 100644 index 0000000000..e2438515f0 --- /dev/null +++ b/src/Umbraco.Core/Mapping/MapDefinitionCollection.cs @@ -0,0 +1,12 @@ +using System.Collections.Generic; +using Umbraco.Core.Composing; + +namespace Umbraco.Core.Mapping +{ + public class MapDefinitionCollection : BuilderCollectionBase + { + public MapDefinitionCollection(IEnumerable items) + : base(items) + { } + } +} diff --git a/src/Umbraco.Core/Mapping/MapDefinitionCollectionBuilder.cs b/src/Umbraco.Core/Mapping/MapDefinitionCollectionBuilder.cs new file mode 100644 index 0000000000..15d94e58a0 --- /dev/null +++ b/src/Umbraco.Core/Mapping/MapDefinitionCollectionBuilder.cs @@ -0,0 +1,11 @@ +using Umbraco.Core.Composing; + +namespace Umbraco.Core.Mapping +{ + public class MapDefinitionCollectionBuilder : SetCollectionBuilderBase + { + protected override MapDefinitionCollectionBuilder This => this; + + protected override Lifetime CollectionLifetime => Lifetime.Transient; + } +} diff --git a/src/Umbraco.Core/Mapping/MapperContext.cs b/src/Umbraco.Core/Mapping/MapperContext.cs new file mode 100644 index 0000000000..a7044a05b9 --- /dev/null +++ b/src/Umbraco.Core/Mapping/MapperContext.cs @@ -0,0 +1,130 @@ +using System; +using System.Collections.Generic; +using System.Linq; + +namespace Umbraco.Core.Mapping +{ + /// + /// Represents a mapper context. + /// + public class MapperContext + { + private readonly UmbracoMapper _mapper; + private IDictionary _items; + + /// + /// Initializes a new instance of the class. + /// + public MapperContext(UmbracoMapper mapper) + { + _mapper = mapper; + } + + /// + /// Gets a value indicating whether the context has items. + /// + public bool HasItems => _items != null; + + /// + /// Gets the context items. + /// + public IDictionary Items => _items ?? (_items = new Dictionary()); + + #region Map + + /// + /// Maps a source object to a new target object. + /// + /// The target type. + /// The source object. + /// The target object. + public TTarget Map(object source) + => _mapper.Map(source, this); + + // let's say this is a bad (dangerous) idea, and leave it out for now + /* + /// + /// Maps a source object to a new target object. + /// + /// The target type. + /// The source object. + /// A mapper context preparation method. + /// The target object. + public TTarget Map(object source, Action f) + { + f(this); + return _mapper.Map(source, this); + } + */ + + /// + /// Maps a source object to a new target object. + /// + /// The source type. + /// The target type. + /// The source object. + /// The target object. + public TTarget Map(TSource source) + => _mapper.Map(source, this); + + // let's say this is a bad (dangerous) idea, and leave it out for now + /* + /// + /// Maps a source object to a new target object. + /// + /// The source type. + /// The target type. + /// The source object. + /// A mapper context preparation method. + /// The target object. + public TTarget Map(TSource source, Action f) + { + f(this); + return _mapper.Map(source, this); + } + */ + + /// + /// Maps a source object to an existing target object. + /// + /// The source type. + /// The target type. + /// The source object. + /// The target object. + /// The target object. + public TTarget Map(TSource source, TTarget target) + => _mapper.Map(source, target, this); + + // let's say this is a bad (dangerous) idea, and leave it out for now + /* + /// + /// Maps a source object to an existing target object. + /// + /// The source type. + /// The target type. + /// The source object. + /// The target object. + /// A mapper context preparation method. + /// The target object. + public TTarget Map(TSource source, TTarget target, Action f) + { + f(this); + return _mapper.Map(source, target, this); + } + */ + + /// + /// Maps an enumerable of source objects to a new list of target objects. + /// + /// The type of the source objects. + /// The type of the target objects. + /// The source objects. + /// A list containing the target objects. + public List MapEnumerable(IEnumerable source) + { + return source.Select(Map).ToList(); + } + + #endregion + } +} diff --git a/src/Umbraco.Core/Mapping/UmbracoMapper.cs b/src/Umbraco.Core/Mapping/UmbracoMapper.cs new file mode 100644 index 0000000000..0831edab4e --- /dev/null +++ b/src/Umbraco.Core/Mapping/UmbracoMapper.cs @@ -0,0 +1,424 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; + +namespace Umbraco.Core.Mapping +{ + // notes: + // AutoMapper maps null to empty arrays, lists, etc + + // TODO: + // when mapping from TSource, and no map is found, consider the actual source.GetType()? + // when mapping to TTarget, and no map is found, consider the actual target.GetType()? + // not sure we want to add magic to this simple mapper class, though + + /// + /// Umbraco Mapper. + /// + /// + /// When a map is defined from TSource to TTarget, the mapper automatically knows how to map + /// from IEnumerable{TSource} to IEnumerable{TTarget} (using a List{TTarget}) and to TTarget[]. + /// When a map is defined from TSource to TTarget, the mapper automatically uses that map + /// for any source type that inherits from, or implements, TSource. + /// When a map is defined from TSource to TTarget, the mapper can map to TTarget exclusively + /// and cannot re-use that map for types that would inherit from, or implement, TTarget. + /// When using the Map{TSource, TTarget}(TSource source, ...) overloads, TSource is explicit. When + /// using the Map{TTarget}(object source, ...) TSource is defined as source.GetType(). + /// In both cases, TTarget is explicit and not typeof(target). + /// + public class UmbracoMapper + { + private readonly Dictionary>> _ctors + = new Dictionary>>(); + + private readonly Dictionary>> _maps + = new Dictionary>>(); + + /// + /// Initializes a new instance of the class. + /// + /// + public UmbracoMapper(MapDefinitionCollection profiles) + { + foreach (var profile in profiles) + profile.DefineMaps(this); + } + + #region Define + + private static TTarget ThrowCtor(TSource source, MapperContext context) + => throw new InvalidOperationException($"Don't know how to create {typeof(TTarget).FullName} instances."); + + private static void Identity(TSource source, TTarget target, MapperContext context) + { } + + /// + /// Defines a mapping. + /// + /// The source type. + /// The target type. + public void Define() + => Define(ThrowCtor, Identity); + + /// + /// Defines a mapping. + /// + /// The source type. + /// The target type. + /// A mapping method. + public void Define(Action map) + => Define(ThrowCtor, map); + + /// + /// Defines a mapping. + /// + /// The source type. + /// The target type. + /// A constructor method. + public void Define(Func ctor) + => Define(ctor, Identity); + + /// + /// Defines a mapping. + /// + /// The source type. + /// The target type. + /// A constructor method. + /// A mapping method. + public void Define(Func ctor, Action map) + { + var sourceType = typeof(TSource); + var targetType = typeof(TTarget); + + var sourceCtors = DefineCtors(sourceType); + if (ctor != null) + sourceCtors[targetType] = (source, context) => ctor((TSource)source, context); + + var sourceMaps = DefineMaps(sourceType); + sourceMaps[targetType] = (source, target, context) => map((TSource)source, (TTarget)target, context); + } + + private Dictionary> DefineCtors(Type sourceType) + { + if (!_ctors.TryGetValue(sourceType, out var sourceCtor)) + sourceCtor = _ctors[sourceType] = new Dictionary>(); + return sourceCtor; + } + + private Dictionary> DefineMaps(Type sourceType) + { + if (!_maps.TryGetValue(sourceType, out var sourceMap)) + sourceMap = _maps[sourceType] = new Dictionary>(); + return sourceMap; + } + + #endregion + + #region Map + + /// + /// Maps a source object to a new target object. + /// + /// The target type. + /// The source object. + /// The target object. + public TTarget Map(object source) + => Map(source, new MapperContext(this)); + + /// + /// Maps a source object to a new target object. + /// + /// The target type. + /// The source object. + /// A mapper context preparation method. + /// The target object. + public TTarget Map(object source, Action f) + { + var context = new MapperContext(this); + f(context); + return Map(source, context); + } + + /// + /// Maps a source object to a new target object. + /// + /// The target type. + /// The source object. + /// A mapper context. + /// The target object. + public TTarget Map(object source, MapperContext context) + => Map(source, source?.GetType(), context); + + /// + /// Maps a source object to a new target object. + /// + /// The source type. + /// The target type. + /// The source object. + /// The target object. + public TTarget Map(TSource source) + => Map(source, new MapperContext(this)); + + /// + /// Maps a source object to a new target object. + /// + /// The source type. + /// The target type. + /// The source object. + /// A mapper context preparation method. + /// The target object. + public TTarget Map(TSource source, Action f) + { + var context = new MapperContext(this); + f(context); + return Map(source, context); + } + + /// + /// Maps a source object to a new target object. + /// + /// The source type. + /// The target type. + /// The source object. + /// A mapper context. + /// The target object. + public TTarget Map(TSource source, MapperContext context) + => Map(source, typeof(TSource), context); + + private TTarget Map(object source, Type sourceType, MapperContext context) + { + if (source == null) + throw new ArgumentNullException(nameof(source)); + + var targetType = typeof(TTarget); + + var ctor = GetCtor(sourceType, targetType); + var map = GetMap(sourceType, targetType); + + // if there is a direct constructor, map + if (ctor != null && map != null) + { + var target = ctor(source, context); + map(source, target, context); + return (TTarget)target; + } + + // otherwise, see if we can deal with enumerable + + var ienumerableOfT = typeof(IEnumerable<>); + + bool IsIEnumerableOfT(Type type) => + type.IsGenericType && + type.GenericTypeArguments.Length == 1 && + type.GetGenericTypeDefinition() == ienumerableOfT; + + // try to get source as an IEnumerable + var sourceIEnumerable = IsIEnumerableOfT(sourceType) ? sourceType : sourceType.GetInterfaces().FirstOrDefault(IsIEnumerableOfT); + + // if source is an IEnumerable and target is T[] or IEnumerable, we can create a map + if (sourceIEnumerable != null && IsEnumerableOrArrayOfType(targetType)) + { + var sourceGenericArg = sourceIEnumerable.GenericTypeArguments[0]; + var targetGenericArg = GetEnumerableOrArrayTypeArgument(targetType); + + ctor = GetCtor(sourceGenericArg, targetGenericArg); + map = GetMap(sourceGenericArg, targetGenericArg); + + // if there is a constructor for the underlying type, create & invoke the map + if (ctor != null && map != null) + { + // register (for next time) and do it now (for this time) + object NCtor(object s, MapperContext c) => MapEnumerableInternal((IEnumerable) s, targetGenericArg, ctor, map, c); + DefineCtors(sourceType)[targetType] = NCtor; + DefineMaps(sourceType)[targetType] = Identity; + return (TTarget) NCtor(source, context); + } + + throw new InvalidOperationException($"Don't know how to map {sourceGenericArg.FullName} to {targetGenericArg.FullName}, so don't know how to map {sourceType.FullName} to {targetType.FullName}."); + } + + throw new InvalidOperationException($"Don't know how to map {sourceType.FullName} to {targetType.FullName}."); + } + + private TTarget MapEnumerableInternal(IEnumerable source, Type targetGenericArg, Func ctor, Action map, MapperContext context) + { + var targetList = (IList)Activator.CreateInstance(typeof(List<>).MakeGenericType(targetGenericArg)); + + foreach (var sourceItem in source) + { + var targetItem = ctor(sourceItem, context); + map(sourceItem, targetItem, context); + targetList.Add(targetItem); + } + + object target = targetList; + + if (typeof(TTarget).IsArray) + { + var elementType = typeof(TTarget).GetElementType(); + if (elementType == null) throw new Exception("panic"); + var targetArray = Array.CreateInstance(elementType, targetList.Count); + targetList.CopyTo(targetArray, 0); + target = targetArray; + } + + return (TTarget) target; + } + + /// + /// Maps a source object to an existing target object. + /// + /// The source type. + /// The target type. + /// The source object. + /// The target object. + /// The target object. + public TTarget Map(TSource source, TTarget target) + => Map(source, target, new MapperContext(this)); + + /// + /// Maps a source object to an existing target object. + /// + /// The source type. + /// The target type. + /// The source object. + /// The target object. + /// A mapper context preparation method. + /// The target object. + public TTarget Map(TSource source, TTarget target, Action f) + { + var context = new MapperContext(this); + f(context); + return Map(source, target, context); + } + + /// + /// Maps a source object to an existing target object. + /// + /// The source type. + /// The target type. + /// The source object. + /// The target object. + /// A mapper context. + /// The target object. + public TTarget Map(TSource source, TTarget target, MapperContext context) + { + var sourceType = typeof(TSource); + var targetType = typeof(TTarget); + + var map = GetMap(sourceType, targetType); + + // if there is a direct map, map + if (map != null) + { + map(source, target, context); + return target; + } + + // we cannot really map to an existing enumerable - give up + + throw new InvalidOperationException($"Don't know how to map {typeof(TSource).FullName} to {typeof(TTarget).FullName}."); + } + + private Func GetCtor(Type sourceType, Type targetType) + { + if (_ctors.TryGetValue(sourceType, out var sourceCtor) && sourceCtor.TryGetValue(targetType, out var ctor)) + return ctor; + + ctor = null; + foreach (var (stype, sctors) in _ctors) + { + if (!stype.IsAssignableFrom(sourceType)) continue; + if (!sctors.TryGetValue(targetType, out ctor)) continue; + + sourceCtor = sctors; + break; + } + + if (ctor == null) return null; + + _ctors[sourceType] = sourceCtor; + return ctor; + } + + private Action GetMap(Type sourceType, Type targetType) + { + if (_maps.TryGetValue(sourceType, out var sourceMap) && sourceMap.TryGetValue(targetType, out var map)) + return map; + + map = null; + foreach (var (stype, smap) in _maps) + { + if (!stype.IsAssignableFrom(sourceType)) continue; + + // TODO: consider looking for assignable types for target too? + if (!smap.TryGetValue(targetType, out map)) continue; + + sourceMap = smap; + break; + } + + if (map == null) return null; + + _maps[sourceType] = sourceMap; + return map; + } + + private static bool IsEnumerableOrArrayOfType(Type type) + { + if (type.IsArray && type.GetArrayRank() == 1) return true; + if (type.IsGenericType && type.GenericTypeArguments.Length == 1) return true; + return false; + } + + private static Type GetEnumerableOrArrayTypeArgument(Type type) + { + if (type.IsArray) return type.GetElementType(); + if (type.IsGenericType) return type.GenericTypeArguments[0]; + throw new Exception("panic"); + } + + /// + /// Maps an enumerable of source objects to a new list of target objects. + /// + /// The type of the source objects. + /// The type of the target objects. + /// The source objects. + /// A list containing the target objects. + public List MapEnumerable(IEnumerable source) + { + return source.Select(Map).ToList(); + } + + /// + /// Maps an enumerable of source objects to a new list of target objects. + /// + /// The type of the source objects. + /// The type of the target objects. + /// The source objects. + /// A mapper context preparation method. + /// A list containing the target objects. + public List MapEnumerable(IEnumerable source, Action f) + { + var context = new MapperContext(this); + f(context); + return source.Select(x => Map(x, context)).ToList(); + } + + /// + /// Maps an enumerable of source objects to a new list of target objects. + /// + /// The type of the source objects. + /// The type of the target objects. + /// The source objects. + /// A mapper context. + /// A list containing the target objects. + public List MapEnumerable(IEnumerable source, MapperContext context) + { + return source.Select(x => Map(x, context)).ToList(); + } + + #endregion + } +} diff --git a/src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs b/src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs index d8283fd112..eab7afe308 100644 --- a/src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs +++ b/src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs @@ -47,7 +47,7 @@ namespace Umbraco.Core.Migrations.Install typeof (LogDto), typeof (MacroDto), typeof (MacroPropertyDto), - typeof (MemberTypeDto), + typeof (MemberPropertyTypeDto), typeof (MemberDto), typeof (Member2MemberGroupDto), typeof (PropertyTypeGroupDto), diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_7_9_0/AddIsSensitiveMemberTypeColumn.cs b/src/Umbraco.Core/Migrations/Upgrade/V_7_9_0/AddIsSensitiveMemberTypeColumn.cs index 4e1a7d1470..2b5f481769 100644 --- a/src/Umbraco.Core/Migrations/Upgrade/V_7_9_0/AddIsSensitiveMemberTypeColumn.cs +++ b/src/Umbraco.Core/Migrations/Upgrade/V_7_9_0/AddIsSensitiveMemberTypeColumn.cs @@ -13,8 +13,8 @@ namespace Umbraco.Core.Migrations.Upgrade.V_7_9_0 { var columns = SqlSyntax.GetColumnsInSchema(Context.Database).ToArray(); - if (columns.Any(x => x.TableName.InvariantEquals(Constants.DatabaseSchema.Tables.MemberType) && x.ColumnName.InvariantEquals("isSensitive")) == false) - AddColumn("isSensitive"); + if (columns.Any(x => x.TableName.InvariantEquals(Constants.DatabaseSchema.Tables.MemberPropertyType) && x.ColumnName.InvariantEquals("isSensitive")) == false) + AddColumn("isSensitive"); } } } diff --git a/src/Umbraco.Core/Models/ContentTypeBase.cs b/src/Umbraco.Core/Models/ContentTypeBase.cs index ed8a098299..d4e35cccdf 100644 --- a/src/Umbraco.Core/Models/ContentTypeBase.cs +++ b/src/Umbraco.Core/Models/ContentTypeBase.cs @@ -210,9 +210,7 @@ namespace Umbraco.Core.Models return Variations.ValidateVariation(culture, segment, false, true, false); } - /// - /// List of PropertyGroups available on this ContentType - /// + /// /// /// A PropertyGroup corresponds to a Tab in the UI /// Marked DoNotClone because we will manually deal with cloning and the event handlers @@ -230,9 +228,7 @@ namespace Umbraco.Core.Models } } - /// - /// Gets all property types, across all property groups. - /// + /// [IgnoreDataMember] [DoNotClone] public IEnumerable PropertyTypes @@ -243,12 +239,7 @@ namespace Umbraco.Core.Models } } - /// - /// Gets or sets the property types that are not in a group. - /// - /// - /// Marked DoNotClone because we will manually deal with cloning and the event handlers - /// + /// [DoNotClone] public IEnumerable NoGroupPropertyTypes { diff --git a/src/Umbraco.Core/Models/ContentTypeCompositionBase.cs b/src/Umbraco.Core/Models/ContentTypeCompositionBase.cs index 7497c100bc..ff61a15979 100644 --- a/src/Umbraco.Core/Models/ContentTypeCompositionBase.cs +++ b/src/Umbraco.Core/Models/ContentTypeCompositionBase.cs @@ -43,9 +43,7 @@ namespace Umbraco.Core.Models } } - /// - /// Gets the property groups for the entire composition. - /// + /// [IgnoreDataMember] public IEnumerable CompositionPropertyGroups { @@ -76,9 +74,7 @@ namespace Umbraco.Core.Models } } - /// - /// Gets the property types for the entire composition. - /// + /// [IgnoreDataMember] public IEnumerable CompositionPropertyTypes { diff --git a/src/Umbraco.Core/Models/CultureImpact.cs b/src/Umbraco.Core/Models/CultureImpact.cs index 0b035c1703..ca18985941 100644 --- a/src/Umbraco.Core/Models/CultureImpact.cs +++ b/src/Umbraco.Core/Models/CultureImpact.cs @@ -25,7 +25,6 @@ namespace Umbraco.Core.Models if (content == null) throw new ArgumentNullException(nameof(content)); if (savingCultures == null) throw new ArgumentNullException(nameof(savingCultures)); if (savingCultures.Length == 0) throw new ArgumentException(nameof(savingCultures)); - if (defaultCulture == null) throw new ArgumentNullException(nameof(defaultCulture)); var cultureForInvariantErrors = savingCultures.Any(x => x.InvariantEquals(defaultCulture)) //the default culture is being flagged for saving so use it diff --git a/src/Umbraco.Core/Models/DoNotCloneAttribute.cs b/src/Umbraco.Core/Models/DoNotCloneAttribute.cs index a827f7af14..5cce9777cb 100644 --- a/src/Umbraco.Core/Models/DoNotCloneAttribute.cs +++ b/src/Umbraco.Core/Models/DoNotCloneAttribute.cs @@ -16,7 +16,7 @@ namespace Umbraco.Core.Models /// * when the setter performs additional required logic other than just setting the underlying field /// /// - internal class DoNotCloneAttribute : Attribute + public class DoNotCloneAttribute : Attribute { } diff --git a/src/Umbraco.Core/Models/IContentTypeBase.cs b/src/Umbraco.Core/Models/IContentTypeBase.cs index 215c8532c1..5f1fe6ed49 100644 --- a/src/Umbraco.Core/Models/IContentTypeBase.cs +++ b/src/Umbraco.Core/Models/IContentTypeBase.cs @@ -96,17 +96,17 @@ namespace Umbraco.Core.Models IEnumerable AllowedContentTypes { get; set; } /// - /// Gets or Sets a collection of Property Groups + /// Gets or sets the local property groups. /// PropertyGroupCollection PropertyGroups { get; set; } /// - /// Gets all property types, across all property groups. + /// Gets all local property types belonging to a group, across all local property groups. /// IEnumerable PropertyTypes { get; } /// - /// Gets or sets the property types that are not in a group. + /// Gets or sets the local property types that do not belong to a group. /// IEnumerable NoGroupPropertyTypes { get; set; } diff --git a/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs b/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs index 0eb53428d1..8dc056d555 100644 --- a/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs +++ b/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs @@ -41,7 +41,7 @@ namespace Umbraco.Core.Models.Identity if (string.IsNullOrWhiteSpace(username)) throw new ArgumentException("Value cannot be null or whitespace.", nameof(username)); if (string.IsNullOrWhiteSpace(culture)) throw new ArgumentException("Value cannot be null or whitespace.", nameof(culture)); - var user = new BackOfficeIdentityUser(); + var user = new BackOfficeIdentityUser(Array.Empty()); user.DisableChangeTracking(); user._userName = username; user._email = email; @@ -54,16 +54,19 @@ namespace Umbraco.Core.Models.Identity return user; } - private BackOfficeIdentityUser() + private BackOfficeIdentityUser(IReadOnlyUserGroup[] groups) { - _startMediaIds = new int[] { }; - _startContentIds = new int[] { }; - _groups = new IReadOnlyUserGroup[] { }; - _allowedSections = new string[] { }; + _startMediaIds = Array.Empty(); + _startContentIds = Array.Empty(); + _allowedSections = Array.Empty(); _culture = Current.Configs.Global().DefaultUILanguage; // TODO: inject - _groups = new IReadOnlyUserGroup[0]; + + // must initialize before setting groups _roles = new ObservableCollection>(); _roles.CollectionChanged += _roles_CollectionChanged; + + // use the property setters - they do more than just setting a field + Groups = groups; } /// @@ -72,19 +75,10 @@ namespace Umbraco.Core.Models.Identity /// /// public BackOfficeIdentityUser(int userId, IEnumerable groups) + : this(groups.ToArray()) { - _startMediaIds = new int[] { }; - _startContentIds = new int[] { }; - _groups = new IReadOnlyUserGroup[] { }; - _allowedSections = new string[] { }; - _culture = Current.Configs.Global().DefaultUILanguage; // TODO: inject - _groups = groups.ToArray(); - _roles = new ObservableCollection>(_groups.Select(x => new IdentityUserRole - { - RoleId = x.Alias, - UserId = userId.ToString() - })); - _roles.CollectionChanged += _roles_CollectionChanged; + // use the property setters - they do more than just setting a field + Id = userId; } /// @@ -226,6 +220,8 @@ namespace Umbraco.Core.Models.Identity //so they recalculate _allowedSections = null; + _groups = value; + //now clear all roles and re-add them _roles.CollectionChanged -= _roles_CollectionChanged; _roles.Clear(); diff --git a/src/Umbraco.Core/Models/Identity/IdentityMapDefinition.cs b/src/Umbraco.Core/Models/Identity/IdentityMapDefinition.cs new file mode 100644 index 0000000000..57e1c9ee5c --- /dev/null +++ b/src/Umbraco.Core/Models/Identity/IdentityMapDefinition.cs @@ -0,0 +1,80 @@ +using System; +using Umbraco.Core.Configuration; +using Umbraco.Core.Mapping; +using Umbraco.Core.Models.Membership; +using Umbraco.Core.Services; + +namespace Umbraco.Core.Models.Identity +{ + public class IdentityMapDefinition : IMapDefinition + { + private readonly ILocalizedTextService _textService; + private readonly IEntityService _entityService; + private readonly IGlobalSettings _globalSettings; + + public IdentityMapDefinition(ILocalizedTextService textService, IEntityService entityService, IGlobalSettings globalSettings) + { + _textService = textService; + _entityService = entityService; + _globalSettings = globalSettings; + } + + public void DefineMaps(UmbracoMapper mapper) + { + mapper.Define( + (source, context) => + { + var target = new BackOfficeIdentityUser(source.Id, source.Groups); + target.DisableChangeTracking(); + return target; + }, + (source, target, context) => + { + Map(source, target); + target.ResetDirtyProperties(true); + target.EnableChangeTracking(); + }); + } + + // Umbraco.Code.MapAll -Id -Groups -LockoutEnabled -PhoneNumber -PhoneNumberConfirmed -TwoFactorEnabled + private void Map(IUser source, BackOfficeIdentityUser target) + { + // well, the ctor has been fixed + /* + // these two are already set in ctor but BackOfficeIdentityUser ctor is CompletelyBroken + target.Id = source.Id; + target.Groups = source.Groups.ToArray(); + */ + + target.CalculatedMediaStartNodeIds = source.CalculateMediaStartNodeIds(_entityService); + target.CalculatedContentStartNodeIds = source.CalculateContentStartNodeIds(_entityService); + target.Email = source.Email; + target.UserName = source.Username; + target.LastPasswordChangeDateUtc = source.LastPasswordChangeDate.ToUniversalTime(); + target.LastLoginDateUtc = source.LastLoginDate.ToUniversalTime(); + target.EmailConfirmed = source.EmailConfirmedDate.HasValue; + target.Name = source.Name; + target.AccessFailedCount = source.FailedPasswordAttempts; + target.PasswordHash = GetPasswordHash(source.RawPasswordValue); + target.StartContentIds = source.StartContentIds; + target.StartMediaIds = source.StartMediaIds; + target.Culture = source.GetUserCulture(_textService, _globalSettings).ToString(); // project CultureInfo to string + target.IsApproved = source.IsApproved; + target.SecurityStamp = source.SecurityStamp; + target.LockoutEndDateUtc = source.IsLockedOut ? DateTime.MaxValue.ToUniversalTime() : (DateTime?) null; + + // this was in AutoMapper but does not have a setter anyways + //target.AllowedSections = source.AllowedSections.ToArray(), + + // these were marked as ignored for AutoMapper but don't have a setter anyways + //target.Logins =; + //target.Claims =; + //target.Roles =; + } + + private static string GetPasswordHash(string storedPass) + { + return storedPass.StartsWith(Constants.Security.EmptyPasswordPrefix) ? null : storedPass; + } + } +} diff --git a/src/Umbraco.Core/Models/Identity/IdentityMapperProfile.cs b/src/Umbraco.Core/Models/Identity/IdentityMapperProfile.cs deleted file mode 100644 index 81069bd74c..0000000000 --- a/src/Umbraco.Core/Models/Identity/IdentityMapperProfile.cs +++ /dev/null @@ -1,58 +0,0 @@ -using System; -using System.Linq; -using AutoMapper; -using Umbraco.Core.Configuration; -using Umbraco.Core.Models.Membership; -using Umbraco.Core.Security; -using Umbraco.Core.Services; - -namespace Umbraco.Core.Models.Identity -{ - public class IdentityMapperProfile : Profile - { - public IdentityMapperProfile(ILocalizedTextService textService, IEntityService entityService, IGlobalSettings globalSettings) - { - CreateMap() - .BeforeMap((src, dest) => - { - dest.DisableChangeTracking(); - }) - .ConstructUsing(src => new BackOfficeIdentityUser(src.Id, src.Groups)) - .ForMember(dest => dest.LastLoginDateUtc, opt => opt.MapFrom(src => src.LastLoginDate.ToUniversalTime())) - .ForMember(user => user.LastPasswordChangeDateUtc, expression => expression.MapFrom(user => user.LastPasswordChangeDate.ToUniversalTime())) - .ForMember(dest => dest.Email, opt => opt.MapFrom(src => src.Email)) - .ForMember(dest => dest.EmailConfirmed, opt => opt.MapFrom(src => src.EmailConfirmedDate.HasValue)) - .ForMember(dest => dest.Id, opt => opt.MapFrom(src => src.Id)) - .ForMember(dest => dest.LockoutEndDateUtc, opt => opt.MapFrom(src => src.IsLockedOut ? DateTime.MaxValue.ToUniversalTime() : (DateTime?) null)) - .ForMember(dest => dest.IsApproved, opt => opt.MapFrom(src => src.IsApproved)) - .ForMember(dest => dest.UserName, opt => opt.MapFrom(src => src.Username)) - .ForMember(dest => dest.PasswordHash, opt => opt.MapFrom(user => GetPasswordHash(user.RawPasswordValue))) - .ForMember(dest => dest.Culture, opt => opt.MapFrom(src => src.GetUserCulture(textService, globalSettings))) - .ForMember(dest => dest.Name, opt => opt.MapFrom(src => src.Name)) - .ForMember(dest => dest.StartMediaIds, opt => opt.MapFrom(src => src.StartMediaIds)) - .ForMember(dest => dest.StartContentIds, opt => opt.MapFrom(src => src.StartContentIds)) - .ForMember(dest => dest.AccessFailedCount, opt => opt.MapFrom(src => src.FailedPasswordAttempts)) - .ForMember(dest => dest.CalculatedContentStartNodeIds, opt => opt.MapFrom(src => src.CalculateContentStartNodeIds(entityService))) - .ForMember(dest => dest.CalculatedMediaStartNodeIds, opt => opt.MapFrom(src => src.CalculateMediaStartNodeIds(entityService))) - .ForMember(dest => dest.AllowedSections, opt => opt.MapFrom(src => src.AllowedSections.ToArray())) - .ForMember(dest => dest.LockoutEnabled, opt => opt.Ignore()) - .ForMember(dest => dest.Logins, opt => opt.Ignore()) - .ForMember(dest => dest.EmailConfirmed, opt => opt.Ignore()) - .ForMember(dest => dest.PhoneNumber, opt => opt.Ignore()) - .ForMember(dest => dest.PhoneNumberConfirmed, opt => opt.Ignore()) - .ForMember(dest => dest.TwoFactorEnabled, opt => opt.Ignore()) - .ForMember(dest => dest.Roles, opt => opt.Ignore()) - .ForMember(dest => dest.Claims, opt => opt.Ignore()) - .AfterMap((src, dest) => - { - dest.ResetDirtyProperties(true); - dest.EnableChangeTracking(); - }); - } - - private static string GetPasswordHash(string storedPass) - { - return storedPass.StartsWith(Constants.Security.EmptyPasswordPrefix) ? null : storedPass; - } - } -} diff --git a/src/Umbraco.Core/Persistence/Constants-DatabaseSchema.cs b/src/Umbraco.Core/Persistence/Constants-DatabaseSchema.cs index 272158551d..f430a8894c 100644 --- a/src/Umbraco.Core/Persistence/Constants-DatabaseSchema.cs +++ b/src/Umbraco.Core/Persistence/Constants-DatabaseSchema.cs @@ -57,7 +57,7 @@ namespace Umbraco.Core public const string MacroProperty = /*TableNamePrefix*/ "cms" + "MacroProperty"; public const string Member = /*TableNamePrefix*/ "cms" + "Member"; - public const string MemberType = /*TableNamePrefix*/ "cms" + "MemberType"; + public const string MemberPropertyType = /*TableNamePrefix*/ "cms" + "MemberType"; public const string Member2MemberGroup = /*TableNamePrefix*/ "cms" + "Member2MemberGroup"; public const string Access = TableNamePrefix + "Access"; diff --git a/src/Umbraco.Core/Persistence/Dtos/ContentTypeDto.cs b/src/Umbraco.Core/Persistence/Dtos/ContentTypeDto.cs index 4f3a67aa91..e7a14a26e2 100644 --- a/src/Umbraco.Core/Persistence/Dtos/ContentTypeDto.cs +++ b/src/Umbraco.Core/Persistence/Dtos/ContentTypeDto.cs @@ -54,6 +54,7 @@ namespace Umbraco.Core.Persistence.Dtos public byte Variations { get; set; } [ResultColumn] + [Reference(ReferenceType.OneToOne, ColumnName = "NodeId")] public NodeDto NodeDto { get; set; } } } diff --git a/src/Umbraco.Core/Persistence/Dtos/DataTypeDto.cs b/src/Umbraco.Core/Persistence/Dtos/DataTypeDto.cs index d270c7b732..24f0e07295 100644 --- a/src/Umbraco.Core/Persistence/Dtos/DataTypeDto.cs +++ b/src/Umbraco.Core/Persistence/Dtos/DataTypeDto.cs @@ -26,7 +26,7 @@ namespace Umbraco.Core.Persistence.Dtos public string Configuration { get; set; } [ResultColumn] - [Reference(ReferenceType.OneToOne, ColumnName = "DataTypeId")] + [Reference(ReferenceType.OneToOne, ColumnName = "NodeId")] public NodeDto NodeDto { get; set; } } } diff --git a/src/Umbraco.Core/Persistence/Dtos/MemberTypeDto.cs b/src/Umbraco.Core/Persistence/Dtos/MemberPropertyTypeDto.cs similarity index 88% rename from src/Umbraco.Core/Persistence/Dtos/MemberTypeDto.cs rename to src/Umbraco.Core/Persistence/Dtos/MemberPropertyTypeDto.cs index 545f92bb82..7186455489 100644 --- a/src/Umbraco.Core/Persistence/Dtos/MemberTypeDto.cs +++ b/src/Umbraco.Core/Persistence/Dtos/MemberPropertyTypeDto.cs @@ -3,10 +3,10 @@ using Umbraco.Core.Persistence.DatabaseAnnotations; namespace Umbraco.Core.Persistence.Dtos { - [TableName(Constants.DatabaseSchema.Tables.MemberType)] + [TableName(Constants.DatabaseSchema.Tables.MemberPropertyType)] [PrimaryKey("pk")] [ExplicitColumns] - internal class MemberTypeDto + internal class MemberPropertyTypeDto { [Column("pk")] [PrimaryKeyColumn] diff --git a/src/Umbraco.Core/Persistence/Dtos/MemberTypeReadOnlyDto.cs b/src/Umbraco.Core/Persistence/Dtos/MemberTypeReadOnlyDto.cs deleted file mode 100644 index c4ea6a10fd..0000000000 --- a/src/Umbraco.Core/Persistence/Dtos/MemberTypeReadOnlyDto.cs +++ /dev/null @@ -1,80 +0,0 @@ -using System; -using System.Collections.Generic; -using NPoco; - -namespace Umbraco.Core.Persistence.Dtos -{ - [TableName(Constants.DatabaseSchema.Tables.Node)] - [PrimaryKey("id")] - [ExplicitColumns] - internal class MemberTypeReadOnlyDto - { - /* from umbracoNode */ - [Column("id")] - public int NodeId { get; set; } - - [Column("trashed")] - public bool Trashed { get; set; } - - [Column("parentID")] - public int ParentId { get; set; } - - [Column("nodeUser")] - public int? UserId { get; set; } - - [Column("level")] - public short Level { get; set; } - - [Column("path")] - public string Path { get; set; } - - [Column("sortOrder")] - public int SortOrder { get; set; } - - [Column("uniqueID")] - public Guid? UniqueId { get; set; } - - [Column("text")] - public string Text { get; set; } - - [Column("nodeObjectType")] - public Guid? NodeObjectType { get; set; } - - [Column("createDate")] - public DateTime CreateDate { get; set; } - - /* cmsContentType */ - [Column("pk")] - public int PrimaryKey { get; set; } - - [Column("alias")] - public string Alias { get; set; } - - [Column("icon")] - public string Icon { get; set; } - - [Column("thumbnail")] - public string Thumbnail { get; set; } - - [Column("description")] - public string Description { get; set; } - - [Column("isContainer")] - public bool IsContainer { get; set; } - - [Column("allowAtRoot")] - public bool AllowAtRoot { get; set; } - - /* PropertyTypes */ - // TODO: Add PropertyTypeDto (+MemberTypeDto and DataTypeDto as one) ReadOnly list - [ResultColumn] - [Reference(ReferenceType.Many, ReferenceMemberName = "ContentTypeId")] - public List PropertyTypes { get; set; } - - /* PropertyTypeGroups */ - // TODO: Add PropertyTypeGroupDto ReadOnly list - [ResultColumn] - [Reference(ReferenceType.Many, ReferenceMemberName = "ContentTypeNodeId")] - public List PropertyTypeGroups { get; set; } - } -} diff --git a/src/Umbraco.Core/Persistence/Dtos/PropertyTypeCommonDto.cs b/src/Umbraco.Core/Persistence/Dtos/PropertyTypeCommonDto.cs new file mode 100644 index 0000000000..040123353e --- /dev/null +++ b/src/Umbraco.Core/Persistence/Dtos/PropertyTypeCommonDto.cs @@ -0,0 +1,18 @@ +using NPoco; + +namespace Umbraco.Core.Persistence.Dtos +{ + // this is PropertyTypeDto + the special property type fields for members + // it is used for querying everything needed for a property type, at once + internal class PropertyTypeCommonDto : PropertyTypeDto + { + [Column("memberCanEdit")] + public bool CanEdit { get; set; } + + [Column("viewOnProfile")] + public bool ViewOnProfile { get; set; } + + [Column("isSensitive")] + public bool IsSensitive { get; set; } + } +} diff --git a/src/Umbraco.Core/Persistence/Factories/ContentTypeFactory.cs b/src/Umbraco.Core/Persistence/Factories/ContentTypeFactory.cs index 7a04a6d0d9..54cfee0ffa 100644 --- a/src/Umbraco.Core/Persistence/Factories/ContentTypeFactory.cs +++ b/src/Umbraco.Core/Persistence/Factories/ContentTypeFactory.cs @@ -67,16 +67,28 @@ namespace Umbraco.Core.Persistence.Factories public static IMemberType BuildMemberTypeEntity(ContentTypeDto dto) { - throw new NotImplementedException(); + var contentType = new MemberType(dto.NodeDto.ParentId); + try + { + contentType.DisableChangeTracking(); + BuildCommonEntity(contentType, dto, false); + contentType.ResetDirtyProperties(false); + } + finally + { + contentType.EnableChangeTracking(); + } + + return contentType; } - public static IEnumerable BuildMemberTypeDtos(IMemberType entity) + public static IEnumerable BuildMemberPropertyTypeDtos(IMemberType entity) { var memberType = entity as MemberType; if (memberType == null || memberType.PropertyTypes.Any() == false) - return Enumerable.Empty(); + return Enumerable.Empty(); - var dtos = memberType.PropertyTypes.Select(x => new MemberTypeDto + var dtos = memberType.PropertyTypes.Select(x => new MemberPropertyTypeDto { NodeId = entity.Id, PropertyTypeId = x.Id, @@ -91,7 +103,7 @@ namespace Umbraco.Core.Persistence.Factories #region Common - private static void BuildCommonEntity(ContentTypeBase entity, ContentTypeDto dto) + private static void BuildCommonEntity(ContentTypeBase entity, ContentTypeDto dto, bool setVariations = true) { entity.Id = dto.NodeDto.NodeId; entity.Key = dto.NodeDto.UniqueId; @@ -102,6 +114,7 @@ namespace Umbraco.Core.Persistence.Factories entity.SortOrder = dto.NodeDto.SortOrder; entity.Description = dto.Description; entity.CreateDate = dto.NodeDto.CreateDate; + entity.UpdateDate = dto.NodeDto.CreateDate; entity.Path = dto.NodeDto.Path; entity.Level = dto.NodeDto.Level; entity.CreatorId = dto.NodeDto.UserId ?? Constants.Security.UnknownUserId; @@ -109,7 +122,9 @@ namespace Umbraco.Core.Persistence.Factories entity.IsContainer = dto.IsContainer; entity.IsElement = dto.IsElement; entity.Trashed = dto.NodeDto.Trashed; - entity.Variations = (ContentVariation) dto.Variations; + + if (setVariations) + entity.Variations = (ContentVariation) dto.Variations; } public static ContentTypeDto BuildContentTypeDto(IContentTypeBase entity) diff --git a/src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs b/src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs deleted file mode 100644 index c7ce98a89c..0000000000 --- a/src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs +++ /dev/null @@ -1,194 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using Umbraco.Core.Models; -using Umbraco.Core.Persistence.Dtos; -using Umbraco.Core.Persistence.Repositories.Implement; - -namespace Umbraco.Core.Persistence.Factories -{ - internal static class MemberTypeReadOnlyFactory - { - public static IMemberType BuildEntity(MemberTypeReadOnlyDto dto, out bool needsSaving) - { - var standardPropertyTypes = Constants.Conventions.Member.GetStandardPropertyTypeStubs(); - needsSaving = false; - - var memberType = new MemberType(dto.ParentId); - - try - { - memberType.DisableChangeTracking(); - - memberType.Alias = dto.Alias; - memberType.AllowedAsRoot = dto.AllowAtRoot; - memberType.CreateDate = dto.CreateDate; - memberType.CreatorId = dto.UserId.HasValue ? dto.UserId.Value : 0; - memberType.Description = dto.Description; - memberType.Icon = dto.Icon; - memberType.Id = dto.NodeId; - memberType.IsContainer = dto.IsContainer; - memberType.Key = dto.UniqueId.Value; - memberType.Level = dto.Level; - memberType.Name = dto.Text; - memberType.Path = dto.Path; - memberType.SortOrder = dto.SortOrder; - memberType.Thumbnail = dto.Thumbnail; - memberType.Trashed = dto.Trashed; - memberType.UpdateDate = dto.CreateDate; - memberType.AllowedContentTypes = Enumerable.Empty(); - - var propertyTypeGroupCollection = GetPropertyTypeGroupCollection(dto, memberType, standardPropertyTypes); - memberType.PropertyGroups = propertyTypeGroupCollection; - - var propertyTypes = GetPropertyTypes(dto, memberType, standardPropertyTypes); - - //By Convention we add 9 standard PropertyTypes - This is only here to support loading of types that didn't have these conventions before. - foreach (var standardPropertyType in standardPropertyTypes) - { - if (dto.PropertyTypes.Any(x => x.Alias.Equals(standardPropertyType.Key))) continue; - - // beware! - // means that we can return a memberType "from database" that has some property types - // that do *not* come from the database and therefore are incomplete eg have no key, - // no id, no dataTypeDefinitionId - ouch! - better notify caller of the situation - needsSaving = true; - - //Add the standard PropertyType to the current list - propertyTypes.Add(standardPropertyType.Value); - - //Internal dictionary for adding "MemberCanEdit", "VisibleOnProfile", "IsSensitive" properties to each PropertyType - memberType.MemberTypePropertyTypes.Add(standardPropertyType.Key, - new MemberTypePropertyProfileAccess(false, false, false)); - } - memberType.NoGroupPropertyTypes = propertyTypes; - - return memberType; - } - finally - { - memberType.EnableChangeTracking(); - } - } - - private static PropertyGroupCollection GetPropertyTypeGroupCollection(MemberTypeReadOnlyDto dto, MemberType memberType, Dictionary standardProps) - { - // see PropertyGroupFactory, repeating code here... - - var propertyGroups = new PropertyGroupCollection(); - foreach (var groupDto in dto.PropertyTypeGroups.Where(x => x.Id.HasValue)) - { - var group = new PropertyGroup(MemberType.SupportsPublishingConst); - - // if the group is defined on the current member type, - // assign its identifier, else it will be zero - if (groupDto.ContentTypeNodeId == memberType.Id) - { - // note: no idea why Id is nullable here, but better check - if (groupDto.Id.HasValue == false) - throw new Exception("GroupDto.Id has no value."); - group.Id = groupDto.Id.Value; - } - - group.Key = groupDto.UniqueId; - group.Name = groupDto.Text; - group.SortOrder = groupDto.SortOrder; - group.PropertyTypes = new PropertyTypeCollection(MemberType.SupportsPublishingConst); - - //Because we are likely to have a group with no PropertyTypes we need to ensure that these are excluded - var localGroupDto = groupDto; - var typeDtos = dto.PropertyTypes.Where(x => x.Id.HasValue && x.Id > 0 && x.PropertyTypeGroupId.HasValue && x.PropertyTypeGroupId.Value == localGroupDto.Id.Value); - foreach (var typeDto in typeDtos) - { - //Internal dictionary for adding "MemberCanEdit" and "VisibleOnProfile" properties to each PropertyType - memberType.MemberTypePropertyTypes.Add(typeDto.Alias, - new MemberTypePropertyProfileAccess(typeDto.ViewOnProfile, typeDto.CanEdit, typeDto.IsSensitive)); - - var tempGroupDto = groupDto; - - //ensures that any built-in membership properties have their correct dbtype assigned no matter - //what the underlying data type is - var propDbType = MemberTypeRepository.GetDbTypeForBuiltInProperty( - typeDto.Alias, - typeDto.DbType.EnumParse(true), - standardProps); - - var propertyType = new PropertyType( - typeDto.PropertyEditorAlias, - propDbType.Result, - //This flag tells the property type that it has an explicit dbtype and that it cannot be changed - // which is what we want for the built-in properties. - propDbType.Success, - typeDto.Alias) - { - DataTypeId = typeDto.DataTypeId, - Description = typeDto.Description, - Id = typeDto.Id.Value, - Name = typeDto.Name, - Mandatory = typeDto.Mandatory, - SortOrder = typeDto.SortOrder, - ValidationRegExp = typeDto.ValidationRegExp, - PropertyGroupId = new Lazy(() => tempGroupDto.Id.Value), - CreateDate = memberType.CreateDate, - UpdateDate = memberType.UpdateDate, - Key = typeDto.UniqueId - }; - - // reset dirty initial properties (U4-1946) - propertyType.ResetDirtyProperties(false); - group.PropertyTypes.Add(propertyType); - } - - // reset dirty initial properties (U4-1946) - group.ResetDirtyProperties(false); - propertyGroups.Add(group); - } - - return propertyGroups; - } - - private static List GetPropertyTypes(MemberTypeReadOnlyDto dto, MemberType memberType, Dictionary standardProps) - { - //Find PropertyTypes that does not belong to a PropertyTypeGroup - var propertyTypes = new List(); - foreach (var typeDto in dto.PropertyTypes.Where(x => (x.PropertyTypeGroupId.HasValue == false || x.PropertyTypeGroupId.Value == 0) && x.Id.HasValue)) - { - //Internal dictionary for adding "MemberCanEdit" and "VisibleOnProfile" properties to each PropertyType - memberType.MemberTypePropertyTypes.Add(typeDto.Alias, - new MemberTypePropertyProfileAccess(typeDto.ViewOnProfile, typeDto.CanEdit, typeDto.IsSensitive)); - - //ensures that any built-in membership properties have their correct dbtype assigned no matter - //what the underlying data type is - var propDbType = MemberTypeRepository.GetDbTypeForBuiltInProperty( - typeDto.Alias, - typeDto.DbType.EnumParse(true), - standardProps); - - var propertyType = new PropertyType( - typeDto.PropertyEditorAlias, - propDbType.Result, - //This flag tells the property type that it has an explicit dbtype and that it cannot be changed - // which is what we want for the built-in properties. - propDbType.Success, - typeDto.Alias) - { - DataTypeId = typeDto.DataTypeId, - Description = typeDto.Description, - Id = typeDto.Id.Value, - Mandatory = typeDto.Mandatory, - Name = typeDto.Name, - SortOrder = typeDto.SortOrder, - ValidationRegExp = typeDto.ValidationRegExp, - PropertyGroupId = null, - CreateDate = dto.CreateDate, - UpdateDate = dto.CreateDate, - Key = typeDto.UniqueId - }; - - propertyTypes.Add(propertyType); - } - return propertyTypes; - } - - } -} diff --git a/src/Umbraco.Core/Persistence/Repositories/IContentTypeCommonRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IContentTypeCommonRepository.cs new file mode 100644 index 0000000000..e7657ac941 --- /dev/null +++ b/src/Umbraco.Core/Persistence/Repositories/IContentTypeCommonRepository.cs @@ -0,0 +1,25 @@ +using System.Collections.Generic; +using Umbraco.Core.Models; + +namespace Umbraco.Core.Persistence.Repositories +{ + // TODO + // this should be IContentTypeRepository, and what is IContentTypeRepository at the moment should + // become IDocumentTypeRepository - but since these interfaces are public, that would be breaking + + /// + /// Represents the content types common repository, dealing with document, media and member types. + /// + public interface IContentTypeCommonRepository + { + /// + /// Gets and cache all types. + /// + IEnumerable GetAllTypes(); + + /// + /// Clears the cache. + /// + void ClearCache(); + } +} diff --git a/src/Umbraco.Core/Persistence/Repositories/IMediaTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IMediaTypeRepository.cs index 09059089e7..fbaff4f510 100644 --- a/src/Umbraco.Core/Persistence/Repositories/IMediaTypeRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/IMediaTypeRepository.cs @@ -1,16 +1,8 @@ using System.Collections.Generic; using Umbraco.Core.Models; -using Umbraco.Core.Persistence.Querying; namespace Umbraco.Core.Persistence.Repositories { public interface IMediaTypeRepository : IContentTypeRepositoryBase - { - /// - /// Gets all entities of the specified query - /// - /// - /// An enumerable list of objects - IEnumerable GetByQuery(IQuery query); - } + { } } diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs new file mode 100644 index 0000000000..194a00b7f2 --- /dev/null +++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs @@ -0,0 +1,285 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using NPoco; +using Umbraco.Core.Cache; +using Umbraco.Core.Models; +using Umbraco.Core.Persistence.Dtos; +using Umbraco.Core.Persistence.Factories; +using Umbraco.Core.Scoping; + +namespace Umbraco.Core.Persistence.Repositories.Implement +{ + /// + /// Implements . + /// + internal class ContentTypeCommonRepository : IContentTypeCommonRepository + { + private const string CacheKey = "Umbraco.Core.Persistence.Repositories.Implement.ContentTypeCommonRepository::AllTypes"; + + private readonly AppCaches _appCaches; + private readonly IScopeAccessor _scopeAccessor; + private readonly ITemplateRepository _templateRepository; + + /// + /// Initializes a new instance of the class. + /// + public ContentTypeCommonRepository(IScopeAccessor scopeAccessor, ITemplateRepository templateRepository, AppCaches appCaches) + { + _scopeAccessor = scopeAccessor; + _templateRepository = templateRepository; + _appCaches = appCaches; + } + + private IScope AmbientScope => _scopeAccessor.AmbientScope; + private IUmbracoDatabase Database => AmbientScope.Database; + private ISqlContext SqlContext => AmbientScope.SqlContext; + private Sql Sql() => SqlContext.Sql(); + //private Sql Sql(string sql, params object[] args) => SqlContext.Sql(sql, args); + //private ISqlSyntaxProvider SqlSyntax => SqlContext.SqlSyntax; + //private IQuery Query() => SqlContext.Query(); + + /// + public IEnumerable GetAllTypes() + { + // use a 5 minutes sliding cache - same as FullDataSet cache policy + return _appCaches.RuntimeCache.GetCacheItem(CacheKey, GetAllTypesInternal, TimeSpan.FromMinutes(5), true); + } + + /// + public void ClearCache() + { + _appCaches.RuntimeCache.Clear(CacheKey); + } + + private IEnumerable GetAllTypesInternal() + { + var contentTypes = new Dictionary(); + + // get content types + var sql1 = Sql() + .Select(r => r.Select(x => x.NodeDto)) + .From() + .InnerJoin().On((ct, n) => ct.NodeId == n.NodeId) + .OrderBy(x => x.NodeId); + + var contentTypeDtos = Database.Fetch(sql1); + + // get allowed content types + var sql2 = Sql() + .Select() + .From() + .OrderBy(x => x.Id); + + var allowedDtos = Database.Fetch(sql2); + + // prepare + // note: same alias could be used for media, content... but always different ids = ok + var aliases = contentTypeDtos.ToDictionary(x => x.NodeId, x => x.Alias); + + // create + var allowedDtoIx = 0; + foreach (var contentTypeDto in contentTypeDtos) + { + // create content type + IContentTypeComposition contentType; + if (contentTypeDto.NodeDto.NodeObjectType == Constants.ObjectTypes.MediaType) + contentType = ContentTypeFactory.BuildMediaTypeEntity(contentTypeDto); + else if (contentTypeDto.NodeDto.NodeObjectType == Constants.ObjectTypes.DocumentType) + contentType = ContentTypeFactory.BuildContentTypeEntity(contentTypeDto); + else if (contentTypeDto.NodeDto.NodeObjectType == Constants.ObjectTypes.MemberType) + contentType = ContentTypeFactory.BuildMemberTypeEntity(contentTypeDto); + else throw new Exception("panic"); + contentTypes.Add(contentType.Id, contentType); + + // map allowed content types + var allowedContentTypes = new List(); + while (allowedDtoIx < allowedDtos.Count && allowedDtos[allowedDtoIx].Id == contentTypeDto.NodeId) + { + var allowedDto = allowedDtos[allowedDtoIx]; + if (!aliases.TryGetValue(allowedDto.AllowedId, out var alias)) continue; + allowedContentTypes.Add(new ContentTypeSort(new Lazy(() => allowedDto.AllowedId), allowedDto.SortOrder, alias)); + allowedDtoIx++; + } + contentType.AllowedContentTypes = allowedContentTypes; + } + + MapTemplates(contentTypes); + MapComposition(contentTypes); + MapGroupsAndProperties(contentTypes); + + // finalize + foreach (var contentType in contentTypes.Values) + { + contentType.ResetDirtyProperties(false); + } + + return contentTypes.Values; + } + + private void MapTemplates(Dictionary contentTypes) + { + // get templates + var sql1 = Sql() + .Select() + .From() + .OrderBy(x => x.ContentTypeNodeId); + + var templateDtos = Database.Fetch(sql1); + //var templates = templateRepository.GetMany(templateDtos.Select(x => x.TemplateNodeId).ToArray()).ToDictionary(x => x.Id, x => x); + var templates = _templateRepository.GetMany().ToDictionary(x => x.Id, x => x); + var templateDtoIx = 0; + + foreach (var c in contentTypes.Values) + { + if (!(c is ContentType contentType)) continue; + + // map allowed templates + var allowedTemplates = new List(); + var defaultTemplateId = 0; + while (templateDtoIx < templateDtos.Count && templateDtos[templateDtoIx].ContentTypeNodeId == contentType.Id) + { + var allowedDto = templateDtos[templateDtoIx]; + if (!templates.TryGetValue(allowedDto.TemplateNodeId, out var template)) continue; + allowedTemplates.Add(template); + templateDtoIx++; + + if (allowedDto.IsDefault) + defaultTemplateId = template.Id; + } + contentType.AllowedTemplates = allowedTemplates; + contentType.DefaultTemplateId = defaultTemplateId; + } + } + + private void MapComposition(IDictionary contentTypes) + { + // get parent/child + var sql1 = Sql() + .Select() + .From() + .OrderBy(x => x.ChildId); + + var compositionDtos = Database.Fetch(sql1); + + // map + var compositionIx = 0; + foreach (var contentType in contentTypes.Values) + { + while (compositionIx < compositionDtos.Count && compositionDtos[compositionIx].ChildId == contentType.Id) + { + var parentDto = compositionDtos[compositionIx]; + if (!contentTypes.TryGetValue(parentDto.ParentId, out var parentContentType)) continue; + contentType.AddContentType(parentContentType); + compositionIx++; + } + } + } + + private void MapGroupsAndProperties(IDictionary contentTypes) + { + var sql1 = Sql() + .Select() + .From() + .InnerJoin().On((ptg, ct) => ptg.ContentTypeNodeId == ct.NodeId) + .OrderBy(x => x.NodeId) + .AndBy(x => x.SortOrder, x => x.Id); + + var groupDtos = Database.Fetch(sql1); + + var sql2 = Sql() + .Select(r => r.Select(x => x.DataTypeDto)) + .AndSelect() + .From() + .InnerJoin().On((pt, dt) => pt.DataTypeId == dt.NodeId) + .InnerJoin().On((pt, ct) => pt.ContentTypeId == ct.NodeId) + .LeftJoin().On((pt, ptg) => pt.PropertyTypeGroupId == ptg.Id) + .LeftJoin().On((pt, mpt) => pt.Id == mpt.PropertyTypeId) + .OrderBy(x => x.NodeId) + .AndBy(x => x.SortOrder, x => x.Id) // NULLs will come first or last, never mind, we deal with it below + .AndBy(x => x.SortOrder, x => x.Id); + + var propertyDtos = Database.Fetch(sql2); + var builtinProperties = Constants.Conventions.Member.GetStandardPropertyTypeStubs(); + + var groupIx = 0; + var propertyIx = 0; + foreach (var contentType in contentTypes.Values) + { + // only IContentType is publishing + var isPublishing = contentType is IContentType; + + // get group-less properties (in case NULL is ordered first) + var noGroupPropertyTypes = new PropertyTypeCollection(isPublishing); + while (propertyIx < propertyDtos.Count && propertyDtos[propertyIx].ContentTypeId == contentType.Id && propertyDtos[propertyIx].PropertyTypeGroupId == null) + { + noGroupPropertyTypes.Add(MapPropertyType(contentType, propertyDtos[propertyIx], builtinProperties)); + propertyIx++; + } + + // get groups and their properties + var groupCollection = new PropertyGroupCollection(); + while (groupIx < groupDtos.Count && groupDtos[groupIx].ContentTypeNodeId == contentType.Id) + { + var group = MapPropertyGroup(groupDtos[groupIx], isPublishing); + groupCollection.Add(group); + groupIx++; + + while (propertyIx < propertyDtos.Count && propertyDtos[propertyIx].ContentTypeId == contentType.Id && propertyDtos[propertyIx].PropertyTypeGroupId == group.Id) + { + group.PropertyTypes.Add(MapPropertyType(contentType, propertyDtos[propertyIx], builtinProperties)); + propertyIx++; + } + } + contentType.PropertyGroups = groupCollection; + + // get group-less properties (in case NULL is ordered last) + while (propertyIx < propertyDtos.Count && propertyDtos[propertyIx].ContentTypeId == contentType.Id && propertyDtos[propertyIx].PropertyTypeGroupId == null) + { + noGroupPropertyTypes.Add(MapPropertyType(contentType, propertyDtos[propertyIx], builtinProperties)); + propertyIx++; + } + contentType.NoGroupPropertyTypes = noGroupPropertyTypes; + } + } + + private PropertyGroup MapPropertyGroup(PropertyTypeGroupDto dto, bool isPublishing) + { + return new PropertyGroup(new PropertyTypeCollection(isPublishing)) + { + Id = dto.Id, + Name = dto.Text, + SortOrder = dto.SortOrder, + Key = dto.UniqueId + }; + } + + private PropertyType MapPropertyType(IContentTypeComposition contentType, PropertyTypeCommonDto dto, IDictionary builtinProperties) + { + var groupId = dto.PropertyTypeGroupId; + + var readonlyStorageType = builtinProperties.TryGetValue(dto.Alias, out var propertyType); + var storageType = readonlyStorageType ? propertyType.ValueStorageType : Enum.Parse(dto.DataTypeDto.DbType); + + if (contentType is MemberType memberType) + { + var access = new MemberTypePropertyProfileAccess(dto.ViewOnProfile, dto.CanEdit, dto.IsSensitive); + memberType.MemberTypePropertyTypes.Add(dto.Alias, access); + } + + return new PropertyType(dto.DataTypeDto.EditorAlias, storageType, readonlyStorageType, dto.Alias) + { + Description = dto.Description, + DataTypeId = dto.DataTypeId, + Id = dto.Id, + Key = dto.UniqueId, + Mandatory = dto.Mandatory, + Name = dto.Name, + PropertyGroupId = groupId.HasValue ? new Lazy(() => groupId.Value) : null, + SortOrder = dto.SortOrder, + ValidationRegExp = dto.ValidationRegExp, + Variations = (ContentVariation)dto.Variations + }; + } + } +} diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepository.cs index 095c77eb42..98ddcdcb17 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepository.cs @@ -17,13 +17,9 @@ namespace Umbraco.Core.Persistence.Repositories.Implement /// internal class ContentTypeRepository : ContentTypeRepositoryBase, IContentTypeRepository { - private readonly ITemplateRepository _templateRepository; - - public ContentTypeRepository(IScopeAccessor scopeAccessor, AppCaches cache, ILogger logger, ITemplateRepository templateRepository) - : base(scopeAccessor, cache, logger) - { - _templateRepository = templateRepository; - } + public ContentTypeRepository(IScopeAccessor scopeAccessor, AppCaches cache, ILogger logger, IContentTypeCommonRepository commonRepository) + : base(scopeAccessor, cache, logger, commonRepository) + { } protected override bool SupportsPublishing => ContentType.SupportsPublishingConst; @@ -32,75 +28,81 @@ namespace Umbraco.Core.Persistence.Repositories.Implement return new FullDataSetRepositoryCachePolicy(GlobalIsolatedCache, ScopeAccessor, GetEntityId, /*expires:*/ true); } + // every GetExists method goes cachePolicy.GetSomething which in turns goes PerformGetAll, + // since this is a FullDataSet policy - and everything is cached + // so here, + // every PerformGet/Exists just GetMany() and then filters + // except PerformGetAll which is the one really doing the job + + // TODO: the filtering is highly inefficient as we deep-clone everything + // there should be a way to GetMany(predicate) right from the cache policy! + // and ah, well, this all caching should be refactored + the cache refreshers + // should to repository.Clear() not deal with magic caches by themselves + protected override IContentType PerformGet(int id) - { - //use the underlying GetAll which will force cache all content types - return GetMany().FirstOrDefault(x => x.Id == id); - } + => GetMany().FirstOrDefault(x => x.Id == id); protected override IContentType PerformGet(Guid id) - { - //use the underlying GetAll which will force cache all content types - return GetMany().FirstOrDefault(x => x.Key == id); - } + => GetMany().FirstOrDefault(x => x.Key == id); protected override IContentType PerformGet(string alias) - { - //use the underlying GetAll which will force cache all content types - return GetMany().FirstOrDefault(x => x.Alias.InvariantEquals(alias)); - } + => GetMany().FirstOrDefault(x => x.Alias.InvariantEquals(alias)); protected override bool PerformExists(Guid id) - { - return GetMany().FirstOrDefault(x => x.Key == id) != null; - } + => GetMany().FirstOrDefault(x => x.Key == id) != null; protected override IEnumerable PerformGetAll(params int[] ids) { - if (ids.Any()) - { - //NOTE: This logic should never be executed according to our cache policy - return ContentTypeQueryMapper.GetContentTypes(Database, SqlSyntax, SupportsPublishing, this, _templateRepository) - .Where(x => ids.Contains(x.Id)); - } - - return ContentTypeQueryMapper.GetContentTypes(Database, SqlSyntax, SupportsPublishing, this, _templateRepository); + // the cache policy will always want everything + // even GetMany(ids) gets everything and filters afterwards + if (ids.Any()) throw new Exception("panic"); + return CommonRepository.GetAllTypes().OfType(); } protected override IEnumerable PerformGetAll(params Guid[] ids) { - // use the underlying GetAll which will force cache all content types - return ids.Any() ? GetMany().Where(x => ids.Contains(x.Key)) : GetMany(); + var all = GetMany(); + return ids.Any() ? all.Where(x => ids.Contains(x.Key)) : all; } protected override IEnumerable PerformGetByQuery(IQuery query) { - var sqlClause = GetBaseQuery(false); - var translator = new SqlTranslator(sqlClause, query); + var baseQuery = GetBaseQuery(false); + var translator = new SqlTranslator(baseQuery, query); var sql = translator.Translate(); + var ids = Database.Fetch(sql).Distinct().ToArray(); - var dtos = Database.Fetch(sql); - - return - //This returns a lookup from the GetAll cached lookup - (dtos.Any() - ? GetMany(dtos.DistinctBy(x => x.ContentTypeDto.NodeId).Select(x => x.ContentTypeDto.NodeId).ToArray()) - : Enumerable.Empty()) - //order the result by name - .OrderBy(x => x.Name); + return ids.Length > 0 ? GetMany(ids).OrderBy(x => x.Name) : Enumerable.Empty(); } - /// - /// Gets all entities of the specified query - /// - /// - /// An enumerable list of objects + /// public IEnumerable GetByQuery(IQuery query) { var ints = PerformGetByQuery(query).ToArray(); - return ints.Any() - ? GetMany(ints) - : Enumerable.Empty(); + return ints.Length > 0 ? GetMany(ints) : Enumerable.Empty(); + } + + protected IEnumerable PerformGetByQuery(IQuery query) + { + // used by DataTypeService to remove properties + // from content types if they have a deleted data type - see + // notes in DataTypeService.Delete as it's a bit weird + + var sqlClause = Sql() + .SelectAll() + .From() + .RightJoin() + .On(left => left.Id, right => right.PropertyTypeGroupId) + .InnerJoin() + .On(left => left.DataTypeId, right => right.NodeId); + + var translator = new SqlTranslator(sqlClause, query); + var sql = translator.Translate() + .OrderBy(x => x.PropertyTypeGroupId); + + return Database + .FetchOneToMany(x => x.PropertyTypeDtos, sql) + .Select(x => x.ContentTypeNodeId).Distinct(); } /// @@ -141,7 +143,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement if (aliases.Length == 0) return Enumerable.Empty(); var sql = Sql() - .Select("cmsContentType.nodeId") + .Select(x => x.NodeId) .From() .InnerJoin() .On(dto => dto.NodeId, dto => dto.NodeId) @@ -156,14 +158,12 @@ namespace Umbraco.Core.Persistence.Repositories.Implement sql = isCount ? sql.SelectCount() - : sql.Select(r => r.Select(x => x.ContentTypeDto, r1 => r1.Select(x => x.NodeDto))); + : sql.Select(x => x.NodeId); sql .From() - .InnerJoin() - .On(left => left.NodeId, right => right.NodeId) - .LeftJoin() - .On(left => left.ContentTypeNodeId, right => right.NodeId) + .InnerJoin().On(left => left.NodeId, right => right.NodeId) + .LeftJoin().On(left => left.ContentTypeNodeId, right => right.NodeId) .Where(x => x.NodeObjectType == NodeObjectTypeId); return sql; diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs index 924efa1e11..591fa2b660 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs @@ -10,11 +10,9 @@ using Umbraco.Core.Events; using Umbraco.Core.Exceptions; using Umbraco.Core.Logging; using Umbraco.Core.Models; -using Umbraco.Core.Models.Entities; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.Factories; using Umbraco.Core.Persistence.Querying; -using Umbraco.Core.Persistence.SqlSyntax; using Umbraco.Core.Scoping; using Umbraco.Core.Services; @@ -28,9 +26,13 @@ namespace Umbraco.Core.Persistence.Repositories.Implement internal abstract class ContentTypeRepositoryBase : NPocoRepositoryBase, IReadRepository where TEntity : class, IContentTypeComposition { - protected ContentTypeRepositoryBase(IScopeAccessor scopeAccessor, AppCaches cache, ILogger logger) + protected ContentTypeRepositoryBase(IScopeAccessor scopeAccessor, AppCaches cache, ILogger logger, IContentTypeCommonRepository commonRepository) : base(scopeAccessor, cache, logger) - { } + { + CommonRepository = commonRepository; + } + + protected IContentTypeCommonRepository CommonRepository { get; } protected abstract bool SupportsPublishing { get; } @@ -82,38 +84,16 @@ namespace Umbraco.Core.Persistence.Repositories.Implement return moveInfo; } - /// - /// Returns the content type ids that match the query - /// - /// - /// - protected IEnumerable PerformGetByQuery(IQuery query) + + protected virtual PropertyType CreatePropertyType(string propertyEditorAlias, ValueStorageType storageType, string propertyTypeAlias) { - // used by DataTypeDefinitionRepository to remove properties - // from content types if they have a deleted data type - see - // notes in DataTypeDefinitionRepository.Delete as it's a bit - // weird - - var sqlClause = Sql() - .SelectAll() - .From() - .RightJoin() - .On(left => left.Id, right => right.PropertyTypeGroupId) - .InnerJoin() - .On(left => left.DataTypeId, right => right.NodeId); - - var translator = new SqlTranslator(sqlClause, query); - var sql = translator.Translate() - .OrderBy(x => x.PropertyTypeGroupId); - - return Database - .FetchOneToMany(x => x.PropertyTypeDtos, sql) - .Select(x => x.ContentTypeNodeId).Distinct(); + return new PropertyType(propertyEditorAlias, storageType, propertyTypeAlias); } - protected virtual PropertyType CreatePropertyType(string propertyEditorAlias, ValueStorageType dbType, string propertyTypeAlias) + protected override void PersistDeletedItem(TEntity entity) { - return new PropertyType(propertyEditorAlias, dbType, propertyTypeAlias); + base.PersistDeletedItem(entity); + CommonRepository.ClearCache(); // always } protected void PersistNewBaseContentType(IContentTypeComposition entity) @@ -228,6 +208,8 @@ AND umbracoNode.nodeObjectType = @objectType", propertyType.PropertyEditorAlias = dataTypeDto.EditorAlias; propertyType.ValueStorageType = dataTypeDto.DbType.EnumParse(true); } + + CommonRepository.ClearCache(); // always } protected void PersistUpdatedBaseContentType(IContentTypeComposition entity) @@ -532,6 +514,8 @@ AND umbracoNode.id <> @id", if (orphanPropertyTypeIds != null) foreach (var id in orphanPropertyTypeIds) DeletePropertyType(entity.Id, id); + + CommonRepository.ClearCache(); // always } private IEnumerable GetImpactedContentTypes(IContentTypeComposition contentType, IEnumerable all) @@ -992,74 +976,6 @@ AND umbracoNode.id <> @id", new { Id = contentTypeId, PropertyTypeId = propertyTypeId }); } - protected IEnumerable GetAllowedContentTypeIds(int id) - { - var sql = Sql() - .SelectAll() - .From() - .LeftJoin() - .On(left => left.AllowedId, right => right.NodeId) - .Where(x => x.Id == id); - - var allowedContentTypeDtos = Database.Fetch(sql); - return allowedContentTypeDtos.Select(x => new ContentTypeSort(new Lazy(() => x.AllowedId), x.SortOrder, x.ContentTypeDto.Alias)).ToList(); - } - - protected PropertyGroupCollection GetPropertyGroupCollection(int id, DateTime createDate, DateTime updateDate) - { - var sql = Sql() - .SelectAll() - .From() - .LeftJoin() - .On(left => left.Id, right => right.PropertyTypeGroupId) - .LeftJoin() - .On(left => left.DataTypeId, right => right.NodeId) - .Where(x => x.ContentTypeNodeId == id) - .OrderBy(x => x.Id); - - - var dtos = Database - .Fetch(sql); - - var propertyGroups = PropertyGroupFactory.BuildEntity(dtos, SupportsPublishing, id, createDate, updateDate,CreatePropertyType); - - return new PropertyGroupCollection(propertyGroups); - } - - protected PropertyTypeCollection GetPropertyTypeCollection(int id, DateTime createDate, DateTime updateDate) - { - var sql = Sql() - .SelectAll() - .From() - .InnerJoin() - .On(left => left.DataTypeId, right => right.NodeId) - .Where(x => x.ContentTypeId == id); - - var dtos = Database.Fetch(sql); - - // TODO: Move this to a PropertyTypeFactory - var list = new List(); - foreach (var dto in dtos.Where(x => x.PropertyTypeGroupId <= 0)) - { - var propType = CreatePropertyType(dto.DataTypeDto.EditorAlias, dto.DataTypeDto.DbType.EnumParse(true), dto.Alias); - propType.DataTypeId = dto.DataTypeId; - propType.Description = dto.Description; - propType.Id = dto.Id; - propType.Key = dto.UniqueId; - propType.Name = dto.Name; - propType.Mandatory = dto.Mandatory; - propType.SortOrder = dto.SortOrder; - propType.ValidationRegExp = dto.ValidationRegExp; - propType.CreateDate = createDate; - propType.UpdateDate = updateDate; - list.Add(propType); - } - //Reset dirty properties - Parallel.ForEach(list, currentFile => currentFile.ResetDirtyProperties(false)); - - return new PropertyTypeCollection(SupportsPublishing, list); - } - protected void ValidateAlias(PropertyType pt) { if (string.IsNullOrWhiteSpace(pt.Alias)) @@ -1114,589 +1030,6 @@ AND umbracoNode.id <> @id", } } - internal static class ContentTypeQueryMapper - { - public class AssociatedTemplate - { - public AssociatedTemplate(int templateId, string alias, string templateName) - { - TemplateId = templateId; - Alias = alias; - TemplateName = templateName; - } - - public int TemplateId { get; set; } - public string Alias { get; set; } - public string TemplateName { get; set; } - - protected bool Equals(AssociatedTemplate other) - { - return TemplateId == other.TemplateId; - } - - public override bool Equals(object obj) - { - if (ReferenceEquals(null, obj)) return false; - if (ReferenceEquals(this, obj)) return true; - if (obj.GetType() != this.GetType()) return false; - return Equals((AssociatedTemplate)obj); - } - - public override int GetHashCode() - { - return TemplateId; - } - } - - public static IEnumerable GetMediaTypes( - IDatabase db, ISqlSyntaxProvider sqlSyntax, bool isPublishing, - TRepo contentTypeRepository) - where TRepo : IReadRepository - { - IDictionary> allParentMediaTypeIds; - var mediaTypes = MapMediaTypes(db, sqlSyntax, out allParentMediaTypeIds) - .ToArray(); - - MapContentTypeChildren(mediaTypes, db, sqlSyntax, isPublishing, contentTypeRepository, allParentMediaTypeIds); - - return mediaTypes; - } - - public static IEnumerable GetContentTypes( - IDatabase db, ISqlSyntaxProvider sqlSyntax, bool isPublishing, - TRepo contentTypeRepository, - ITemplateRepository templateRepository) - where TRepo : IReadRepository - { - IDictionary> allAssociatedTemplates; - IDictionary> allParentContentTypeIds; - var contentTypes = MapContentTypes(db, sqlSyntax, out allAssociatedTemplates, out allParentContentTypeIds) - .ToArray(); - - if (contentTypes.Any()) - { - MapContentTypeTemplates( - contentTypes, db, contentTypeRepository, templateRepository, allAssociatedTemplates); - - MapContentTypeChildren(contentTypes, db, sqlSyntax, isPublishing, contentTypeRepository, allParentContentTypeIds); - } - - return contentTypes; - } - - internal static void MapContentTypeChildren(IContentTypeComposition[] contentTypes, - IDatabase db, ISqlSyntaxProvider sqlSyntax, bool isPublishing, - TRepo contentTypeRepository, - IDictionary> allParentContentTypeIds) - where TRepo : IReadRepository - { - //NOTE: SQL call #2 - - var ids = contentTypes.Select(x => x.Id).ToArray(); - IDictionary allPropGroups; - IDictionary allPropTypes; - MapGroupsAndProperties(ids, db, sqlSyntax, isPublishing, out allPropTypes, out allPropGroups); - - foreach (var contentType in contentTypes) - { - contentType.PropertyGroups = allPropGroups[contentType.Id]; - contentType.NoGroupPropertyTypes = allPropTypes[contentType.Id]; - } - - //NOTE: SQL call #3++ - - if (allParentContentTypeIds != null) - { - var allParentIdsAsArray = allParentContentTypeIds.SelectMany(x => x.Value).Distinct().ToArray(); - if (allParentIdsAsArray.Any()) - { - var allParentContentTypes = contentTypes.Where(x => allParentIdsAsArray.Contains(x.Id)).ToArray(); - - foreach (var contentType in contentTypes) - { - var entityId = contentType.Id; - - var parentContentTypes = allParentContentTypes.Where(x => - { - var parentEntityId = x.Id; - - return allParentContentTypeIds[entityId].Contains(parentEntityId); - }); - foreach (var parentContentType in parentContentTypes) - { - var result = contentType.AddContentType(parentContentType); - //Do something if adding fails? (Should hopefully not be possible unless someone created a circular reference) - } - - // reset dirty initial properties (U4-1946) - ((EntityBase)contentType).ResetDirtyProperties(false); - } - } - } - - - } - - internal static void MapContentTypeTemplates(IContentType[] contentTypes, - IDatabase db, - TRepo contentTypeRepository, - ITemplateRepository templateRepository, - IDictionary> associatedTemplates) - where TRepo : IReadRepository - { - if (associatedTemplates == null || associatedTemplates.Any() == false) return; - - //NOTE: SQL call #3++ - //SEE: http://issues.umbraco.org/issue/U4-5174 to fix this - - var templateIds = associatedTemplates.SelectMany(x => x.Value).Select(x => x.TemplateId) - .Distinct() - .ToArray(); - - var templates = (templateIds.Any() - ? templateRepository.GetMany(templateIds) - : Enumerable.Empty()).ToArray(); - - foreach (var contentType in contentTypes) - { - var entityId = contentType.Id; - - var associatedTemplateIds = associatedTemplates[entityId].Select(x => x.TemplateId) - .Distinct() - .ToArray(); - - contentType.AllowedTemplates = (associatedTemplateIds.Any() - ? templates.Where(x => associatedTemplateIds.Contains(x.Id)) - : Enumerable.Empty()).ToArray(); - } - - - } - - internal static IEnumerable MapMediaTypes(IDatabase db, ISqlSyntaxProvider sqlSyntax, - out IDictionary> parentMediaTypeIds) - { - if (db == null) throw new ArgumentNullException(nameof(db)); - - var sql = @"SELECT cmsContentType.pk as ctPk, cmsContentType.alias as ctAlias, cmsContentType.allowAtRoot as ctAllowAtRoot, cmsContentType.description as ctDesc, cmsContentType.variations as ctVariations, - cmsContentType.icon as ctIcon, cmsContentType.isContainer as ctIsContainer, cmsContentType.IsElement as ctIsElement, cmsContentType.nodeId as ctId, cmsContentType.thumbnail as ctThumb, - AllowedTypes.AllowedId as ctaAllowedId, AllowedTypes.SortOrder as ctaSortOrder, AllowedTypes.alias as ctaAlias, - ParentTypes.parentContentTypeId as chtParentId, ParentTypes.parentContentTypeKey as chtParentKey, - umbracoNode.createDate as nCreateDate, umbracoNode." + sqlSyntax.GetQuotedColumnName("level") + @" as nLevel, umbracoNode.nodeObjectType as nObjectType, umbracoNode.nodeUser as nUser, - umbracoNode.parentID as nParentId, umbracoNode." + sqlSyntax.GetQuotedColumnName("path") + @" as nPath, umbracoNode.sortOrder as nSortOrder, umbracoNode." + sqlSyntax.GetQuotedColumnName("text") + @" as nName, umbracoNode.trashed as nTrashed, - umbracoNode.uniqueID as nUniqueId - FROM cmsContentType - INNER JOIN umbracoNode - ON cmsContentType.nodeId = umbracoNode.id - LEFT JOIN ( - SELECT cmsContentTypeAllowedContentType.Id, cmsContentTypeAllowedContentType.AllowedId, cmsContentType.alias, cmsContentTypeAllowedContentType.SortOrder - FROM cmsContentTypeAllowedContentType - INNER JOIN cmsContentType - ON cmsContentTypeAllowedContentType.AllowedId = cmsContentType.nodeId - ) AllowedTypes - ON AllowedTypes.Id = cmsContentType.nodeId - LEFT JOIN ( - SELECT cmsContentType2ContentType.parentContentTypeId, umbracoNode.uniqueID AS parentContentTypeKey, cmsContentType2ContentType.childContentTypeId - FROM cmsContentType2ContentType - INNER JOIN umbracoNode - ON cmsContentType2ContentType.parentContentTypeId = umbracoNode." + sqlSyntax.GetQuotedColumnName("id") + @" - ) ParentTypes - ON ParentTypes.childContentTypeId = cmsContentType.nodeId - WHERE (umbracoNode.nodeObjectType = @nodeObjectType) - ORDER BY ctId"; - - var result = db.Fetch(sql, new { nodeObjectType = Constants.ObjectTypes.MediaType }); - - if (result.Any() == false) - { - parentMediaTypeIds = null; - return Enumerable.Empty(); - } - - parentMediaTypeIds = new Dictionary>(); - var mappedMediaTypes = new List(); - - //loop through each result and fill in our required values, each row will contain different required data than the rest. - // it is much quicker to iterate each result and populate instead of looking up the values over and over in the result like - // we used to do. - var queue = new Queue(result); - var currAllowedContentTypes = new List(); - - while (queue.Count > 0) - { - var ct = queue.Dequeue(); - - //check for allowed content types - int? allowedCtId = ct.ctaAllowedId; - int? allowedCtSort = ct.ctaSortOrder; - string allowedCtAlias = ct.ctaAlias; - if (allowedCtId.HasValue && allowedCtSort.HasValue && allowedCtAlias != null) - { - var ctSort = new ContentTypeSort(new Lazy(() => allowedCtId.Value), allowedCtSort.Value, allowedCtAlias); - if (currAllowedContentTypes.Contains(ctSort) == false) - { - currAllowedContentTypes.Add(ctSort); - } - } - - //always ensure there's a list for this content type - if (parentMediaTypeIds.ContainsKey(ct.ctId) == false) - parentMediaTypeIds[ct.ctId] = new List(); - - //check for parent ids and assign to the outgoing collection - int? parentId = ct.chtParentId; - if (parentId.HasValue) - { - var associatedParentIds = parentMediaTypeIds[ct.ctId]; - if (associatedParentIds.Contains(parentId.Value) == false) - associatedParentIds.Add(parentId.Value); - } - - if (queue.Count == 0 || queue.Peek().ctId != ct.ctId) - { - //it's the last in the queue or the content type is changing (moving to the next one) - var mediaType = CreateForMapping(ct, currAllowedContentTypes); - mappedMediaTypes.Add(mediaType); - - //Here we need to reset the current variables, we're now collecting data for a different content type - currAllowedContentTypes = new List(); - } - } - - return mappedMediaTypes; - } - - private static IMediaType CreateForMapping(dynamic currCt, List currAllowedContentTypes) - { - // * create the DTO object - // * create the content type object - // * map the allowed content types - // * add to the outgoing list - - var contentTypeDto = new ContentTypeDto - { - Alias = currCt.ctAlias, - AllowAtRoot = currCt.ctAllowAtRoot, - Description = currCt.ctDesc, - Icon = currCt.ctIcon, - IsContainer = currCt.ctIsContainer, - IsElement = currCt.ctIsElement, - NodeId = currCt.ctId, - PrimaryKey = currCt.ctPk, - Thumbnail = currCt.ctThumb, - Variations = (byte) currCt.ctVariations, - //map the underlying node dto - NodeDto = new NodeDto - { - CreateDate = currCt.nCreateDate, - Level = (short)currCt.nLevel, - NodeId = currCt.ctId, - NodeObjectType = currCt.nObjectType, - ParentId = currCt.nParentId, - Path = currCt.nPath, - SortOrder = currCt.nSortOrder, - Text = currCt.nName, - Trashed = currCt.nTrashed, - UniqueId = currCt.nUniqueId, - UserId = currCt.nUser - } - }; - - //now create the content type object; - var mediaType = ContentTypeFactory.BuildMediaTypeEntity(contentTypeDto); - - //map the allowed content types - mediaType.AllowedContentTypes = currAllowedContentTypes; - - return mediaType; - } - - internal static IEnumerable MapContentTypes(IDatabase db, ISqlSyntaxProvider sqlSyntax, - out IDictionary> associatedTemplates, - out IDictionary> parentContentTypeIds) - { - if (db == null) throw new ArgumentNullException(nameof(db)); - - var sql = @"SELECT cmsDocumentType.IsDefault as dtIsDefault, cmsDocumentType.templateNodeId as dtTemplateId, - cmsContentType.pk as ctPk, cmsContentType.alias as ctAlias, cmsContentType.allowAtRoot as ctAllowAtRoot, cmsContentType.description as ctDesc, cmsContentType.variations as ctVariations, - cmsContentType.icon as ctIcon, cmsContentType.isContainer as ctIsContainer, cmsContentType.IsElement as ctIsElement, cmsContentType.nodeId as ctId, cmsContentType.thumbnail as ctThumb, - AllowedTypes.AllowedId as ctaAllowedId, AllowedTypes.SortOrder as ctaSortOrder, AllowedTypes.alias as ctaAlias, - ParentTypes.parentContentTypeId as chtParentId,ParentTypes.parentContentTypeKey as chtParentKey, - umbracoNode.createDate as nCreateDate, umbracoNode." + sqlSyntax.GetQuotedColumnName("level") + @" as nLevel, umbracoNode.nodeObjectType as nObjectType, umbracoNode.nodeUser as nUser, - umbracoNode.parentID as nParentId, umbracoNode." + sqlSyntax.GetQuotedColumnName("path") + @" as nPath, umbracoNode.sortOrder as nSortOrder, umbracoNode." + sqlSyntax.GetQuotedColumnName("text") + @" as nName, umbracoNode.trashed as nTrashed, - umbracoNode.uniqueID as nUniqueId, - Template.alias as tAlias, Template.nodeId as tId,Template.text as tText - FROM cmsContentType - INNER JOIN umbracoNode - ON cmsContentType.nodeId = umbracoNode.id - LEFT JOIN cmsDocumentType - ON cmsDocumentType.contentTypeNodeId = cmsContentType.nodeId - LEFT JOIN ( - SELECT cmsContentTypeAllowedContentType.Id, cmsContentTypeAllowedContentType.AllowedId, cmsContentType.alias, cmsContentTypeAllowedContentType.SortOrder - FROM cmsContentTypeAllowedContentType - INNER JOIN cmsContentType - ON cmsContentTypeAllowedContentType.AllowedId = cmsContentType.nodeId - ) AllowedTypes - ON AllowedTypes.Id = cmsContentType.nodeId - LEFT JOIN ( - SELECT * FROM cmsTemplate - INNER JOIN umbracoNode - ON cmsTemplate.nodeId = umbracoNode.id - ) as Template - ON Template.nodeId = cmsDocumentType.templateNodeId - LEFT JOIN ( - SELECT cmsContentType2ContentType.parentContentTypeId, umbracoNode.uniqueID AS parentContentTypeKey, cmsContentType2ContentType.childContentTypeId - FROM cmsContentType2ContentType - INNER JOIN umbracoNode - ON cmsContentType2ContentType.parentContentTypeId = umbracoNode." + sqlSyntax.GetQuotedColumnName("id") + @" - ) ParentTypes - ON ParentTypes.childContentTypeId = cmsContentType.nodeId - WHERE (umbracoNode.nodeObjectType = @nodeObjectType) - ORDER BY ctId"; - - var result = db.Fetch(sql, new { nodeObjectType = Constants.ObjectTypes.DocumentType }); - - if (result.Any() == false) - { - parentContentTypeIds = null; - associatedTemplates = null; - return Enumerable.Empty(); - } - - parentContentTypeIds = new Dictionary>(); - associatedTemplates = new Dictionary>(); - var mappedContentTypes = new List(); - - var queue = new Queue(result); - var currDefaultTemplate = -1; - var currAllowedContentTypes = new List(); - while (queue.Count > 0) - { - var ct = queue.Dequeue(); - - //check for default templates - bool? isDefaultTemplate = Convert.ToBoolean(ct.dtIsDefault); - int? templateId = ct.dtTemplateId; - if (currDefaultTemplate == -1 && isDefaultTemplate.HasValue && isDefaultTemplate.Value && templateId.HasValue) - { - currDefaultTemplate = templateId.Value; - } - - //always ensure there's a list for this content type - if (associatedTemplates.ContainsKey(ct.ctId) == false) - associatedTemplates[ct.ctId] = new List(); - - //check for associated templates and assign to the outgoing collection - if (ct.tId != null) - { - var associatedTemplate = new AssociatedTemplate(ct.tId, ct.tAlias, ct.tText); - var associatedList = associatedTemplates[ct.ctId]; - - if (associatedList.Contains(associatedTemplate) == false) - associatedList.Add(associatedTemplate); - } - - //check for allowed content types - int? allowedCtId = ct.ctaAllowedId; - int? allowedCtSort = ct.ctaSortOrder; - string allowedCtAlias = ct.ctaAlias; - if (allowedCtId.HasValue && allowedCtSort.HasValue && allowedCtAlias != null) - { - var ctSort = new ContentTypeSort(new Lazy(() => allowedCtId.Value), allowedCtSort.Value, allowedCtAlias); - if (currAllowedContentTypes.Contains(ctSort) == false) - { - currAllowedContentTypes.Add(ctSort); - } - } - - //always ensure there's a list for this content type - if (parentContentTypeIds.ContainsKey(ct.ctId) == false) - parentContentTypeIds[ct.ctId] = new List(); - - //check for parent ids and assign to the outgoing collection - int? parentId = ct.chtParentId; - if (parentId.HasValue) - { - var associatedParentIds = parentContentTypeIds[ct.ctId]; - - if (associatedParentIds.Contains(parentId.Value) == false) - associatedParentIds.Add(parentId.Value); - } - - if (queue.Count == 0 || queue.Peek().ctId != ct.ctId) - { - //it's the last in the queue or the content type is changing (moving to the next one) - var contentType = CreateForMapping(ct, currAllowedContentTypes, currDefaultTemplate); - mappedContentTypes.Add(contentType); - - //Here we need to reset the current variables, we're now collecting data for a different content type - currDefaultTemplate = -1; - currAllowedContentTypes = new List(); - } - } - - return mappedContentTypes; - } - - private static IContentType CreateForMapping(dynamic currCt, List currAllowedContentTypes, int currDefaultTemplate) - { - // * set the default template to the first one if a default isn't found - // * create the DTO object - // * create the content type object - // * map the allowed content types - // * add to the outgoing list - - var dtDto = new ContentTypeTemplateDto - { - //create the content type dto - ContentTypeDto = new ContentTypeDto - { - Alias = currCt.ctAlias, - AllowAtRoot = currCt.ctAllowAtRoot, - Description = currCt.ctDesc, - Icon = currCt.ctIcon, - IsContainer = currCt.ctIsContainer, - IsElement = currCt.ctIsElement, - NodeId = currCt.ctId, - PrimaryKey = currCt.ctPk, - Thumbnail = currCt.ctThumb, - Variations = (byte) currCt.ctVariations, - //map the underlying node dto - NodeDto = new NodeDto - { - CreateDate = currCt.nCreateDate, - Level = (short)currCt.nLevel, - NodeId = currCt.ctId, - NodeObjectType = currCt.nObjectType, - ParentId = currCt.nParentId, - Path = currCt.nPath, - SortOrder = currCt.nSortOrder, - Text = currCt.nName, - Trashed = currCt.nTrashed, - UniqueId = currCt.nUniqueId, - UserId = currCt.nUser - } - }, - ContentTypeNodeId = currCt.ctId, - IsDefault = currDefaultTemplate != -1, - TemplateNodeId = currDefaultTemplate != -1 ? currDefaultTemplate : 0, - }; - - //now create the content type object - var contentType = ContentTypeFactory.BuildContentTypeEntity(dtDto.ContentTypeDto); - - // NOTE - // that was done by the factory but makes little sense, moved here, so - // now we have to reset dirty props again (as the factory does it) and yet, - // we are not managing allowed templates... the whole thing is weird. - ((ContentType)contentType).DefaultTemplateId = dtDto.TemplateNodeId; - contentType.ResetDirtyProperties(false); - - //map the allowed content types - contentType.AllowedContentTypes = currAllowedContentTypes; - - return contentType; - } - - internal static void MapGroupsAndProperties(int[] contentTypeIds, IDatabase db, ISqlSyntaxProvider sqlSyntax, bool isPublishing, - out IDictionary allPropertyTypeCollection, - out IDictionary allPropertyGroupCollection) - { - allPropertyGroupCollection = new Dictionary(); - allPropertyTypeCollection = new Dictionary(); - - // query below is not safe + pointless if array is empty - if (contentTypeIds.Length == 0) return; - - var sqlGroups = @"SELECT - pg.contenttypeNodeId AS contentTypeId, - pg.id AS id, pg.uniqueID AS " + sqlSyntax.GetQuotedColumnName("key") + @", - pg.sortOrder AS sortOrder, pg." + sqlSyntax.GetQuotedColumnName("text") + @" AS text -FROM cmsPropertyTypeGroup pg -WHERE pg.contenttypeNodeId IN (@ids) -ORDER BY contentTypeId, id"; - - var sqlProps = @"SELECT - pt.contentTypeId AS contentTypeId, - pt.id AS id, pt.uniqueID AS " + sqlSyntax.GetQuotedColumnName("key") + @", - pt.propertyTypeGroupId AS groupId, - pt.Alias AS alias, pt." + sqlSyntax.GetQuotedColumnName("Description") + @" AS " + sqlSyntax.GetQuotedColumnName("desc") + $@", pt.mandatory AS mandatory, - pt.Name AS name, pt.sortOrder AS sortOrder, pt.validationRegExp AS regexp, pt.variations as variations, - dt.nodeId as dataTypeId, dt.dbType as dbType, dt.propertyEditorAlias as editorAlias -FROM cmsPropertyType pt -INNER JOIN {Constants.DatabaseSchema.Tables.DataType} as dt ON pt.dataTypeId = dt.nodeId -WHERE pt.contentTypeId IN (@ids) -ORDER BY contentTypeId, groupId, id"; - - if (contentTypeIds.Length > 2000) - throw new InvalidOperationException("Cannot perform this lookup, too many sql parameters"); - - var groups = db.Fetch(sqlGroups, new { ids = contentTypeIds }); - var groupsEnumerator = groups.GetEnumerator(); - var group = groupsEnumerator.MoveNext() ? groupsEnumerator.Current : null; - - var props = db.Fetch(sqlProps, new { ids = contentTypeIds }); - var propsEnumerator = props.GetEnumerator(); - var prop = propsEnumerator.MoveNext() ? propsEnumerator.Current : null; - - // groups are ordered by content type, group id - // props are ordered by content type, group id, prop id - - foreach (var contentTypeId in contentTypeIds) - { - var propertyTypeCollection = allPropertyTypeCollection[contentTypeId] = new PropertyTypeCollection(isPublishing); - var propertyGroupCollection = allPropertyGroupCollection[contentTypeId] = new PropertyGroupCollection(); - - while (prop != null && prop.contentTypeId == contentTypeId && prop.groupId == null) - { - AddPropertyType(propertyTypeCollection, prop); - prop = propsEnumerator.MoveNext() ? propsEnumerator.Current : null; - } - - while (group != null && group.contentTypeId == contentTypeId) - { - var propertyGroup = new PropertyGroup(new PropertyTypeCollection(isPublishing)) - { - Id = group.id, - Name = group.text, - SortOrder = group.sortOrder, - Key = group.key - }; - propertyGroupCollection.Add(propertyGroup); - - while (prop != null && prop.groupId == group.id) - { - AddPropertyType(propertyGroup.PropertyTypes, prop, propertyGroup); - prop = propsEnumerator.MoveNext() ? propsEnumerator.Current : null; - } - - group = groupsEnumerator.MoveNext() ? groupsEnumerator.Current : null; - } - } - - propsEnumerator.Dispose(); - groupsEnumerator.Dispose(); - } - - private static void AddPropertyType(PropertyTypeCollection propertyTypes, dynamic prop, PropertyGroup propertyGroup = null) - { - var propertyType = new PropertyType(prop.editorAlias, Enum.Parse(prop.dbType), prop.alias) - { - Description = prop.desc, - DataTypeId = prop.dataTypeId, - Id = prop.id, - Key = prop.key, - Mandatory = Convert.ToBoolean(prop.mandatory), - Name = prop.name, - PropertyGroupId = propertyGroup == null ? null : new Lazy(() => propertyGroup.Id), - SortOrder = prop.sortOrder, - ValidationRegExp = prop.regexp, - Variations = (ContentVariation) prop.variations - }; - propertyTypes.Add(propertyType); - } - } - protected abstract TEntity PerformGet(Guid id); protected abstract TEntity PerformGet(string alias); protected abstract IEnumerable PerformGetAll(params Guid[] ids); diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/MediaTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MediaTypeRepository.cs index a6f39bdb71..281255e755 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Implement/MediaTypeRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MediaTypeRepository.cs @@ -16,8 +16,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement /// internal class MediaTypeRepository : ContentTypeRepositoryBase, IMediaTypeRepository { - public MediaTypeRepository(IScopeAccessor scopeAccessor, AppCaches cache, ILogger logger) - : base(scopeAccessor, cache, logger) + public MediaTypeRepository(IScopeAccessor scopeAccessor, AppCaches cache, ILogger logger, IContentTypeCommonRepository commonRepository) + : base(scopeAccessor, cache, logger, commonRepository) { } protected override bool SupportsPublishing => MediaType.SupportsPublishingConst; @@ -27,83 +27,46 @@ namespace Umbraco.Core.Persistence.Repositories.Implement return new FullDataSetRepositoryCachePolicy(GlobalIsolatedCache, ScopeAccessor, GetEntityId, /*expires:*/ true); } + // every GetExists method goes cachePolicy.GetSomething which in turns goes PerformGetAll, + // since this is a FullDataSet policy - and everything is cached + // so here, + // every PerformGet/Exists just GetMany() and then filters + // except PerformGetAll which is the one really doing the job + protected override IMediaType PerformGet(int id) - { - //use the underlying GetAll which will force cache all content types - return GetMany().FirstOrDefault(x => x.Id == id); - } + => GetMany().FirstOrDefault(x => x.Id == id); protected override IMediaType PerformGet(Guid id) - { - //use the underlying GetAll which will force cache all content types - return GetMany().FirstOrDefault(x => x.Key == id); - } + => GetMany().FirstOrDefault(x => x.Key == id); protected override bool PerformExists(Guid id) - { - return GetMany().FirstOrDefault(x => x.Key == id) != null; - } + => GetMany().FirstOrDefault(x => x.Key == id) != null; protected override IMediaType PerformGet(string alias) - { - //use the underlying GetAll which will force cache all content types - return GetMany().FirstOrDefault(x => x.Alias.InvariantEquals(alias)); - } + => GetMany().FirstOrDefault(x => x.Alias.InvariantEquals(alias)); protected override IEnumerable PerformGetAll(params int[] ids) { - if (ids.Any()) - { - //NOTE: This logic should never be executed according to our cache policy - return ContentTypeQueryMapper.GetMediaTypes(Database, SqlSyntax, SupportsPublishing, this) - .Where(x => ids.Contains(x.Id)); - } - - return ContentTypeQueryMapper.GetMediaTypes(Database, SqlSyntax, SupportsPublishing, this); + // the cache policy will always want everything + // even GetMany(ids) gets everything and filters afterwards + if (ids.Any()) throw new Exception("panic"); + return CommonRepository.GetAllTypes().OfType(); } protected override IEnumerable PerformGetAll(params Guid[] ids) { - //use the underlying GetAll which will force cache all content types - - if (ids.Any()) - { - return GetMany().Where(x => ids.Contains(x.Key)); - } - else - { - return GetMany(); - } + var all = GetMany(); + return ids.Any() ? all.Where(x => ids.Contains(x.Key)) : all; } protected override IEnumerable PerformGetByQuery(IQuery query) { - var sqlClause = GetBaseQuery(false); - var translator = new SqlTranslator(sqlClause, query); + var baseQuery = GetBaseQuery(false); + var translator = new SqlTranslator(baseQuery, query); var sql = translator.Translate(); + var ids = Database.Fetch(sql).Distinct().ToArray(); - var dtos = Database.Fetch(sql); - - return - //This returns a lookup from the GetAll cached lookup - (dtos.Any() - ? GetMany(dtos.DistinctBy(x => x.NodeId).Select(x => x.NodeId).ToArray()) - : Enumerable.Empty()) - //order the result by name - .OrderBy(x => x.Name); - } - - /// - /// Gets all entities of the specified query - /// - /// - /// An enumerable list of objects - public IEnumerable GetByQuery(IQuery query) - { - var ints = PerformGetByQuery(query).ToArray(); - return ints.Any() - ? GetMany(ints) - : Enumerable.Empty(); + return ids.Length > 0 ? GetMany(ids).OrderBy(x => x.Name) : Enumerable.Empty(); } protected override Sql GetBaseQuery(bool isCount) @@ -112,12 +75,11 @@ namespace Umbraco.Core.Persistence.Repositories.Implement sql = isCount ? sql.SelectCount() - : sql.Select(r => r.Select(x => x.NodeDto)); + : sql.Select(x => x.NodeId); sql .From() - .InnerJoin() - .On( left => left.NodeId, right => right.NodeId) + .InnerJoin().On( left => left.NodeId, right => right.NodeId) .Where(x => x.NodeObjectType == NodeObjectTypeId); return sql; diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs index afb6ac8b43..a32ec1b422 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs @@ -17,8 +17,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement /// internal class MemberTypeRepository : ContentTypeRepositoryBase, IMemberTypeRepository { - public MemberTypeRepository(IScopeAccessor scopeAccessor, AppCaches cache, ILogger logger) - : base(scopeAccessor, cache, logger) + public MemberTypeRepository(IScopeAccessor scopeAccessor, AppCaches cache, ILogger logger, IContentTypeCommonRepository commonRepository) + : base(scopeAccessor, cache, logger, commonRepository) { } protected override bool SupportsPublishing => MemberType.SupportsPublishingConst; @@ -28,108 +28,49 @@ namespace Umbraco.Core.Persistence.Repositories.Implement return new FullDataSetRepositoryCachePolicy(GlobalIsolatedCache, ScopeAccessor, GetEntityId, /*expires:*/ true); } + // every GetExists method goes cachePolicy.GetSomething which in turns goes PerformGetAll, + // since this is a FullDataSet policy - and everything is cached + // so here, + // every PerformGet/Exists just GetMany() and then filters + // except PerformGetAll which is the one really doing the job + protected override IMemberType PerformGet(int id) - { - //use the underlying GetAll which will force cache all content types - return GetMany().FirstOrDefault(x => x.Id == id); - } + => GetMany().FirstOrDefault(x => x.Id == id); protected override IMemberType PerformGet(Guid id) - { - //use the underlying GetAll which will force cache all content types - return GetMany().FirstOrDefault(x => x.Key == id); - } + => GetMany().FirstOrDefault(x => x.Key == id); protected override IEnumerable PerformGetAll(params Guid[] ids) { - //use the underlying GetAll which will force cache all content types - - if (ids.Any()) - { - return GetMany().Where(x => ids.Contains(x.Key)); - } - else - { - return GetMany(); - } + var all = GetMany(); + return ids.Any() ? all.Where(x => ids.Contains(x.Key)) : all; } protected override bool PerformExists(Guid id) - { - return GetMany().FirstOrDefault(x => x.Key == id) != null; - } + => GetMany().FirstOrDefault(x => x.Key == id) != null; protected override IMemberType PerformGet(string alias) - { - //use the underlying GetAll which will force cache all content types - return GetMany().FirstOrDefault(x => x.Alias.InvariantEquals(alias)); - } + => GetMany().FirstOrDefault(x => x.Alias.InvariantEquals(alias)); protected override IEnumerable PerformGetAll(params int[] ids) { - var sql = GetBaseQuery(false); - if (ids.Any()) - { - //NOTE: This logic should never be executed according to our cache policy - var statement = string.Join(" OR ", ids.Select(x => string.Format("umbracoNode.id='{0}'", x))); - sql.Where(statement); - } - sql.OrderByDescending(x => x.NodeId); - - var dtos = Database - .Fetch(sql) // cannot use FetchOneToMany because we have 2 collections! - .Transform(MapOneToManies) - .ToList(); - - return BuildFromDtos(dtos); + // the cache policy will always want everything + // even GetMany(ids) gets everything and filters afterwards + if (ids.Any()) throw new Exception("panic"); + return CommonRepository.GetAllTypes().OfType(); } protected override IEnumerable PerformGetByQuery(IQuery query) { - var sqlSubquery = GetSubquery(); - var translator = new SqlTranslator(sqlSubquery, query); - var subquery = translator.Translate(); + var subQuery = GetSubquery(); + var translator = new SqlTranslator(subQuery, query); + var subSql = translator.Translate(); var sql = GetBaseQuery(false) - .Append("WHERE umbracoNode.id IN (" + subquery.SQL + ")", subquery.Arguments) + .WhereIn(x => x.NodeId, subSql) .OrderBy(x => x.SortOrder); + var ids = Database.Fetch(sql).Distinct().ToArray(); - var dtos = Database - .Fetch(sql) // cannot use FetchOneToMany because we have 2 collections! - .Transform(MapOneToManies) - .ToList(); - - return BuildFromDtos(dtos); - } - - private IEnumerable MapOneToManies(IEnumerable dtos) - { - MemberTypeReadOnlyDto acc = null; - foreach (var dto in dtos) - { - if (acc == null) - { - acc = dto; - } - else if (acc.UniqueId == dto.UniqueId) - { - var prop = dto.PropertyTypes.SingleOrDefault(); - var group = dto.PropertyTypeGroups.SingleOrDefault(); - - if (prop != null && prop.Id.HasValue && acc.PropertyTypes.Any(x => x.Id == prop.Id.Value) == false) - acc.PropertyTypes.Add(prop); - - if (group != null && group.Id.HasValue && acc.PropertyTypeGroups.Any(x => x.Id == group.Id.Value) == false) - acc.PropertyTypeGroups.Add(group); - } - else - { - yield return acc; - acc = dto; - } - } - - if (acc != null) - yield return acc; + return ids.Length > 0 ? GetMany(ids).OrderBy(x => x.Name) : Enumerable.Empty(); } protected override Sql GetBaseQuery(bool isCount) @@ -144,18 +85,11 @@ namespace Umbraco.Core.Persistence.Repositories.Implement } var sql = Sql() - .Select("umbracoNode.*", "cmsContentType.*", "cmsPropertyType.id AS PropertyTypeId", "cmsPropertyType.Alias", - "cmsPropertyType.Name", "cmsPropertyType.Description", "cmsPropertyType.mandatory", "cmsPropertyType.UniqueID", - "cmsPropertyType.validationRegExp", "cmsPropertyType.dataTypeId", "cmsPropertyType.sortOrder AS PropertyTypeSortOrder", - "cmsPropertyType.propertyTypeGroupId AS PropertyTypesGroupId", - "cmsMemberType.memberCanEdit", "cmsMemberType.viewOnProfile", "cmsMemberType.isSensitive", - $"{Constants.DatabaseSchema.Tables.DataType}.propertyEditorAlias", $"{Constants.DatabaseSchema.Tables.DataType}.dbType", "cmsPropertyTypeGroup.id AS PropertyTypeGroupId", - "cmsPropertyTypeGroup.text AS PropertyGroupName", "cmsPropertyTypeGroup.uniqueID AS PropertyGroupUniqueID", - "cmsPropertyTypeGroup.sortorder AS PropertyGroupSortOrder", "cmsPropertyTypeGroup.contenttypeNodeId") + .Select(x => x.NodeId) .From() .InnerJoin().On(left => left.NodeId, right => right.NodeId) .LeftJoin().On(left => left.ContentTypeId, right => right.NodeId) - .LeftJoin().On(left => left.PropertyTypeId, right => right.Id) + .LeftJoin().On(left => left.PropertyTypeId, right => right.Id) .LeftJoin().On(left => left.NodeId, right => right.DataTypeId) .LeftJoin().On(left => left.ContentTypeNodeId, right => right.NodeId) .Where(x => x.NodeObjectType == NodeObjectTypeId); @@ -170,7 +104,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement .From() .InnerJoin().On(left => left.NodeId, right => right.NodeId) .LeftJoin().On(left => left.ContentTypeId, right => right.NodeId) - .LeftJoin().On(left => left.PropertyTypeId, right => right.Id) + .LeftJoin().On(left => left.PropertyTypeId, right => right.Id) .LeftJoin().On(left => left.NodeId, right => right.DataTypeId) .LeftJoin().On(left => left.ContentTypeNodeId, right => right.NodeId) .Where(x => x.NodeObjectType == NodeObjectTypeId); @@ -212,12 +146,12 @@ namespace Umbraco.Core.Persistence.Repositories.Implement { entity.AddPropertyType(standardPropertyType.Value, Constants.Conventions.Member.StandardPropertiesGroupName); } - + EnsureExplicitDataTypeForBuiltInProperties(entity); PersistNewBaseContentType(entity); //Handles the MemberTypeDto (cmsMemberType table) - var memberTypeDtos = ContentTypeFactory.BuildMemberTypeDtos(entity); + var memberTypeDtos = ContentTypeFactory.BuildMemberPropertyTypeDtos(entity); foreach (var memberTypeDto in memberTypeDtos) { Database.Insert(memberTypeDto); @@ -245,13 +179,13 @@ namespace Umbraco.Core.Persistence.Repositories.Implement new { ParentId = entity.ParentId, NodeObjectType = NodeObjectTypeId }); entity.SortOrder = maxSortOrder + 1; } - + EnsureExplicitDataTypeForBuiltInProperties(entity); PersistUpdatedBaseContentType(entity); // remove and insert - handle cmsMemberType table - Database.Delete("WHERE NodeId = @Id", new { Id = entity.Id }); - var memberTypeDtos = ContentTypeFactory.BuildMemberTypeDtos(entity); + Database.Delete("WHERE NodeId = @Id", new { Id = entity.Id }); + var memberTypeDtos = ContentTypeFactory.BuildMemberPropertyTypeDtos(entity); foreach (var memberTypeDto in memberTypeDtos) { Database.Insert(memberTypeDto); @@ -264,19 +198,16 @@ namespace Umbraco.Core.Persistence.Repositories.Implement /// Override so we can specify explicit db type's on any property types that are built-in. /// /// - /// + /// /// /// - protected override PropertyType CreatePropertyType(string propertyEditorAlias, ValueStorageType dbType, string propertyTypeAlias) + protected override PropertyType CreatePropertyType(string propertyEditorAlias, ValueStorageType storageType, string propertyTypeAlias) { //custom property type constructor logic to set explicit dbtype's for built in properties - var stdProps = Constants.Conventions.Member.GetStandardPropertyTypeStubs(); - var propDbType = GetDbTypeForBuiltInProperty(propertyTypeAlias, dbType, stdProps); - return new PropertyType(propertyEditorAlias, propDbType.Result, - //This flag tells the property type that it has an explicit dbtype and that it cannot be changed - // which is what we want for the built-in properties. - propDbType.Success, - propertyTypeAlias); + var builtinProperties = Constants.Conventions.Member.GetStandardPropertyTypeStubs(); + var readonlyStorageType = builtinProperties.TryGetValue(propertyTypeAlias, out var propertyType); + storageType = readonlyStorageType ? propertyType.ValueStorageType : storageType; + return new PropertyType(propertyEditorAlias, storageType, readonlyStorageType, propertyTypeAlias); } /// @@ -286,62 +217,15 @@ namespace Umbraco.Core.Persistence.Repositories.Implement /// private static void EnsureExplicitDataTypeForBuiltInProperties(IContentTypeBase memberType) { - var stdProps = Constants.Conventions.Member.GetStandardPropertyTypeStubs(); + var builtinProperties = Constants.Conventions.Member.GetStandardPropertyTypeStubs(); foreach (var propertyType in memberType.PropertyTypes) { - var dbTypeAttempt = GetDbTypeForBuiltInProperty(propertyType.Alias, propertyType.ValueStorageType, stdProps); - if (dbTypeAttempt) + if (builtinProperties.ContainsKey(propertyType.Alias)) { - //this reset's it's current data type reference which will be re-assigned based on the property editor assigned on the next line + //this reset's its current data type reference which will be re-assigned based on the property editor assigned on the next line propertyType.DataTypeId = 0; } } } - - /// - /// Builds a collection of entities from a collection of Dtos - /// - /// - /// - private IEnumerable BuildFromDtos(List dtos) - { - if (dtos == null || dtos.Any() == false) - return Enumerable.Empty(); - - return dtos.Select(x => - { - bool needsSaving; - var memberType = MemberTypeReadOnlyFactory.BuildEntity(x, out needsSaving); - if (needsSaving) PersistUpdatedItem(memberType); - return memberType; - }).ToList(); - } - - /// - /// If this is one of our internal properties - we will manually assign the data type since they must - /// always correspond to the correct db type no matter what the backing data type is assigned. - /// - /// - /// - /// - /// - /// Successful attempt if it was a built in property - /// - internal static Attempt GetDbTypeForBuiltInProperty( - string propAlias, - ValueStorageType dbType, - Dictionary standardProps) - { - var aliases = standardProps.Select(x => x.Key).ToArray(); - - //check if it is built in - if (aliases.Contains(propAlias)) - { - //return the pre-determined db type for this property - return Attempt.Succeed(standardProps.Single(x => x.Key == propAlias).Value.ValueStorageType); - } - - return Attempt.Fail(dbType); - } } } diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/RepositoryBaseOfTIdTEntity.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/RepositoryBaseOfTIdTEntity.cs index a7e366a94f..69e4db5940 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Implement/RepositoryBaseOfTIdTEntity.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Implement/RepositoryBaseOfTIdTEntity.cs @@ -78,51 +78,24 @@ namespace Umbraco.Core.Persistence.Repositories.Implement } } - // TODO: but now that we have 1 unique repository? - // this is a *bad* idea because PerformCount captures the current repository and its UOW - // - //private static RepositoryCachePolicyOptions _defaultOptions; - //protected virtual RepositoryCachePolicyOptions DefaultOptions - //{ - // get - // { - // return _defaultOptions ?? (_defaultOptions - // = new RepositoryCachePolicyOptions(() => - // { - // // get count of all entities of current type (TEntity) to ensure cached result is correct - // // create query once if it is needed (no need for locking here) - query is static! - // var query = _hasIdQuery ?? (_hasIdQuery = Query.Builder.Where(x => x.Id != 0)); - // return PerformCount(query); - // })); - // } - //} - + // ReSharper disable once StaticMemberInGenericType + private static RepositoryCachePolicyOptions _defaultOptions; + // ReSharper disable once InconsistentNaming protected virtual RepositoryCachePolicyOptions DefaultOptions { get { - return new RepositoryCachePolicyOptions(() => - { - // get count of all entities of current type (TEntity) to ensure cached result is correct - // create query once if it is needed (no need for locking here) - query is static! - var query = _hasIdQuery ?? (_hasIdQuery = AmbientScope.SqlContext.Query().Where(x => x.Id != 0)); - return PerformCount(query); - }); + return _defaultOptions ?? (_defaultOptions + = new RepositoryCachePolicyOptions(() => + { + // get count of all entities of current type (TEntity) to ensure cached result is correct + // create query once if it is needed (no need for locking here) - query is static! + var query = _hasIdQuery ?? (_hasIdQuery = AmbientScope.SqlContext.Query().Where(x => x.Id != 0)); + return PerformCount(query); + })); } } - // this would be better for perfs BUT it breaks the tests - l8tr - // - //private static IRepositoryCachePolicy _defaultCachePolicy; - //protected virtual IRepositoryCachePolicy DefaultCachePolicy - //{ - // get - // { - // return _defaultCachePolicy ?? (_defaultCachePolicy - // = new DefaultRepositoryCachePolicy(IsolatedCache, DefaultOptions)); - // } - //} - protected IRepositoryCachePolicy CachePolicy { get diff --git a/src/Umbraco.Core/Runtime/CoreInitialComponent.cs b/src/Umbraco.Core/Runtime/CoreInitialComponent.cs index 20fee7a299..2e40bf1339 100644 --- a/src/Umbraco.Core/Runtime/CoreInitialComponent.cs +++ b/src/Umbraco.Core/Runtime/CoreInitialComponent.cs @@ -1,28 +1,12 @@ -using System.Collections.Generic; -using AutoMapper; -using Umbraco.Core.Composing; +using Umbraco.Core.Composing; using Umbraco.Core.IO; namespace Umbraco.Core.Runtime { public class CoreInitialComponent : IComponent { - private readonly IEnumerable _mapperProfiles; - - public CoreInitialComponent(IEnumerable mapperProfiles) - { - _mapperProfiles = mapperProfiles; - } - public void Initialize() { - // mapper profiles have been registered & are created by the container - Mapper.Initialize(configuration => - { - foreach (var profile in _mapperProfiles) - configuration.AddProfile(profile); - }); - // ensure we have some essential directories // every other component can then initialize safely IOHelper.EnsurePathExists("~/App_Data"); diff --git a/src/Umbraco.Core/Runtime/CoreRuntime.cs b/src/Umbraco.Core/Runtime/CoreRuntime.cs index f00365496a..f9a41b4f66 100644 --- a/src/Umbraco.Core/Runtime/CoreRuntime.cs +++ b/src/Umbraco.Core/Runtime/CoreRuntime.cs @@ -1,10 +1,8 @@ using System; using System.Collections.Generic; using System.Diagnostics; -using System.Linq; -using System.Reflection; -using System.Threading; using System.Web; +using System.Web.Hosting; using Umbraco.Core.Cache; using Umbraco.Core.Composing; using Umbraco.Core.Configuration; @@ -12,10 +10,8 @@ using Umbraco.Core.Exceptions; using Umbraco.Core.IO; using Umbraco.Core.Logging; using Umbraco.Core.Logging.Serilog; -using Umbraco.Core.Migrations.Upgrade; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Mappers; -using Umbraco.Core.Services.Implement; using Umbraco.Core.Sync; namespace Umbraco.Core.Runtime @@ -70,15 +66,19 @@ namespace Umbraco.Core.Runtime // objects. using (var timer = profilingLogger.TraceDuration( - $"Booting Umbraco {UmbracoVersion.SemanticVersion.ToSemanticString()} on {NetworkHelper.MachineName}.", + $"Booting Umbraco {UmbracoVersion.SemanticVersion.ToSemanticString()}.", "Booted.", "Boot failed.")) { + logger.Info("Booting site '{HostingSiteName}', app '{HostingApplicationID}', path '{HostingPhysicalPath}', server '{MachineName}'.", + HostingEnvironment.SiteName, + HostingEnvironment.ApplicationID, + HostingEnvironment.ApplicationPhysicalPath, + NetworkHelper.MachineName); logger.Debug("Runtime: {Runtime}", GetType().FullName); // application environment ConfigureUnhandledException(); - ConfigureAssemblyResolve(); ConfigureApplicationRootPath(); Boot(register, timer); @@ -211,20 +211,6 @@ namespace Umbraco.Core.Runtime }; } - protected virtual void ConfigureAssemblyResolve() - { - // When an assembly can't be resolved. In here we can do magic with the assembly name and try loading another. - // This is used for loading a signed assembly of AutoMapper (v. 3.1+) without having to recompile old code. - AppDomain.CurrentDomain.AssemblyResolve += (sender, args) => - { - // ensure the assembly is indeed AutoMapper and that the PublicKeyToken is null before trying to Load again - // do NOT just replace this with 'return Assembly', as it will cause an infinite loop -> stack overflow - if (args.Name.StartsWith("AutoMapper") && args.Name.EndsWith("PublicKeyToken=null")) - return Assembly.Load(args.Name.Replace(", PublicKeyToken=null", ", PublicKeyToken=be96cd2c38ef1005")); - return null; - }; - } - protected virtual void ConfigureApplicationRootPath() { var path = GetApplicationRootPath(); diff --git a/src/Umbraco.Core/RuntimeState.cs b/src/Umbraco.Core/RuntimeState.cs index 55255b418d..6fb8a04c0d 100644 --- a/src/Umbraco.Core/RuntimeState.cs +++ b/src/Umbraco.Core/RuntimeState.cs @@ -252,7 +252,7 @@ namespace Umbraco.Core FinalMigrationState = upgrader.Plan.FinalState; } - logger.Debug("Final upgrade state is {FinalMigrationState}, database contains {DatabaseState}", CurrentMigrationState, FinalMigrationState ?? ""); + logger.Debug("Final upgrade state is {FinalMigrationState}, database contains {DatabaseState}", FinalMigrationState, CurrentMigrationState ?? ""); return CurrentMigrationState == FinalMigrationState; } diff --git a/src/Umbraco.Core/Security/BackOfficeUserStore.cs b/src/Umbraco.Core/Security/BackOfficeUserStore.cs index 3d87482d60..085a7b7a5b 100644 --- a/src/Umbraco.Core/Security/BackOfficeUserStore.cs +++ b/src/Umbraco.Core/Security/BackOfficeUserStore.cs @@ -1,15 +1,13 @@ using System; using System.Collections.Generic; using System.Data; -using System.Data.Common; using System.Linq; using System.Threading.Tasks; using System.Web.Security; -using AutoMapper; using Microsoft.AspNet.Identity; -using Microsoft.Owin; using Umbraco.Core.Configuration; using Umbraco.Core.Exceptions; +using Umbraco.Core.Mapping; using Umbraco.Core.Models; using Umbraco.Core.Models.Identity; using Umbraco.Core.Models.Membership; @@ -19,7 +17,7 @@ using Task = System.Threading.Tasks.Task; namespace Umbraco.Core.Security { - public class BackOfficeUserStore : DisposableObjectSlim, + public class BackOfficeUserStore : DisposableObjectSlim, IUserStore, IUserPasswordStore, IUserEmailStore, @@ -40,9 +38,10 @@ namespace Umbraco.Core.Security private readonly IEntityService _entityService; private readonly IExternalLoginService _externalLoginService; private readonly IGlobalSettings _globalSettings; + private readonly UmbracoMapper _mapper; private bool _disposed = false; - public BackOfficeUserStore(IUserService userService, IMemberTypeService memberTypeService, IEntityService entityService, IExternalLoginService externalLoginService, IGlobalSettings globalSettings, MembershipProviderBase usersMembershipProvider) + public BackOfficeUserStore(IUserService userService, IMemberTypeService memberTypeService, IEntityService entityService, IExternalLoginService externalLoginService, IGlobalSettings globalSettings, MembershipProviderBase usersMembershipProvider, UmbracoMapper mapper) { _userService = userService; _memberTypeService = memberTypeService; @@ -52,6 +51,7 @@ namespace Umbraco.Core.Security if (userService == null) throw new ArgumentNullException("userService"); if (usersMembershipProvider == null) throw new ArgumentNullException("usersMembershipProvider"); if (externalLoginService == null) throw new ArgumentNullException("externalLoginService"); + _mapper = mapper; _userService = userService; _externalLoginService = externalLoginService; @@ -185,7 +185,8 @@ namespace Umbraco.Core.Security { return null; } - return await Task.FromResult(AssignLoginsCallback(Mapper.Map(user))); + + return await Task.FromResult(AssignLoginsCallback(_mapper.Map(user))); } /// @@ -202,7 +203,7 @@ namespace Umbraco.Core.Security return null; } - var result = AssignLoginsCallback(Mapper.Map(user)); + var result = AssignLoginsCallback(_mapper.Map(user)); return await Task.FromResult(result); } @@ -314,7 +315,7 @@ namespace Umbraco.Core.Security var user = _userService.GetByEmail(email); var result = user == null ? null - : Mapper.Map(user); + : _mapper.Map(user); return Task.FromResult(AssignLoginsCallback(result)); } @@ -391,7 +392,7 @@ namespace Umbraco.Core.Security var user = _userService.GetUserById(l.UserId); if (user != null) { - output = Mapper.Map(user); + output = _mapper.Map(user); break; } } diff --git a/src/Umbraco.Core/Services/Implement/DataTypeService.cs b/src/Umbraco.Core/Services/Implement/DataTypeService.cs index 445daddff4..3552b2d8fc 100644 --- a/src/Umbraco.Core/Services/Implement/DataTypeService.cs +++ b/src/Umbraco.Core/Services/Implement/DataTypeService.cs @@ -424,7 +424,6 @@ namespace Umbraco.Core.Services.Implement return; } - // find ContentTypes using this IDataTypeDefinition on a PropertyType, and delete // TODO: media and members?! // TODO: non-group properties?! diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index a29cc3647a..68091fb3a9 100755 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -55,7 +55,11 @@ - + + 1.0.5 + runtime; build; native; contentfiles; analyzers + all + @@ -208,10 +212,18 @@ + + + + + + + + @@ -441,7 +453,7 @@ - + @@ -855,8 +867,7 @@ - - + @@ -951,7 +962,6 @@ - diff --git a/src/Umbraco.Tests/App.config b/src/Umbraco.Tests/App.config index 49de625450..91047ba6a2 100644 --- a/src/Umbraco.Tests/App.config +++ b/src/Umbraco.Tests/App.config @@ -54,62 +54,46 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Umbraco.Tests/Mapping/MappingTests.cs b/src/Umbraco.Tests/Mapping/MappingTests.cs new file mode 100644 index 0000000000..3435050cc5 --- /dev/null +++ b/src/Umbraco.Tests/Mapping/MappingTests.cs @@ -0,0 +1,148 @@ +using System.Collections.Generic; +using System.Linq; +using NUnit.Framework; +using Umbraco.Core.Mapping; +using Umbraco.Core.Models; +using Umbraco.Web.Models.ContentEditing; + +namespace Umbraco.Tests.Mapping +{ + [TestFixture] + public class MappingTests + { + [Test] + public void SimpleMap() + { + var definitions = new MapDefinitionCollection(new IMapDefinition[] + { + new MapperDefinition1(), + }); + var mapper = new UmbracoMapper(definitions); + + var thing1 = new Thing1 { Value = "value" }; + var thing2 = mapper.Map(thing1); + + Assert.IsNotNull(thing2); + Assert.AreEqual("value", thing2.Value); + + thing2 = mapper.Map(thing1); + + Assert.IsNotNull(thing2); + Assert.AreEqual("value", thing2.Value); + + thing2 = new Thing2(); + mapper.Map(thing1, thing2); + Assert.AreEqual("value", thing2.Value); + } + + [Test] + public void EnumerableMap() + { + var definitions = new MapDefinitionCollection(new IMapDefinition[] + { + new MapperDefinition1(), + }); + var mapper = new UmbracoMapper(definitions); + + var thing1A = new Thing1 { Value = "valueA" }; + var thing1B = new Thing1 { Value = "valueB" }; + var thing1 = new[] { thing1A, thing1B }; + var thing2 = mapper.Map, IEnumerable>(thing1).ToList(); + + Assert.IsNotNull(thing2); + Assert.AreEqual(2, thing2.Count); + Assert.AreEqual("valueA", thing2[0].Value); + Assert.AreEqual("valueB", thing2[1].Value); + + thing2 = mapper.Map>(thing1).ToList(); + + Assert.IsNotNull(thing2); + Assert.AreEqual(2, thing2.Count); + Assert.AreEqual("valueA", thing2[0].Value); + Assert.AreEqual("valueB", thing2[1].Value); + + thing2 = mapper.MapEnumerable(thing1).ToList(); + + Assert.IsNotNull(thing2); + Assert.AreEqual(2, thing2.Count); + Assert.AreEqual("valueA", thing2[0].Value); + Assert.AreEqual("valueB", thing2[1].Value); + } + + [Test] + public void InheritedMap() + { + var definitions = new MapDefinitionCollection(new IMapDefinition[] + { + new MapperDefinition1(), + }); + var mapper = new UmbracoMapper(definitions); + + var thing3 = new Thing3 { Value = "value" }; + var thing2 = mapper.Map(thing3); + + Assert.IsNotNull(thing2); + Assert.AreEqual("value", thing2.Value); + + thing2 = mapper.Map(thing3); + + Assert.IsNotNull(thing2); + Assert.AreEqual("value", thing2.Value); + + thing2 = new Thing2(); + mapper.Map(thing3, thing2); + Assert.AreEqual("value", thing2.Value); + } + + [Test] + public void CollectionsMap() + { + var definitions = new MapDefinitionCollection(new IMapDefinition[] + { + new MapperDefinition2(), + }); + var mapper = new UmbracoMapper(definitions); + + // can map a PropertyCollection + var source = new PropertyCollection(); + var target = mapper.Map>(source); + } + + private class Thing1 + { + public string Value { get; set; } + } + + private class Thing3 : Thing1 + { } + + private class Thing2 + { + public string Value { get; set; } + } + + private class MapperDefinition1 : IMapDefinition + { + public void DefineMaps(UmbracoMapper mapper) + { + mapper.Define((source, context) => new Thing2(), Map); + } + + private void Map(Thing1 source, Thing2 target, MapperContext context) + { + target.Value = source.Value; + } + } + + private class MapperDefinition2 : IMapDefinition + { + public void DefineMaps(UmbracoMapper mapper) + { + mapper.Define((source, context) => new ContentPropertyDto(), Map); + } + + private static void Map(Property source, ContentPropertyDto target, MapperContext context) + { } + } + } +} diff --git a/src/Umbraco.Tests/Models/Mapping/AutoMapper6Tests.cs b/src/Umbraco.Tests/Models/Mapping/AutoMapper6Tests.cs deleted file mode 100644 index 18bceaae49..0000000000 --- a/src/Umbraco.Tests/Models/Mapping/AutoMapper6Tests.cs +++ /dev/null @@ -1,198 +0,0 @@ -using System; -using AutoMapper; -using NUnit.Framework; - -namespace Umbraco.Tests.Models.Mapping -{ - [TestFixture] - public class AutoMapper6Tests - { - [Test] - public void Test1() - { - ThingProfile.CtorCount = 0; - Assert.AreEqual(0, ThingProfile.CtorCount); - - var config = new MapperConfiguration(cfg => - { - cfg.AddProfile(); - }); - - Assert.AreEqual(1, ThingProfile.CtorCount); - Assert.AreEqual(0, MemberValueResolver.CtorCount); - - var mapper = config.CreateMapper(); - - Assert.AreEqual(1, ThingProfile.CtorCount); - Assert.AreEqual(0, MemberValueResolver.CtorCount); - - var thingA = new ThingA { ValueInt = 42, ValueString = "foo" }; - var thingB = mapper.Map(thingA); - Assert.AreEqual(42, thingB.ValueInt); - Assert.AreEqual("!!foo!!", thingB.ValueString); - - mapper.Map(thingA); - mapper.Map(thingA); - mapper.Map(thingA); - Assert.AreEqual(1, ThingProfile.CtorCount); // one single profile - Assert.AreEqual(4, MemberValueResolver.CtorCount); // many resolvers - } - - [Test] - public void Test2() - { - var config = new MapperConfiguration(cfg => - { - cfg.AddProfile(); - }); - - var mapper = config.CreateMapper(); - - Assert.AreEqual(0, ValueResolver.CtorCount); - - var thingA = new ThingA { ValueInt = 42, ValueString = "foo" }; - var thingB = mapper.Map(thingA); - Assert.AreEqual(42, thingB.ValueInt); - Assert.AreEqual("!!foo!!", thingB.ValueString); - - mapper.Map(thingA); - mapper.Map(thingA); - mapper.Map(thingA); - Assert.AreEqual(4, ValueResolver.CtorCount); // many resolvers - } - - [Test] - public void Test3() - { - var config = new MapperConfiguration(cfg => - { - cfg.AddProfile(); - }); - - var mapper = config.CreateMapper(); - - var thingA = new ThingA { ValueInt = 42, ValueString = "foo" }; - var thingB = mapper.Map(thingA); - Assert.AreEqual(42, thingB.ValueInt); - Assert.AreEqual("!!foo!!", thingB.ValueString); - - mapper.Map(thingA); - mapper.Map(thingA); - mapper.Map(thingA); - } - - // Resolve destination member using a custom value resolver - // void ResolveUsing() - // where TValueResolver : IValueResolver; - - // Resolve destination member using a custom value resolver from a source member - // void ResolveUsing(Expression> sourceMember) - // where TValueResolver : IMemberValueResolver; - // void ResolveUsing(string sourceMemberName) - // where TValueResolver : IMemberValueResolver; - - // Resolve destination member using a custom value resolver instance - // void ResolveUsing(IValueResolver valueResolver); - // void ResolveUsing(IMemberValueResolver valueResolver, Expression> sourceMember); - - // Resolve destination member using a custom value resolver callback - // void ResolveUsing(Func resolver); - // void ResolveUsing(Func resolver); - // void ResolveUsing(Func resolver); - // void ResolveUsing(Func resolver); - - // read https://stackoverflow.com/questions/14875075/automapper-what-is-the-difference-between-mapfrom-and-resolveusing - // about the diff between MapFrom and ResolveUsing... keeping ResolveUsing in our code - - public class ThingProfile : Profile - { - public static int CtorCount { get; set; } - - public ThingProfile(int ver) - { - CtorCount++; - - var map = CreateMap() - .ForMember(dest => dest.ValueInt, opt => opt.MapFrom(src => src.ValueInt)); - - switch (ver) - { - case 0: - break; - case 1: - map - .ForMember(dest => dest.ValueString, opt => opt.MapFrom(src => src.ValueString)); - break; - case 2: - map - .ForMember(dest => dest.ValueString, opt => opt.MapFrom()); - break; - case 3: - // in most cases that should be perfectly enough? - map - .ForMember(dest => dest.ValueString, opt => opt.MapFrom(source => "!!" + source.ValueString + "!!")); - break; - default: - throw new ArgumentOutOfRangeException(nameof(ver)); - } - } - } - - public class ThingProfile1 : ThingProfile - { - public ThingProfile1() : base(1) { } - } - - public class ThingProfile2 : ThingProfile - { - public ThingProfile2() : base(2) { } - } - - public class ThingProfile3 : ThingProfile - { - public ThingProfile3() : base(3) { } - } - - public class ValueResolver : IValueResolver - { - public static int CtorCount { get; set; } - - public ValueResolver() - { - CtorCount++; - } - - public string Resolve(ThingA source, ThingB destination, string destMember, ResolutionContext context) - { - return "!!" + source.ValueString + "!!"; - } - } - - public class MemberValueResolver : IMemberValueResolver - { - public static int CtorCount { get; set; } - - public MemberValueResolver() - { - CtorCount++; - } - - public string Resolve(ThingA source, ThingB destination, string sourceMember, string destMember, ResolutionContext context) - { - return "!!" + sourceMember + "!!"; - } - } - - public class ThingA - { - public int ValueInt { get; set; } - public string ValueString { get; set; } - } - - public class ThingB - { - public int ValueInt { get; set; } - public string ValueString { get; set; } - } - } -} diff --git a/src/Umbraco.Tests/Models/Mapping/AutoMapperTests.cs b/src/Umbraco.Tests/Models/Mapping/AutoMapperTests.cs deleted file mode 100644 index 57d38e342e..0000000000 --- a/src/Umbraco.Tests/Models/Mapping/AutoMapperTests.cs +++ /dev/null @@ -1,86 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using AutoMapper; -using NUnit.Framework; -using Umbraco.Core.Cache; -using Umbraco.Core.Manifest; -using Umbraco.Core.PropertyEditors; -using Umbraco.Tests.TestHelpers; -using Umbraco.Tests.Testing; - -namespace Umbraco.Tests.Models.Mapping -{ - [TestFixture] - [UmbracoTest(WithApplication = true)] - public class AutoMapperTests : UmbracoTestBase - { - protected override void Compose() - { - base.Compose(); - - var manifestBuilder = new ManifestParser( - AppCaches.Disabled, - new ManifestValueValidatorCollection(Enumerable.Empty()), - Composition.Logger) - { - Path = TestHelper.CurrentAssemblyDirectory - }; - Composition.RegisterUnique(_ => manifestBuilder); - - Func> typeListProducerList = Enumerable.Empty; - Composition.WithCollectionBuilder() - .Clear() - .Add(typeListProducerList); - } - - [Test] - public void AssertConfigurationIsValid() - { - var profiles = Factory.GetAllInstances().ToArray(); - - var config = new MapperConfiguration(cfg => - { - foreach (var profile in profiles) - cfg.AddProfile(profile); - }); - - // validate each profile (better granularity for error reports) - - Console.WriteLine("Validate each profile:"); - foreach (var profile in profiles) - { - try - { - config.AssertConfigurationIsValid(profile.GetType().FullName); - //Console.WriteLine("OK " + profile.GetType().FullName); - } - catch (Exception e) - { - Console.WriteLine("KO " + profile.GetType().FullName); - Console.WriteLine(e); - } - } - - Console.WriteLine(); - Console.WriteLine("Validate each profile and throw:"); - foreach (var profile in profiles) - { - try - { - config.AssertConfigurationIsValid(profile.GetType().FullName); - } - catch - { - Console.WriteLine("KO " + profile.GetType().FullName); - throw; - } - } - - // validate the global config - Console.WriteLine(); - Console.WriteLine("Validate global config:"); - config.AssertConfigurationIsValid(); - } - } -} diff --git a/src/Umbraco.Tests/Models/Mapping/ContentTypeModelMappingTests.cs b/src/Umbraco.Tests/Models/Mapping/ContentTypeModelMappingTests.cs index 2e6cfaae89..21180ce51b 100644 --- a/src/Umbraco.Tests/Models/Mapping/ContentTypeModelMappingTests.cs +++ b/src/Umbraco.Tests/Models/Mapping/ContentTypeModelMappingTests.cs @@ -1,6 +1,5 @@ using System; using System.Linq; -using AutoMapper; using Moq; using NUnit.Framework; using Umbraco.Core; @@ -11,7 +10,6 @@ using Umbraco.Core.Services; using Umbraco.Tests.TestHelpers.Entities; using Umbraco.Tests.Testing; using Umbraco.Web.Models.ContentEditing; -using Umbraco.Web.Models.Mapping; using Umbraco.Web.PropertyEditors; namespace Umbraco.Tests.Models.Mapping @@ -28,22 +26,6 @@ namespace Umbraco.Tests.Models.Mapping private readonly Mock _fileService = new Mock(); private Mock _editorsMock; - public override void SetUp() - { - base.SetUp(); - - // FIXME: are we initializing mappers that... have already been? - Mapper.Reset(); - Mapper.Initialize(configuration => - { - //initialize our content type mapper - var profile1 = new ContentTypeMapperProfile(_editorsMock.Object, _dataTypeService.Object, _fileService.Object, _contentTypeService.Object, Mock.Of(), Mock.Of()); - configuration.AddProfile(profile1); - var profile2 = new EntityMapperProfile(); - configuration.AddProfile(profile2); - }); - } - protected override void Compose() { base.Compose(); diff --git a/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs b/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs index 7ebdfabbb0..6a4054d5ae 100644 --- a/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs +++ b/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs @@ -1,6 +1,5 @@ using System.Globalization; using System.Linq; -using AutoMapper; using Moq; using NUnit.Framework; using Umbraco.Core; @@ -22,7 +21,7 @@ using Current = Umbraco.Web.Composing.Current; namespace Umbraco.Tests.Models.Mapping { [TestFixture] - [UmbracoTest(AutoMapper = true, Database = UmbracoTestOptions.Database.NewSchemaPerFixture)] + [UmbracoTest(Mapper = true, Database = UmbracoTestOptions.Database.NewSchemaPerFixture)] public class ContentWebModelMappingTests : TestWithDatabaseBase { private IContentTypeService _contentTypeService; diff --git a/src/Umbraco.Tests/Models/Mapping/UserModelMapperTests.cs b/src/Umbraco.Tests/Models/Mapping/UserModelMapperTests.cs index bdab736cd1..797fce2bd1 100644 --- a/src/Umbraco.Tests/Models/Mapping/UserModelMapperTests.cs +++ b/src/Umbraco.Tests/Models/Mapping/UserModelMapperTests.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using AutoMapper; using Newtonsoft.Json; using NUnit.Framework; using Umbraco.Core.Models.Membership; @@ -10,7 +9,7 @@ using Umbraco.Web.Models.ContentEditing; namespace Umbraco.Tests.Models.Mapping { [TestFixture] - [UmbracoTest(AutoMapper = true, Database = UmbracoTestOptions.Database.NewSchemaPerFixture)] + [UmbracoTest(Mapper = true, Database = UmbracoTestOptions.Database.NewSchemaPerFixture)] public class UserModelMapperTests : TestWithDatabaseBase { [Test] diff --git a/src/Umbraco.Tests/Persistence/Querying/ContentTypeSqlMappingTests.cs b/src/Umbraco.Tests/Persistence/Querying/ContentTypeSqlMappingTests.cs index ce6447f4b5..fcf64641c8 100644 --- a/src/Umbraco.Tests/Persistence/Querying/ContentTypeSqlMappingTests.cs +++ b/src/Umbraco.Tests/Persistence/Querying/ContentTypeSqlMappingTests.cs @@ -1,200 +1,199 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using NPoco; -using NUnit.Framework; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Persistence.Dtos; -using Umbraco.Core.Persistence.Repositories; -using Umbraco.Core.Persistence.Repositories.Implement; -using Umbraco.Tests.TestHelpers; -using Umbraco.Tests.Testing; +// fixme - does it make any sense to keep these tests here? +//using System; +//using System.Collections.Generic; +//using System.Linq; +//using NPoco; +//using NUnit.Framework; +//using Umbraco.Core; +//using Umbraco.Core.Models; +//using Umbraco.Core.Persistence.Dtos; +//using Umbraco.Core.Persistence.Repositories; +//using Umbraco.Core.Persistence.Repositories.Implement; +//using Umbraco.Tests.TestHelpers; +//using Umbraco.Tests.Testing; -namespace Umbraco.Tests.Persistence.Querying -{ - [TestFixture] - [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] - public class ContentTypeSqlMappingTests : TestWithDatabaseBase - { - [Test] - public void Can_Map_Content_Type_Templates_And_Allowed_Types() - { - IDictionary> allAssociatedTemplates; - IDictionary> allParentContentTypeIds; - IContentType[] contentTypes; +//namespace Umbraco.Tests.Persistence.Querying +//{ +// [TestFixture] +// [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] +// public class ContentTypeSqlMappingTests : TestWithDatabaseBase +// { +// [Test] +// public void Can_Map_Content_Type_Templates_And_Allowed_Types() +// { +// IDictionary.AssociatedTemplate>> allAssociatedTemplates; +// IDictionary> allParentContentTypeIds; +// IContentType[] contentTypes; - using (var scope = ScopeProvider.CreateScope()) - { - scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} ON ", SqlSyntax.GetQuotedTableName("umbracoNode")))); - scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 55554, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,55554", SortOrder = 1, UniqueId = new Guid("87D1EAB6-AB27-4852-B3DF-DE8DBA4A1AA0"), Text = "Template 1", NodeObjectType = Constants.ObjectTypes.Template, CreateDate = DateTime.Now }); - scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 55555, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,55555", SortOrder = 1, UniqueId = new Guid("3390BDF4-C974-4211-AA95-3812A8CE7C46"), Text = "Template 2", NodeObjectType = Constants.ObjectTypes.Template, CreateDate = DateTime.Now }); - scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 99997, Trashed = false, ParentId = -1, UserId = -1, Level = 0, Path = "-1,99997", SortOrder = 0, UniqueId = new Guid("BB3241D5-6842-4EFA-A82A-5F56885CF528"), Text = "Test Content Type 1", NodeObjectType = Constants.ObjectTypes.DocumentType, CreateDate = DateTime.Now }); - scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 99998, Trashed = false, ParentId = -1, UserId = -1, Level = 0, Path = "-1,99998", SortOrder = 0, UniqueId = new Guid("EEA66B06-302E-49BA-A8B2-EDF07248BC59"), Text = "Test Content Type 2", NodeObjectType = Constants.ObjectTypes.DocumentType, CreateDate = DateTime.Now }); - scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 99999, Trashed = false, ParentId = -1, UserId = -1, Level = 0, Path = "-1,99999", SortOrder = 0, UniqueId = new Guid("C45CC083-BB27-4C1C-B448-6F703CC9B799"), Text = "Test Content Type 2", NodeObjectType = Constants.ObjectTypes.DocumentType, CreateDate = DateTime.Now }); - scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} OFF ", SqlSyntax.GetQuotedTableName("umbracoNode")))); +// using (var scope = ScopeProvider.CreateScope()) +// { +// scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} ON ", SqlSyntax.GetQuotedTableName("umbracoNode")))); +// scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 55554, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,55554", SortOrder = 1, UniqueId = new Guid("87D1EAB6-AB27-4852-B3DF-DE8DBA4A1AA0"), Text = "Template 1", NodeObjectType = Constants.ObjectTypes.Template, CreateDate = DateTime.Now }); +// scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 55555, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,55555", SortOrder = 1, UniqueId = new Guid("3390BDF4-C974-4211-AA95-3812A8CE7C46"), Text = "Template 2", NodeObjectType = Constants.ObjectTypes.Template, CreateDate = DateTime.Now }); +// scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 99997, Trashed = false, ParentId = -1, UserId = -1, Level = 0, Path = "-1,99997", SortOrder = 0, UniqueId = new Guid("BB3241D5-6842-4EFA-A82A-5F56885CF528"), Text = "Test Content Type 1", NodeObjectType = Constants.ObjectTypes.DocumentType, CreateDate = DateTime.Now }); +// scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 99998, Trashed = false, ParentId = -1, UserId = -1, Level = 0, Path = "-1,99998", SortOrder = 0, UniqueId = new Guid("EEA66B06-302E-49BA-A8B2-EDF07248BC59"), Text = "Test Content Type 2", NodeObjectType = Constants.ObjectTypes.DocumentType, CreateDate = DateTime.Now }); +// scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 99999, Trashed = false, ParentId = -1, UserId = -1, Level = 0, Path = "-1,99999", SortOrder = 0, UniqueId = new Guid("C45CC083-BB27-4C1C-B448-6F703CC9B799"), Text = "Test Content Type 2", NodeObjectType = Constants.ObjectTypes.DocumentType, CreateDate = DateTime.Now }); +// scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} OFF ", SqlSyntax.GetQuotedTableName("umbracoNode")))); - scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} ON ", SqlSyntax.GetQuotedTableName("cmsTemplate")))); - scope.Database.Insert("cmsTemplate", "pk", false, new TemplateDto { NodeId = 55554, Alias = "testTemplate1", PrimaryKey = 22221}); - scope.Database.Insert("cmsTemplate", "pk", false, new TemplateDto { NodeId = 55555, Alias = "testTemplate2", PrimaryKey = 22222 }); - scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} OFF ", SqlSyntax.GetQuotedTableName("cmsTemplate")))); +// scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} ON ", SqlSyntax.GetQuotedTableName("cmsTemplate")))); +// scope.Database.Insert("cmsTemplate", "pk", false, new TemplateDto { NodeId = 55554, Alias = "testTemplate1", PrimaryKey = 22221}); +// scope.Database.Insert("cmsTemplate", "pk", false, new TemplateDto { NodeId = 55555, Alias = "testTemplate2", PrimaryKey = 22222 }); +// scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} OFF ", SqlSyntax.GetQuotedTableName("cmsTemplate")))); - scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} ON ", SqlSyntax.GetQuotedTableName("cmsContentType")))); - scope.Database.Insert("cmsContentType", "pk", false, new ContentTypeDto { PrimaryKey = 88887, NodeId = 99997, Alias = "TestContentType1", Icon = "icon-folder", Thumbnail = "folder.png", IsContainer = false, AllowAtRoot = true }); - scope.Database.Insert("cmsContentType", "pk", false, new ContentTypeDto { PrimaryKey = 88888, NodeId = 99998, Alias = "TestContentType2", Icon = "icon-folder", Thumbnail = "folder.png", IsContainer = false, AllowAtRoot = true }); - scope.Database.Insert("cmsContentType", "pk", false, new ContentTypeDto { PrimaryKey = 88889, NodeId = 99999, Alias = "TestContentType3", Icon = "icon-folder", Thumbnail = "folder.png", IsContainer = false, AllowAtRoot = true }); - scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} OFF ", SqlSyntax.GetQuotedTableName("cmsContentType")))); +// scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} ON ", SqlSyntax.GetQuotedTableName("cmsContentType")))); +// scope.Database.Insert("cmsContentType", "pk", false, new ContentTypeDto { PrimaryKey = 88887, NodeId = 99997, Alias = "TestContentType1", Icon = "icon-folder", Thumbnail = "folder.png", IsContainer = false, AllowAtRoot = true }); +// scope.Database.Insert("cmsContentType", "pk", false, new ContentTypeDto { PrimaryKey = 88888, NodeId = 99998, Alias = "TestContentType2", Icon = "icon-folder", Thumbnail = "folder.png", IsContainer = false, AllowAtRoot = true }); +// scope.Database.Insert("cmsContentType", "pk", false, new ContentTypeDto { PrimaryKey = 88889, NodeId = 99999, Alias = "TestContentType3", Icon = "icon-folder", Thumbnail = "folder.png", IsContainer = false, AllowAtRoot = true }); +// scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} OFF ", SqlSyntax.GetQuotedTableName("cmsContentType")))); - scope.Database.Insert(new ContentTypeTemplateDto { ContentTypeNodeId = 99997, IsDefault = true, TemplateNodeId = 55555 }); - scope.Database.Insert(new ContentTypeTemplateDto { ContentTypeNodeId = 99997, IsDefault = false, TemplateNodeId = 55554 }); +// scope.Database.Insert(new ContentTypeTemplateDto { ContentTypeNodeId = 99997, IsDefault = true, TemplateNodeId = 55555 }); +// scope.Database.Insert(new ContentTypeTemplateDto { ContentTypeNodeId = 99997, IsDefault = false, TemplateNodeId = 55554 }); - scope.Database.Insert(new ContentTypeAllowedContentTypeDto { AllowedId = 99998, Id = 99997, SortOrder = 1 }); - scope.Database.Insert(new ContentTypeAllowedContentTypeDto { AllowedId = 99999, Id = 99997, SortOrder = 2}); +// scope.Database.Insert(new ContentTypeAllowedContentTypeDto { AllowedId = 99998, Id = 99997, SortOrder = 1 }); +// scope.Database.Insert(new ContentTypeAllowedContentTypeDto { AllowedId = 99999, Id = 99997, SortOrder = 2}); - scope.Database.Insert(new ContentType2ContentTypeDto { ChildId = 99999, ParentId = 99997}); - scope.Database.Insert(new ContentType2ContentTypeDto { ChildId = 99998, ParentId = 99997 }); +// scope.Database.Insert(new ContentType2ContentTypeDto { ChildId = 99999, ParentId = 99997}); +// scope.Database.Insert(new ContentType2ContentTypeDto { ChildId = 99998, ParentId = 99997 }); - contentTypes = ContentTypeRepository.ContentTypeQueryMapper.MapContentTypes( - scope.Database, SqlSyntax, out allAssociatedTemplates, out allParentContentTypeIds) - .Where(x => new[] { 99997, 99998 }.Contains(x.Id)) - .ToArray(); +// contentTypes = ContentTypeQueryMapper.GetContentTypes( +// scope.Database, out allAssociatedTemplates, out allParentContentTypeIds) +// .Where(x => new[] { 99997, 99998 }.Contains(x.Id)) +// .ToArray(); - scope.Complete(); - } +// scope.Complete(); +// } - var contentType1 = contentTypes.SingleOrDefault(x => x.Id == 99997); - Assert.IsNotNull(contentType1); +// var contentType1 = contentTypes.SingleOrDefault(x => x.Id == 99997); +// Assert.IsNotNull(contentType1); - var associatedTemplates1 = allAssociatedTemplates[contentType1.Id]; - var parentContentTypes1 = allParentContentTypeIds[contentType1.Id]; +// var associatedTemplates1 = allAssociatedTemplates[contentType1.Id]; +// var parentContentTypes1 = allParentContentTypeIds[contentType1.Id]; - Assert.AreEqual(2, contentType1.AllowedContentTypes.Count()); - Assert.AreEqual(2, associatedTemplates1.Count()); - Assert.AreEqual(0, parentContentTypes1.Count()); +// Assert.AreEqual(2, contentType1.AllowedContentTypes.Count()); +// Assert.AreEqual(2, associatedTemplates1.Count()); +// Assert.AreEqual(0, parentContentTypes1.Count()); - var contentType2 = contentTypes.SingleOrDefault(x => x.Id == 99998); - Assert.IsNotNull(contentType2); +// var contentType2 = contentTypes.SingleOrDefault(x => x.Id == 99998); +// Assert.IsNotNull(contentType2); - var associatedTemplates2 = allAssociatedTemplates[contentType2.Id]; - var parentContentTypes2 = allParentContentTypeIds[contentType2.Id]; +// var associatedTemplates2 = allAssociatedTemplates[contentType2.Id]; +// var parentContentTypes2 = allParentContentTypeIds[contentType2.Id]; - Assert.AreEqual(0, contentType2.AllowedContentTypes.Count()); - Assert.AreEqual(0, associatedTemplates2.Count()); - Assert.AreEqual(1, parentContentTypes2.Count()); - } +// Assert.AreEqual(0, contentType2.AllowedContentTypes.Count()); +// Assert.AreEqual(0, associatedTemplates2.Count()); +// Assert.AreEqual(1, parentContentTypes2.Count()); +// } - [Test] - public void Can_Map_Media_Type_And_Allowed_Types() - { - IDictionary> allParentContentTypeIds; - IMediaType[] contentTypes; +// [Test] +// public void Can_Map_Media_Type_And_Allowed_Types() +// { +// IDictionary> allParentContentTypeIds; +// IMediaType[] contentTypes; - using (var scope = ScopeProvider.CreateScope()) - { - scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} ON ", SqlSyntax.GetQuotedTableName("umbracoNode")))); - scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 99997, Trashed = false, ParentId = -1, UserId = -1, Level = 0, Path = "-1,99997", SortOrder = 0, UniqueId = new Guid("BB3241D5-6842-4EFA-A82A-5F56885CF528"), Text = "Test Media Type 1", NodeObjectType = Constants.ObjectTypes.MediaType, CreateDate = DateTime.Now }); - scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 99998, Trashed = false, ParentId = -1, UserId = -1, Level = 0, Path = "-1,99998", SortOrder = 0, UniqueId = new Guid("EEA66B06-302E-49BA-A8B2-EDF07248BC59"), Text = "Test Media Type 2", NodeObjectType = Constants.ObjectTypes.MediaType, CreateDate = DateTime.Now }); - scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 99999, Trashed = false, ParentId = -1, UserId = -1, Level = 0, Path = "-1,99999", SortOrder = 0, UniqueId = new Guid("C45CC083-BB27-4C1C-B448-6F703CC9B799"), Text = "Test Media Type 2", NodeObjectType = Constants.ObjectTypes.MediaType, CreateDate = DateTime.Now }); - scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} OFF ", SqlSyntax.GetQuotedTableName("umbracoNode")))); +// using (var scope = ScopeProvider.CreateScope()) +// { +// scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} ON ", SqlSyntax.GetQuotedTableName("umbracoNode")))); +// scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 99997, Trashed = false, ParentId = -1, UserId = -1, Level = 0, Path = "-1,99997", SortOrder = 0, UniqueId = new Guid("BB3241D5-6842-4EFA-A82A-5F56885CF528"), Text = "Test Media Type 1", NodeObjectType = Constants.ObjectTypes.MediaType, CreateDate = DateTime.Now }); +// scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 99998, Trashed = false, ParentId = -1, UserId = -1, Level = 0, Path = "-1,99998", SortOrder = 0, UniqueId = new Guid("EEA66B06-302E-49BA-A8B2-EDF07248BC59"), Text = "Test Media Type 2", NodeObjectType = Constants.ObjectTypes.MediaType, CreateDate = DateTime.Now }); +// scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 99999, Trashed = false, ParentId = -1, UserId = -1, Level = 0, Path = "-1,99999", SortOrder = 0, UniqueId = new Guid("C45CC083-BB27-4C1C-B448-6F703CC9B799"), Text = "Test Media Type 2", NodeObjectType = Constants.ObjectTypes.MediaType, CreateDate = DateTime.Now }); +// scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} OFF ", SqlSyntax.GetQuotedTableName("umbracoNode")))); - scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} ON ", SqlSyntax.GetQuotedTableName("cmsContentType")))); - scope.Database.Insert("cmsContentType", "pk", false, new ContentTypeDto { PrimaryKey = 88887, NodeId = 99997, Alias = "TestContentType1", Icon = "icon-folder", Thumbnail = "folder.png", IsContainer = false, AllowAtRoot = true }); - scope.Database.Insert("cmsContentType", "pk", false, new ContentTypeDto { PrimaryKey = 88888, NodeId = 99998, Alias = "TestContentType2", Icon = "icon-folder", Thumbnail = "folder.png", IsContainer = false, AllowAtRoot = true }); - scope.Database.Insert("cmsContentType", "pk", false, new ContentTypeDto { PrimaryKey = 88889, NodeId = 99999, Alias = "TestContentType3", Icon = "icon-folder", Thumbnail = "folder.png", IsContainer = false, AllowAtRoot = true }); - scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} OFF ", SqlSyntax.GetQuotedTableName("cmsContentType")))); +// scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} ON ", SqlSyntax.GetQuotedTableName("cmsContentType")))); +// scope.Database.Insert("cmsContentType", "pk", false, new ContentTypeDto { PrimaryKey = 88887, NodeId = 99997, Alias = "TestContentType1", Icon = "icon-folder", Thumbnail = "folder.png", IsContainer = false, AllowAtRoot = true }); +// scope.Database.Insert("cmsContentType", "pk", false, new ContentTypeDto { PrimaryKey = 88888, NodeId = 99998, Alias = "TestContentType2", Icon = "icon-folder", Thumbnail = "folder.png", IsContainer = false, AllowAtRoot = true }); +// scope.Database.Insert("cmsContentType", "pk", false, new ContentTypeDto { PrimaryKey = 88889, NodeId = 99999, Alias = "TestContentType3", Icon = "icon-folder", Thumbnail = "folder.png", IsContainer = false, AllowAtRoot = true }); +// scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} OFF ", SqlSyntax.GetQuotedTableName("cmsContentType")))); - scope.Database.Insert(new ContentTypeAllowedContentTypeDto { AllowedId = 99998, Id = 99997, SortOrder = 1 }); - scope.Database.Insert(new ContentTypeAllowedContentTypeDto { AllowedId = 99999, Id = 99997, SortOrder = 2 }); +// scope.Database.Insert(new ContentTypeAllowedContentTypeDto { AllowedId = 99998, Id = 99997, SortOrder = 1 }); +// scope.Database.Insert(new ContentTypeAllowedContentTypeDto { AllowedId = 99999, Id = 99997, SortOrder = 2 }); - scope.Database.Insert(new ContentType2ContentTypeDto { ChildId = 99999, ParentId = 99997 }); - scope.Database.Insert(new ContentType2ContentTypeDto { ChildId = 99998, ParentId = 99997 }); +// scope.Database.Insert(new ContentType2ContentTypeDto { ChildId = 99999, ParentId = 99997 }); +// scope.Database.Insert(new ContentType2ContentTypeDto { ChildId = 99998, ParentId = 99997 }); - contentTypes = ContentTypeRepository.ContentTypeQueryMapper.MapMediaTypes( - scope.Database, SqlSyntax, out allParentContentTypeIds) - .Where(x => (new[] { 99997, 99998 }).Contains(x.Id)) - .ToArray(); +// contentTypes = ContentTypeQueryMapper.MapMediaTypes( +// scope.Database, SqlSyntax, out allParentContentTypeIds) +// .Where(x => (new[] { 99997, 99998 }).Contains(x.Id)) +// .ToArray(); - scope.Complete(); - } +// scope.Complete(); +// } - var contentType1 = contentTypes.SingleOrDefault(x => x.Id == 99997); - Assert.IsNotNull(contentType1); +// var contentType1 = contentTypes.SingleOrDefault(x => x.Id == 99997); +// Assert.IsNotNull(contentType1); - var parentContentTypes1 = allParentContentTypeIds[contentType1.Id]; +// var parentContentTypes1 = allParentContentTypeIds[contentType1.Id]; - Assert.AreEqual(2, contentType1.AllowedContentTypes.Count()); - Assert.AreEqual(0, parentContentTypes1.Count()); +// Assert.AreEqual(2, contentType1.AllowedContentTypes.Count()); +// Assert.AreEqual(0, parentContentTypes1.Count()); - var contentType2 = contentTypes.SingleOrDefault(x => x.Id == 99998); - Assert.IsNotNull(contentType2); +// var contentType2 = contentTypes.SingleOrDefault(x => x.Id == 99998); +// Assert.IsNotNull(contentType2); - var parentContentTypes2 = allParentContentTypeIds[contentType2.Id]; +// var parentContentTypes2 = allParentContentTypeIds[contentType2.Id]; - Assert.AreEqual(0, contentType2.AllowedContentTypes.Count()); - Assert.AreEqual(1, parentContentTypes2.Count()); +// Assert.AreEqual(0, contentType2.AllowedContentTypes.Count()); +// Assert.AreEqual(1, parentContentTypes2.Count()); - } +// } - [Test] - public void Can_Map_All_Property_Groups_And_Types() - { - IDictionary allPropTypeCollection; - IDictionary allPropGroupCollection; +// [Test] +// public void Can_Map_All_Property_Groups_And_Types() +// { +// IDictionary allPropTypeCollection; +// IDictionary allPropGroupCollection; - using (var scope = ScopeProvider.CreateScope()) - { - scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} ON ", SqlSyntax.GetQuotedTableName("umbracoNode")))); - scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 55555, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,55555", SortOrder = 1, UniqueId = new Guid("3390BDF4-C974-4211-AA95-3812A8CE7C46"), Text = "Test Data Type", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now }); - scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 99999, Trashed = false, ParentId = -1, UserId = -1, Level = 0, Path = "-1,99999", SortOrder = 0, UniqueId = new Guid("129241F0-D24E-4FC3-92D1-BC2D48B7C431"), Text = "Test Content Type", NodeObjectType = Constants.ObjectTypes.DocumentType, CreateDate = DateTime.Now }); - scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} OFF ", SqlSyntax.GetQuotedTableName("umbracoNode")))); +// using (var scope = ScopeProvider.CreateScope()) +// { +// scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} ON ", SqlSyntax.GetQuotedTableName("umbracoNode")))); +// scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 55555, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,55555", SortOrder = 1, UniqueId = new Guid("3390BDF4-C974-4211-AA95-3812A8CE7C46"), Text = "Test Data Type", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now }); +// scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 99999, Trashed = false, ParentId = -1, UserId = -1, Level = 0, Path = "-1,99999", SortOrder = 0, UniqueId = new Guid("129241F0-D24E-4FC3-92D1-BC2D48B7C431"), Text = "Test Content Type", NodeObjectType = Constants.ObjectTypes.DocumentType, CreateDate = DateTime.Now }); +// scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} OFF ", SqlSyntax.GetQuotedTableName("umbracoNode")))); - scope.Database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = 55555, EditorAlias = Constants.PropertyEditors.Aliases.TextBox, DbType = "Nvarchar" }); +// scope.Database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = 55555, EditorAlias = Constants.PropertyEditors.Aliases.TextBox, DbType = "Nvarchar" }); - scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} ON ", SqlSyntax.GetQuotedTableName("cmsContentType")))); - scope.Database.Insert("cmsContentType", "pk", false, new ContentTypeDto { PrimaryKey = 88888, NodeId = 99999, Alias = "TestContentType", Icon = "icon-folder", Thumbnail = "folder.png", IsContainer = false, AllowAtRoot = true }); - scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} OFF ", SqlSyntax.GetQuotedTableName("cmsContentType")))); +// scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} ON ", SqlSyntax.GetQuotedTableName("cmsContentType")))); +// scope.Database.Insert("cmsContentType", "pk", false, new ContentTypeDto { PrimaryKey = 88888, NodeId = 99999, Alias = "TestContentType", Icon = "icon-folder", Thumbnail = "folder.png", IsContainer = false, AllowAtRoot = true }); +// scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} OFF ", SqlSyntax.GetQuotedTableName("cmsContentType")))); - scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} ON ", SqlSyntax.GetQuotedTableName("cmsPropertyTypeGroup")))); - scope.Database.Insert("cmsPropertyTypeGroup", "id", false, new PropertyTypeGroupDto { Id = 77776, UniqueId = 77776.ToGuid(), ContentTypeNodeId = 99999, Text = "Group1", SortOrder = 1 }); - scope.Database.Insert("cmsPropertyTypeGroup", "id", false, new PropertyTypeGroupDto { Id = 77777, UniqueId = 77777.ToGuid(), ContentTypeNodeId = 99999, Text = "Group2", SortOrder = 2 }); - scope.Database.Insert("cmsPropertyTypeGroup", "id", false, new PropertyTypeGroupDto { Id = 77778, UniqueId = 77778.ToGuid(), ContentTypeNodeId = 99999, Text = "Group3", SortOrder = 3 }); - scope.Database.Insert("cmsPropertyTypeGroup", "id", false, new PropertyTypeGroupDto { Id = 77779, UniqueId = 77779.ToGuid(), ContentTypeNodeId = 99999, Text = "Group4", SortOrder = 4 }); - scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} OFF ", SqlSyntax.GetQuotedTableName("cmsPropertyTypeGroup")))); +// scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} ON ", SqlSyntax.GetQuotedTableName("cmsPropertyTypeGroup")))); +// scope.Database.Insert("cmsPropertyTypeGroup", "id", false, new PropertyTypeGroupDto { Id = 77776, UniqueId = 77776.ToGuid(), ContentTypeNodeId = 99999, Text = "Group1", SortOrder = 1 }); +// scope.Database.Insert("cmsPropertyTypeGroup", "id", false, new PropertyTypeGroupDto { Id = 77777, UniqueId = 77777.ToGuid(), ContentTypeNodeId = 99999, Text = "Group2", SortOrder = 2 }); +// scope.Database.Insert("cmsPropertyTypeGroup", "id", false, new PropertyTypeGroupDto { Id = 77778, UniqueId = 77778.ToGuid(), ContentTypeNodeId = 99999, Text = "Group3", SortOrder = 3 }); +// scope.Database.Insert("cmsPropertyTypeGroup", "id", false, new PropertyTypeGroupDto { Id = 77779, UniqueId = 77779.ToGuid(), ContentTypeNodeId = 99999, Text = "Group4", SortOrder = 4 }); +// scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} OFF ", SqlSyntax.GetQuotedTableName("cmsPropertyTypeGroup")))); - scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} ON ", SqlSyntax.GetQuotedTableName("cmsPropertyType")))); - scope.Database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 66662, UniqueId = 66662.ToGuid(), DataTypeId = 55555, ContentTypeId = 99999, PropertyTypeGroupId = 77776, Alias = "property1", Name = "Property 1", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = null }); - scope.Database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 66663, UniqueId = 66663.ToGuid(), DataTypeId = 55555, ContentTypeId = 99999, PropertyTypeGroupId = 77776, Alias = "property2", Name = "Property 2", SortOrder = 1, Mandatory = false, ValidationRegExp = null, Description = null }); - scope.Database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 66664, UniqueId = 66664.ToGuid(), DataTypeId = 55555, ContentTypeId = 99999, PropertyTypeGroupId = 77777, Alias = "property3", Name = "Property 3", SortOrder = 2, Mandatory = false, ValidationRegExp = null, Description = null }); - scope.Database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 66665, UniqueId = 66665.ToGuid(), DataTypeId = 55555, ContentTypeId = 99999, PropertyTypeGroupId = 77777, Alias = "property4", Name = "Property 4", SortOrder = 3, Mandatory = false, ValidationRegExp = null, Description = null }); - scope.Database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 66666, UniqueId = 66666.ToGuid(), DataTypeId = 55555, ContentTypeId = 99999, PropertyTypeGroupId = null, Alias = "property5", Name = "Property 5", SortOrder = 4, Mandatory = false, ValidationRegExp = null, Description = null }); - scope.Database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 66667, UniqueId = 66667.ToGuid(), DataTypeId = 55555, ContentTypeId = 99999, PropertyTypeGroupId = 77778, Alias = "property6", Name = "Property 6", SortOrder = 5, Mandatory = false, ValidationRegExp = null, Description = null }); - scope.Database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 66668, UniqueId = 66668.ToGuid(), DataTypeId = 55555, ContentTypeId = 99999, PropertyTypeGroupId = 77778, Alias = "property7", Name = "Property 7", SortOrder = 6, Mandatory = false, ValidationRegExp = null, Description = null }); - scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} OFF ", SqlSyntax.GetQuotedTableName("cmsPropertyType")))); +// scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} ON ", SqlSyntax.GetQuotedTableName("cmsPropertyType")))); +// scope.Database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 66662, UniqueId = 66662.ToGuid(), DataTypeId = 55555, ContentTypeId = 99999, PropertyTypeGroupId = 77776, Alias = "property1", Name = "Property 1", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = null }); +// scope.Database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 66663, UniqueId = 66663.ToGuid(), DataTypeId = 55555, ContentTypeId = 99999, PropertyTypeGroupId = 77776, Alias = "property2", Name = "Property 2", SortOrder = 1, Mandatory = false, ValidationRegExp = null, Description = null }); +// scope.Database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 66664, UniqueId = 66664.ToGuid(), DataTypeId = 55555, ContentTypeId = 99999, PropertyTypeGroupId = 77777, Alias = "property3", Name = "Property 3", SortOrder = 2, Mandatory = false, ValidationRegExp = null, Description = null }); +// scope.Database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 66665, UniqueId = 66665.ToGuid(), DataTypeId = 55555, ContentTypeId = 99999, PropertyTypeGroupId = 77777, Alias = "property4", Name = "Property 4", SortOrder = 3, Mandatory = false, ValidationRegExp = null, Description = null }); +// scope.Database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 66666, UniqueId = 66666.ToGuid(), DataTypeId = 55555, ContentTypeId = 99999, PropertyTypeGroupId = null, Alias = "property5", Name = "Property 5", SortOrder = 4, Mandatory = false, ValidationRegExp = null, Description = null }); +// scope.Database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 66667, UniqueId = 66667.ToGuid(), DataTypeId = 55555, ContentTypeId = 99999, PropertyTypeGroupId = 77778, Alias = "property6", Name = "Property 6", SortOrder = 5, Mandatory = false, ValidationRegExp = null, Description = null }); +// scope.Database.Insert("cmsPropertyType", "id", false, new PropertyTypeDto { Id = 66668, UniqueId = 66668.ToGuid(), DataTypeId = 55555, ContentTypeId = 99999, PropertyTypeGroupId = 77778, Alias = "property7", Name = "Property 7", SortOrder = 6, Mandatory = false, ValidationRegExp = null, Description = null }); +// scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} OFF ", SqlSyntax.GetQuotedTableName("cmsPropertyType")))); - ContentTypeRepository.ContentTypeQueryMapper.MapGroupsAndProperties(new[] { 99999 }, scope.Database, SqlSyntax, true, out allPropTypeCollection, out allPropGroupCollection); +// ContentTypeQueryMapper.MapGroupsAndProperties_(new[] { 99999 }, scope.Database, SqlSyntax, true, out allPropTypeCollection, out allPropGroupCollection); - scope.Complete(); - } +// scope.Complete(); +// } - var propGroupCollection = allPropGroupCollection[99999]; - var propTypeCollection = allPropTypeCollection[99999]; +// var propGroupCollection = allPropGroupCollection[99999]; +// var propTypeCollection = allPropTypeCollection[99999]; - Assert.AreEqual(4, propGroupCollection.Count); - Assert.AreEqual(2, propGroupCollection["Group1"].PropertyTypes.Count); - Assert.IsTrue(propGroupCollection["Group1"].PropertyTypes.Contains("property1")); - Assert.IsTrue(propGroupCollection["Group1"].PropertyTypes.Contains("property2")); - Assert.AreEqual(2, propGroupCollection["Group2"].PropertyTypes.Count); - Assert.IsTrue(propGroupCollection["Group2"].PropertyTypes.Contains("property3")); - Assert.IsTrue(propGroupCollection["Group2"].PropertyTypes.Contains("property4")); - Assert.AreEqual(2, propGroupCollection["Group3"].PropertyTypes.Count); - Assert.IsTrue(propGroupCollection["Group3"].PropertyTypes.Contains("property6")); - Assert.IsTrue(propGroupCollection["Group3"].PropertyTypes.Contains("property7")); - Assert.AreEqual(0, propGroupCollection["Group4"].PropertyTypes.Count); +// Assert.AreEqual(4, propGroupCollection.Count); +// Assert.AreEqual(2, propGroupCollection["Group1"].PropertyTypes.Count); +// Assert.IsTrue(propGroupCollection["Group1"].PropertyTypes.Contains("property1")); +// Assert.IsTrue(propGroupCollection["Group1"].PropertyTypes.Contains("property2")); +// Assert.AreEqual(2, propGroupCollection["Group2"].PropertyTypes.Count); +// Assert.IsTrue(propGroupCollection["Group2"].PropertyTypes.Contains("property3")); +// Assert.IsTrue(propGroupCollection["Group2"].PropertyTypes.Contains("property4")); +// Assert.AreEqual(2, propGroupCollection["Group3"].PropertyTypes.Count); +// Assert.IsTrue(propGroupCollection["Group3"].PropertyTypes.Contains("property6")); +// Assert.IsTrue(propGroupCollection["Group3"].PropertyTypes.Contains("property7")); +// Assert.AreEqual(0, propGroupCollection["Group4"].PropertyTypes.Count); - Assert.AreEqual(1, propTypeCollection.Count); - Assert.IsTrue(propTypeCollection.Contains("property5")); - - } - - } -} +// Assert.AreEqual(1, propTypeCollection.Count); +// Assert.IsTrue(propTypeCollection.Contains("property5")); +// } +// } +//} diff --git a/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs index 03aae74920..53f150f140 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs @@ -1,12 +1,9 @@ using System; using System.Collections.Generic; using System.Linq; -using AutoMapper; -using Moq; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Cache; -using Umbraco.Core.Configuration.UmbracoSettings; using Umbraco.Core.Models; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Dtos; @@ -20,7 +17,7 @@ using Umbraco.Web.Models.ContentEditing; namespace Umbraco.Tests.Persistence.Repositories { [TestFixture] - [UmbracoTest(AutoMapper = true, Database = UmbracoTestOptions.Database.NewSchemaPerTest)] + [UmbracoTest(Mapper = true, Database = UmbracoTestOptions.Database.NewSchemaPerTest)] public class ContentTypeRepositoryTest : TestWithDatabaseBase { public override void SetUp() @@ -32,25 +29,28 @@ namespace Umbraco.Tests.Persistence.Repositories private DocumentRepository CreateRepository(IScopeAccessor scopeAccessor, out ContentTypeRepository contentTypeRepository) { - var cacheHelper = AppCaches.Disabled; - var templateRepository = new TemplateRepository(scopeAccessor, cacheHelper, Logger, TestObjects.GetFileSystemsMock()); - var tagRepository = new TagRepository(scopeAccessor, cacheHelper, Logger); - contentTypeRepository = new ContentTypeRepository(scopeAccessor, cacheHelper, Logger, templateRepository); - var languageRepository = new LanguageRepository(scopeAccessor, cacheHelper, Logger); - var repository = new DocumentRepository(scopeAccessor, cacheHelper, Logger, contentTypeRepository, templateRepository, tagRepository, languageRepository); + var templateRepository = new TemplateRepository(scopeAccessor, AppCaches.Disabled, Logger, TestObjects.GetFileSystemsMock()); + var tagRepository = new TagRepository(scopeAccessor, AppCaches.Disabled, Logger); + var commonRepository = new ContentTypeCommonRepository(scopeAccessor, templateRepository, AppCaches.Disabled); + contentTypeRepository = new ContentTypeRepository(scopeAccessor, AppCaches.Disabled, Logger, commonRepository); + var languageRepository = new LanguageRepository(scopeAccessor, AppCaches.Disabled, Logger); + var repository = new DocumentRepository(scopeAccessor, AppCaches.Disabled, Logger, contentTypeRepository, templateRepository, tagRepository, languageRepository); return repository; } private ContentTypeRepository CreateRepository(IScopeAccessor scopeAccessor) { var templateRepository = new TemplateRepository(scopeAccessor, AppCaches.Disabled, Logger, TestObjects.GetFileSystemsMock()); - var contentTypeRepository = new ContentTypeRepository(scopeAccessor, AppCaches.Disabled, Logger, templateRepository); + var commonRepository = new ContentTypeCommonRepository(scopeAccessor, templateRepository, AppCaches.Disabled); + var contentTypeRepository = new ContentTypeRepository(scopeAccessor, AppCaches.Disabled, Logger, commonRepository); return contentTypeRepository; } private MediaTypeRepository CreateMediaTypeRepository(IScopeAccessor scopeAccessor) { - var contentTypeRepository = new MediaTypeRepository(scopeAccessor, AppCaches.Disabled, Logger); + var templateRepository = new TemplateRepository(scopeAccessor, AppCaches.Disabled, Logger, TestObjects.GetFileSystemsMock()); + var commonRepository = new ContentTypeCommonRepository(scopeAccessor, templateRepository, AppCaches.Disabled); + var contentTypeRepository = new MediaTypeRepository(scopeAccessor, AppCaches.Disabled, Logger, commonRepository); return contentTypeRepository; } @@ -60,7 +60,7 @@ namespace Umbraco.Tests.Persistence.Repositories } // TODO: Add test to verify SetDefaultTemplates updates both AllowedTemplates and DefaultTemplate(id). - + [Test] public void Maps_Templates_Correctly() { @@ -80,13 +80,13 @@ namespace Umbraco.Tests.Persistence.Repositories { templateRepo.Save(template); } - + var contentType = MockedContentTypes.CreateSimpleContentType(); contentType.AllowedTemplates = new[] { templates[0], templates[1] }; contentType.SetDefaultTemplate(templates[0]); repository.Save(contentType); - + //re-get var result = repository.Get(contentType.Id); @@ -107,16 +107,16 @@ namespace Umbraco.Tests.Persistence.Repositories var repository = CreateRepository((IScopeAccessor) provider); var container1 = new EntityContainer(Constants.ObjectTypes.DocumentType) { Name = "blah1" }; containerRepository.Save(container1); - + var container2 = new EntityContainer(Constants.ObjectTypes.DocumentType) { Name = "blah2", ParentId = container1.Id }; containerRepository.Save(container2); - + var contentType = (IContentType)MockedContentTypes.CreateBasicContentType("asdfasdf"); contentType.ParentId = container2.Id; repository.Save(contentType); - + //create a var contentType2 = (IContentType)new ContentType(contentType, "hello") @@ -125,10 +125,10 @@ namespace Umbraco.Tests.Persistence.Repositories }; contentType.ParentId = contentType.Id; repository.Save(contentType2); - + var result = repository.Move(contentType, container1).ToArray(); - + Assert.AreEqual(2, result.Count()); @@ -152,7 +152,7 @@ namespace Umbraco.Tests.Persistence.Repositories var containerRepository = CreateContainerRepository((IScopeAccessor) provider, Constants.ObjectTypes.DocumentTypeContainer); var container = new EntityContainer(Constants.ObjectTypes.DocumentType) { Name = "blah" }; containerRepository.Save(container); - + Assert.That(container.Id, Is.GreaterThan(0)); var found = containerRepository.Get(container.Id); @@ -176,7 +176,7 @@ namespace Umbraco.Tests.Persistence.Repositories containerRepository.Save(container2); container3 = new EntityContainer(Constants.ObjectTypes.DocumentType) { Name = "container3" }; containerRepository.Save(container3); - + Assert.That(container1.Id, Is.GreaterThan(0)); Assert.That(container2.Id, Is.GreaterThan(0)); Assert.That(container3.Id, Is.GreaterThan(0)); @@ -201,11 +201,11 @@ namespace Umbraco.Tests.Persistence.Repositories var containerRepository = CreateContainerRepository((IScopeAccessor) provider, Constants.ObjectTypes.DocumentTypeContainer); var container = new EntityContainer(Constants.ObjectTypes.DocumentType) { Name = "blah" }; containerRepository.Save(container); - + // Act containerRepository.Delete(container); - + var found = containerRepository.Get(container.Id); Assert.IsNull(found); @@ -222,12 +222,12 @@ namespace Umbraco.Tests.Persistence.Repositories var repository = CreateRepository((IScopeAccessor) provider); var container = new EntityContainer(Constants.ObjectTypes.MediaType) { Name = "blah" }; containerRepository.Save(container); - + var contentType = MockedContentTypes.CreateSimpleContentType("test", "Test", propertyGroupName: "testGroup"); contentType.ParentId = container.Id; repository.Save(contentType); - + Assert.AreEqual(container.Id, contentType.ParentId); } @@ -243,16 +243,16 @@ namespace Umbraco.Tests.Persistence.Repositories var repository = CreateMediaTypeRepository((IScopeAccessor) provider); var container = new EntityContainer(Constants.ObjectTypes.MediaType) { Name = "blah" }; containerRepository.Save(container); - + IMediaType contentType = MockedContentTypes.CreateSimpleMediaType("test", "Test", propertyGroupName: "testGroup"); contentType.ParentId = container.Id; repository.Save(contentType); - + // Act containerRepository.Delete(container); - + var found = containerRepository.Get(container.Id); Assert.IsNull(found); @@ -274,7 +274,7 @@ namespace Umbraco.Tests.Persistence.Repositories // Act var contentType = MockedContentTypes.CreateSimpleContentType("test", "Test", propertyGroupName: "testGroup"); repository.Save(contentType); - + var fetched = repository.Get(contentType.Id); @@ -294,7 +294,7 @@ namespace Umbraco.Tests.Persistence.Repositories Assert.AreNotEqual(propertyType.Key, Guid.Empty); } - TestHelper.AssertPropertyValuesAreEqual(contentType, fetched, "yyyy-MM-dd HH:mm:ss", ignoreProperties: new [] { "DefaultTemplate", "AllowedTemplates", "UpdateDate" }); + TestHelper.AssertPropertyValuesAreEqual(fetched, contentType, "yyyy-MM-dd HH:mm:ss", ignoreProperties: new [] { "DefaultTemplate", "AllowedTemplates", "UpdateDate" }); } } @@ -323,7 +323,7 @@ namespace Umbraco.Tests.Persistence.Repositories Assert.AreEqual(4, mapped.PropertyTypes.Count()); repository.Save(mapped); - + Assert.AreEqual(4, mapped.PropertyTypes.Count()); @@ -371,7 +371,7 @@ namespace Umbraco.Tests.Persistence.Repositories DataTypeId = -88 }); repository.Save(contentType); - + var dirty = contentType.IsDirty(); @@ -469,7 +469,7 @@ namespace Umbraco.Tests.Persistence.Repositories Assert.IsTrue(mapped.PropertyTypes.Any(x => x.Alias == "subtitle")); repository.Save(mapped); - + var dirty = mapped.IsDirty(); @@ -500,11 +500,11 @@ namespace Umbraco.Tests.Persistence.Repositories // Act var contentType = MockedContentTypes.CreateSimpleContentType(); repository.Save(contentType); - + var contentType2 = repository.Get(contentType.Id); repository.Delete(contentType2); - + var exists = repository.Exists(contentType.Id); @@ -528,13 +528,13 @@ namespace Umbraco.Tests.Persistence.Repositories repository.Save(ctMain); repository.Save(ctChild1); repository.Save(ctChild2); - + // Act var resolvedParent = repository.Get(ctMain.Id); repository.Delete(resolvedParent); - + // Assert Assert.That(repository.Exists(ctMain.Id), Is.False); @@ -546,19 +546,27 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Perform_Query_On_ContentTypeRepository_Sort_By_Name() { + IContentType contentType; + // Arrange var provider = TestObjects.GetScopeProvider(Logger); using (var scope = provider.CreateScope()) { var repository = CreateRepository((IScopeAccessor) provider); - var contentType = repository.Get(NodeDto.NodeIdSeed + 1); + contentType = repository.Get(NodeDto.NodeIdSeed + 1); var child1 = MockedContentTypes.CreateSimpleContentType("abc", "abc", contentType, randomizeAliases: true); repository.Save(child1); var child3 = MockedContentTypes.CreateSimpleContentType("zyx", "zyx", contentType, randomizeAliases: true); repository.Save(child3); var child2 = MockedContentTypes.CreateSimpleContentType("a123", "a123", contentType, randomizeAliases: true); repository.Save(child2); - + + scope.Complete(); + } + + using (var scope = provider.CreateScope()) + { + var repository = CreateRepository((IScopeAccessor)provider); // Act var contentTypes = repository.Get(scope.SqlContext.Query().Where(x => x.ParentId == contentType.Id)); @@ -601,7 +609,7 @@ namespace Umbraco.Tests.Persistence.Repositories var contentType = repository.Get(NodeDto.NodeIdSeed + 1); var childContentType = MockedContentTypes.CreateSimpleContentType("blah", "Blah", contentType, randomizeAliases:true); repository.Save(childContentType); - + // Act var result = repository.Get(childContentType.Key); @@ -703,7 +711,7 @@ namespace Umbraco.Tests.Persistence.Repositories // Act contentType.PropertyGroups["Meta"].PropertyTypes.Remove("description"); repository.Save(contentType); - + var result = repository.Get(NodeDto.NodeIdSeed + 1); @@ -779,7 +787,7 @@ namespace Umbraco.Tests.Persistence.Repositories Assert.That(contentType.PropertyTypes.Count(), Is.EqualTo(5)); repository.Save(contentType); - + // Assert var updated = repository.Get(NodeDto.NodeIdSeed + 1); @@ -804,7 +812,7 @@ namespace Umbraco.Tests.Persistence.Repositories var simpleSubpageContentType = MockedContentTypes.CreateSimpleContentType("umbSimpleSubpage", "Simple Subpage"); repository.Save(subpageContentType); repository.Save(simpleSubpageContentType); - + // Act var contentType = repository.Get(NodeDto.NodeIdSeed); @@ -814,7 +822,7 @@ namespace Umbraco.Tests.Persistence.Repositories new ContentTypeSort(new Lazy(() => simpleSubpageContentType.Id), 1, simpleSubpageContentType.Alias) }; repository.Save(contentType); - + //Assert var updated = repository.Get(NodeDto.NodeIdSeed); @@ -838,12 +846,12 @@ namespace Umbraco.Tests.Persistence.Repositories var subpage = MockedContent.CreateTextpageContent(contentType, "Text Page 1", contentType.Id); contentRepository.Save(subpage); - + // Act contentType.RemovePropertyType("keywords"); repository.Save(contentType); - + // Assert Assert.That(contentType.PropertyTypes.Count(), Is.EqualTo(3)); @@ -865,13 +873,13 @@ namespace Umbraco.Tests.Persistence.Repositories var subpage = MockedContent.CreateTextpageContent(contentType, "Text Page 1", contentType.Id); contentRepository.Save(subpage); - + // Act var propertyGroup = contentType.PropertyGroups.First(x => x.Name == "Meta"); propertyGroup.PropertyTypes.Add(new PropertyType("test", ValueStorageType.Ntext, "metaAuthor") { Name = "Meta Author", Description = "", Mandatory = false, SortOrder = 1, DataTypeId = -88 }); repository.Save(contentType); - + // Assert Assert.That(contentType.PropertyTypes.Count(), Is.EqualTo(5)); @@ -893,18 +901,18 @@ namespace Umbraco.Tests.Persistence.Repositories var subpage = MockedContent.CreateTextpageContent(contentType, "Text Page 1", contentType.Id); contentRepository.Save(subpage); - + var propertyGroup = contentType.PropertyGroups.First(x => x.Name == "Meta"); propertyGroup.PropertyTypes.Add(new PropertyType("test", ValueStorageType.Ntext, "metaAuthor") { Name = "Meta Author", Description = "", Mandatory = false, SortOrder = 1, DataTypeId = -88 }); repository.Save(contentType); - + // Act var content = contentRepository.Get(subpage.Id); content.SetValue("metaAuthor", "John Doe"); contentRepository.Save(content); - + //Assert var updated = contentRepository.Get(subpage.Id); @@ -927,7 +935,7 @@ namespace Umbraco.Tests.Persistence.Repositories var subpage = MockedContent.CreateTextpageContent(contentType, "Text Page 1", contentType.Id); contentRepository.Save(subpage); - + //Remove PropertyType contentType.RemovePropertyType("keywords"); @@ -935,13 +943,13 @@ namespace Umbraco.Tests.Persistence.Repositories var propertyGroup = contentType.PropertyGroups.First(x => x.Name == "Meta"); propertyGroup.PropertyTypes.Add(new PropertyType("test", ValueStorageType.Ntext, "metaAuthor") { Name = "Meta Author", Description = "", Mandatory = false, SortOrder = 1, DataTypeId = -88 }); repository.Save(contentType); - + // Act var content = contentRepository.Get(subpage.Id); content.SetValue("metaAuthor", "John Doe"); contentRepository.Save(content); - + //Assert var updated = contentRepository.Get(subpage.Id); diff --git a/src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs index c7a83717a8..fd797662c0 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs @@ -66,7 +66,8 @@ namespace Umbraco.Tests.Persistence.Repositories templateRepository = new TemplateRepository(scopeAccessor, appCaches, Logger, TestObjects.GetFileSystemsMock()); var tagRepository = new TagRepository(scopeAccessor, appCaches, Logger); - contentTypeRepository = new ContentTypeRepository(scopeAccessor, appCaches, Logger, templateRepository); + var commonRepository = new ContentTypeCommonRepository(scopeAccessor, templateRepository, appCaches); + contentTypeRepository = new ContentTypeRepository(scopeAccessor, appCaches, Logger, commonRepository); var languageRepository = new LanguageRepository(scopeAccessor, appCaches, Logger); var repository = new DocumentRepository(scopeAccessor, appCaches, Logger, contentTypeRepository, templateRepository, tagRepository, languageRepository); return repository; diff --git a/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs index d0da875332..f00b2fd046 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs @@ -22,7 +22,8 @@ namespace Umbraco.Tests.Persistence.Repositories var accessor = (IScopeAccessor) provider; var templateRepository = new TemplateRepository(accessor, Core.Cache.AppCaches.Disabled, Logger, TestObjects.GetFileSystemsMock()); var tagRepository = new TagRepository(accessor, Core.Cache.AppCaches.Disabled, Logger); - contentTypeRepository = new ContentTypeRepository(accessor, Core.Cache.AppCaches.Disabled, Logger, templateRepository); + var commonRepository = new ContentTypeCommonRepository(accessor, templateRepository, AppCaches); + contentTypeRepository = new ContentTypeRepository(accessor, Core.Cache.AppCaches.Disabled, Logger, commonRepository); languageRepository = new LanguageRepository(accessor, Core.Cache.AppCaches.Disabled, Logger); documentRepository = new DocumentRepository(accessor, Core.Cache.AppCaches.Disabled, Logger, contentTypeRepository, templateRepository, tagRepository, languageRepository); var domainRepository = new DomainRepository(accessor, Core.Cache.AppCaches.Disabled, Logger); diff --git a/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs index 1c1b5e60f4..1d9cf6d022 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs @@ -4,6 +4,7 @@ using Moq; using NUnit.Framework; using Umbraco.Core.Cache; using Umbraco.Core.Configuration.UmbracoSettings; +using Umbraco.Core.IO; using Umbraco.Core.Models; using Umbraco.Core.Models.Entities; using Umbraco.Core.Persistence; @@ -35,7 +36,9 @@ namespace Umbraco.Tests.Persistence.Repositories appCaches = appCaches ?? AppCaches; var scopeAccessor = (IScopeAccessor) provider; - mediaTypeRepository = new MediaTypeRepository(scopeAccessor, appCaches, Logger); + var templateRepository = new TemplateRepository(scopeAccessor, appCaches, Logger, TestObjects.GetFileSystemsMock()); + var commonRepository = new ContentTypeCommonRepository(scopeAccessor, templateRepository, appCaches); + mediaTypeRepository = new MediaTypeRepository(scopeAccessor, appCaches, Logger, commonRepository); var tagRepository = new TagRepository(scopeAccessor, appCaches, Logger); var repository = new MediaRepository(scopeAccessor, appCaches, Logger, mediaTypeRepository, tagRepository, Mock.Of()); return repository; diff --git a/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs index 49bb93f2a7..f302d1d992 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs @@ -6,7 +6,6 @@ using Umbraco.Core.Cache; using Umbraco.Core.Models; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Dtos; -using Umbraco.Core.Persistence.Repositories; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; using Umbraco.Tests.TestHelpers; @@ -21,7 +20,10 @@ namespace Umbraco.Tests.Persistence.Repositories { private MediaTypeRepository CreateRepository(IScopeProvider provider) { - return new MediaTypeRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger); + var cacheHelper = AppCaches.Disabled; + var templateRepository = new TemplateRepository((IScopeAccessor)provider, cacheHelper, Logger, TestObjects.GetFileSystemsMock()); + var commonRepository = new ContentTypeCommonRepository((IScopeAccessor)provider, templateRepository, AppCaches); + return new MediaTypeRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, commonRepository); } private EntityContainerRepository CreateContainerRepository(IScopeProvider provider) diff --git a/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs index c46a090685..a5f7f08f22 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs @@ -29,7 +29,9 @@ namespace Umbraco.Tests.Persistence.Repositories private MemberRepository CreateRepository(IScopeProvider provider, out MemberTypeRepository memberTypeRepository, out MemberGroupRepository memberGroupRepository) { var accessor = (IScopeAccessor) provider; - memberTypeRepository = new MemberTypeRepository(accessor, AppCaches.Disabled, Logger); + var templateRepository = Mock.Of(); + var commonRepository = new ContentTypeCommonRepository(accessor, templateRepository, AppCaches); + memberTypeRepository = new MemberTypeRepository(accessor, AppCaches.Disabled, Logger, commonRepository); memberGroupRepository = new MemberGroupRepository(accessor, AppCaches.Disabled, Logger); var tagRepo = new TagRepository(accessor, AppCaches.Disabled, Logger); var repository = new MemberRepository(accessor, AppCaches.Disabled, Logger, memberTypeRepository, memberGroupRepository, tagRepo, Mock.Of()); @@ -196,17 +198,17 @@ namespace Umbraco.Tests.Persistence.Repositories var memberType = MockedContentTypes.CreateSimpleMemberType(); memberTypeRepository.Save(memberType); - + var member = MockedMember.CreateSimpleMember(memberType, "Johnny Hefty", "johnny@example.com", "123", "hefty"); repository.Save(member); - + sut = repository.Get(member.Id); //when the password is null it will not overwrite what is already there. sut.RawPasswordValue = null; repository.Save(sut); - + sut = repository.Get(member.Id); Assert.That(sut.RawPasswordValue, Is.EqualTo("123")); @@ -226,17 +228,17 @@ namespace Umbraco.Tests.Persistence.Repositories var memberType = MockedContentTypes.CreateSimpleMemberType(); memberTypeRepository.Save(memberType); - + var member = MockedMember.CreateSimpleMember(memberType, "Johnny Hefty", "johnny@example.com", "123", "hefty"); repository.Save(member); - + sut = repository.Get(member.Id); sut.Username = "This is new"; sut.Email = "thisisnew@hello.com"; repository.Save(sut); - + sut = repository.Get(member.Id); Assert.That(sut.Email, Is.EqualTo("thisisnew@hello.com")); @@ -278,7 +280,7 @@ namespace Umbraco.Tests.Persistence.Repositories { memberType = MockedContentTypes.CreateSimpleMemberType(); memberTypeRepository.Save(memberType); - + } var member = MockedMember.CreateSimpleMember(memberType, name ?? "Johnny Hefty", email ?? "johnny@example.com", password ?? "123", username ?? "hefty", key); diff --git a/src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs index 0c2314fd47..2b3ab50a22 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs @@ -22,7 +22,9 @@ namespace Umbraco.Tests.Persistence.Repositories { private MemberTypeRepository CreateRepository(IScopeProvider provider) { - return new MemberTypeRepository((IScopeAccessor) provider, AppCaches.Disabled, Mock.Of()); + var templateRepository = Mock.Of(); + var commonRepository = new ContentTypeCommonRepository((IScopeAccessor)provider, templateRepository, AppCaches); + return new MemberTypeRepository((IScopeAccessor) provider, AppCaches.Disabled, Mock.Of(), commonRepository); } [Test] @@ -35,7 +37,6 @@ namespace Umbraco.Tests.Persistence.Repositories var memberType = (IMemberType) MockedContentTypes.CreateSimpleMemberType(); repository.Save(memberType); - var sut = repository.Get(memberType.Id); @@ -88,7 +89,7 @@ namespace Umbraco.Tests.Persistence.Repositories var memberType = MockedContentTypes.CreateSimpleMemberType(); memberType.Alias = null; - + Assert.Throws(() => repository.Save(memberType)); } @@ -104,13 +105,13 @@ namespace Umbraco.Tests.Persistence.Repositories var memberType1 = MockedContentTypes.CreateSimpleMemberType(); repository.Save(memberType1); - + var memberType2 = MockedContentTypes.CreateSimpleMemberType(); memberType2.Name = "AnotherType"; memberType2.Alias = "anotherType"; repository.Save(memberType2); - + var result = repository.GetMany(); @@ -129,13 +130,13 @@ namespace Umbraco.Tests.Persistence.Repositories var memberType1 = MockedContentTypes.CreateSimpleMemberType(); repository.Save(memberType1); - + var memberType2 = MockedContentTypes.CreateSimpleMemberType(); memberType2.Name = "AnotherType"; memberType2.Alias = "anotherType"; repository.Save(memberType2); - + var result = ((IReadRepository)repository).GetMany(memberType1.Key, memberType2.Key); @@ -154,13 +155,13 @@ namespace Umbraco.Tests.Persistence.Repositories var memberType1 = MockedContentTypes.CreateSimpleMemberType(); repository.Save(memberType1); - + var memberType2 = MockedContentTypes.CreateSimpleMemberType(); memberType2.Name = "AnotherType"; memberType2.Alias = "anotherType"; repository.Save(memberType2); - + var result = repository.Get(memberType1.Key); @@ -183,14 +184,14 @@ namespace Umbraco.Tests.Persistence.Repositories var memberType1 = MockedContentTypes.CreateSimpleMemberType(); memberType1.PropertyTypeCollection.Clear(); repository.Save(memberType1); - + var memberType2 = MockedContentTypes.CreateSimpleMemberType(); memberType2.PropertyTypeCollection.Clear(); memberType2.Name = "AnotherType"; memberType2.Alias = "anotherType"; repository.Save(memberType2); - + var result = repository.GetMany(); @@ -210,7 +211,7 @@ namespace Umbraco.Tests.Persistence.Repositories IMemberType memberType = MockedContentTypes.CreateSimpleMemberType(); repository.Save(memberType); - + memberType = repository.Get(memberType.Id); Assert.That(memberType, Is.Not.Null); } @@ -226,7 +227,7 @@ namespace Umbraco.Tests.Persistence.Repositories IMemberType memberType = MockedContentTypes.CreateSimpleMemberType(); repository.Save(memberType); - + memberType = repository.Get(memberType.Key); Assert.That(memberType, Is.Not.Null); } @@ -242,7 +243,7 @@ namespace Umbraco.Tests.Persistence.Repositories IMemberType memberType = MockedContentTypes.CreateSimpleMemberType(); repository.Save(memberType); - + memberType = repository.Get(memberType.Id); @@ -265,7 +266,7 @@ namespace Umbraco.Tests.Persistence.Repositories IMemberType memberType2 = MockedContentTypes.CreateSimpleMemberType("test2"); repository.Save(memberType1); repository.Save(memberType2); - + var m1Ids = memberType1.PropertyTypes.Select(x => x.Id).ToArray(); var m2Ids = memberType2.PropertyTypes.Select(x => x.Id).ToArray(); @@ -286,11 +287,11 @@ namespace Umbraco.Tests.Persistence.Repositories // Act IMemberType memberType = MockedContentTypes.CreateSimpleMemberType(); repository.Save(memberType); - + var contentType2 = repository.Get(memberType.Id); repository.Delete(contentType2); - + var exists = repository.Exists(memberType.Id); diff --git a/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs index 684c8f9a22..803eff25af 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs @@ -307,7 +307,8 @@ namespace Umbraco.Tests.Persistence.Repositories var accessor = (IScopeAccessor) provider; var templateRepository = new TemplateRepository(accessor, AppCaches, Logger, TestObjects.GetFileSystemsMock()); var tagRepository = new TagRepository(accessor, AppCaches, Logger); - contentTypeRepository = new ContentTypeRepository(accessor, AppCaches, Logger, templateRepository); + var commonRepository = new ContentTypeCommonRepository(accessor, templateRepository, AppCaches); + contentTypeRepository = new ContentTypeRepository(accessor, AppCaches, Logger, commonRepository); var languageRepository = new LanguageRepository(accessor, AppCaches, Logger); var repository = new DocumentRepository(accessor, AppCaches, Logger, contentTypeRepository, templateRepository, tagRepository, languageRepository); return repository; diff --git a/src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs index ddbf3bfc9d..b6cc4dc50d 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs @@ -955,7 +955,8 @@ namespace Umbraco.Tests.Persistence.Repositories var accessor = (IScopeAccessor) provider; var templateRepository = new TemplateRepository(accessor, AppCaches.Disabled, Logger, TestObjects.GetFileSystemsMock()); var tagRepository = new TagRepository(accessor, AppCaches.Disabled, Logger); - contentTypeRepository = new ContentTypeRepository(accessor, AppCaches.Disabled, Logger, templateRepository); + var commonRepository = new ContentTypeCommonRepository(accessor, templateRepository, AppCaches.Disabled); + contentTypeRepository = new ContentTypeRepository(accessor, AppCaches.Disabled, Logger, commonRepository); var languageRepository = new LanguageRepository(accessor, AppCaches.Disabled, Logger); var repository = new DocumentRepository(accessor, AppCaches.Disabled, Logger, contentTypeRepository, templateRepository, tagRepository, languageRepository); return repository; @@ -964,8 +965,10 @@ namespace Umbraco.Tests.Persistence.Repositories private MediaRepository CreateMediaRepository(IScopeProvider provider, out MediaTypeRepository mediaTypeRepository) { var accessor = (IScopeAccessor) provider; + var templateRepository = new TemplateRepository(accessor, AppCaches.Disabled, Logger, TestObjects.GetFileSystemsMock()); var tagRepository = new TagRepository(accessor, AppCaches.Disabled, Logger); - mediaTypeRepository = new MediaTypeRepository(accessor, AppCaches.Disabled, Logger); + var commonRepository = new ContentTypeCommonRepository(accessor, templateRepository, AppCaches.Disabled); + mediaTypeRepository = new MediaTypeRepository(accessor, AppCaches.Disabled, Logger, commonRepository); var repository = new MediaRepository(accessor, AppCaches.Disabled, Logger, mediaTypeRepository, tagRepository, Mock.Of()); return repository; } diff --git a/src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs index 8f0150277d..13cbd463fb 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs @@ -238,7 +238,8 @@ namespace Umbraco.Tests.Persistence.Repositories var templateRepository = CreateRepository(ScopeProvider); var tagRepository = new TagRepository((IScopeAccessor) ScopeProvider, AppCaches.Disabled, Logger); - var contentTypeRepository = new ContentTypeRepository((IScopeAccessor) ScopeProvider, AppCaches.Disabled, Logger, templateRepository); + var commonRepository = new ContentTypeCommonRepository(ScopeProvider, templateRepository, AppCaches); + var contentTypeRepository = new ContentTypeRepository((IScopeAccessor) ScopeProvider, AppCaches.Disabled, Logger, commonRepository); var languageRepository = new LanguageRepository((IScopeAccessor) ScopeProvider, AppCaches.Disabled, Logger); var contentRepo = new DocumentRepository((IScopeAccessor) ScopeProvider, AppCaches.Disabled, Logger, contentTypeRepository, templateRepository, tagRepository, languageRepository); diff --git a/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs index 1d50fcac9e..b550091591 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs @@ -3,8 +3,6 @@ using Moq; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Cache; -using Umbraco.Core.Configuration.UmbracoSettings; -using Umbraco.Core.IO; using Umbraco.Core.Logging; using Umbraco.Core.Models.Membership; using Umbraco.Core.Persistence.Mappers; @@ -26,7 +24,9 @@ namespace Umbraco.Tests.Persistence.Repositories private MediaRepository CreateMediaRepository(IScopeProvider provider, out IMediaTypeRepository mediaTypeRepository) { var accessor = (IScopeAccessor) provider; - mediaTypeRepository = new MediaTypeRepository(accessor, AppCaches, Mock.Of()); + var templateRepository = new TemplateRepository(accessor, AppCaches.Disabled, Logger, TestObjects.GetFileSystemsMock()); + var commonRepository = new ContentTypeCommonRepository(accessor, templateRepository, AppCaches); + mediaTypeRepository = new MediaTypeRepository(accessor, AppCaches, Mock.Of(), commonRepository); var tagRepository = new TagRepository(accessor, AppCaches, Mock.Of()); var repository = new MediaRepository(accessor, AppCaches, Mock.Of(), mediaTypeRepository, tagRepository, Mock.Of()); return repository; @@ -43,7 +43,8 @@ namespace Umbraco.Tests.Persistence.Repositories var accessor = (IScopeAccessor) provider; templateRepository = new TemplateRepository(accessor, AppCaches, Logger, TestObjects.GetFileSystemsMock()); var tagRepository = new TagRepository(accessor, AppCaches, Logger); - contentTypeRepository = new ContentTypeRepository(accessor, AppCaches, Logger, templateRepository); + var commonRepository = new ContentTypeCommonRepository(accessor, templateRepository, AppCaches); + contentTypeRepository = new ContentTypeRepository(accessor, AppCaches, Logger, commonRepository); var languageRepository = new LanguageRepository(accessor, AppCaches, Logger); var repository = new DocumentRepository(accessor, AppCaches, Logger, contentTypeRepository, templateRepository, tagRepository, languageRepository); return repository; diff --git a/src/Umbraco.Tests/Persistence/SqlCeTableByTableTest.cs b/src/Umbraco.Tests/Persistence/SqlCeTableByTableTest.cs index dcbf5919eb..2afbdaca8f 100644 --- a/src/Umbraco.Tests/Persistence/SqlCeTableByTableTest.cs +++ b/src/Umbraco.Tests/Persistence/SqlCeTableByTableTest.cs @@ -316,7 +316,7 @@ namespace Umbraco.Tests.Persistence helper.CreateTable(); helper.CreateTable(); - helper.CreateTable(); + helper.CreateTable(); scope.Complete(); } diff --git a/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs b/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs index cb7a984ff3..ed5e6073ac 100644 --- a/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs +++ b/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs @@ -165,7 +165,8 @@ namespace Umbraco.Tests.Services { var tRepository = new TemplateRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, TestObjects.GetFileSystemsMock()); var tagRepo = new TagRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger); - var ctRepository = new ContentTypeRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, tRepository); + var commonRepository = new ContentTypeCommonRepository((IScopeAccessor)provider, tRepository, AppCaches); + var ctRepository = new ContentTypeRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, commonRepository); var languageRepository = new LanguageRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger); var repository = new DocumentRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, ctRepository, tRepository, tagRepo, languageRepository); @@ -198,7 +199,8 @@ namespace Umbraco.Tests.Services { var tRepository = new TemplateRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, TestObjects.GetFileSystemsMock()); var tagRepo = new TagRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger); - var ctRepository = new ContentTypeRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, tRepository); + var commonRepository = new ContentTypeCommonRepository((IScopeAccessor)provider, tRepository, AppCaches); + var ctRepository = new ContentTypeRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, commonRepository); var languageRepository = new LanguageRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger); var repository = new DocumentRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, ctRepository, tRepository, tagRepo, languageRepository); @@ -229,7 +231,8 @@ namespace Umbraco.Tests.Services { var tRepository = new TemplateRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, TestObjects.GetFileSystemsMock()); var tagRepo = new TagRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger); - var ctRepository = new ContentTypeRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, tRepository); + var commonRepository = new ContentTypeCommonRepository((IScopeAccessor) provider, tRepository, AppCaches); + var ctRepository = new ContentTypeRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, commonRepository); var languageRepository = new LanguageRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger); var repository = new DocumentRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, ctRepository, tRepository, tagRepo, languageRepository); @@ -263,7 +266,8 @@ namespace Umbraco.Tests.Services { var tRepository = new TemplateRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, TestObjects.GetFileSystemsMock()); var tagRepo = new TagRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger); - var ctRepository = new ContentTypeRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, tRepository); + var commonRepository = new ContentTypeCommonRepository((IScopeAccessor)provider, tRepository, AppCaches); + var ctRepository = new ContentTypeRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, commonRepository); var languageRepository = new LanguageRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger); var repository = new DocumentRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, ctRepository, tRepository, tagRepo, languageRepository); diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs index 7d8e000879..222f40aeed 100644 --- a/src/Umbraco.Tests/Services/ContentServiceTests.cs +++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs @@ -757,7 +757,7 @@ namespace Umbraco.Tests.Services content = ServiceContext.ContentService.GetById(content.Id); Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode)); Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode)); - + } @@ -784,7 +784,7 @@ namespace Umbraco.Tests.Services IContent content = new Content("content", Constants.System.Root, contentType); content.SetCultureName("content-en", langGB.IsoCode); content.SetCultureName("content-fr", langFr.IsoCode); - + Assert.IsTrue(ServiceContext.ContentService.SaveAndPublish(content, new []{ langGB.IsoCode , langFr.IsoCode }).Success); //re-get @@ -1597,7 +1597,7 @@ namespace Umbraco.Tests.Services var contentType = MockedContentTypes.CreateAllTypesContentType("test", "test"); ServiceContext.ContentTypeService.Save(contentType, Constants.Security.SuperUserId); - + object obj = new { @@ -3007,7 +3007,8 @@ namespace Umbraco.Tests.Services var accessor = (IScopeAccessor) provider; var templateRepository = new TemplateRepository(accessor, AppCaches.Disabled, Logger, TestObjects.GetFileSystemsMock()); var tagRepository = new TagRepository(accessor, AppCaches.Disabled, Logger); - contentTypeRepository = new ContentTypeRepository(accessor, AppCaches.Disabled, Logger, templateRepository); + var commonRepository = new ContentTypeCommonRepository(accessor, templateRepository, AppCaches); + contentTypeRepository = new ContentTypeRepository(accessor, AppCaches.Disabled, Logger, commonRepository); var languageRepository = new LanguageRepository(accessor, AppCaches.Disabled, Logger); var repository = new DocumentRepository(accessor, AppCaches.Disabled, Logger, contentTypeRepository, templateRepository, tagRepository, languageRepository); return repository; diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs index 341371ca02..a0b5f01a1f 100644 --- a/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs +++ b/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs @@ -1654,17 +1654,31 @@ namespace Umbraco.Tests.Services // create 'page' content type with a 'Content_' group var page = MockedContentTypes.CreateSimpleContentType("page", "Page", null, false, "Content_"); - Assert.IsTrue(page.PropertyGroups.Contains("Content_")); + Assert.AreEqual(1, page.PropertyGroups.Count); + Assert.AreEqual("Content_", page.PropertyGroups.First().Name); Assert.AreEqual(3, page.PropertyTypes.Count()); + Assert.AreEqual("Title", page.PropertyTypes.First().Name); + Assert.AreEqual("Body Text", page.PropertyTypes.Skip(1).First().Name); + Assert.AreEqual("Author", page.PropertyTypes.Skip(2).First().Name); service.Save(page); // create 'contentPage' content type as a child of 'page' var contentPage = MockedContentTypes.CreateSimpleContentType("contentPage", "Content Page", page, true); + Assert.AreEqual(1, page.PropertyGroups.Count); + Assert.AreEqual("Content_", page.PropertyGroups.First().Name); Assert.AreEqual(3, contentPage.PropertyTypes.Count()); + Assert.AreEqual("Title", contentPage.PropertyTypes.First().Name); + Assert.AreEqual("Body Text", contentPage.PropertyTypes.Skip(1).First().Name); + Assert.AreEqual("Author", contentPage.PropertyTypes.Skip(2).First().Name); service.Save(contentPage); // add 'Content' group to 'meta' content type var meta = MockedContentTypes.CreateMetaContentType(); + Assert.AreEqual(1, meta.PropertyGroups.Count); + Assert.AreEqual("Meta", meta.PropertyGroups.First().Name); + Assert.AreEqual(2, meta.PropertyTypes.Count()); + Assert.AreEqual("Meta Keywords", meta.PropertyTypes.First().Name); + Assert.AreEqual("Meta Description", meta.PropertyTypes.Skip(1).First().Name); meta.AddPropertyGroup("Content"); Assert.AreEqual(2, meta.PropertyTypes.Count()); service.Save(meta); diff --git a/src/Umbraco.Tests/Testing/UmbracoTestAttribute.cs b/src/Umbraco.Tests/Testing/UmbracoTestAttribute.cs index 4013d93cd3..b33a0ad69a 100644 --- a/src/Umbraco.Tests/Testing/UmbracoTestAttribute.cs +++ b/src/Umbraco.Tests/Testing/UmbracoTestAttribute.cs @@ -12,17 +12,17 @@ namespace Umbraco.Tests.Testing /// /// Default is false. /// This is for tests that inherited from TestWithApplicationBase. - /// Implies AutoMapper = true (, ResetPluginManager = false). + /// Implies Mapper = true (, ResetPluginManager = false). /// public bool WithApplication { get => _withApplication.ValueOrDefault(false); set => _withApplication.Set(value); } private readonly Settable _withApplication = new Settable(); /// - /// Gets or sets a value indicating whether to compose and initialize AutoMapper. + /// Gets or sets a value indicating whether to compose and initialize the mapper. /// /// Default is false unless WithApplication is true, in which case default is true. - public bool AutoMapper { get => _autoMapper.ValueOrDefault(WithApplication); set => _autoMapper.Set(value); } - private readonly Settable _autoMapper = new Settable(); + public bool Mapper { get => _mapper.ValueOrDefault(WithApplication); set => _mapper.Set(value); } + private readonly Settable _mapper = new Settable(); // FIXME: to be completed /// @@ -59,7 +59,7 @@ namespace Umbraco.Tests.Testing base.Merge(other); - _autoMapper.Set(attr._autoMapper); + _mapper.Set(attr._mapper); _publishedRepositoryEvents.Set(attr._publishedRepositoryEvents); _logger.Set(attr._logger); _database.Set(attr._database); diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs index 589d4b3df5..2d2cbaa3fd 100644 --- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs +++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs @@ -1,7 +1,6 @@ using System; using System.IO; using System.Reflection; -using AutoMapper; using Examine; using Moq; using NUnit.Framework; @@ -37,6 +36,7 @@ using Umbraco.Web.PublishedCache; using Umbraco.Web.Routing; using Umbraco.Web.Trees; using Umbraco.Core.Composing.CompositionExtensions; +using Umbraco.Core.Mapping; using Umbraco.Web.Composing.CompositionExtensions; using Umbraco.Web.Sections; using Current = Umbraco.Core.Composing.Current; @@ -108,6 +108,8 @@ namespace Umbraco.Tests.Testing protected IMapperCollection Mappers => Factory.GetInstance(); + protected UmbracoMapper Mapper => Factory.GetInstance(); + #endregion #region Setup @@ -148,7 +150,7 @@ namespace Umbraco.Tests.Testing protected virtual void Compose() { - ComposeAutoMapper(Options.AutoMapper); + ComposeMapper(Options.Mapper); ComposeDatabase(Options.Database); ComposeApplication(Options.WithApplication); @@ -165,7 +167,6 @@ namespace Umbraco.Tests.Testing protected virtual void Initialize() { - InitializeAutoMapper(Options.AutoMapper); InitializeApplication(Options.WithApplication); } @@ -249,7 +250,7 @@ namespace Umbraco.Tests.Testing Composition.WithCollectionBuilder(); } - protected virtual void ComposeAutoMapper(bool configure) + protected virtual void ComposeMapper(bool configure) { if (configure == false) return; @@ -371,18 +372,6 @@ namespace Umbraco.Tests.Testing #region Initialize - protected virtual void InitializeAutoMapper(bool configure) - { - if (configure == false) return; - - Mapper.Initialize(configuration => - { - var profiles = Factory.GetAllInstances(); - foreach (var profile in profiles) - configuration.AddProfile(profile); - }); - } - protected virtual void InitializeApplication(bool withApplication) { if (withApplication == false) return; @@ -430,8 +419,6 @@ namespace Umbraco.Tests.Testing UriUtility.ResetAppDomainAppVirtualPath(); SettingsForTests.Reset(); // FIXME: should it be optional? - Mapper.Reset(); - // clear static events DocumentRepository.ClearScopeEvents(); MediaRepository.ClearScopeEvents(); diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj index fb3c8ccea2..6188f577bb 100644 --- a/src/Umbraco.Tests/Umbraco.Tests.csproj +++ b/src/Umbraco.Tests/Umbraco.Tests.csproj @@ -78,7 +78,6 @@ - @@ -131,6 +130,7 @@ + @@ -166,7 +166,6 @@ - @@ -275,7 +274,6 @@ - diff --git a/src/Umbraco.Web.UI.Client/src/common/services/appstate.service.js b/src/Umbraco.Web.UI.Client/src/common/services/appstate.service.js index 9b1d92f2b0..47ed1f7749 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/appstate.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/appstate.service.js @@ -291,84 +291,3 @@ function appState(eventsService) { }; } angular.module('umbraco.services').factory('appState', appState); - -/** - * @ngdoc service - * @name umbraco.services.editorState - * @function - * - * @description - * Tracks the parent object for complex editors by exposing it as - * an object reference via editorState.current.entity - * - * it is possible to modify this object, so should be used with care - */ -angular.module('umbraco.services').factory("editorState", function() { - - var current = null; - var state = { - - /** - * @ngdoc function - * @name umbraco.services.angularHelper#set - * @methodOf umbraco.services.editorState - * @function - * - * @description - * Sets the current entity object for the currently active editor - * This is only used when implementing an editor with a complex model - * like the content editor, where the model is modified by several - * child controllers. - */ - set: function (entity) { - current = entity; - }, - - /** - * @ngdoc function - * @name umbraco.services.angularHelper#reset - * @methodOf umbraco.services.editorState - * @function - * - * @description - * Since the editorstate entity is read-only, you cannot set it to null - * only through the reset() method - */ - reset: function() { - current = null; - }, - - /** - * @ngdoc function - * @name umbraco.services.angularHelper#getCurrent - * @methodOf umbraco.services.editorState - * @function - * - * @description - * Returns an object reference to the current editor entity. - * the entity is the root object of the editor. - * EditorState is used by property/parameter editors that need - * access to the entire entity being edited, not just the property/parameter - * - * editorState.current can not be overwritten, you should only read values from it - * since modifying individual properties should be handled by the property editors - */ - getCurrent: function() { - return current; - } - }; - - // TODO: This shouldn't be removed! use getCurrent() method instead of a hacked readonly property which is confusing. - - //create a get/set property but don't allow setting - Object.defineProperty(state, "current", { - get: function () { - return current; - }, - set: function (value) { - throw "Use editorState.set to set the value of the current entity"; - } - }); - - return state; -}); diff --git a/src/Umbraco.Web.UI.Client/src/common/services/editorstate.service.js b/src/Umbraco.Web.UI.Client/src/common/services/editorstate.service.js new file mode 100644 index 0000000000..5e42af9c5e --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/common/services/editorstate.service.js @@ -0,0 +1,80 @@ +/** + * @ngdoc service + * @name umbraco.services.editorState + * @function + * + * @description + * Tracks the parent object for complex editors by exposing it as + * an object reference via editorState.current.entity + * + * it is possible to modify this object, so should be used with care + */ +angular.module('umbraco.services').factory("editorState", function() { + + var current = null; + var state = { + + /** + * @ngdoc function + * @name umbraco.services.angularHelper#set + * @methodOf umbraco.services.editorState + * @function + * + * @description + * Sets the current entity object for the currently active editor + * This is only used when implementing an editor with a complex model + * like the content editor, where the model is modified by several + * child controllers. + */ + set: function (entity) { + current = entity; + }, + + /** + * @ngdoc function + * @name umbraco.services.angularHelper#reset + * @methodOf umbraco.services.editorState + * @function + * + * @description + * Since the editorstate entity is read-only, you cannot set it to null + * only through the reset() method + */ + reset: function() { + current = null; + }, + + /** + * @ngdoc function + * @name umbraco.services.angularHelper#getCurrent + * @methodOf umbraco.services.editorState + * @function + * + * @description + * Returns an object reference to the current editor entity. + * the entity is the root object of the editor. + * EditorState is used by property/parameter editors that need + * access to the entire entity being edited, not just the property/parameter + * + * editorState.current can not be overwritten, you should only read values from it + * since modifying individual properties should be handled by the property editors + */ + getCurrent: function() { + return current; + } + }; + + // TODO: This shouldn't be removed! use getCurrent() method instead of a hacked readonly property which is confusing. + + //create a get/set property but don't allow setting + Object.defineProperty(state, "current", { + get: function () { + return current; + }, + set: function (value) { + throw "Use editorState.set to set the value of the current entity"; + } + }); + + return state; +}); diff --git a/src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js index 6304f4b8a0..8aaddbf98f 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js @@ -397,6 +397,54 @@ } } + + + /** + * @ngdoc method + * @name umbraco.services.listViewHelper#selectAllItemsToggle + * @methodOf umbraco.services.listViewHelper + * + * @description + * Helper method for toggling the select state on all items. + * + * @param {Array} items Items to toggle selection on, should be $scope.items + * @param {Array} selection Listview selection, available as $scope.selection + */ + + function selectAllItemsToggle(items, selection) { + + if (!angular.isArray(items)) { + return; + } + + if (isSelectedAll(items, selection)) { + // unselect all items + angular.forEach(items, function (item) { + item.selected = false; + }); + + // reset selection without loosing reference. + selection.length = 0; + + } else { + + // reset selection without loosing reference. + selection.length = 0; + + // select all items + angular.forEach(items, function (item) { + var obj = { + id: item.id + }; + if (item.key) { + obj.key = item.key; + } + item.selected = true; + selection.push(obj); + }); + } + + } /** * @ngdoc method @@ -527,6 +575,7 @@ deselectItem: deselectItem, clearSelection: clearSelection, selectAllItems: selectAllItems, + selectAllItemsToggle: selectAllItemsToggle, isSelectedAll: isSelectedAll, setSortingDirection: setSortingDirection, setSorting: setSorting, diff --git a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-toggle.less b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-toggle.less index 4c30ae583c..6f23677a1c 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-toggle.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-toggle.less @@ -10,47 +10,111 @@ } } -.umb-toggle:focus .umb-toggle__toggle{ - box-shadow: 0 1px 3px fade(@black, 12%), 0 1px 2px fade(@black, 24%); -} - -.umb-toggle__handler { - position: absolute; - top: 0; - left: 0; - display: block; - width: 24px; - height: 24px; - background-color: @white; - border-radius: 50px; - transform: rotate(-45deg); -} - .umb-toggle__toggle { cursor: pointer; align-items: center; display: flex; - width: 48px; - height: 24px; - background: @gray-8; - border-radius: 90px; + width: 38px; + height: 18px; + border-radius: 10px; + border: 1px solid @inputBorder; + background-color: @inputBorder; position: relative; - transition: box-shadow .3s; + transition: background-color 120ms; + + .umb-toggle:hover &, + .umb-toggle:focus & { + border-color: @inputBorderFocus; + } + + .umb-toggle.umb-toggle--checked & { + border-color: @ui-btn; + background-color: @ui-btn; + + &:hover { + background-color: @ui-btn-hover; + } + } + + .umb-toggle.umb-toggle--checked:focus & { + border-color: black; + } } -.umb-toggle--checked .umb-toggle__toggle { - background-color: @green; + + + +.umb-toggle__handler { + position: absolute; + top: 1px; + left: 1px; + display: block; + width: 16px; + height: 16px; + background-color: @white; + border-radius: 8px; + transition: transform 120ms ease-in-out, background-color 120ms; + + .umb-toggle.umb-toggle--checked & { + transform: translateX(20px); + background-color: white; + } + } -.umb-toggle--disabled .umb-toggle__toggle { - cursor: not-allowed; - opacity: 0.8; + +/* Icons */ + +.umb-toggle__icon { + position: absolute; + font-size: 12px; + line-height: 1em; + text-decoration: none; + transition: all 0.2s ease; } -.umb-toggle--checked .umb-toggle__handler { - transform: translate3d(24px, 0, 0) rotate(0); +.umb-toggle__icon--left { + left: 5px; + color: white; + transition: opacity 120ms; + opacity: 0; + // .umb-toggle:hover & { + // color: @ui-btn-hover; + // } + .umb-toggle--checked & { + opacity: 1; + } + .umb-toggle.umb-toggle--checked:hover & { + color: white; + } } +.umb-toggle__icon--right { + right: 5px; + color: @ui-btn; + transition: opacity 120ms; + .umb-toggle--checked & { + opacity: 0; + } + .umb-toggle:hover & { + color: @ui-btn-hover; + } +} + + + + +.umb-toggle.umb-toggle--disabled { + .umb-toggle__toggle { + cursor: not-allowed; + border-color: @gray-5; + } + .umb-toggle__handler { + background-color: @gray-5; + } +} + + /* Labels */ .umb-toggle__label { @@ -64,22 +128,3 @@ .umb-toggle__label--right { margin-left: 8px; } - -/* Icons */ - -.umb-toggle__icon { - position: absolute; - line-height: 1em; - text-decoration: none; - transition: all 0.2s ease; -} - -.umb-toggle__icon--left { - left: 7px; - color: @white; -} - -.umb-toggle__icon--right { - right: 7px; - color: @gray-5; -} diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor.less b/src/Umbraco.Web.UI.Client/src/less/components/editor.less index aa3b83ed6c..9d0e0d93a1 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/editor.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/editor.less @@ -90,6 +90,9 @@ .umb-editor-header__name-and-description { margin-right: 20px; + .umb-panel-header-description { + padding: 0 10px; + } } .-split-view-active .umb-editor-header__name-and-description { diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less index d8c7224d57..e2a35c5fb5 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less @@ -75,7 +75,7 @@ display: flex; align-items: center; border-bottom: 1px solid @gray-9; - padding: 10px 15px; + padding: 10px 15px 10px 10px; } .umb-group-builder__group-title { @@ -112,7 +112,7 @@ input.umb-group-builder__group-title-input { } input.umb-group-builder__group-title-input:disabled:hover { - border: none; + border-color: transparent; } .umb-group-builder__group-title-input:hover { @@ -135,12 +135,35 @@ input.umb-group-builder__group-title-input:disabled:hover { margin-left: auto; } +.umb-group-builder__group-add-property { + min-height: 46px; + margin-right: 30px; + margin-left: 270px; + border-radius: 3px; + + display: flex; + justify-content: center; + align-items: center; + cursor: pointer; + border: 1px dashed @gray-7; + background-color: transparent; + color: @ui-action-type; + font-weight: bold; + position: relative; + &:hover { + color:@ui-action-type-hover; + text-decoration: none; + border-color: @ui-active-type-hover; + } +} + /* ---------- PROPERTIES ---------- */ .umb-group-builder__properties { list-style: none; margin: 0; padding: 15px; + padding-right: 5px; min-height: 35px; // the height of a sortable property } @@ -228,6 +251,9 @@ input.umb-group-builder__group-title-input:disabled:hover { overflow: hidden; border-color: transparent; background: transparent; + &:focus { + border-color: @inputBorderFocus; + } } .umb-group-builder__property-meta-label textarea.ng-invalid { @@ -247,6 +273,9 @@ input.umb-group-builder__group-title-input:disabled:hover { overflow: hidden; border-color: transparent; background: transparent; + &:focus { + border-color: @inputBorderFocus; + } } .umb-group-builder__property-preview { @@ -265,21 +294,17 @@ input.umb-group-builder__group-title-input:disabled:hover { bottom: 0; left: 0; right: 0; - background: rgba(0,0,0,0.1); + background: rgba(225,225,225,.5); transition: opacity 120ms; } } -.umb-group-builder__property-preview:hover { +.umb-group-builder__property-preview:not(.-not-clickable):hover { &::after { - opacity: .8; + opacity: .66; } } -.umb-group-builder__property-preview:focus { - outline: none; -} - .umb-group-builder__property-preview.-not-clickable { cursor: auto; } @@ -301,23 +326,54 @@ input.umb-group-builder__group-title-input:disabled:hover { opacity: 0.8 } + +.umb-group-builder__open-settings { + position: absolute; + z-index:1; + top: 0; + bottom:0; + left: 0; + width: 100%; + background-color: transparent; + border: none; + &:focus { + outline:0; + border: 1px solid @inputBorderFocus; + } +} + .umb-group-builder__property-actions { - flex: 0 0 40px; - text-align: center; - margin: 15px 0 0 15px; + flex: 0 0 44px; + text-align: right; + margin-top: 7px; } .umb-group-builder__property-action { - margin: 0 0 10px 0; - display: block; - font-size: 18px; - position: relative; - cursor: pointer; - color: @ui-icon; -} - -.umb-group-builder__property-action:hover { - color: @ui-icon-hover; + + position: relative; + margin: 5px 0; + + > button { + border: none; + + font-size: 18px; + position: relative; + cursor: pointer; + color: @ui-icon; + + margin: 0; + padding: 5px 10px; + width: auto; + overflow: visible; + background: transparent; + line-height: normal; + outline: 0; + -webkit-appearance: none; + + &:hover, &:focus { + color: @ui-icon-hover; + } + } } .umb-group-builder__property-tags { @@ -439,7 +495,7 @@ input.umb-group-builder__group-sort-value { font-size: 14px; color: @ui-action-type; - &:hover { + &:hover{ text-decoration: none; color:@ui-action-type-hover; border-color:@ui-action-border-hover; diff --git a/src/Umbraco.Web.UI.Client/src/less/forms.less b/src/Umbraco.Web.UI.Client/src/less/forms.less index 45188ca02e..dc63baf335 100644 --- a/src/Umbraco.Web.UI.Client/src/less/forms.less +++ b/src/Umbraco.Web.UI.Client/src/less/forms.less @@ -533,6 +533,10 @@ div.help { } +table.domains .help-inline { + color:@red; +} + // INPUT GROUPS // ------------ diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.html index 620f9f1731..3faf74fdef 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.html @@ -11,7 +11,7 @@ hide-description="true"> - + diff --git a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-toggle.html b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-toggle.html index c8039448fd..ded527b3f7 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-toggle.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-toggle.html @@ -6,9 +6,9 @@
- -
- + + +
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html index 4d649a7fab..37b09ca005 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html @@ -116,7 +116,7 @@ -
+
@@ -234,29 +234,31 @@
- - - + + + + +
-
+
-
- +
+
- +
- + + + + +
- Name - - + Name +
Status diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html b/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html index 93c2ce05ed..4767f6fdcc 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html +++ b/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html @@ -250,7 +250,7 @@
Compatibility
-
This package is compatible with the following versions of Umbraco, as reported by community members. Full compatability cannot be gauranteed for versions reported below 100%
+
This package is compatible with the following versions of Umbraco, as reported by community members. Full compatability cannot be guaranteed for versions reported below 100%
{{compatibility.version}} diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js index 045a33ac32..94b8991e1f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js @@ -1,75 +1,84 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.CheckboxListController", function ($scope) { - + + var vm = this; + + vm.configItems = []; + vm.viewItems = []; + vm.changed = changed; + function init() { - - //we can't really do anything if the config isn't an object + + // currently the property editor will onyl work if our input is an object. if (angular.isObject($scope.model.config.items)) { - //now we need to format the items in the dictionary because we always want to have an array - var configItems = []; + // formatting the items in the dictionary into an array + var sortedItems = []; var vals = _.values($scope.model.config.items); var keys = _.keys($scope.model.config.items); for (var i = 0; i < vals.length; i++) { - configItems.push({ id: keys[i], sortOrder: vals[i].sortOrder, value: vals[i].value }); + sortedItems.push({ key: keys[i], sortOrder: vals[i].sortOrder, value: vals[i].value}); } //ensure the items are sorted by the provided sort order - configItems.sort(function (a, b) { return (a.sortOrder > b.sortOrder) ? 1 : ((b.sortOrder > a.sortOrder) ? -1 : 0); }); - + sortedItems.sort(function (a, b) { return (a.sortOrder > b.sortOrder) ? 1 : ((b.sortOrder > a.sortOrder) ? -1 : 0); }); + + vm.configItems = sortedItems; + if ($scope.model.value === null || $scope.model.value === undefined) { $scope.model.value = []; } - - updateViewModel(configItems); - + + // update view model. + generateViewModel($scope.model.value); + //watch the model.value in case it changes so that we can keep our view model in sync - $scope.$watchCollection("model.value", - function (newVal) { - updateViewModel(configItems); - }); + $scope.$watchCollection("model.value", updateViewModel); } } - - function updateViewModel(configItems) { + + function updateViewModel(newVal) { - //get the checked vals from the view model - var selectedVals = _.map( - _.filter($scope.selectedItems, - function(f) { - return f.checked; - } - ), - function(m) { - return m.value; + var i = vm.configItems.length; + while(i--) { + + var item = vm.configItems[i]; + + // are this item the same in the model + if (item.checked !== (newVal.indexOf(item.value) !== -1)) { + + // if not lets update the full model. + generateViewModel(newVal); + + return; } - ); - - //if the length is zero, then we are in sync, just exit. - if (_.difference($scope.model.value, selectedVals).length === 0) { - return; } - - $scope.selectedItems = []; + + } + + function generateViewModel(newVal) { + + vm.viewItems = []; var iConfigItem; - for (var i = 0; i < configItems.length; i++) { - iConfigItem = configItems[i]; - var isChecked = _.contains($scope.model.value, iConfigItem.value); - $scope.selectedItems.push({ + for (var i = 0; i < vm.configItems.length; i++) { + iConfigItem = vm.configItems[i]; + var isChecked = _.contains(newVal, iConfigItem.value); + vm.viewItems.push({ checked: isChecked, - key: iConfigItem.id, - val: iConfigItem.value + key: iConfigItem.key, + value: iConfigItem.value }); } + } function changed(model, value) { var index = $scope.model.value.indexOf(value); - if (model) { + if (model === true) { //if it doesn't exist in the model, then add it if (index < 0) { $scope.model.value.push(value); @@ -80,11 +89,9 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.CheckboxListContro $scope.model.value.splice(index, 1); } } + } - $scope.selectedItems = []; - $scope.changed = changed; - init(); }); diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html index 783b413d5e..b685b10dd8 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html @@ -1,7 +1,7 @@ -
+
    -
  • - +
  • +
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js index f26f077e66..294dd50147 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js @@ -40,8 +40,8 @@ } } - function selectAll($event) { - listViewHelper.selectAllItems($scope.items, $scope.selection, $event); + function selectAll() { + listViewHelper.selectAllItemsToggle($scope.items, $scope.selection); } function isSelectedAll() { diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 8fb0dc6cd9..6777e66456 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -83,7 +83,6 @@ - diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml index 88a628436f..5459356f47 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml @@ -1,2119 +1,2119 @@ - - - - The Umbraco community - https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files - - - Culture and Hostnames - Audit Trail - Browse Node - Change Document Type - Copy - Create - Export - Create Package - Create group - Delete - Disable - Empty recycle bin - Enable - Export Document Type - Import Document Type - Import Package - Edit in Canvas - Exit - Move - Notifications - Public access - Publish - Unpublish - Reload - Republish entire site - Rename - Restore - Set permissions for the page %0% - Choose where to copy - Choose where to move - to in the tree structure below - was moved to - was copied to - Permissions - Rollback - Send To Publish - Send To Translation - Set group - Sort - Translate - Update - Set permissions - Unlock - Create Content Template - Resend Invitation - - - Content - Administration - Structure - Other - - - Allow access to assign culture and hostnames - Allow access to view a node's history log - Allow access to view a node - Allow access to change document type for a node - Allow access to copy a node - Allow access to create nodes - Allow access to delete nodes - Allow access to move a node - Allow access to set and change public access for a node - Allow access to publish a node - Allow access to unpublish a node - Allow access to change permissions for a node - Allow access to roll back a node to a previous state - Allow access to send a node for approval before publishing - Allow access to send a node for translation - Allow access to change the sort order for nodes - Allow access to translate a node - Allow access to save a node - Allow access to create a Content Template - - - Content - Info - - - Permission denied. - Add new Domain - remove - Invalid node. - Invalid domain format. - Domain has already been assigned. - Language - Domain - New domain '%0%' has been created - Domain '%0%' is deleted - Domain '%0%' has already been assigned - Domain '%0%' has been updated - Edit Current Domains - - Inherit - Culture - - or inherit culture from parent nodes. Will also apply
- to the current node, unless a domain below applies too.]]> - - Domains - - - Clear selection - Select - Do something else - Bold - Cancel Paragraph Indent - Insert form field - Insert graphic headline - Edit Html - Indent Paragraph - Italic - Center - Justify Left - Justify Right - Insert Link - Insert local link (anchor) - Bullet List - Numeric List - Insert macro - Insert picture - Publish and close - Publish with descendants - Edit relations - Return to list - Save - Save and close - Save and publish - Save and schedule - Save and send for approval - Save list view - Schedule - Preview - Preview is disabled because there's no template assigned - Choose style - Show styles - Insert table - Save and generate models - Undo - Redo - Delete tag - Cancel - Confirm - - - Viewing for - Content deleted - Content unpublished - Content saved and Published - Content saved and published for languages: %0% - Content saved - Content saved for languages: %0% - Content moved - Content copied - Content rolled back - Content sent for publishing - Content sent for publishing for languages: %0% - Sort child items performed by user - Copy - Publish - Publish - Move - Save - Save - Delete - Unpublish - Rollback - Send To Publish - Send To Publish - Sort - History (all variants) - - - To change the document type for the selected content, first select from the list of valid types for this location. - Then confirm and/or amend the mapping of properties from the current type to the new, and click Save. - The content has been re-published. - Current Property - Current type - The document type cannot be changed, as there are no alternatives valid for this location. An alternative will be valid if it is allowed under the parent of the selected content item and that all existing child content items are allowed to be created under it. - Document Type Changed - Map Properties - Map to Property - New Template - New Type - none - Content - Select New Document Type - The document type of the selected content has been successfully changed to [new type] and the following properties mapped: - to - Could not complete property mapping as one or more properties have more than one mapping defined. - Only alternate types valid for the current location are displayed. - - - Failed to create a folder under parent with ID %0% - Failed to create a folder under parent with name %0% - The folder name cannot contain illegal characters. - Failed to delete item: %0% - - - Is Published - About this page - Alias - (how would you describe the picture over the phone) - Alternative Links - Click to edit this item - Created by - Original author - Updated by - Created - Date/time this document was created - Document Type - Editing - Remove at - This item has been changed after publication - This item is not published - Last published - There are no items to show - There are no items to show in the list. - No content has been added - No members have been added - Media Type - Link to media item(s) - Member Group - Role - Member Type - No changes have been made - No date chosen - Page title - This media item has no link - Properties - This document is published but is not visible because the parent '%0%' is unpublished - This culture is published but is not visible because it is unpublished on parent '%0%' - This document is published but is not in the cache - Could not get the url - This document is published but its url would collide with content %0% - This document is published but its url cannot be routed - Publish - Published - Published (pending changes) - Publication Status - Publish with descendants to publish %0% and all content items underneath and thereby making their content publicly available.]]> - Publish with descendants to publish the selected languages and the same languages of content items underneath and thereby making their content publicly available.]]> - Publish at - Unpublish at - Clear Date - Set date - Sortorder is updated - To sort the nodes, simply drag the nodes or click one of the column headers. You can select multiple nodes by holding the "shift" or "control" key while selecting - Statistics - Title (optional) - Alternative text (optional) - Type - Unpublish - Unpublished - Last edited - Date/time this document was edited - Remove file(s) - Link to document - Member of group(s) - Not a member of group(s) - Child items - Target - This translates to the following time on the server: - What does this mean?]]> - Are you sure you want to delete this item? - Property %0% uses editor %1% which is not supported by Nested Content. - Add another text box - Remove this text box - Content root - Include drafts: also publish unpublished content items. - This value is hidden. If you need access to view this value please contact your website administrator. - This value is hidden. - What languages would you like to publish? All languages with content are saved! - What languages would you like to publish? - What languages would you like to save? - What languages would you like to save? - What languages would you like to send for approval? - What languages would you like to schedule? - Select the languages to unpublish. Unpublishing a mandatory language will unpublish all languages. - Published Languages - Unpublished Languages - Unmodified Languages - These languages haven't been created - Ready to Publish? - Ready to Save? - Send for approval - Select the date and time to publish and/or unpublish the content item. - - - Create a new Content Template from '%0%' - Blank - Select a Content Template - Content Template created - A Content Template was created from '%0%' - Another Content Template with the same name already exists - A Content Template is pre-defined content that an editor can select to use as the basis for creating new content - - - Click to upload - or click here to choose files - You can drag files here to upload - Cannot upload this file, it does not have an approved file type - Max file size is - Media root - Failed to move media - Failed to copy media - Failed to create a folder under parent id %0% - Failed to rename the folder with id %0% - - - Create a new member - All Members - Member groups have no additional properties for editing. - - - Where do you want to create the new %0% - Create an item under - Select the document type you want to make a content template for - Enter a folder name - Choose a type and a title - "document types".]]> - "media types".]]> - Document Type without a template - New folder - New data type - New JavaScript file - New empty partial view - New partial view macro - New partial view from snippet - New partial view macro from snippet - New partial view macro (without macro) - New style sheet file - New Rich Text Editor style sheet file - - - Browse your website - - Hide - If Umbraco isn't opening, you might need to allow popups from this site - has opened in a new window - Restart - Visit - Welcome - - - Stay - Discard changes - You have unsaved changes - Are you sure you want to navigate away from this page? - you have unsaved changes - Publishing will make the selected items visible on the site. - Unpublishing will remove the selected items and all their descendants from the site. - Unpublishing will remove this page and all its descendants from the site. - You have unsaved changes. Making changes to the Document Type will discard the changes. - - - Done - Deleted %0% item - Deleted %0% items - Deleted %0% out of %1% item - Deleted %0% out of %1% items - Published %0% item - Published %0% items - Published %0% out of %1% item - Published %0% out of %1% items - Unpublished %0% item - Unpublished %0% items - Unpublished %0% out of %1% item - Unpublished %0% out of %1% items - Moved %0% item - Moved %0% items - Moved %0% out of %1% item - Moved %0% out of %1% items - Copied %0% item - Copied %0% items - Copied %0% out of %1% item - Copied %0% out of %1% items - - - Link title - Link - Anchor / querystring - Name - Manage hostnames - Close this window - Are you sure you want to delete - Are you sure you want to disable - Are you sure? - Are you sure? - Cut - Edit Dictionary Item - Edit Language - Insert local link - Insert character - Insert graphic headline - Insert picture - Insert link - Click to add a Macro - Insert table - This will delete the language - Last Edited - Link - Internal link: - When using local links, insert "#" in front of link - Open in new window? - Macro Settings - This macro does not contain any properties you can edit - Paste - Edit permissions for - Set permissions for - Set permissions for %0% for user group %1% - Select the users groups you want to set permissions for - The items in the recycle bin are now being deleted. Please do not close this window while this operation takes place - The recycle bin is now empty - When items are deleted from the recycle bin, they will be gone forever - regexlib.com's webservice is currently experiencing some problems, which we have no control over. We are very sorry for this inconvenience.]]> - Search for a regular expression to add validation to a form field. Example: 'email, 'zip-code' 'url' - Remove Macro - Required Field - Site is reindexed - The website cache has been refreshed. All publish content is now up to date. While all unpublished content is still unpublished - The website cache will be refreshed. All published content will be updated, while unpublished content will stay unpublished. - Number of columns - Number of rows - Click on the image to see full size - Pick item - View Cache Item - Relate to original - Include descendants - The friendliest community - Link to page - Opens the linked document in a new window or tab - Link to media - Select content start node - Select media - Select icon - Select item - Select link - Select macro - Select content - Select media start node - Select member - Select member group - Select node - Select sections - Select users - No icons were found - There are no parameters for this macro - There are no macros available to insert - External login providers - Exception Details - Stacktrace - Inner Exception - Link your - Un-link your - account - Select editor - Select snippet - This will delete the node and all its languages. If you only want to delete one language go and unpublish it instead. - - - There are no dictionary items. - - - %0%' below
You can add additional languages under the 'languages' in the menu on the left - ]]> - Culture Name - - Dictionary overview - - - Configured Searchers - Shows properties and tools for any configured Searcher (i.e. such as a multi-index searcher) - Field values - Health status - The health status of the index and if it can be read - Indexers - Index info - Lists the properties of the index - Manage Examine's indexes - Allows you to view the details of each index and provides some tools for managing the indexes - Rebuild index - - Depending on how much content there is in your site this could take a while.
- It is not recommended to rebuild an index during times of high website traffic or when editors are editing content. - ]]> - - Searchers - Search the index and view the results - Tools - Tools to manage the index - - - Enter your username - Enter your password - Confirm your password - Name the %0%... - Enter a name... - Enter an email... - Enter a username... - Label... - Enter a description... - Type to search... - Type to filter... - Type to add tags (press enter after each tag)... - Enter your email - Enter a message... - Your username is usually your email - #value or ?key=value - Enter alias... - Generating alias... - - - Allowed child node types - Create - Delete tab - Description - New tab - Tab - Thumbnail - Create custom list view - Remove custom list view - A content type, media type or member type with this alias already exists - - - Renamed - Enter a new folder name here - %0% was renamed to %1% - - - Add prevalue - Database datatype - Property editor GUID - Property editor - Buttons - Enable advanced settings for - Enable context menu - Maximum default size of inserted images - Related stylesheets - Show label - Width and height - All property types & property data - using this data type will be deleted permanently, please confirm you want to delete these as well - Yes, delete - and all property types & property data using this data type - Select the folder to move - to in the tree structure below - was moved underneath - - - Your data has been saved, but before you can publish this page there are some errors you need to fix first: - The current membership provider does not support changing password (EnablePasswordRetrieval need to be true) - %0% already exists - There were errors: - There were errors: - The password should be a minimum of %0% characters long and contain at least %1% non-alpha numeric character(s) - %0% must be an integer - The %0% field in the %1% tab is mandatory - %0% is a mandatory field - %0% at %1% is not in a correct format - %0% is not in a correct format - - - Received an error from the server - The specified file type has been disallowed by the administrator - NOTE! Even though CodeMirror is enabled by configuration, it is disabled in Internet Explorer because it's not stable enough. - Please fill both alias and name on the new property type! - There is a problem with read/write access to a specific file or folder - Error loading Partial View script (file: %0%) - Please enter a title - Please choose a type - You're about to make the picture larger than the original size. Are you sure that you want to proceed? - Startnode deleted, please contact your administrator - Please mark content before changing style - No active styles available - Please place cursor at the left of the two cells you wish to merge - You cannot split a cell that hasn't been merged. - - - About - Action - Actions - Add - Alias - All - Are you sure? - Back - Back to overview - Border - by - Cancel - Cell margin - Choose - Close - Close Window - Comment - Confirm - Constrain - Constrain proportions - Content - Continue - Copy - Create - Database - Date - Default - Delete - Deleted - Deleting... - Design - Dictionary - Dimensions - Down - Download - Edit - Edited - Elements - Email - Error - Field - Find - First - General - Groups - Height - Help - Hide - History - Icon - Id - Import - Include subfolders in search - Info - Inner margin - Insert - Install - Invalid - Justify - Label - Language - Last - Layout - Links - Loading - Locked - Login - Log off - Logout - Macro - Mandatory - Message - Move - Name - New - Next - No - of - Off - OK - Open - Options - On - or - Order by - Password - Path - One moment please... - Previous - Properties - Rebuild - Email to receive form data - Recycle Bin - Your recycle bin is empty - Reload - Remaining - Remove - Rename - Renew - Required - Retrieve - Retry - Permissions - Scheduled Publishing - Search - Sorry, we can not find what you are looking for. - No items have been added - Server - Settings - Show - Show page on Send - Size - Sort - Status - Submit - Type - Type to search... - under - Up - Update - Upgrade - Upload - Url - User - Username - Value - View - Welcome... - Width - Yes - Folder - Search results - Reorder - I am done reordering - Preview - Change password - to - List view - Saving... - current - Embed - selected - - - Blue - - - Add group - Add property - Add editor - Add template - Add child node - Add child - Edit data type - Navigate sections - Shortcuts - show shortcuts - Toggle list view - Toggle allow as root - Comment/Uncomment lines - Remove line - Copy Lines Up - Copy Lines Down - Move Lines Up - Move Lines Down - General - Editor - Toggle allow culture variants - - - Background colour - Bold - Text colour - Font - Text - - - Page - - - The installer cannot connect to the database. - Could not save the web.config file. Please modify the connection string manually. - Your database has been found and is identified as - Database configuration - - install button to install the Umbraco %0% database - ]]> - - Next to proceed.]]> - Database not found! Please check that the information in the "connection string" of the "web.config" file is correct.

-

To proceed, please edit the "web.config" file (using Visual Studio or your favourite text editor), scroll to the bottom, add the connection string for your database in the key named "UmbracoDbDSN" and save the file.

-

- Click the retry button when - done.
- More information on editing web.config here.

]]> - - Please contact your ISP if necessary. - If you're installing on a local machine or server you might need information from your system administrator.]]> - - Press the upgrade button to upgrade your database to Umbraco %0%

-

- Don't worry - no content will be deleted and everything will continue working afterwards! -

- ]]> - Press Next to - proceed. ]]> - next to continue the configuration wizard]]> - The Default users' password needs to be changed!]]> - The Default user has been disabled or has no access to Umbraco!

No further actions needs to be taken. Click Next to proceed.]]> - The Default user's password has been successfully changed since the installation!

No further actions needs to be taken. Click Next to proceed.]]> - The password is changed! - Get a great start, watch our introduction videos - By clicking the next button (or modifying the umbracoConfigurationStatus in web.config), you accept the license for this software as specified in the box below. Notice that this Umbraco distribution consists of two different licenses, the open source MIT license for the framework and the Umbraco freeware license that covers the UI. - Not installed yet. - Affected files and folders - More information on setting up permissions for Umbraco here - You need to grant ASP.NET modify permissions to the following files/folders - Your permission settings are almost perfect!

- You can run Umbraco without problems, but you will not be able to install packages which are recommended to take full advantage of Umbraco.]]> - How to Resolve - Click here to read the text version - video tutorial on setting up folder permissions for Umbraco or read the text version.]]> - Your permission settings might be an issue! -

- You can run Umbraco without problems, but you will not be able to create folders or install packages which are recommended to take full advantage of Umbraco.]]> - Your permission settings are not ready for Umbraco! -

- In order to run Umbraco, you'll need to update your permission settings.]]> - Your permission settings are perfect!

- You are ready to run Umbraco and install packages!]]> - Resolving folder issue - Follow this link for more information on problems with ASP.NET and creating folders - Setting up folder permissions - - I want to start from scratch - learn how) - You can still choose to install Runway later on. Please go to the Developer section and choose Packages. - ]]> - You've just set up a clean Umbraco platform. What do you want to do next? - Runway is installed - - This is our list of recommended modules, check off the ones you would like to install, or view the full list of modules - ]]> - Only recommended for experienced users - I want to start with a simple website - - "Runway" is a simple website providing some basic document types and templates. The installer can set up Runway for you automatically, - but you can easily edit, extend or remove it. It's not necessary and you can perfectly use Umbraco without it. However, - Runway offers an easy foundation based on best practices to get you started faster than ever. - If you choose to install Runway, you can optionally select basic building blocks called Runway Modules to enhance your Runway pages. -

- - Included with Runway: Home page, Getting Started page, Installing Modules page.
- Optional Modules: Top Navigation, Sitemap, Contact, Gallery. - - ]]> - What is Runway - Step 1/5 Accept license - Step 2/5: Database configuration - Step 3/5: Validating File Permissions - Step 4/5: Check Umbraco security - Step 5/5: Umbraco is ready to get you started - Thank you for choosing Umbraco - Browse your new site -You installed Runway, so why not see how your new website looks.]]> - Further help and information -Get help from our award winning community, browse the documentation or watch some free videos on how to build a simple site, how to use packages and a quick guide to the Umbraco terminology]]> - Umbraco %0% is installed and ready for use - /web.config file and update the AppSetting key UmbracoConfigurationStatus in the bottom to the value of '%0%'.]]> - started instantly by clicking the "Launch Umbraco" button below.
If you are new to Umbraco, -you can find plenty of resources on our getting started pages.]]> - Launch Umbraco -To manage your website, simply open the Umbraco back office and start adding content, updating the templates and stylesheets or add new functionality]]> - Connection to database failed. - Umbraco Version 3 - Umbraco Version 4 - Watch - Umbraco %0% for a fresh install or upgrading from version 3.0. -

- Press "next" to start the wizard.]]> - - - Culture Code - Culture Name - - - You've been idle and logout will automatically occur in - Renew now to save your work - - - Happy super Sunday - Happy manic Monday - Happy tubular Tuesday - Happy wonderful Wednesday - Happy thunderous Thursday - Happy funky Friday - Happy Caturday - Log in below - Sign in with - Session timed out - © 2001 - %0%
Umbraco.com

]]> - Forgotten password? - An email will be sent to the address specified with a link to reset your password - An email with password reset instructions will be sent to the specified address if it matched our records - Show password - Hide password - Return to login form - Please provide a new password - Your Password has been updated - The link you have clicked on is invalid or has expired - Umbraco: Reset Password - - - - - - - - - - - -
- - - - - -
- -
- -
-
- - - - - - -
-
-
- - - - -
- - - - -
-

- Password reset requested -

-

- Your username to login to the Umbraco back-office is: %0% -

-

- - - - - - -
- - Click this link to reset your password - -
-

-

If you cannot click on the link, copy and paste this URL into your browser window:

- - - - -
- - %1% - -
-

-
-
-


-
-
- - - ]]> - - - Dashboard - Sections - Content - - - Choose page above... - %0% has been copied to %1% - Select where the document %0% should be copied to below - %0% has been moved to %1% - Select where the document %0% should be moved to below - has been selected as the root of your new content, click 'ok' below. - No node selected yet, please select a node in the list above before clicking 'ok' - The current node is not allowed under the chosen node because of its type - The current node cannot be moved to one of its subpages - The current node cannot exist at the root - The action isn't allowed since you have insufficient permissions on 1 or more child documents. - Relate copied items to original - - - %0%]]> - Notification settings saved for - - The following languages have been modified %0% - - - - - - - - - - - -
- - - - - -
- -
- -
-
- - - - - - -
-
-
- - - - -
- - - - -
-

- Hi %0%, -

-

- This is an automated mail to inform you that the task '%1%' has been performed on the page '%2%' by the user '%3%' -

- - - - - - -
- -
- EDIT
-
-

-

Update summary:

- %6% -

-

- Have a nice day!

- Cheers from the Umbraco robot -

-
-
-


-
-
- - - ]]> - The following languages have been modified:

- %0% - ]]> - [%0%] Notification about %1% performed on %2% - Notifications - - - Actions - Created - Create package - - button and locating the package. Umbraco packages usually have a ".umb" or ".zip" extension. - ]]> - This will delete the package - Drop to upload - Include all child nodes - or click here to choose package file - Upload package - Install a local package by selecting it from your machine. Only install packages from sources you know and trust - Upload another package - Cancel and upload another package - I accept - terms of use - - Path to file - Absolute path to file (ie: /bin/umbraco.bin) - Installed - Installed packages - Install local - Finish - This package has no configuration view - No packages have been created yet - You don’t have any packages installed - 'Packages' icon in the top right of your screen]]> - Package Actions - Author URL - Package Content - Package Files - Icon URL - Install package - License - License URL - Package Properties - Search for packages - Results for - We couldn’t find anything for - Please try searching for another package or browse through the categories - Popular - New releases - has - karma points - Information - Owner - Contributors - Created - Current version - .NET version - Downloads - Likes - Compatibility - This package is compatible with the following versions of Umbraco, as reported by community members. Full compatability cannot be gauranteed for versions reported below 100% - External sources - Author - Documentation - Package meta data - Package name - Package doesn't contain any items -
- You can safely remove this from the system by clicking "uninstall package" below.]]> - Package options - Package readme - Package repository - Confirm package uninstall - Package was uninstalled - The package was successfully uninstalled - Uninstall package - - Notice: any documents, media etc depending on the items you remove, will stop working, and could lead to system instability, - so uninstall with caution. If in doubt, contact the package author.]]> - Package version - Package already installed - This package cannot be installed, it requires a minimum Umbraco version of - Uninstalling... - Downloading... - Importing... - Installing... - Restarting, please wait... - All done, your browser will now refresh, please wait... - Please click 'Finish' to complete installation and reload the page. - Uploading package... - - - Paste with full formatting (Not recommended) - The text you're trying to paste contains special characters or formatting. This could be caused by copying text from Microsoft Word. Umbraco can remove special characters or formatting automatically, so the pasted content will be more suitable for the web. - Paste as raw text without any formatting at all - Paste, but remove formatting (Recommended) - - - Group based protection - If you want to grant access to all members of specific member groups - You need to create a member group before you can use group based authentication - Error Page - Used when people are logged on, but do not have access - %0%]]> - %0% is now protected]]> - %0%]]> - Login Page - Choose the page that contains the login form - Remove protection... - %0%?]]> - Select the pages that contain login form and error messages - %0%]]> - %0%]]> - Specific members protection - If you wish to grant access to specific members - - - - - - - - - Include unpublished subpages - Publishing in progress - please wait... - %0% out of %1% pages have been published... - %0% has been published - %0% and subpages have been published - Publish %0% and all its subpages - Publish to publish %0% and thereby making its content publicly available.

- You can publish this page and all its subpages by checking Include unpublished subpages below. - ]]> - - - You have not configured any approved colours - - - You have picked a content item currently deleted or in the recycle bin - You have picked content items currently deleted or in the recycle bin - - - You have picked a media item currently deleted or in the recycle bin - You have picked media items currently deleted or in the recycle bin - Trashed - - - enter external link - choose internal page - Caption - Link - Open in new window - enter the display caption - Enter the link - - - Reset crop - Save crop - Add new crop - Done - Undo edits - - - Select a version to compare with the current version - Current version - Red text will not be shown in the selected version. , green means added]]> - Document has been rolled back - This displays the selected version as HTML, if you wish to see the difference between 2 versions at the same time, use the diff view - Rollback to - Select version - View - - - Edit script file - - - Concierge - Content - Courier - Developer - Forms - Help - Umbraco Configuration Wizard - Media - Members - Newsletters - Packages - Settings - Statistics - Translation - Users - - - The best Umbraco video tutorials - - - Default template - To import a document type, find the ".udt" file on your computer by clicking the "Browse" button and click "Import" (you'll be asked for confirmation on the next screen) - New Tab Title - Node type - Type - Stylesheet - Script - Tab - Tab Title - Tabs - Master Content Type enabled - This Content Type uses - as a Master Content Type. Tabs from Master Content Types are not shown and can only be edited on the Master Content Type itself - No properties defined on this tab. Click on the "add a new property" link at the top to create a new property. - Create matching template - Add icon - - - Sort order - Creation date - Sorting complete. - Drag the different items up or down below to set how they should be arranged. Or click the column headers to sort the entire collection of items - - - - Validation - Validation errors must be fixed before the item can be saved - Failed - Saved - Insufficient user permissions, could not complete the operation - Cancelled - Operation was cancelled by a 3rd party add-in - Publishing was cancelled by a 3rd party add-in - Property type already exists - Property type created - DataType: %1%]]> - Propertytype deleted - Document Type saved - Tab created - Tab deleted - Tab with id: %0% deleted - Stylesheet not saved - Stylesheet saved - Stylesheet saved without any errors - Datatype saved - Dictionary item saved - Publishing failed because the parent page isn't published - Content published - and visible on the website - Content saved - Remember to publish to make changes visible - Sent For Approval - Changes have been sent for approval - Media saved - Member group saved - Media saved without any errors - Member saved - Stylesheet Property Saved - Stylesheet saved - Template saved - Error saving user (check log) - User Saved - User type saved - User group saved - File not saved - file could not be saved. Please check file permissions - File saved - File saved without any errors - Language saved - Media Type saved - Member Type saved - Member Group saved - Template not saved - Please make sure that you do not have 2 templates with the same alias - Template saved - Template saved without any errors! - Content unpublished - Partial view saved - Partial view saved without any errors! - Partial view not saved - An error occurred saving the file. - Permissions saved for - Deleted %0% user groups - %0% was deleted - Enabled %0% users - Disabled %0% users - %0% is now enabled - %0% is now disabled - User groups have been set - Unlocked %0% users - %0% is now unlocked - Member was exported to file - An error occurred while exporting the member - User %0% was deleted - Invite user - Invitation has been re-sent to %0% - Document type was exported to file - An error occurred while exporting the document type - - - Add style - Edit style - Rich text editor styles - Define the styles that should be available in the rich text editor for this stylesheet - Edit stylesheet - Edit stylesheet property - The name displayed in the editor style selector - Preview - How the text will look like in the rich text editor. - Selector - Uses CSS syntax, e.g. "h1" or ".redHeader" - Styles - The CSS that should be applied in the rich text editor, e.g. "color:red;" - Code - Editor - - - Failed to delete template with ID %0% - Edit template - Sections - Insert content area - Insert content area placeholder - Insert - Choose what to insert into your template - Dictionary item - A dictionary item is a placeholder for a translatable piece of text, which makes it easy to create designs for multilingual websites. - Macro - - A Macro is a configurable component which is great for - reusable parts of your design, where you need the option to provide parameters, - such as galleries, forms and lists. - - Value - Displays the value of a named field from the current page, with options to modify the value or fallback to alternative values. - Partial view - - A partial view is a separate template file which can be rendered inside another - template, it's great for reusing markup or for separating complex templates into separate files. - - Master template - No master - Render child template - @RenderBody() placeholder. - ]]> - Define a named section - @section { ... }. This can be rendered in a - specific area of the parent of this template, by using @RenderSection. - ]]> - Render a named section - @RenderSection(name) placeholder. - This renders an area of a child template which is wrapped in a corresponding @section [name]{ ... } definition. - ]]> - Section Name - Section is mandatory - - If mandatory, the child template must contain a @section definition, otherwise an error is shown. - - Query builder - items returned, in - I want - all content - content of type "%0%" - from - my website - where - and - is - is not - before - before (including selected date) - after - after (including selected date) - equals - does not equal - contains - does not contain - greater than - greater than or equal to - less than - less than or equal to - Id - Name - Created Date - Last Updated Date - order by - ascending - descending - Template - - - Image - Macro - Choose type of content - Choose a layout - Add a row - Add content - Drop content - Settings applied - This content is not allowed here - This content is allowed here - Click to embed - Click to insert image - Image caption... - Write here... - Grid Layouts - Layouts are the overall work area for the grid editor, usually you only need one or two different layouts - Add Grid Layout - Adjust the layout by setting column widths and adding additional sections - Row configurations - Rows are predefined cells arranged horizontally - Add row configuration - Adjust the row by setting cell widths and adding additional cells - Columns - Total combined number of columns in the grid layout - Settings - Configure what settings editors can change - Styles - Configure what styling editors can change - Allow all editors - Allow all row configurations - Maximum items - Leave blank or set to 0 for unlimited - Set as default - Choose extra - Choose default - are added - - - Compositions - You have not added any groups - Add group - Inherited from - Add property - Required label - Enable list view - Configures the content item to show a sortable and searchable list of its children, the children will not be shown in the tree - Allowed Templates - Choose which templates editors are allowed to use on content of this type - Allow as root - Allow editors to create content of this type in the root of the content tree - Allowed child node types - Allow content of the specified types to be created underneath content of this type - Choose child node - Inherit tabs and properties from an existing document type. New tabs will be added to the current document type or merged if a tab with an identical name exists. - This content type is used in a composition, and therefore cannot be composed itself. - There are no content types available to use as a composition. - Create new - Use existing - Editor settings - Configuration - Yes, delete - was moved underneath - was copied underneath - Select the folder to move - Select the folder to copy - to in the tree structure below - All Document types - All Documents - All media items - using this document type will be deleted permanently, please confirm you want to delete these as well. - using this media type will be deleted permanently, please confirm you want to delete these as well. - using this member type will be deleted permanently, please confirm you want to delete these as well - and all documents using this type - and all media items using this type - and all members using this type - Member can edit - Allow this property value to be edited by the member on their profile page - Is sensitive data - Hide this property value from content editors that don't have access to view sensitive information - Show on member profile - Allow this property value to be displayed on the member profile page - tab has no sort order - Where is this composition used? - This composition is currently used in the composition of the following content types: - Allow varying by culture - Allow editors to create content of this type in different languages - Allow varying by culture - Is an Element type - An Element type is meant to be used for instance in Nested Content, and not in the tree - This is not applicable for an Element type - - - Add language - Mandatory language - Properties on this language have to be filled out before the node can be published. - Default language - An Umbraco site can only have one default language set. - Switching default language may result in default content missing. - Falls back to - No fall back language - To allow multi-lingual content to fall back to another language if not present in the requested language, select it here. - Fall back language - - - - Add parameter - Edit parameter - Enter macro name - Parameters - Define the parameters that should be available when using this macro. - - - Building models - this can take a bit of time, don't worry - Models generated - Models could not be generated - Models generation has failed, see exception in U log - - - Add fallback field - Fallback field - Add default value - Default value - Fallback field - Default value - Casing - Encoding - Choose field - Convert line breaks - Yes, convert line breaks - Replaces line breaks with 'br' html tag - Custom Fields - Date only - Format and encoding - Format as date - Format the value as a date, or a date with time, according to the active culture - HTML encode - Will replace special characters by their HTML equivalent. - Will be inserted after the field value - Will be inserted before the field value - Lowercase - Modify output - None - Output sample - Insert after field - Insert before field - Recursive - Yes, make it recursive - Separator - Standard Fields - Uppercase - URL encode - Will format special characters in URLs - Will only be used when the field values above are empty - This field will only be used if the primary field is empty - Date and time - - - Translation details - Download XML DTD - Fields - Include subpages - - No translator users found. Please create a translator user before you start sending content to translation - The page '%0%' has been send to translation - Send the page '%0%' to translation - Total words - Translate to - Translation completed. - You can preview the pages, you've just translated, by clicking below. If the original page is found, you will get a comparison of the 2 pages. - Translation failed, the XML file might be corrupt - Translation options - Translator - Upload translation XML - - - Content - Content Templates - Media - Cache Browser - Recycle Bin - Created packages - Data Types - Dictionary - Installed packages - Install skin - Install starter kit - Languages - Install local package - Macros - Media Types - Members - Member Groups - Member Roles - Member Types - Document Types - Relation Types - Packages - Packages - Partial Views - Partial View Macro Files - Install from repository - Install Runway - Runway modules - Scripting Files - Scripts - Stylesheets - Templates - Log Viewer - Users - Settings - Templating - Third Party - - - New update ready - %0% is ready, click here for download - No connection to server - Error checking for update. Please review trace-stack for further information - - - Access - Based on the assigned groups and start nodes, the user has access to the following nodes - Assign access - Administrator - Category field - User created - Change Your Password - Change photo - New password - hasn't been locked out - The password hasn't been changed - Confirm new password - You can change your password for accessing the Umbraco Back Office by filling out the form below and click the 'Change Password' button - Content Channel - Create another user - Create new users to give them access to Umbraco. When a new user is created a password will be generated that you can share with the user. - Description field - Disable User - Document Type - Editor - Excerpt field - Failed login attempts - Go to user profile - Add groups to assign access and permissions - Invite another user - Invite new users to give them access to Umbraco. An invite email will be sent to the user with information on how to log in to Umbraco. Invites last for 72 hours. - Language - Set the language you will see in menus and dialogs - Last lockout date - Last login - Password last changed - Username - Media start node - Limit the media library to a specific start node - Media start nodes - Limit the media library to specific start nodes - Sections - Disable Umbraco Access - has not logged in yet - Old password - Password - Reset password - Your password has been changed! - Please confirm the new password - Enter your new password - Your new password cannot be blank! - Current password - Invalid current password - There was a difference between the new password and the confirmed password. Please try again! - The confirmed password doesn't match the new password! - Replace child node permissions - You are currently modifying permissions for the pages: - Select pages to modify their permissions - Remove photo - Default permissions - Granular permissions - Set permissions for specific nodes - Profile - Search all children - Add sections to give users access - Select user groups - No start node selected - No start nodes selected - Content start node - Limit the content tree to a specific start node - Content start nodes - Limit the content tree to specific start nodes - User last updated - has been created - The new user has successfully been created. To log in to Umbraco use the password below. - User management - Name - User permissions - User group - has been invited - An invitation has been sent to the new user with details about how to log in to Umbraco. - Hello there and welcome to Umbraco! In just 1 minute you’ll be good to go, we just need you to setup a password and add a picture for your avatar. - Welcome to Umbraco! Unfortunately your invite has expired. Please contact your administrator and ask them to resend it. - Uploading a photo of yourself will make it easy for other users to recognize you. Click the circle above to upload your photo. - Writer - Change - Your profile - Your recent history - Session expires in - Invite user - Create user - Send invite - Back to users - Umbraco: Invitation - - - - - - - - - - - -
- - - - - -
- -
- -
-
- - - - - - -
-
-
- - - - -
- - - - -
-

- Hi %0%, -

-

- You have been invited by %1% to the Umbraco Back Office. -

-

- Message from %1%: -
- %2% -

- - - - - - -
- - - - - - -
- - Click this link to accept the invite - -
-
-

If you cannot click on the link, copy and paste this URL into your browser window:

- - - - -
- - %3% - -
-

-
-
-


-
-
- - ]]> - Invite - Resending invitation... - Delete User - Are you sure you wish to delete this user account? - All - Active - Disabled - Locked out - Invited - Inactive - Name (A-Z) - Name (Z-A) - Newest - Oldest - Last login - - - Validation - No validation - Validate as an email address - Validate as a number - Validate as a URL - ...or enter a custom validation - Field is mandatory - Enter a regular expression - You need to add at least - You can only have - items - items selected - Invalid date - Not a number - Invalid email - Custom validation - - - - Value is set to the recommended value: '%0%'. - Value was set to '%1%' for XPath '%2%' in configuration file '%3%'. - Expected value '%1%' for '%2%' in configuration file '%3%', but found '%0%'. - Found unexpected value '%0%' for '%2%' in configuration file '%3%'. - - Custom errors are set to '%0%'. - Custom errors are currently set to '%0%'. It is recommended to set this to '%1%' before go live. - Custom errors successfully set to '%0%'. - MacroErrors are set to '%0%'. - MacroErrors are set to '%0%' which will prevent some or all pages in your site from loading completely if there are any errors in macros. Rectifying this will set the value to '%1%'. - MacroErrors are now set to '%0%'. - - Try Skip IIS Custom Errors is set to '%0%' and you're using IIS version '%1%'. - Try Skip IIS Custom Errors is currently '%0%'. It is recommended to set this to '%1%' for your IIS version (%2%). - Try Skip IIS Custom Errors successfully set to '%0%'. - - File does not exist: '%0%'. - '%0%' in config file '%1%'.]]> - There was an error, check log for full error: %0%. - Database - The database schema is correct for this version of Umbraco - %0% problems were detected with your database schema (Check the log for details) - Some errors were detected while validating the database schema against the current version of Umbraco. - Your website's certificate is valid. - Certificate validation error: '%0%' - Your website's SSL certificate has expired. - Your website's SSL certificate is expiring in %0% days. - Error pinging the URL %0% - '%1%' - You are currently %0% viewing the site using the HTTPS scheme. - The appSetting 'Umbraco.Core.UseHttps' is set to 'false' in your web.config file. Once you access this site using the HTTPS scheme, that should be set to 'true'. - The appSetting 'Umbraco.Core.UseHttps' is set to '%0%' in your web.config file, your cookies are %1% marked as secure. - Could not update the 'Umbraco.Core.UseHttps' setting in your web.config file. Error: %0% - - Enable HTTPS - Sets umbracoSSL setting to true in the appSettings of the web.config file. - The appSetting 'Umbraco.Core.UseHttps' is now set to 'true' in your web.config file, your cookies will be marked as secure. - Fix - Cannot fix a check with a value comparison type of 'ShouldNotEqual'. - Cannot fix a check with a value comparison type of 'ShouldEqual' with a provided value. - Value to fix check not provided. - Debug compilation mode is disabled. - Debug compilation mode is currently enabled. It is recommended to disable this setting before go live. - Debug compilation mode successfully disabled. - Trace mode is disabled. - Trace mode is currently enabled. It is recommended to disable this setting before go live. - Trace mode successfully disabled. - All folders have the correct permissions set. - - %0%.]]> - %0%. If they aren't being written to no action need be taken.]]> - All files have the correct permissions set. - - %0%.]]> - %0%. If they aren't being written to no action need be taken.]]> - X-Frame-Options used to control whether a site can be IFRAMEd by another was found.]]> - X-Frame-Options used to control whether a site can be IFRAMEd by another was not found.]]> - Set Header in Config - Adds a value to the httpProtocol/customHeaders section of web.config to prevent the site being IFRAMEd by other websites. - A setting to create a header preventing IFRAMEing of the site by other websites has been added to your web.config file. - Could not update web.config file. Error: %0% - X-Content-Type-Options used to protect against MIME sniffing vulnerabilities was found.]]> - X-Content-Type-Options used to protect against MIME sniffing vulnerabilities was not found.]]> - Adds a value to the httpProtocol/customHeaders section of web.config to protect against MIME sniffing vulnerabilities. - A setting to create a header protecting against MIME sniffing vulnerabilities has been added to your web.config file. - Strict-Transport-Security, also known as the HSTS-header, was found.]]> - Strict-Transport-Security was not found.]]> - Adds the header 'Strict-Transport-Security' with the value 'max-age=10886400; preload' to the httpProtocol/customHeaders section of web.config. Use this fix only if you will have your domains running with https for the next 18 weeks (minimum). - The HSTS header has been added to your web.config file. - X-XSS-Protection was found.]]> - X-XSS-Protection was not found.]]> - Adds the header 'X-XSS-Protection' with the value '1; mode=block' to the httpProtocol/customHeaders section of web.config. - The X-XSS-Protection header has been added to your web.config file. - - %0%.]]> - No headers revealing information about the website technology were found. - In the Web.config file, system.net/mailsettings could not be found. - In the Web.config file system.net/mailsettings section, the host is not configured. - SMTP settings are configured correctly and the service is operating as expected. - The SMTP server configured with host '%0%' and port '%1%' could not be reached. Please check to ensure the SMTP settings in the Web.config file system.net/mailsettings are correct. - %0%.]]> - %0%.]]> -

Results of the scheduled Umbraco Health Checks run on %0% at %1% are as follows:

%2%]]> - Umbraco Health Check Status: %0% - - - Disable URL tracker - Enable URL tracker - Original URL - Redirected To - Redirect Url Management - The following URLs redirect to this content item: - No redirects have been made - When a published page gets renamed or moved a redirect will automatically be made to the new page. - Are you sure you want to remove the redirect from '%0%' to '%1%'? - Redirect URL removed. - Error removing redirect URL. - This will remove the redirect - Are you sure you want to disable the URL tracker? - URL tracker has now been disabled. - Error disabling the URL tracker, more information can be found in your log file. - URL tracker has now been enabled. - Error enabling the URL tracker, more information can be found in your log file. - - - No Dictionary items to choose from - + + + + The Umbraco community + https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files + + + Culture and Hostnames + Audit Trail + Browse Node + Change Document Type + Copy + Create + Export + Create Package + Create group + Delete + Disable + Empty recycle bin + Enable + Export Document Type + Import Document Type + Import Package + Edit in Canvas + Exit + Move + Notifications + Public access + Publish + Unpublish + Reload + Republish entire site + Rename + Restore + Set permissions for the page %0% + Choose where to copy + Choose where to move + to in the tree structure below + was moved to + was copied to + Permissions + Rollback + Send To Publish + Send To Translation + Set group + Sort + Translate + Update + Set permissions + Unlock + Create Content Template + Resend Invitation + + + Content + Administration + Structure + Other + + + Allow access to assign culture and hostnames + Allow access to view a node's history log + Allow access to view a node + Allow access to change document type for a node + Allow access to copy a node + Allow access to create nodes + Allow access to delete nodes + Allow access to move a node + Allow access to set and change public access for a node + Allow access to publish a node + Allow access to unpublish a node + Allow access to change permissions for a node + Allow access to roll back a node to a previous state + Allow access to send a node for approval before publishing + Allow access to send a node for translation + Allow access to change the sort order for nodes + Allow access to translate a node + Allow access to save a node + Allow access to create a Content Template + + + Content + Info + + + Permission denied. + Add new Domain + remove + Invalid node. + Invalid domain format. + Domain has already been assigned. + Language + Domain + New domain '%0%' has been created + Domain '%0%' is deleted + Domain '%0%' has already been assigned + Domain '%0%' has been updated + Edit Current Domains + + Inherit + Culture + + or inherit culture from parent nodes. Will also apply
+ to the current node, unless a domain below applies too.]]> + + Domains + + + Clear selection + Select + Do something else + Bold + Cancel Paragraph Indent + Insert form field + Insert graphic headline + Edit Html + Indent Paragraph + Italic + Center + Justify Left + Justify Right + Insert Link + Insert local link (anchor) + Bullet List + Numeric List + Insert macro + Insert picture + Publish and close + Publish with descendants + Edit relations + Return to list + Save + Save and close + Save and publish + Save and schedule + Save and send for approval + Save list view + Schedule + Preview + Preview is disabled because there's no template assigned + Choose style + Show styles + Insert table + Save and generate models + Undo + Redo + Delete tag + Cancel + Confirm + + + Viewing for + Content deleted + Content unpublished + Content saved and Published + Content saved and published for languages: %0% + Content saved + Content saved for languages: %0% + Content moved + Content copied + Content rolled back + Content sent for publishing + Content sent for publishing for languages: %0% + Sort child items performed by user + Copy + Publish + Publish + Move + Save + Save + Delete + Unpublish + Rollback + Send To Publish + Send To Publish + Sort + History (all variants) + + + To change the document type for the selected content, first select from the list of valid types for this location. + Then confirm and/or amend the mapping of properties from the current type to the new, and click Save. + The content has been re-published. + Current Property + Current type + The document type cannot be changed, as there are no alternatives valid for this location. An alternative will be valid if it is allowed under the parent of the selected content item and that all existing child content items are allowed to be created under it. + Document Type Changed + Map Properties + Map to Property + New Template + New Type + none + Content + Select New Document Type + The document type of the selected content has been successfully changed to [new type] and the following properties mapped: + to + Could not complete property mapping as one or more properties have more than one mapping defined. + Only alternate types valid for the current location are displayed. + + + Failed to create a folder under parent with ID %0% + Failed to create a folder under parent with name %0% + The folder name cannot contain illegal characters. + Failed to delete item: %0% + + + Is Published + About this page + Alias + (how would you describe the picture over the phone) + Alternative Links + Click to edit this item + Created by + Original author + Updated by + Created + Date/time this document was created + Document Type + Editing + Remove at + This item has been changed after publication + This item is not published + Last published + There are no items to show + There are no items to show in the list. + No content has been added + No members have been added + Media Type + Link to media item(s) + Member Group + Role + Member Type + No changes have been made + No date chosen + Page title + This media item has no link + Properties + This document is published but is not visible because the parent '%0%' is unpublished + This culture is published but is not visible because it is unpublished on parent '%0%' + This document is published but is not in the cache + Could not get the url + This document is published but its url would collide with content %0% + This document is published but its url cannot be routed + Publish + Published + Published (pending changes) + Publication Status + Publish with descendants to publish %0% and all content items underneath and thereby making their content publicly available.]]> + Publish with descendants to publish the selected languages and the same languages of content items underneath and thereby making their content publicly available.]]> + Publish at + Unpublish at + Clear Date + Set date + Sortorder is updated + To sort the nodes, simply drag the nodes or click one of the column headers. You can select multiple nodes by holding the "shift" or "control" key while selecting + Statistics + Title (optional) + Alternative text (optional) + Type + Unpublish + Unpublished + Last edited + Date/time this document was edited + Remove file(s) + Link to document + Member of group(s) + Not a member of group(s) + Child items + Target + This translates to the following time on the server: + What does this mean?]]> + Are you sure you want to delete this item? + Property %0% uses editor %1% which is not supported by Nested Content. + Add another text box + Remove this text box + Content root + Include drafts: also publish unpublished content items. + This value is hidden. If you need access to view this value please contact your website administrator. + This value is hidden. + What languages would you like to publish? All languages with content are saved! + What languages would you like to publish? + What languages would you like to save? + What languages would you like to save? + What languages would you like to send for approval? + What languages would you like to schedule? + Select the languages to unpublish. Unpublishing a mandatory language will unpublish all languages. + Published Languages + Unpublished Languages + Unmodified Languages + These languages haven't been created + Ready to Publish? + Ready to Save? + Send for approval + Select the date and time to publish and/or unpublish the content item. + + + Create a new Content Template from '%0%' + Blank + Select a Content Template + Content Template created + A Content Template was created from '%0%' + Another Content Template with the same name already exists + A Content Template is pre-defined content that an editor can select to use as the basis for creating new content + + + Click to upload + or click here to choose files + You can drag files here to upload + Cannot upload this file, it does not have an approved file type + Max file size is + Media root + Failed to move media + Failed to copy media + Failed to create a folder under parent id %0% + Failed to rename the folder with id %0% + + + Create a new member + All Members + Member groups have no additional properties for editing. + + + Where do you want to create the new %0% + Create an item under + Select the document type you want to make a content template for + Enter a folder name + Choose a type and a title + "document types".]]> + "media types".]]> + Document Type without a template + New folder + New data type + New JavaScript file + New empty partial view + New partial view macro + New partial view from snippet + New partial view macro from snippet + New partial view macro (without macro) + New style sheet file + New Rich Text Editor style sheet file + + + Browse your website + - Hide + If Umbraco isn't opening, you might need to allow popups from this site + has opened in a new window + Restart + Visit + Welcome + + + Stay + Discard changes + You have unsaved changes + Are you sure you want to navigate away from this page? - you have unsaved changes + Publishing will make the selected items visible on the site. + Unpublishing will remove the selected items and all their descendants from the site. + Unpublishing will remove this page and all its descendants from the site. + You have unsaved changes. Making changes to the Document Type will discard the changes. + + + Done + Deleted %0% item + Deleted %0% items + Deleted %0% out of %1% item + Deleted %0% out of %1% items + Published %0% item + Published %0% items + Published %0% out of %1% item + Published %0% out of %1% items + Unpublished %0% item + Unpublished %0% items + Unpublished %0% out of %1% item + Unpublished %0% out of %1% items + Moved %0% item + Moved %0% items + Moved %0% out of %1% item + Moved %0% out of %1% items + Copied %0% item + Copied %0% items + Copied %0% out of %1% item + Copied %0% out of %1% items + + + Link title + Link + Anchor / querystring + Name + Manage hostnames + Close this window + Are you sure you want to delete + Are you sure you want to disable + Are you sure? + Are you sure? + Cut + Edit Dictionary Item + Edit Language + Insert local link + Insert character + Insert graphic headline + Insert picture + Insert link + Click to add a Macro + Insert table + This will delete the language + Last Edited + Link + Internal link: + When using local links, insert "#" in front of link + Open in new window? + Macro Settings + This macro does not contain any properties you can edit + Paste + Edit permissions for + Set permissions for + Set permissions for %0% for user group %1% + Select the users groups you want to set permissions for + The items in the recycle bin are now being deleted. Please do not close this window while this operation takes place + The recycle bin is now empty + When items are deleted from the recycle bin, they will be gone forever + regexlib.com's webservice is currently experiencing some problems, which we have no control over. We are very sorry for this inconvenience.]]> + Search for a regular expression to add validation to a form field. Example: 'email, 'zip-code' 'url' + Remove Macro + Required Field + Site is reindexed + The website cache has been refreshed. All publish content is now up to date. While all unpublished content is still unpublished + The website cache will be refreshed. All published content will be updated, while unpublished content will stay unpublished. + Number of columns + Number of rows + Click on the image to see full size + Pick item + View Cache Item + Relate to original + Include descendants + The friendliest community + Link to page + Opens the linked document in a new window or tab + Link to media + Select content start node + Select media + Select icon + Select item + Select link + Select macro + Select content + Select media start node + Select member + Select member group + Select node + Select sections + Select users + No icons were found + There are no parameters for this macro + There are no macros available to insert + External login providers + Exception Details + Stacktrace + Inner Exception + Link your + Un-link your + account + Select editor + Select snippet + This will delete the node and all its languages. If you only want to delete one language go and unpublish it instead. + + + There are no dictionary items. + + + %0%' below
You can add additional languages under the 'languages' in the menu on the left + ]]> + Culture Name + + Dictionary overview + + + Configured Searchers + Shows properties and tools for any configured Searcher (i.e. such as a multi-index searcher) + Field values + Health status + The health status of the index and if it can be read + Indexers + Index info + Lists the properties of the index + Manage Examine's indexes + Allows you to view the details of each index and provides some tools for managing the indexes + Rebuild index + + Depending on how much content there is in your site this could take a while.
+ It is not recommended to rebuild an index during times of high website traffic or when editors are editing content. + ]]> + + Searchers + Search the index and view the results + Tools + Tools to manage the index + + + Enter your username + Enter your password + Confirm your password + Name the %0%... + Enter a name... + Enter an email... + Enter a username... + Label... + Enter a description... + Type to search... + Type to filter... + Type to add tags (press enter after each tag)... + Enter your email + Enter a message... + Your username is usually your email + #value or ?key=value + Enter alias... + Generating alias... + + + Allowed child node types + Create + Delete tab + Description + New tab + Tab + Thumbnail + Create custom list view + Remove custom list view + A content type, media type or member type with this alias already exists + + + Renamed + Enter a new folder name here + %0% was renamed to %1% + + + Add prevalue + Database datatype + Property editor GUID + Property editor + Buttons + Enable advanced settings for + Enable context menu + Maximum default size of inserted images + Related stylesheets + Show label + Width and height + All property types & property data + using this data type will be deleted permanently, please confirm you want to delete these as well + Yes, delete + and all property types & property data using this data type + Select the folder to move + to in the tree structure below + was moved underneath + + + Your data has been saved, but before you can publish this page there are some errors you need to fix first: + The current membership provider does not support changing password (EnablePasswordRetrieval need to be true) + %0% already exists + There were errors: + There were errors: + The password should be a minimum of %0% characters long and contain at least %1% non-alpha numeric character(s) + %0% must be an integer + The %0% field in the %1% tab is mandatory + %0% is a mandatory field + %0% at %1% is not in a correct format + %0% is not in a correct format + + + Received an error from the server + The specified file type has been disallowed by the administrator + NOTE! Even though CodeMirror is enabled by configuration, it is disabled in Internet Explorer because it's not stable enough. + Please fill both alias and name on the new property type! + There is a problem with read/write access to a specific file or folder + Error loading Partial View script (file: %0%) + Please enter a title + Please choose a type + You're about to make the picture larger than the original size. Are you sure that you want to proceed? + Startnode deleted, please contact your administrator + Please mark content before changing style + No active styles available + Please place cursor at the left of the two cells you wish to merge + You cannot split a cell that hasn't been merged. + + + About + Action + Actions + Add + Alias + All + Are you sure? + Back + Back to overview + Border + by + Cancel + Cell margin + Choose + Close + Close Window + Comment + Confirm + Constrain + Constrain proportions + Content + Continue + Copy + Create + Database + Date + Default + Delete + Deleted + Deleting... + Design + Dictionary + Dimensions + Down + Download + Edit + Edited + Elements + Email + Error + Field + Find + First + General + Groups + Height + Help + Hide + History + Icon + Id + Import + Include subfolders in search + Info + Inner margin + Insert + Install + Invalid + Justify + Label + Language + Last + Layout + Links + Loading + Locked + Login + Log off + Logout + Macro + Mandatory + Message + Move + Name + New + Next + No + of + Off + OK + Open + Options + On + or + Order by + Password + Path + One moment please... + Previous + Properties + Rebuild + Email to receive form data + Recycle Bin + Your recycle bin is empty + Reload + Remaining + Remove + Rename + Renew + Required + Retrieve + Retry + Permissions + Scheduled Publishing + Search + Sorry, we can not find what you are looking for. + No items have been added + Server + Settings + Show + Show page on Send + Size + Sort + Status + Submit + Type + Type to search... + under + Up + Update + Upgrade + Upload + Url + User + Username + Value + View + Welcome... + Width + Yes + Folder + Search results + Reorder + I am done reordering + Preview + Change password + to + List view + Saving... + current + Embed + selected + + + Blue + + + Add group + Add property + Add editor + Add template + Add child node + Add child + Edit data type + Navigate sections + Shortcuts + show shortcuts + Toggle list view + Toggle allow as root + Comment/Uncomment lines + Remove line + Copy Lines Up + Copy Lines Down + Move Lines Up + Move Lines Down + General + Editor + Toggle allow culture variants + + + Background colour + Bold + Text colour + Font + Text + + + Page + + + The installer cannot connect to the database. + Could not save the web.config file. Please modify the connection string manually. + Your database has been found and is identified as + Database configuration + + install button to install the Umbraco %0% database + ]]> + + Next to proceed.]]> + Database not found! Please check that the information in the "connection string" of the "web.config" file is correct.

+

To proceed, please edit the "web.config" file (using Visual Studio or your favourite text editor), scroll to the bottom, add the connection string for your database in the key named "UmbracoDbDSN" and save the file.

+

+ Click the retry button when + done.
+ More information on editing web.config here.

]]> + + Please contact your ISP if necessary. + If you're installing on a local machine or server you might need information from your system administrator.]]> + + Press the upgrade button to upgrade your database to Umbraco %0%

+

+ Don't worry - no content will be deleted and everything will continue working afterwards! +

+ ]]> + Press Next to + proceed. ]]> + next to continue the configuration wizard]]> + The Default users' password needs to be changed!]]> + The Default user has been disabled or has no access to Umbraco!

No further actions needs to be taken. Click Next to proceed.]]> + The Default user's password has been successfully changed since the installation!

No further actions needs to be taken. Click Next to proceed.]]> + The password is changed! + Get a great start, watch our introduction videos + By clicking the next button (or modifying the umbracoConfigurationStatus in web.config), you accept the license for this software as specified in the box below. Notice that this Umbraco distribution consists of two different licenses, the open source MIT license for the framework and the Umbraco freeware license that covers the UI. + Not installed yet. + Affected files and folders + More information on setting up permissions for Umbraco here + You need to grant ASP.NET modify permissions to the following files/folders + Your permission settings are almost perfect!

+ You can run Umbraco without problems, but you will not be able to install packages which are recommended to take full advantage of Umbraco.]]> + How to Resolve + Click here to read the text version + video tutorial on setting up folder permissions for Umbraco or read the text version.]]> + Your permission settings might be an issue! +

+ You can run Umbraco without problems, but you will not be able to create folders or install packages which are recommended to take full advantage of Umbraco.]]> + Your permission settings are not ready for Umbraco! +

+ In order to run Umbraco, you'll need to update your permission settings.]]> + Your permission settings are perfect!

+ You are ready to run Umbraco and install packages!]]> + Resolving folder issue + Follow this link for more information on problems with ASP.NET and creating folders + Setting up folder permissions + + I want to start from scratch + learn how) + You can still choose to install Runway later on. Please go to the Developer section and choose Packages. + ]]> + You've just set up a clean Umbraco platform. What do you want to do next? + Runway is installed + + This is our list of recommended modules, check off the ones you would like to install, or view the full list of modules + ]]> + Only recommended for experienced users + I want to start with a simple website + + "Runway" is a simple website providing some basic document types and templates. The installer can set up Runway for you automatically, + but you can easily edit, extend or remove it. It's not necessary and you can perfectly use Umbraco without it. However, + Runway offers an easy foundation based on best practices to get you started faster than ever. + If you choose to install Runway, you can optionally select basic building blocks called Runway Modules to enhance your Runway pages. +

+ + Included with Runway: Home page, Getting Started page, Installing Modules page.
+ Optional Modules: Top Navigation, Sitemap, Contact, Gallery. + + ]]> + What is Runway + Step 1/5 Accept license + Step 2/5: Database configuration + Step 3/5: Validating File Permissions + Step 4/5: Check Umbraco security + Step 5/5: Umbraco is ready to get you started + Thank you for choosing Umbraco + Browse your new site +You installed Runway, so why not see how your new website looks.]]> + Further help and information +Get help from our award winning community, browse the documentation or watch some free videos on how to build a simple site, how to use packages and a quick guide to the Umbraco terminology]]> + Umbraco %0% is installed and ready for use + /web.config file and update the AppSetting key UmbracoConfigurationStatus in the bottom to the value of '%0%'.]]> + started instantly by clicking the "Launch Umbraco" button below.
If you are new to Umbraco, +you can find plenty of resources on our getting started pages.]]> + Launch Umbraco +To manage your website, simply open the Umbraco back office and start adding content, updating the templates and stylesheets or add new functionality]]> + Connection to database failed. + Umbraco Version 3 + Umbraco Version 4 + Watch + Umbraco %0% for a fresh install or upgrading from version 3.0. +

+ Press "next" to start the wizard.]]> + + + Culture Code + Culture Name + + + You've been idle and logout will automatically occur in + Renew now to save your work + + + Happy super Sunday + Happy manic Monday + Happy tubular Tuesday + Happy wonderful Wednesday + Happy thunderous Thursday + Happy funky Friday + Happy Caturday + Log in below + Sign in with + Session timed out + © 2001 - %0%
Umbraco.com

]]> + Forgotten password? + An email will be sent to the address specified with a link to reset your password + An email with password reset instructions will be sent to the specified address if it matched our records + Show password + Hide password + Return to login form + Please provide a new password + Your Password has been updated + The link you have clicked on is invalid or has expired + Umbraco: Reset Password + + + + + + + + + + + +
+ + + + + +
+ +
+ +
+
+ + + + + + +
+
+
+ + + + +
+ + + + +
+

+ Password reset requested +

+

+ Your username to login to the Umbraco back-office is: %0% +

+

+ + + + + + +
+ + Click this link to reset your password + +
+

+

If you cannot click on the link, copy and paste this URL into your browser window:

+ + + + +
+ + %1% + +
+

+
+
+


+
+
+ + + ]]> + + + Dashboard + Sections + Content + + + Choose page above... + %0% has been copied to %1% + Select where the document %0% should be copied to below + %0% has been moved to %1% + Select where the document %0% should be moved to below + has been selected as the root of your new content, click 'ok' below. + No node selected yet, please select a node in the list above before clicking 'ok' + The current node is not allowed under the chosen node because of its type + The current node cannot be moved to one of its subpages + The current node cannot exist at the root + The action isn't allowed since you have insufficient permissions on 1 or more child documents. + Relate copied items to original + + + %0%]]> + Notification settings saved for + + The following languages have been modified %0% + + + + + + + + + + + +
+ + + + + +
+ +
+ +
+
+ + + + + + +
+
+
+ + + + +
+ + + + +
+

+ Hi %0%, +

+

+ This is an automated mail to inform you that the task '%1%' has been performed on the page '%2%' by the user '%3%' +

+ + + + + + +
+ +
+ EDIT
+
+

+

Update summary:

+ %6% +

+

+ Have a nice day!

+ Cheers from the Umbraco robot +

+
+
+


+
+
+ + + ]]> + The following languages have been modified:

+ %0% + ]]> + [%0%] Notification about %1% performed on %2% + Notifications + + + Actions + Created + Create package + + button and locating the package. Umbraco packages usually have a ".umb" or ".zip" extension. + ]]> + This will delete the package + Drop to upload + Include all child nodes + or click here to choose package file + Upload package + Install a local package by selecting it from your machine. Only install packages from sources you know and trust + Upload another package + Cancel and upload another package + I accept + terms of use + + Path to file + Absolute path to file (ie: /bin/umbraco.bin) + Installed + Installed packages + Install local + Finish + This package has no configuration view + No packages have been created yet + You don’t have any packages installed + 'Packages' icon in the top right of your screen]]> + Package Actions + Author URL + Package Content + Package Files + Icon URL + Install package + License + License URL + Package Properties + Search for packages + Results for + We couldn’t find anything for + Please try searching for another package or browse through the categories + Popular + New releases + has + karma points + Information + Owner + Contributors + Created + Current version + .NET version + Downloads + Likes + Compatibility + This package is compatible with the following versions of Umbraco, as reported by community members. Full compatability cannot be guaranteed for versions reported below 100% + External sources + Author + Documentation + Package meta data + Package name + Package doesn't contain any items +
+ You can safely remove this from the system by clicking "uninstall package" below.]]> + Package options + Package readme + Package repository + Confirm package uninstall + Package was uninstalled + The package was successfully uninstalled + Uninstall package + + Notice: any documents, media etc depending on the items you remove, will stop working, and could lead to system instability, + so uninstall with caution. If in doubt, contact the package author.]]> + Package version + Package already installed + This package cannot be installed, it requires a minimum Umbraco version of + Uninstalling... + Downloading... + Importing... + Installing... + Restarting, please wait... + All done, your browser will now refresh, please wait... + Please click 'Finish' to complete installation and reload the page. + Uploading package... + + + Paste with full formatting (Not recommended) + The text you're trying to paste contains special characters or formatting. This could be caused by copying text from Microsoft Word. Umbraco can remove special characters or formatting automatically, so the pasted content will be more suitable for the web. + Paste as raw text without any formatting at all + Paste, but remove formatting (Recommended) + + + Group based protection + If you want to grant access to all members of specific member groups + You need to create a member group before you can use group based authentication + Error Page + Used when people are logged on, but do not have access + %0%]]> + %0% is now protected]]> + %0%]]> + Login Page + Choose the page that contains the login form + Remove protection... + %0%?]]> + Select the pages that contain login form and error messages + %0%]]> + %0%]]> + Specific members protection + If you wish to grant access to specific members + + + + + + + + + Include unpublished subpages + Publishing in progress - please wait... + %0% out of %1% pages have been published... + %0% has been published + %0% and subpages have been published + Publish %0% and all its subpages + Publish to publish %0% and thereby making its content publicly available.

+ You can publish this page and all its subpages by checking Include unpublished subpages below. + ]]> + + + You have not configured any approved colours + + + You have picked a content item currently deleted or in the recycle bin + You have picked content items currently deleted or in the recycle bin + + + You have picked a media item currently deleted or in the recycle bin + You have picked media items currently deleted or in the recycle bin + Trashed + + + enter external link + choose internal page + Caption + Link + Open in new window + enter the display caption + Enter the link + + + Reset crop + Save crop + Add new crop + Done + Undo edits + + + Select a version to compare with the current version + Current version + Red text will not be shown in the selected version. , green means added]]> + Document has been rolled back + This displays the selected version as HTML, if you wish to see the difference between 2 versions at the same time, use the diff view + Rollback to + Select version + View + + + Edit script file + + + Concierge + Content + Courier + Developer + Forms + Help + Umbraco Configuration Wizard + Media + Members + Newsletters + Packages + Settings + Statistics + Translation + Users + + + The best Umbraco video tutorials + + + Default template + To import a document type, find the ".udt" file on your computer by clicking the "Browse" button and click "Import" (you'll be asked for confirmation on the next screen) + New Tab Title + Node type + Type + Stylesheet + Script + Tab + Tab Title + Tabs + Master Content Type enabled + This Content Type uses + as a Master Content Type. Tabs from Master Content Types are not shown and can only be edited on the Master Content Type itself + No properties defined on this tab. Click on the "add a new property" link at the top to create a new property. + Create matching template + Add icon + + + Sort order + Creation date + Sorting complete. + Drag the different items up or down below to set how they should be arranged. Or click the column headers to sort the entire collection of items + + + + Validation + Validation errors must be fixed before the item can be saved + Failed + Saved + Insufficient user permissions, could not complete the operation + Cancelled + Operation was cancelled by a 3rd party add-in + Publishing was cancelled by a 3rd party add-in + Property type already exists + Property type created + DataType: %1%]]> + Propertytype deleted + Document Type saved + Tab created + Tab deleted + Tab with id: %0% deleted + Stylesheet not saved + Stylesheet saved + Stylesheet saved without any errors + Datatype saved + Dictionary item saved + Publishing failed because the parent page isn't published + Content published + and visible on the website + Content saved + Remember to publish to make changes visible + Sent For Approval + Changes have been sent for approval + Media saved + Member group saved + Media saved without any errors + Member saved + Stylesheet Property Saved + Stylesheet saved + Template saved + Error saving user (check log) + User Saved + User type saved + User group saved + File not saved + file could not be saved. Please check file permissions + File saved + File saved without any errors + Language saved + Media Type saved + Member Type saved + Member Group saved + Template not saved + Please make sure that you do not have 2 templates with the same alias + Template saved + Template saved without any errors! + Content unpublished + Partial view saved + Partial view saved without any errors! + Partial view not saved + An error occurred saving the file. + Permissions saved for + Deleted %0% user groups + %0% was deleted + Enabled %0% users + Disabled %0% users + %0% is now enabled + %0% is now disabled + User groups have been set + Unlocked %0% users + %0% is now unlocked + Member was exported to file + An error occurred while exporting the member + User %0% was deleted + Invite user + Invitation has been re-sent to %0% + Document type was exported to file + An error occurred while exporting the document type + + + Add style + Edit style + Rich text editor styles + Define the styles that should be available in the rich text editor for this stylesheet + Edit stylesheet + Edit stylesheet property + The name displayed in the editor style selector + Preview + How the text will look like in the rich text editor. + Selector + Uses CSS syntax, e.g. "h1" or ".redHeader" + Styles + The CSS that should be applied in the rich text editor, e.g. "color:red;" + Code + Editor + + + Failed to delete template with ID %0% + Edit template + Sections + Insert content area + Insert content area placeholder + Insert + Choose what to insert into your template + Dictionary item + A dictionary item is a placeholder for a translatable piece of text, which makes it easy to create designs for multilingual websites. + Macro + + A Macro is a configurable component which is great for + reusable parts of your design, where you need the option to provide parameters, + such as galleries, forms and lists. + + Value + Displays the value of a named field from the current page, with options to modify the value or fallback to alternative values. + Partial view + + A partial view is a separate template file which can be rendered inside another + template, it's great for reusing markup or for separating complex templates into separate files. + + Master template + No master + Render child template + @RenderBody() placeholder. + ]]> + Define a named section + @section { ... }. This can be rendered in a + specific area of the parent of this template, by using @RenderSection. + ]]> + Render a named section + @RenderSection(name) placeholder. + This renders an area of a child template which is wrapped in a corresponding @section [name]{ ... } definition. + ]]> + Section Name + Section is mandatory + + If mandatory, the child template must contain a @section definition, otherwise an error is shown. + + Query builder + items returned, in + I want + all content + content of type "%0%" + from + my website + where + and + is + is not + before + before (including selected date) + after + after (including selected date) + equals + does not equal + contains + does not contain + greater than + greater than or equal to + less than + less than or equal to + Id + Name + Created Date + Last Updated Date + order by + ascending + descending + Template + + + Image + Macro + Choose type of content + Choose a layout + Add a row + Add content + Drop content + Settings applied + This content is not allowed here + This content is allowed here + Click to embed + Click to insert image + Image caption... + Write here... + Grid Layouts + Layouts are the overall work area for the grid editor, usually you only need one or two different layouts + Add Grid Layout + Adjust the layout by setting column widths and adding additional sections + Row configurations + Rows are predefined cells arranged horizontally + Add row configuration + Adjust the row by setting cell widths and adding additional cells + Columns + Total combined number of columns in the grid layout + Settings + Configure what settings editors can change + Styles + Configure what styling editors can change + Allow all editors + Allow all row configurations + Maximum items + Leave blank or set to 0 for unlimited + Set as default + Choose extra + Choose default + are added + + + Compositions + You have not added any groups + Add group + Inherited from + Add property + Required label + Enable list view + Configures the content item to show a sortable and searchable list of its children, the children will not be shown in the tree + Allowed Templates + Choose which templates editors are allowed to use on content of this type + Allow as root + Allow editors to create content of this type in the root of the content tree + Allowed child node types + Allow content of the specified types to be created underneath content of this type + Choose child node + Inherit tabs and properties from an existing document type. New tabs will be added to the current document type or merged if a tab with an identical name exists. + This content type is used in a composition, and therefore cannot be composed itself. + There are no content types available to use as a composition. + Create new + Use existing + Editor settings + Configuration + Yes, delete + was moved underneath + was copied underneath + Select the folder to move + Select the folder to copy + to in the tree structure below + All Document types + All Documents + All media items + using this document type will be deleted permanently, please confirm you want to delete these as well. + using this media type will be deleted permanently, please confirm you want to delete these as well. + using this member type will be deleted permanently, please confirm you want to delete these as well + and all documents using this type + and all media items using this type + and all members using this type + Member can edit + Allow this property value to be edited by the member on their profile page + Is sensitive data + Hide this property value from content editors that don't have access to view sensitive information + Show on member profile + Allow this property value to be displayed on the member profile page + tab has no sort order + Where is this composition used? + This composition is currently used in the composition of the following content types: + Allow varying by culture + Allow editors to create content of this type in different languages + Allow varying by culture + Is an Element type + An Element type is meant to be used for instance in Nested Content, and not in the tree + This is not applicable for an Element type + + + Add language + Mandatory language + Properties on this language have to be filled out before the node can be published. + Default language + An Umbraco site can only have one default language set. + Switching default language may result in default content missing. + Falls back to + No fall back language + To allow multi-lingual content to fall back to another language if not present in the requested language, select it here. + Fall back language + + + + Add parameter + Edit parameter + Enter macro name + Parameters + Define the parameters that should be available when using this macro. + + + Building models + this can take a bit of time, don't worry + Models generated + Models could not be generated + Models generation has failed, see exception in U log + + + Add fallback field + Fallback field + Add default value + Default value + Fallback field + Default value + Casing + Encoding + Choose field + Convert line breaks + Yes, convert line breaks + Replaces line breaks with 'br' html tag + Custom Fields + Date only + Format and encoding + Format as date + Format the value as a date, or a date with time, according to the active culture + HTML encode + Will replace special characters by their HTML equivalent. + Will be inserted after the field value + Will be inserted before the field value + Lowercase + Modify output + None + Output sample + Insert after field + Insert before field + Recursive + Yes, make it recursive + Separator + Standard Fields + Uppercase + URL encode + Will format special characters in URLs + Will only be used when the field values above are empty + This field will only be used if the primary field is empty + Date and time + + + Translation details + Download XML DTD + Fields + Include subpages + + No translator users found. Please create a translator user before you start sending content to translation + The page '%0%' has been send to translation + Send the page '%0%' to translation + Total words + Translate to + Translation completed. + You can preview the pages, you've just translated, by clicking below. If the original page is found, you will get a comparison of the 2 pages. + Translation failed, the XML file might be corrupt + Translation options + Translator + Upload translation XML + + + Content + Content Templates + Media + Cache Browser + Recycle Bin + Created packages + Data Types + Dictionary + Installed packages + Install skin + Install starter kit + Languages + Install local package + Macros + Media Types + Members + Member Groups + Member Roles + Member Types + Document Types + Relation Types + Packages + Packages + Partial Views + Partial View Macro Files + Install from repository + Install Runway + Runway modules + Scripting Files + Scripts + Stylesheets + Templates + Log Viewer + Users + Settings + Templating + Third Party + + + New update ready + %0% is ready, click here for download + No connection to server + Error checking for update. Please review trace-stack for further information + + + Access + Based on the assigned groups and start nodes, the user has access to the following nodes + Assign access + Administrator + Category field + User created + Change Your Password + Change photo + New password + hasn't been locked out + The password hasn't been changed + Confirm new password + You can change your password for accessing the Umbraco Back Office by filling out the form below and click the 'Change Password' button + Content Channel + Create another user + Create new users to give them access to Umbraco. When a new user is created a password will be generated that you can share with the user. + Description field + Disable User + Document Type + Editor + Excerpt field + Failed login attempts + Go to user profile + Add groups to assign access and permissions + Invite another user + Invite new users to give them access to Umbraco. An invite email will be sent to the user with information on how to log in to Umbraco. Invites last for 72 hours. + Language + Set the language you will see in menus and dialogs + Last lockout date + Last login + Password last changed + Username + Media start node + Limit the media library to a specific start node + Media start nodes + Limit the media library to specific start nodes + Sections + Disable Umbraco Access + has not logged in yet + Old password + Password + Reset password + Your password has been changed! + Please confirm the new password + Enter your new password + Your new password cannot be blank! + Current password + Invalid current password + There was a difference between the new password and the confirmed password. Please try again! + The confirmed password doesn't match the new password! + Replace child node permissions + You are currently modifying permissions for the pages: + Select pages to modify their permissions + Remove photo + Default permissions + Granular permissions + Set permissions for specific nodes + Profile + Search all children + Add sections to give users access + Select user groups + No start node selected + No start nodes selected + Content start node + Limit the content tree to a specific start node + Content start nodes + Limit the content tree to specific start nodes + User last updated + has been created + The new user has successfully been created. To log in to Umbraco use the password below. + User management + Name + User permissions + User group + has been invited + An invitation has been sent to the new user with details about how to log in to Umbraco. + Hello there and welcome to Umbraco! In just 1 minute you’ll be good to go, we just need you to setup a password and add a picture for your avatar. + Welcome to Umbraco! Unfortunately your invite has expired. Please contact your administrator and ask them to resend it. + Uploading a photo of yourself will make it easy for other users to recognize you. Click the circle above to upload your photo. + Writer + Change + Your profile + Your recent history + Session expires in + Invite user + Create user + Send invite + Back to users + Umbraco: Invitation + + + + + + + + + + + +
+ + + + + +
+ +
+ +
+
+ + + + + + +
+
+
+ + + + +
+ + + + +
+

+ Hi %0%, +

+

+ You have been invited by %1% to the Umbraco Back Office. +

+

+ Message from %1%: +
+ %2% +

+ + + + + + +
+ + + + + + +
+ + Click this link to accept the invite + +
+
+

If you cannot click on the link, copy and paste this URL into your browser window:

+ + + + +
+ + %3% + +
+

+
+
+


+
+
+ + ]]> + Invite + Resending invitation... + Delete User + Are you sure you wish to delete this user account? + All + Active + Disabled + Locked out + Invited + Inactive + Name (A-Z) + Name (Z-A) + Newest + Oldest + Last login + + + Validation + No validation + Validate as an email address + Validate as a number + Validate as a URL + ...or enter a custom validation + Field is mandatory + Enter a regular expression + You need to add at least + You can only have + items + items selected + Invalid date + Not a number + Invalid email + Custom validation + + + + Value is set to the recommended value: '%0%'. + Value was set to '%1%' for XPath '%2%' in configuration file '%3%'. + Expected value '%1%' for '%2%' in configuration file '%3%', but found '%0%'. + Found unexpected value '%0%' for '%2%' in configuration file '%3%'. + + Custom errors are set to '%0%'. + Custom errors are currently set to '%0%'. It is recommended to set this to '%1%' before go live. + Custom errors successfully set to '%0%'. + MacroErrors are set to '%0%'. + MacroErrors are set to '%0%' which will prevent some or all pages in your site from loading completely if there are any errors in macros. Rectifying this will set the value to '%1%'. + MacroErrors are now set to '%0%'. + + Try Skip IIS Custom Errors is set to '%0%' and you're using IIS version '%1%'. + Try Skip IIS Custom Errors is currently '%0%'. It is recommended to set this to '%1%' for your IIS version (%2%). + Try Skip IIS Custom Errors successfully set to '%0%'. + + File does not exist: '%0%'. + '%0%' in config file '%1%'.]]> + There was an error, check log for full error: %0%. + Database - The database schema is correct for this version of Umbraco + %0% problems were detected with your database schema (Check the log for details) + Some errors were detected while validating the database schema against the current version of Umbraco. + Your website's certificate is valid. + Certificate validation error: '%0%' + Your website's SSL certificate has expired. + Your website's SSL certificate is expiring in %0% days. + Error pinging the URL %0% - '%1%' + You are currently %0% viewing the site using the HTTPS scheme. + The appSetting 'Umbraco.Core.UseHttps' is set to 'false' in your web.config file. Once you access this site using the HTTPS scheme, that should be set to 'true'. + The appSetting 'Umbraco.Core.UseHttps' is set to '%0%' in your web.config file, your cookies are %1% marked as secure. + Could not update the 'Umbraco.Core.UseHttps' setting in your web.config file. Error: %0% + + Enable HTTPS + Sets umbracoSSL setting to true in the appSettings of the web.config file. + The appSetting 'Umbraco.Core.UseHttps' is now set to 'true' in your web.config file, your cookies will be marked as secure. + Fix + Cannot fix a check with a value comparison type of 'ShouldNotEqual'. + Cannot fix a check with a value comparison type of 'ShouldEqual' with a provided value. + Value to fix check not provided. + Debug compilation mode is disabled. + Debug compilation mode is currently enabled. It is recommended to disable this setting before go live. + Debug compilation mode successfully disabled. + Trace mode is disabled. + Trace mode is currently enabled. It is recommended to disable this setting before go live. + Trace mode successfully disabled. + All folders have the correct permissions set. + + %0%.]]> + %0%. If they aren't being written to no action need be taken.]]> + All files have the correct permissions set. + + %0%.]]> + %0%. If they aren't being written to no action need be taken.]]> + X-Frame-Options used to control whether a site can be IFRAMEd by another was found.]]> + X-Frame-Options used to control whether a site can be IFRAMEd by another was not found.]]> + Set Header in Config + Adds a value to the httpProtocol/customHeaders section of web.config to prevent the site being IFRAMEd by other websites. + A setting to create a header preventing IFRAMEing of the site by other websites has been added to your web.config file. + Could not update web.config file. Error: %0% + X-Content-Type-Options used to protect against MIME sniffing vulnerabilities was found.]]> + X-Content-Type-Options used to protect against MIME sniffing vulnerabilities was not found.]]> + Adds a value to the httpProtocol/customHeaders section of web.config to protect against MIME sniffing vulnerabilities. + A setting to create a header protecting against MIME sniffing vulnerabilities has been added to your web.config file. + Strict-Transport-Security, also known as the HSTS-header, was found.]]> + Strict-Transport-Security was not found.]]> + Adds the header 'Strict-Transport-Security' with the value 'max-age=10886400; preload' to the httpProtocol/customHeaders section of web.config. Use this fix only if you will have your domains running with https for the next 18 weeks (minimum). + The HSTS header has been added to your web.config file. + X-XSS-Protection was found.]]> + X-XSS-Protection was not found.]]> + Adds the header 'X-XSS-Protection' with the value '1; mode=block' to the httpProtocol/customHeaders section of web.config. + The X-XSS-Protection header has been added to your web.config file. + + %0%.]]> + No headers revealing information about the website technology were found. + In the Web.config file, system.net/mailsettings could not be found. + In the Web.config file system.net/mailsettings section, the host is not configured. + SMTP settings are configured correctly and the service is operating as expected. + The SMTP server configured with host '%0%' and port '%1%' could not be reached. Please check to ensure the SMTP settings in the Web.config file system.net/mailsettings are correct. + %0%.]]> + %0%.]]> +

Results of the scheduled Umbraco Health Checks run on %0% at %1% are as follows:

%2%]]> + Umbraco Health Check Status: %0% + + + Disable URL tracker + Enable URL tracker + Original URL + Redirected To + Redirect Url Management + The following URLs redirect to this content item: + No redirects have been made + When a published page gets renamed or moved a redirect will automatically be made to the new page. + Are you sure you want to remove the redirect from '%0%' to '%1%'? + Redirect URL removed. + Error removing redirect URL. + This will remove the redirect + Are you sure you want to disable the URL tracker? + URL tracker has now been disabled. + Error disabling the URL tracker, more information can be found in your log file. + URL tracker has now been enabled. + Error enabling the URL tracker, more information can be found in your log file. + + + No Dictionary items to choose from + %0% characters left.]]> - %1% too many.]]> - - - Trashed content with Id: {0} related to original parent content with Id: {1} - Trashed media with Id: {0} related to original parent media item with Id: {1} - Cannot automatically restore this item - There is no location where this item can be automatically restored. You can move the item manually using the tree below. - was restored under - - - Direction - Parent to child - Bidirectional - Parent - Child - Count - Relations - Created - Comment - Name - No relations for this relation type. - Relation Type - Relations - - - Getting Started - Redirect URL Management - Content - Welcome - Examine Management - Published Cache - Models Builder - Health Check - Getting Started - Install Umbraco Forms - > - + %1% too many.]]> + + + Trashed content with Id: {0} related to original parent content with Id: {1} + Trashed media with Id: {0} related to original parent media item with Id: {1} + Cannot automatically restore this item + There is no location where this item can be automatically restored. You can move the item manually using the tree below. + was restored under + + + Direction + Parent to child + Bidirectional + Parent + Child + Count + Relations + Created + Comment + Name + No relations for this relation type. + Relation Type + Relations + + + Getting Started + Redirect URL Management + Content + Welcome + Examine Management + Published Cache + Models Builder + Health Check + Getting Started + Install Umbraco Forms + > + diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml index d2daea059d..88fc432d08 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml @@ -1,2132 +1,2132 @@ - - - - The Umbraco community - https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files - - - Culture and Hostnames - Audit Trail - Browse Node - Change Document Type - Copy - Create - Export - Create Package - Create group - Delete - Disable - Empty recycle bin - Enable - Export Document Type - Import Document Type - Import Package - Edit in Canvas - Exit - Move - Notifications - Public access - Publish - Unpublish - Reload - Republish entire site - Rename - Restore - Set permissions for the page %0% - Choose where to copy - Choose where to move - to in the tree structure below - was moved to - was copied to - Permissions - Rollback - Send To Publish - Send To Translation - Set group - Sort - Translate - Update - Set permissions - Unlock - Create Content Template - Resend Invitation - - - Content - Administration - Structure - Other - - - Allow access to assign culture and hostnames - Allow access to view a node's history log - Allow access to view a node - Allow access to change document type for a node - Allow access to copy a node - Allow access to create nodes - Allow access to delete nodes - Allow access to move a node - Allow access to set and change public access for a node - Allow access to publish a node - Allow access to unpublish a node - Allow access to change permissions for a node - Allow access to roll back a node to a previous state - Allow access to send a node for approval before publishing - Allow access to send a node for translation - Allow access to change the sort order for nodes - Allow access to translate a node - Allow access to save a node - Allow access to create a Content Template - - - Content - Info - - - Permission denied. - Add new Domain - remove - Invalid node. - Invalid domain format. - Domain has already been assigned. - Language - Domain - New domain '%0%' has been created - Domain '%0%' is deleted - Domain '%0%' has already been assigned - Domain '%0%' has been updated - Edit Current Domains - - Inherit - Culture - or inherit culture from parent nodes. Will also apply
- to the current node, unless a domain below applies too.]]> - Domains - - - Clear selection - Select - Do something else - Bold - Cancel Paragraph Indent - Insert form field - Insert graphic headline - Edit Html - Indent Paragraph - Italic - Center - Justify Left - Justify Right - Insert Link - Insert local link (anchor) - Bullet List - Numeric List - Insert macro - Insert picture - Publish and close - Publish with descendants - Edit relations - Return to list - Save - Save and close - Save and publish - Save and schedule - Send for approval - Save list view - Schedule - Preview - Preview is disabled because there's no template assigned - Choose style - Show styles - Insert table - Generate models and close - Save and generate models - Undo - Redo - Rollback - Delete tag - Cancel - Confirm - - - Viewing for - Content deleted - Content unpublished - Content unpublished for languages: %0% - Content published - Content published for languages: %0% - Content saved - Content saved for languages: %0% - Content moved - Content copied - Content rolled back - Content sent for publishing - Content sent for publishing for languages: %0% - Sort child items performed by user - Copy - Publish - Publish - Move - Save - Save - Delete - Unpublish - Unpublish - Rollback - Send To Publish - Send To Publish - Sort - History (all variants) - - - To change the document type for the selected content, first select from the list of valid types for this location. - Then confirm and/or amend the mapping of properties from the current type to the new, and click Save. - The content has been re-published. - Current Property - Current type - The document type cannot be changed, as there are no alternatives valid for this location. An alternative will be valid if it is allowed under the parent of the selected content item and that all existing child content items are allowed to be created under it. - Document Type Changed - Map Properties - Map to Property - New Template - New Type - none - Content - Select New Document Type - The document type of the selected content has been successfully changed to [new type] and the following properties mapped: - to - Could not complete property mapping as one or more properties have more than one mapping defined. - Only alternate types valid for the current location are displayed. - - - Failed to create a folder under parent with ID %0% - Failed to create a folder under parent with name %0% - The folder name cannot contain illegal characters. - Failed to delete item: %0% - - - Is Published - About this page - Alias - (how would you describe the picture over the phone) - Alternative Links - Click to edit this item - Created by - Original author - Updated by - Created - Date/time this document was created - Document Type - Editing - Remove at - This item has been changed after publication - This item is not published - Last published - There are no items to show - There are no items to show in the list. - No child items have been added - No members have been added - Media Type - Link to media item(s) - Member Group - Role - Member Type - No changes have been made - No date chosen - Page title - This media item has no link - No content can be added for this item - Properties - This document is published but is not visible because the parent '%0%' is unpublished - This culture is published but is not visible because it is unpublished on parent '%0%' - This document is published but is not in the cache - Could not get the url - This document is published but its url would collide with content %0% - This document is published but its url cannot be routed - Publish - Published - Published (pending changes)> - Publication Status - Publish with descendants to publish %0% and all content items underneath and thereby making their content publicly available.]]> - Publish with descendants to publish the selected languages and the same languages of content items underneath and thereby making their content publicly available.]]> - Publish at - Unpublish at - Clear Date - Set date - Sortorder is updated - To sort the nodes, simply drag the nodes or click one of the column headers. You can select multiple nodes by holding the "shift" or "control" key while selecting - Statistics - Title (optional) - Alternative text (optional) - Type - Unpublish - Draft - Not created - Last edited - Date/time this document was edited - Remove file(s) - Link to document - Member of group(s) - Not a member of group(s) - Child items - Target - This translates to the following time on the server: - What does this mean?]]>Are you sure you want to delete this item?Property %0% uses editor %1% which is not supported by Nested Content. - Add another text box - Remove this text box - Content root - Include drafts: also publish unpublished content items. - This value is hidden. If you need access to view this value please contact your website administrator. - This value is hidden. - What languages would you like to publish? All languages with content are saved! - What languages would you like to publish? - What languages would you like to save? - What languages would you like to save? - What languages would you like to send for approval? - What languages would you like to schedule? - Select the languages to unpublish. Unpublishing a mandatory language will unpublish all languages. - Published Languages - Unpublished Languages - Unmodified Languages - These languages haven't been created - Ready to Publish? - Ready to Save? - Send for approval - Select the date and time to publish and/or unpublish the content item. - - - Create a new Content Template from '%0%' - Blank - Select a Content Template - Content Template created - A Content Template was created from '%0%' - Another Content Template with the same name already exists - A Content Template is pre-defined content that an editor can select to use as the basis for creating new content - - - Click to upload - or click here to choose files - You can drag files here to upload. - Cannot upload this file, it does not have an approved file type - Max file size is - Media root - Failed to move media - Parent and destination folders cannot be the same - Failed to copy media - Failed to create a folder under parent id %0% - Failed to rename the folder with id %0% - - - Create a new member - All Members - Member groups have no additional properties for editing. - - - Where do you want to create the new %0% - Create an item under - Select the document type you want to make a content template for - Enter a folder name - Choose a type and a title - "document types".]]> - "media types".]]> - Document Type without a template - New folder - New data type - New JavaScript file - New empty partial view - New partial view macro - New partial view from snippet - New partial view macro from snippet - New partial view macro (without macro) - New style sheet file - New Rich Text Editor style sheet file - - - Browse your website - - Hide - If Umbraco isn't opening, you might need to allow popups from this site - has opened in a new window - Restart - Visit - Welcome - - - Stay - Discard changes - You have unsaved changes - Are you sure you want to navigate away from this page? - you have unsaved changes - Publishing will make the selected items visible on the site. - Unpublishing will remove the selected items and all their descendants from the site. - Unpublishing will remove this page and all its descendants from the site. - You have unsaved changes. Making changes to the Document Type will discard the changes. - - - Done - Deleted %0% item - Deleted %0% items - Deleted %0% out of %1% item - Deleted %0% out of %1% items - Published %0% item - Published %0% items - Published %0% out of %1% item - Published %0% out of %1% items - Unpublished %0% item - Unpublished %0% items - Unpublished %0% out of %1% item - Unpublished %0% out of %1% items - Moved %0% item - Moved %0% items - Moved %0% out of %1% item - Moved %0% out of %1% items - Copied %0% item - Copied %0% items - Copied %0% out of %1% item - Copied %0% out of %1% items - - - Link title - Link - Anchor / querystring - Name - Close this window - Are you sure you want to delete - Are you sure you want to disable - Are you sure? - Are you sure? - Cut - Edit Dictionary Item - Edit Language - Insert local link - Insert character - Insert graphic headline - Insert picture - Insert link - Click to add a Macro - Insert table - This will delete the language - Last Edited - Link - Internal link: - When using local links, insert "#" in front of link - Open in new window? - Macro Settings - This macro does not contain any properties you can edit - Paste - Edit permissions for - Set permissions for - Set permissions for %0% for user group %1% - Select the users groups you want to set permissions for - The items in the recycle bin are now being deleted. Please do not close this window while this operation takes place - The recycle bin is now empty - When items are deleted from the recycle bin, they will be gone forever - regexlib.com's webservice is currently experiencing some problems, which we have no control over. We are very sorry for this inconvenience.]]> - Search for a regular expression to add validation to a form field. Example: 'email, 'zip-code' 'url' - Remove Macro - Required Field - Site is reindexed - The website cache has been refreshed. All publish content is now up to date. While all unpublished content is still unpublished - The website cache will be refreshed. All published content will be updated, while unpublished content will stay unpublished. - Number of columns - Number of rows - Click on the image to see full size - Pick item - View Cache Item - Relate to original - Include descendants - The friendliest community - Link to page - Opens the linked document in a new window or tab - Link to media - Select content start node - Select media - Select icon - Select item - Select link - Select macro - Select content - Select media start node - Select member - Select member group - Select node - Select sections - Select users - No icons were found - There are no parameters for this macro - There are no macros available to insert - External login providers - Exception Details - Stacktrace - Inner Exception - Link your - Un-link your - account - Select editor - Select snippet - This will delete the node and all its languages. If you only want to delete one language go and unpublish it instead. - - - There are no dictionary items. - - - %0%' below
You can add additional languages under the 'languages' in the menu on the left - ]]> - Culture Name - - Dictionary overview - - - Configured Searchers - Shows properties and tools for any configured Searcher (i.e. such as a multi-index searcher) - Field values - Health status - The health status of the index and if it can be read - Indexers - Index info - Lists the properties of the index - Manage Examine's indexes - Allows you to view the details of each index and provides some tools for managing the indexes - Rebuild index - - Depending on how much content there is in your site this could take a while.
- It is not recommended to rebuild an index during times of high website traffic or when editors are editing content. - ]]> - - Searchers - Search the index and view the results - Tools - Tools to manage the index - - - Enter your username - Enter your password - Confirm your password - Name the %0%... - Enter a name... - Enter an email... - Enter a username... - Label... - Enter a description... - Type to search... - Type to filter... - Type to add tags (press enter after each tag)... - Enter your email - Enter a message... - Your username is usually your email - #value or ?key=value - Enter alias... - Generating alias... - - - Allowed child node types - Create - Delete tab - Description - New tab - Tab - Thumbnail - Create custom list view - Remove custom list view - A content type, media type or member type with this alias already exists - - - Renamed - Enter a new folder name here - %0% was renamed to %1% - - - Add prevalue - Database datatype - Property editor GUID - Property editor - Buttons - Enable advanced settings for - Enable context menu - Maximum default size of inserted images - Related stylesheets - Show label - Width and height - All property types & property data - using this data type will be deleted permanently, please confirm you want to delete these as well - Yes, delete - and all property types & property data using this data type - Select the folder to move - to in the tree structure below - was moved underneath - - - Your data has been saved, but before you can publish this page there are some errors you need to fix first: - The current membership provider does not support changing password (EnablePasswordRetrieval need to be true) - %0% already exists - There were errors: - There were errors: - The password should be a minimum of %0% characters long and contain at least %1% non-alpha numeric character(s) - %0% must be an integer - The %0% field in the %1% tab is mandatory - %0% is a mandatory field - %0% at %1% is not in a correct format - %0% is not in a correct format - - - Received an error from the server - The specified file type has been disallowed by the administrator - NOTE! Even though CodeMirror is enabled by configuration, it is disabled in Internet Explorer because it's not stable enough. - Please fill both alias and name on the new property type! - There is a problem with read/write access to a specific file or folder - Error loading Partial View script (file: %0%) - Please enter a title - Please choose a type - You're about to make the picture larger than the original size. Are you sure that you want to proceed? - Startnode deleted, please contact your administrator - Please mark content before changing style - No active styles available - Please place cursor at the left of the two cells you wish to merge - You cannot split a cell that hasn't been merged. - - - Options - About - Action - Actions - Add - Alias - All - Are you sure? - Back - Back to overview - Border - by - Cancel - Cell margin - Choose - Close - Close Window - Comment - Confirm - Constrain - Constrain proportions - Content - Continue - Copy - Create - Database - Date - Default - Delete - Deleted - Deleting... - Design - Dictionary - Dimensions - Down - Download - Edit - Edited - Elements - Email - Error - Field - Find - First - General - Groups - Height - Help - Hide - History - Icon - Id - Import - Include subfolders in search - Info - Inner margin - Insert - Install - Invalid - Justify - Label - Language - Last - Layout - Links - Loading - Locked - Login - Log off - Logout - Macro - Mandatory - Message - Move - Name - New - Next - No - of - Off - OK - Open - On - or - Order by - Password - Path - One moment please... - Previous - Properties - Rebuild - Email to receive form data - Recycle Bin - Your recycle bin is empty - Reload - Remaining - Remove - Rename - Renew - Required - Retrieve - Retry - Permissions - Scheduled Publishing - Search - Sorry, we can not find what you are looking for. - No items have been added - Server - Settings - Show - Show page on Send - Size - Sort - Status - Submit - Type - Type to search... - under - Up - Update - Upgrade - Upload - Url - User - Username - Value - View - Welcome... - Width - Yes - Folder - Search results - Reorder - I am done reordering - Preview - Change password - to - List view - Saving... - current - Embed - selected - - - Blue - - - Add group - Add property - Add editor - Add template - Add child node - Add child - Edit data type - Navigate sections - Shortcuts - show shortcuts - Toggle list view - Toggle allow as root - Comment/Uncomment lines - Remove line - Copy Lines Up - Copy Lines Down - Move Lines Up - Move Lines Down - General - Editor - Toggle allow culture variants - - - Background color - Bold - Text color - Font - Text - - - Page - - - The installer cannot connect to the database. - Could not save the web.config file. Please modify the connection string manually. - Your database has been found and is identified as - Database configuration - install button to install the Umbraco %0% database - ]]> - Next to proceed.]]> - Database not found! Please check that the information in the "connection string" of the "web.config" file is correct.

-

To proceed, please edit the "web.config" file (using Visual Studio or your favourite text editor), scroll to the bottom, add the connection string for your database in the key named "UmbracoDbDSN" and save the file.

-

- Click the retry button when - done.
- More information on editing web.config here.

]]> - - Please contact your ISP if necessary. - If you're installing on a local machine or server you might need information from your system administrator.]]> - - Press the upgrade button to upgrade your database to Umbraco %0%

-

- Don't worry - no content will be deleted and everything will continue working afterwards! -

- ]]> - Press Next to - proceed. ]]> - next to continue the configuration wizard]]> - The Default users' password needs to be changed!]]> - The Default user has been disabled or has no access to Umbraco!

No further actions needs to be taken. Click Next to proceed.]]> - The Default user's password has been successfully changed since the installation!

No further actions needs to be taken. Click Next to proceed.]]> - The password is changed! - Get a great start, watch our introduction videos - By clicking the next button (or modifying the umbracoConfigurationStatus in web.config), you accept the license for this software as specified in the box below. Notice that this Umbraco distribution consists of two different licenses, the open source MIT license for the framework and the Umbraco freeware license that covers the UI. - Not installed yet. - Affected files and folders - More information on setting up permissions for Umbraco here - You need to grant ASP.NET modify permissions to the following files/folders - Your permission settings are almost perfect!

- You can run Umbraco without problems, but you will not be able to install packages which are recommended to take full advantage of Umbraco.]]> - How to Resolve - Click here to read the text version - video tutorial on setting up folder permissions for Umbraco or read the text version.]]> - Your permission settings might be an issue! -

- You can run Umbraco without problems, but you will not be able to create folders or install packages which are recommended to take full advantage of Umbraco.]]> - Your permission settings are not ready for Umbraco! -

- In order to run Umbraco, you'll need to update your permission settings.]]> - Your permission settings are perfect!

- You are ready to run Umbraco and install packages!]]> - Resolving folder issue - Follow this link for more information on problems with ASP.NET and creating folders - Setting up folder permissions - - I want to start from scratch - learn how) - You can still choose to install Runway later on. Please go to the Developer section and choose Packages. - ]]> - You've just set up a clean Umbraco platform. What do you want to do next? - Runway is installed - - This is our list of recommended modules, check off the ones you would like to install, or view the full list of modules - ]]> - Only recommended for experienced users - I want to start with a simple website - - "Runway" is a simple website providing some basic document types and templates. The installer can set up Runway for you automatically, - but you can easily edit, extend or remove it. It's not necessary and you can perfectly use Umbraco without it. However, - Runway offers an easy foundation based on best practices to get you started faster than ever. - If you choose to install Runway, you can optionally select basic building blocks called Runway Modules to enhance your Runway pages. -

- - Included with Runway: Home page, Getting Started page, Installing Modules page.
- Optional Modules: Top Navigation, Sitemap, Contact, Gallery. - - ]]> - What is Runway - Step 1/5 Accept license - Step 2/5: Database configuration - Step 3/5: Validating File Permissions - Step 4/5: Check Umbraco security - Step 5/5: Umbraco is ready to get you started - Thank you for choosing Umbraco - Browse your new site -You installed Runway, so why not see how your new website looks.]]> - Further help and information -Get help from our award winning community, browse the documentation or watch some free videos on how to build a simple site, how to use packages and a quick guide to the Umbraco terminology]]> - Umbraco %0% is installed and ready for use - /web.config file and update the AppSetting key UmbracoConfigurationStatus in the bottom to the value of '%0%'.]]> - started instantly by clicking the "Launch Umbraco" button below.
If you are new to Umbraco, -you can find plenty of resources on our getting started pages.]]> - Launch Umbraco -To manage your website, simply open the Umbraco back office and start adding content, updating the templates and stylesheets or add new functionality]]> - Connection to database failed. - Umbraco Version 3 - Umbraco Version 4 - Watch - Umbraco %0% for a fresh install or upgrading from version 3.0. -

- Press "next" to start the wizard.]]> - - - Culture Code - Culture Name - - - You've been idle and logout will automatically occur in - Renew now to save your work - - - Happy super Sunday - Happy manic Monday - Happy tubular Tuesday - Happy wonderful Wednesday - Happy thunderous Thursday - Happy funky Friday - Happy Caturday - Log in below - Sign in with - Session timed out - © 2001 - %0%
Umbraco.com

]]> - Forgotten password? - An email will be sent to the address specified with a link to reset your password - An email with password reset instructions will be sent to the specified address if it matched our records - Show password - Hide password - Return to login form - Please provide a new password - Your Password has been updated - The link you have clicked on is invalid or has expired - Umbraco: Reset Password - - - - - - - - - - - -
- - - - - -
- -
- -
-
- - - - - - -
-
-
- - - - -
- - - - -
-

- Password reset requested -

-

- Your username to login to the Umbraco back-office is: %0% -

-

- - - - - - -
- - Click this link to reset your password - -
-

-

If you cannot click on the link, copy and paste this URL into your browser window:

- - - - -
- - %1% - -
-

-
-
-


-
-
- - - ]]> - - - Dashboard - Sections - Content - - - Choose page above... - %0% has been copied to %1% - Select where the document %0% should be copied to below - %0% has been moved to %1% - Select where the document %0% should be moved to below - has been selected as the root of your new content, click 'ok' below. - No node selected yet, please select a node in the list above before clicking 'ok' - The current node is not allowed under the chosen node because of its type - The current node cannot be moved to one of its subpages - The current node cannot exist at the root - The action isn't allowed since you have insufficient permissions on 1 or more child documents. - Relate copied items to original - - - %0%]]> - Notification settings saved for - - The following languages have been modified %0% - - - - - - - - - - - -
- - - - - -
- -
- -
-
- - - - - - -
-
-
- - - - -
- - - - -
-

- Hi %0%, -

-

- This is an automated mail to inform you that the task '%1%' has been performed on the page '%2%' by the user '%3%' -

- - - - - - -
- -
- EDIT
-
-

-

Update summary:

- %6% -

-

- Have a nice day!

- Cheers from the Umbraco robot -

-
-
-


-
-
- - - ]]> - The following languages have been modified:

- %0% - ]]> - [%0%] Notification about %1% performed on %2% - Notifications - - - Actions - Created - Create package - - button and locating the package. Umbraco packages usually have a ".umb" or ".zip" extension. - ]]> - This will delete the package - Drop to upload - Include all child nodes - or click here to choose package file - Upload package - Install a local package by selecting it from your machine. Only install packages from sources you know and trust - Upload another package - Cancel and upload another package - I accept - terms of use - Path to file - Absolute path to file (ie: /bin/umbraco.bin) - Installed - Installed packages - Install local - Finish - This package has no configuration view - No packages have been created yet - You don’t have any packages installed - 'Packages' icon in the top right of your screen]]> - Package Actions - Author URL - Package Content - Package Files - Icon URL - Install package - License - License URL - Package Properties - Search for packages - Results for - We couldn’t find anything for - Please try searching for another package or browse through the categories - Popular - New releases - has - karma points - Information - Owner - Contributors - Created - Current version - .NET version - Downloads - Likes - Compatibility - This package is compatible with the following versions of Umbraco, as reported by community members. Full compatability cannot be gauranteed for versions reported below 100% - External sources - Author - Documentation - Package meta data - Package name - Package doesn't contain any items -
- You can safely remove this from the system by clicking "uninstall package" below.]]> - Package options - Package readme - Package repository - Confirm package uninstall - Package was uninstalled - The package was successfully uninstalled - Uninstall package - - Notice: any documents, media etc depending on the items you remove, will stop working, and could lead to system instability, - so uninstall with caution. If in doubt, contact the package author.]]> - Package version - Upgrading from version - Package already installed - This package cannot be installed, it requires a minimum Umbraco version of - Uninstalling... - Downloading... - Importing... - Installing... - Restarting, please wait... - All done, your browser will now refresh, please wait... - Please click 'Finish' to complete installation and reload the page. - Uploading package... - - - Paste with full formatting (Not recommended) - The text you're trying to paste contains special characters or formatting. This could be caused by copying text from Microsoft Word. Umbraco can remove special characters or formatting automatically, so the pasted content will be more suitable for the web. - Paste as raw text without any formatting at all - Paste, but remove formatting (Recommended) - - - Group based protection - If you want to grant access to all members of specific member groups - You need to create a member group before you can use group based authentication - Error Page - Used when people are logged on, but do not have access - %0%]]> - %0% is now protected]]> - %0%]]> - Login Page - Choose the page that contains the login form - Remove protection... - %0%?]]> - Select the pages that contain login form and error messages - %0%]]> - %0%]]> - Specific members protection - If you wish to grant access to specific members - - - Insufficient user permissions to publish all descendant documents - - - - - - - - Validation failed for required language '%0%'. This language was saved but not published. - Publishing in progress - please wait... - %0% out of %1% pages have been published... - %0% has been published - %0% and subpages have been published - Publish %0% and all its subpages - Publish to publish %0% and thereby making its content publicly available.

- You can publish this page and all its subpages by checking Include unpublished subpages below. - ]]> - - - You have not configured any approved colors - - - You have picked a content item currently deleted or in the recycle bin - You have picked content items currently deleted or in the recycle bin - - - You have picked a media item currently deleted or in the recycle bin - You have picked media items currently deleted or in the recycle bin - Trashed - - - enter external link - choose internal page - Caption - Link - Open in new window - enter the display caption - Enter the link - - - Reset crop - Save crop - Add new crop - Done - Undo edits - - - Select a version to compare with the current version - Current version - Red text will not be shown in the selected version. , green means added]]> - Document has been rolled back - This displays the selected version as HTML, if you wish to see the difference between 2 versions at the same time, use the diff view - Rollback to - Select version - View - - - Edit script file - - - Content - Forms - Media - Members - Packages - Settings - Translation - Users - - - The best Umbraco video tutorials - - - Default template - To import a document type, find the ".udt" file on your computer by clicking the "Browse" button and click "Import" (you'll be asked for confirmation on the next screen) - New Tab Title - Node type - Type - Stylesheet - Script - Tab - Tab Title - Tabs - Master Content Type enabled - This Content Type uses - as a Master Content Type. Tabs from Master Content Types are not shown and can only be edited on the Master Content Type itself - No properties defined on this tab. Click on the "add a new property" link at the top to create a new property. - Create matching template - Add icon - - - Sort order - Creation date - Sorting complete. - Drag the different items up or down below to set how they should be arranged. Or click the column headers to sort the entire collection of items - - This node has no child nodes to sort - - - Validation - Validation errors must be fixed before the item can be saved - Failed - Saved - Insufficient user permissions, could not complete the operation - Cancelled - Operation was cancelled by a 3rd party add-in - Property type already exists - Property type created - DataType: %1%]]> - Propertytype deleted - Document Type saved - Tab created - Tab deleted - Tab with id: %0% deleted - Stylesheet not saved - Stylesheet saved - Stylesheet saved without any errors - Datatype saved - Dictionary item saved - Content published - and is visible on the website - %0% documents published and visible on the website - %0% published and visible on the website - %0% documents published for languages %1% and visible on the website - Content saved - Remember to publish to make changes visible - A schedule for publishing has been updated - %0% saved - Sent For Approval - Changes have been sent for approval - %0% changes have been sent for approval - Media saved - Media saved without any errors - Member saved - Member group saved - Stylesheet Property Saved - Stylesheet saved - Template saved - Error saving user (check log) - User Saved - User type saved - User group saved - File not saved - file could not be saved. Please check file permissions - File saved - File saved without any errors - Language saved - Media Type saved - Member Type saved - Member Group saved - Template not saved - Please make sure that you do not have 2 templates with the same alias - Template saved - Template saved without any errors! - Content unpublished - Content variation %0% unpublished - The mandatory language '%0%' was unpublished. All languages for this content item are now unpublished. - Partial view saved - Partial view saved without any errors! - Partial view not saved - An error occurred saving the file. - Permissions saved for - Deleted %0% user groups - %0% was deleted - Enabled %0% users - Disabled %0% users - %0% is now enabled - %0% is now disabled - User groups have been set - Unlocked %0% users - %0% is now unlocked - Member was exported to file - An error occurred while exporting the member - User %0% was deleted - Invite user - Invitation has been re-sent to %0% - Cannot publish the document since the required '%0%' is not published - Validation failed for language '%0%' - Document type was exported to file - An error occurred while exporting the document type - The release date cannot be in the past - Cannot schedule the document for publishing since the required '%0%' is not published - Cannot schedule the document for publishing since the required '%0%' has a publish date later than a non mandatory language - The expire date cannot be in the past - The expire date cannot be before the release date - - - Add style - Edit style - Rich text editor styles - Define the styles that should be available in the rich text editor for this stylesheet - Edit stylesheet - Edit stylesheet property - The name displayed in the editor style selector - Preview - How the text will look like in the rich text editor. - Selector - Uses CSS syntax, e.g. "h1" or ".redHeader" - Styles - The CSS that should be applied in the rich text editor, e.g. "color:red;" - Code - Rich Text Editor - - - Failed to delete template with ID %0% - Edit template - Sections - Insert content area - Insert content area placeholder - Insert - Choose what to insert into your template - Dictionary item - A dictionary item is a placeholder for a translatable piece of text, which makes it easy to create designs for multilingual websites. - Macro - - A Macro is a configurable component which is great for - reusable parts of your design, where you need the option to provide parameters, - such as galleries, forms and lists. - - Value - Displays the value of a named field from the current page, with options to modify the value or fallback to alternative values. - Partial view - - A partial view is a separate template file which can be rendered inside another - template, it's great for reusing markup or for separating complex templates into separate files. - - Master template - No master - Render child template - @RenderBody() placeholder. - ]]> - Define a named section - @section { ... }. This can be rendered in a - specific area of the parent of this template, by using @RenderSection. - ]]> - Render a named section - @RenderSection(name) placeholder. - This renders an area of a child template which is wrapped in a corresponding @section [name]{ ... } definition. - ]]> - Section Name - Section is mandatory - - If mandatory, the child template must contain a @section definition, otherwise an error is shown. - - Query builder - items returned, in - I want - all content - content of type "%0%" - from - my website - where - and - is - is not - before - before (including selected date) - after - after (including selected date) - equals - does not equal - contains - does not contain - greater than - greater than or equal to - less than - less than or equal to - Id - Name - Created Date - Last Updated Date - order by - ascending - descending - Template - - - Image - Macro - Choose type of content - Choose a layout - Add a row - Add content - Drop content - Settings applied - This content is not allowed here - This content is allowed here - Click to embed - Click to insert image - Image caption... - Write here... - Grid Layouts - Layouts are the overall work area for the grid editor, usually you only need one or two different layouts - Add Grid Layout - Adjust the layout by setting column widths and adding additional sections - Row configurations - Rows are predefined cells arranged horizontally - Add row configuration - Adjust the row by setting cell widths and adding additional cells - Columns - Total combined number of columns in the grid layout - Settings - Configure what settings editors can change - Styles - Configure what styling editors can change - Allow all editors - Allow all row configurations - Maximum items - Leave blank or set to 0 for unlimited - Set as default - Choose extra - Choose default - are added - - - Compositions - You have not added any groups - Add group - Inherited from - Add property - Required label - Enable list view - Configures the content item to show a sortable and searchable list of its children, the children will not be shown in the tree - Allowed Templates - Choose which templates editors are allowed to use on content of this type - Allow as root - Allow editors to create content of this type in the root of the content tree - Allowed child node types - Allow content of the specified types to be created underneath content of this type - Choose child node - Inherit tabs and properties from an existing document type. New tabs will be added to the current document type or merged if a tab with an identical name exists. - This content type is used in a composition, and therefore cannot be composed itself. - There are no content types available to use as a composition. - Create new - Use existing - Editor settings - Configuration - Yes, delete - was moved underneath - was copied underneath - Select the folder to move - Select the folder to copy - to in the tree structure below - All Document types - All Documents - All media items - using this document type will be deleted permanently, please confirm you want to delete these as well. - using this media type will be deleted permanently, please confirm you want to delete these as well. - using this member type will be deleted permanently, please confirm you want to delete these as well - and all documents using this type - and all media items using this type - and all members using this type - Member can edit - Allow this property value to be edited by the member on their profile page - Is sensitive data - Hide this property value from content editors that don't have access to view sensitive information - Show on member profile - Allow this property value to be displayed on the member profile page - tab has no sort order - Where is this composition used? - This composition is currently used in the composition of the following content types: - Allow varying by culture - Allow editors to create content of this type in different languages - Allow varying by culture - Is an Element type - An Element type is meant to be used for instance in Nested Content, and not in the tree - This is not applicable for an Element type - - - Add language - Mandatory language - Properties on this language have to be filled out before the node can be published. - Default language - An Umbraco site can only have one default language set. - Switching default language may result in default content missing. - Falls back to - No fall back language - To allow multi-lingual content to fall back to another language if not present in the requested language, select it here. - Fall back language - - - Add parameter - Edit parameter - Enter macro name - Parameters - Define the parameters that should be available when using this macro. - - - Building models - this can take a bit of time, don't worry - Models generated - Models could not be generated - Models generation has failed, see exception in U log - - - Add fallback field - Fallback field - Add default value - Default value - Fallback field - Default value - Casing - Encoding - Choose field - Convert line breaks - Yes, convert line breaks - Replaces line breaks with 'br' html tag - Custom Fields - Date only - Format and encoding - Format as date - Format the value as a date, or a date with time, according to the active culture - HTML encode - Will replace special characters by their HTML equivalent. - Will be inserted after the field value - Will be inserted before the field value - Lowercase - Modify output - None - Output sample - Insert after field - Insert before field - Recursive - Yes, make it recursive - Separator - Standard Fields - Uppercase - URL encode - Will format special characters in URLs - Will only be used when the field values above are empty - This field will only be used if the primary field is empty - Date and time - - - Translation details - Download XML DTD - Fields - Include subpages - - No translator users found. Please create a translator user before you start sending content to translation - The page '%0%' has been send to translation - Send the page '%0%' to translation - Total words - Translate to - Translation completed. - You can preview the pages, you've just translated, by clicking below. If the original page is found, you will get a comparison of the 2 pages. - Translation failed, the XML file might be corrupt - Translation options - Translator - Upload translation XML - - - Content - Content Templates - Media - Cache Browser - Recycle Bin - Created packages - Data Types - Dictionary - Installed packages - Install skin - Install starter kit - Languages - Install local package - Macros - Media Types - Members - Member Groups - Member Roles - Member Types - Document Types - Relation Types - Packages - Packages - Partial Views - Partial View Macro Files - Install from repository - Install Runway - Runway modules - Scripting Files - Scripts - Stylesheets - Templates - Log Viewer - Users - Settings - Templating - Third Party - - - New update ready - %0% is ready, click here for download - No connection to server - Error checking for update. Please review trace-stack for further information - - - Access - Based on the assigned groups and start nodes, the user has access to the following nodes - Assign access - Administrator - Category field - User created - Change Your Password - Change photo - New password - hasn't been locked out - The password hasn't been changed - Confirm new password - You can change your password for accessing the Umbraco Back Office by filling out the form below and click the 'Change Password' button - Content Channel - Create another user - Create new users to give them access to Umbraco. When a new user is created a password will be generated that you can share with the user. - Description field - Disable User - Document Type - Editor - Excerpt field - Failed login attempts - Go to user profile - Add groups to assign access and permissions - Invite another user - Invite new users to give them access to Umbraco. An invite email will be sent to the user with information on how to log in to Umbraco. Invites last for 72 hours. - Language - Set the language you will see in menus and dialogs - Last lockout date - Last login - Password last changed - Username - Media start node - Limit the media library to a specific start node - Media start nodes - Limit the media library to specific start nodes - Sections - Disable Umbraco Access - has not logged in yet - Old password - Password - Reset password - Your password has been changed! - Please confirm the new password - Enter your new password - Your new password cannot be blank! - Current password - Invalid current password - There was a difference between the new password and the confirmed password. Please try again! - The confirmed password doesn't match the new password! - Replace child node permissions - You are currently modifying permissions for the pages: - Select pages to modify their permissions - Remove photo - Default permissions - Granular permissions - Set permissions for specific nodes - Profile - Search all children - Add sections to give users access - Select user groups - No start node selected - No start nodes selected - Content start node - Limit the content tree to a specific start node - Content start nodes - Limit the content tree to specific start nodes - User last updated - has been created - The new user has successfully been created. To log in to Umbraco use the password below. - User management - Name - User permissions - User group - has been invited - An invitation has been sent to the new user with details about how to log in to Umbraco. - Hello there and welcome to Umbraco! In just 1 minute you’ll be good to go, we just need you to setup a password and add a picture for your avatar. - Welcome to Umbraco! Unfortunately your invite has expired. Please contact your administrator and ask them to resend it. - Uploading a photo of yourself will make it easy for other users to recognize you. Click the circle above to upload your photo. - Writer - Change - Your profile - Your recent history - Session expires in - Invite user - Create user - Send invite - Back to users - Umbraco: Invitation - - - - - - - - - - - -
- - - - - -
- -
- -
-
- - - - - - -
-
-
- - - - -
- - - - -
-

- Hi %0%, -

-

- You have been invited by %1% to the Umbraco Back Office. -

-

- Message from %1%: -
- %2% -

- - - - - - -
- - - - - - -
- - Click this link to accept the invite - -
-
-

If you cannot click on the link, copy and paste this URL into your browser window:

- - - - -
- - %3% - -
-

-
-
-


-
-
- - ]]> - Invite - Resending invitation... - Delete User - Are you sure you wish to delete this user account? - All - Active - Disabled - Locked out - Invited - Inactive - Name (A-Z) - Name (Z-A) - Newest - Oldest - Last login - - - Validation - Validate as an email address - Validate as a number - Validate as a URL - ...or enter a custom validation - Field is mandatory - Enter a regular expression - You need to add at least - You can only have - items - items selected - Invalid date - Not a number - Invalid email - Value cannot be null - Value cannot be empty - Value is invalid, it does not match the correct pattern - Custom validation - - - - Value is set to the recommended value: '%0%'. - Value was set to '%1%' for XPath '%2%' in configuration file '%3%'. - Expected value '%1%' for '%2%' in configuration file '%3%', but found '%0%'. - Found unexpected value '%0%' for '%2%' in configuration file '%3%'. - - Custom errors are set to '%0%'. - Custom errors are currently set to '%0%'. It is recommended to set this to '%1%' before go live. - Custom errors successfully set to '%0%'. - MacroErrors are set to '%0%'. - MacroErrors are set to '%0%' which will prevent some or all pages in your site from loading completely if there are any errors in macros. Rectifying this will set the value to '%1%'. - MacroErrors are now set to '%0%'. - - Try Skip IIS Custom Errors is set to '%0%' and you're using IIS version '%1%'. - Try Skip IIS Custom Errors is currently '%0%'. It is recommended to set this to '%1%' for your IIS version (%2%). - Try Skip IIS Custom Errors successfully set to '%0%'. - - File does not exist: '%0%'. - '%0%' in config file '%1%'.]]> - There was an error, check log for full error: %0%. - Database - The database schema is correct for this version of Umbraco - %0% problems were detected with your database schema (Check the log for details) - Some errors were detected while validating the database schema against the current version of Umbraco. - Your website's certificate is valid. - Certificate validation error: '%0%' - Your website's SSL certificate has expired. - Your website's SSL certificate is expiring in %0% days. - Error pinging the URL %0% - '%1%' - You are currently %0% viewing the site using the HTTPS scheme. - The appSetting 'Umbraco.Core.UseHttps' is set to 'false' in your web.config file. Once you access this site using the HTTPS scheme, that should be set to 'true'. - The appSetting 'Umbraco.Core.UseHttps' is set to '%0%' in your web.config file, your cookies are %1% marked as secure. - Could not update the 'Umbraco.Core.UseHttps' setting in your web.config file. Error: %0% - - Enable HTTPS - Sets umbracoSSL setting to true in the appSettings of the web.config file. - The appSetting 'Umbraco.Core.UseHttps' is now set to 'true' in your web.config file, your cookies will be marked as secure. - Fix - Cannot fix a check with a value comparison type of 'ShouldNotEqual'. - Cannot fix a check with a value comparison type of 'ShouldEqual' with a provided value. - Value to fix check not provided. - Debug compilation mode is disabled. - Debug compilation mode is currently enabled. It is recommended to disable this setting before go live. - Debug compilation mode successfully disabled. - Trace mode is disabled. - Trace mode is currently enabled. It is recommended to disable this setting before go live. - Trace mode successfully disabled. - All folders have the correct permissions set. - - %0%.]]> - %0%. If they aren't being written to no action need be taken.]]> - All files have the correct permissions set. - - %0%.]]> - %0%. If they aren't being written to no action need be taken.]]> - X-Frame-Options used to control whether a site can be IFRAMEd by another was found.]]> - X-Frame-Options used to control whether a site can be IFRAMEd by another was not found.]]> - Set Header in Config - Adds a value to the httpProtocol/customHeaders section of web.config to prevent the site being IFRAMEd by other websites. - A setting to create a header preventing IFRAMEing of the site by other websites has been added to your web.config file. - Could not update web.config file. Error: %0% - X-Content-Type-Options used to protect against MIME sniffing vulnerabilities was found.]]> - X-Content-Type-Options used to protect against MIME sniffing vulnerabilities was not found.]]> - Adds a value to the httpProtocol/customHeaders section of web.config to protect against MIME sniffing vulnerabilities. - A setting to create a header protecting against MIME sniffing vulnerabilities has been added to your web.config file. - Strict-Transport-Security, also known as the HSTS-header, was found.]]> - Strict-Transport-Security was not found.]]> - Adds the header 'Strict-Transport-Security' with the value 'max-age=10886400; preload' to the httpProtocol/customHeaders section of web.config. Use this fix only if you will have your domains running with https for the next 18 weeks (minimum). - The HSTS header has been added to your web.config file. - X-XSS-Protection was found.]]> - X-XSS-Protection was not found.]]> - Adds the header 'X-XSS-Protection' with the value '1; mode=block' to the httpProtocol/customHeaders section of web.config. - The X-XSS-Protection header has been added to your web.config file. - - %0%.]]> - No headers revealing information about the website technology were found. - In the Web.config file, system.net/mailsettings could not be found. - In the Web.config file system.net/mailsettings section, the host is not configured. - SMTP settings are configured correctly and the service is operating as expected. - The SMTP server configured with host '%0%' and port '%1%' could not be reached. Please check to ensure the SMTP settings in the Web.config file system.net/mailsettings are correct. - %0%.]]> - %0%.]]> -

Results of the scheduled Umbraco Health Checks run on %0% at %1% are as follows:

%2%]]> - Umbraco Health Check Status: %0% - - - Disable URL tracker - Enable URL tracker - Culture - Original URL - Redirected To - Redirect Url Management - The following URLs redirect to this content item: - No redirects have been made - When a published page gets renamed or moved a redirect will automatically be made to the new page. - Are you sure you want to remove the redirect from '%0%' to '%1%'? - Redirect URL removed. - Error removing redirect URL. - This will remove the redirect - Are you sure you want to disable the URL tracker? - URL tracker has now been disabled. - Error disabling the URL tracker, more information can be found in your log file. - URL tracker has now been enabled. - Error enabling the URL tracker, more information can be found in your log file. - - - No Dictionary items to choose from - + + + + The Umbraco community + https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files + + + Culture and Hostnames + Audit Trail + Browse Node + Change Document Type + Copy + Create + Export + Create Package + Create group + Delete + Disable + Empty recycle bin + Enable + Export Document Type + Import Document Type + Import Package + Edit in Canvas + Exit + Move + Notifications + Public access + Publish + Unpublish + Reload + Republish entire site + Rename + Restore + Set permissions for the page %0% + Choose where to copy + Choose where to move + to in the tree structure below + was moved to + was copied to + Permissions + Rollback + Send To Publish + Send To Translation + Set group + Sort + Translate + Update + Set permissions + Unlock + Create Content Template + Resend Invitation + + + Content + Administration + Structure + Other + + + Allow access to assign culture and hostnames + Allow access to view a node's history log + Allow access to view a node + Allow access to change document type for a node + Allow access to copy a node + Allow access to create nodes + Allow access to delete nodes + Allow access to move a node + Allow access to set and change public access for a node + Allow access to publish a node + Allow access to unpublish a node + Allow access to change permissions for a node + Allow access to roll back a node to a previous state + Allow access to send a node for approval before publishing + Allow access to send a node for translation + Allow access to change the sort order for nodes + Allow access to translate a node + Allow access to save a node + Allow access to create a Content Template + + + Content + Info + + + Permission denied. + Add new Domain + remove + Invalid node. + Invalid domain format. + Domain has already been assigned. + Language + Domain + New domain '%0%' has been created + Domain '%0%' is deleted + Domain '%0%' has already been assigned + Domain '%0%' has been updated + Edit Current Domains + + Inherit + Culture + or inherit culture from parent nodes. Will also apply
+ to the current node, unless a domain below applies too.]]> + Domains + + + Clear selection + Select + Do something else + Bold + Cancel Paragraph Indent + Insert form field + Insert graphic headline + Edit Html + Indent Paragraph + Italic + Center + Justify Left + Justify Right + Insert Link + Insert local link (anchor) + Bullet List + Numeric List + Insert macro + Insert picture + Publish and close + Publish with descendants + Edit relations + Return to list + Save + Save and close + Save and publish + Save and schedule + Send for approval + Save list view + Schedule + Preview + Preview is disabled because there's no template assigned + Choose style + Show styles + Insert table + Generate models and close + Save and generate models + Undo + Redo + Rollback + Delete tag + Cancel + Confirm + + + Viewing for + Content deleted + Content unpublished + Content unpublished for languages: %0% + Content published + Content published for languages: %0% + Content saved + Content saved for languages: %0% + Content moved + Content copied + Content rolled back + Content sent for publishing + Content sent for publishing for languages: %0% + Sort child items performed by user + Copy + Publish + Publish + Move + Save + Save + Delete + Unpublish + Unpublish + Rollback + Send To Publish + Send To Publish + Sort + History (all variants) + + + To change the document type for the selected content, first select from the list of valid types for this location. + Then confirm and/or amend the mapping of properties from the current type to the new, and click Save. + The content has been re-published. + Current Property + Current type + The document type cannot be changed, as there are no alternatives valid for this location. An alternative will be valid if it is allowed under the parent of the selected content item and that all existing child content items are allowed to be created under it. + Document Type Changed + Map Properties + Map to Property + New Template + New Type + none + Content + Select New Document Type + The document type of the selected content has been successfully changed to [new type] and the following properties mapped: + to + Could not complete property mapping as one or more properties have more than one mapping defined. + Only alternate types valid for the current location are displayed. + + + Failed to create a folder under parent with ID %0% + Failed to create a folder under parent with name %0% + The folder name cannot contain illegal characters. + Failed to delete item: %0% + + + Is Published + About this page + Alias + (how would you describe the picture over the phone) + Alternative Links + Click to edit this item + Created by + Original author + Updated by + Created + Date/time this document was created + Document Type + Editing + Remove at + This item has been changed after publication + This item is not published + Last published + There are no items to show + There are no items to show in the list. + No child items have been added + No members have been added + Media Type + Link to media item(s) + Member Group + Role + Member Type + No changes have been made + No date chosen + Page title + This media item has no link + No content can be added for this item + Properties + This document is published but is not visible because the parent '%0%' is unpublished + This culture is published but is not visible because it is unpublished on parent '%0%' + This document is published but is not in the cache + Could not get the url + This document is published but its url would collide with content %0% + This document is published but its url cannot be routed + Publish + Published + Published (pending changes)> + Publication Status + Publish with descendants to publish %0% and all content items underneath and thereby making their content publicly available.]]> + Publish with descendants to publish the selected languages and the same languages of content items underneath and thereby making their content publicly available.]]> + Publish at + Unpublish at + Clear Date + Set date + Sortorder is updated + To sort the nodes, simply drag the nodes or click one of the column headers. You can select multiple nodes by holding the "shift" or "control" key while selecting + Statistics + Title (optional) + Alternative text (optional) + Type + Unpublish + Draft + Not created + Last edited + Date/time this document was edited + Remove file(s) + Link to document + Member of group(s) + Not a member of group(s) + Child items + Target + This translates to the following time on the server: + What does this mean?]]>Are you sure you want to delete this item?Property %0% uses editor %1% which is not supported by Nested Content. + Add another text box + Remove this text box + Content root + Include drafts: also publish unpublished content items. + This value is hidden. If you need access to view this value please contact your website administrator. + This value is hidden. + What languages would you like to publish? All languages with content are saved! + What languages would you like to publish? + What languages would you like to save? + What languages would you like to save? + What languages would you like to send for approval? + What languages would you like to schedule? + Select the languages to unpublish. Unpublishing a mandatory language will unpublish all languages. + Published Languages + Unpublished Languages + Unmodified Languages + These languages haven't been created + Ready to Publish? + Ready to Save? + Send for approval + Select the date and time to publish and/or unpublish the content item. + + + Create a new Content Template from '%0%' + Blank + Select a Content Template + Content Template created + A Content Template was created from '%0%' + Another Content Template with the same name already exists + A Content Template is pre-defined content that an editor can select to use as the basis for creating new content + + + Click to upload + or click here to choose files + You can drag files here to upload. + Cannot upload this file, it does not have an approved file type + Max file size is + Media root + Failed to move media + Parent and destination folders cannot be the same + Failed to copy media + Failed to create a folder under parent id %0% + Failed to rename the folder with id %0% + + + Create a new member + All Members + Member groups have no additional properties for editing. + + + Where do you want to create the new %0% + Create an item under + Select the document type you want to make a content template for + Enter a folder name + Choose a type and a title + "document types".]]> + "media types".]]> + Document Type without a template + New folder + New data type + New JavaScript file + New empty partial view + New partial view macro + New partial view from snippet + New partial view macro from snippet + New partial view macro (without macro) + New style sheet file + New Rich Text Editor style sheet file + + + Browse your website + - Hide + If Umbraco isn't opening, you might need to allow popups from this site + has opened in a new window + Restart + Visit + Welcome + + + Stay + Discard changes + You have unsaved changes + Are you sure you want to navigate away from this page? - you have unsaved changes + Publishing will make the selected items visible on the site. + Unpublishing will remove the selected items and all their descendants from the site. + Unpublishing will remove this page and all its descendants from the site. + You have unsaved changes. Making changes to the Document Type will discard the changes. + + + Done + Deleted %0% item + Deleted %0% items + Deleted %0% out of %1% item + Deleted %0% out of %1% items + Published %0% item + Published %0% items + Published %0% out of %1% item + Published %0% out of %1% items + Unpublished %0% item + Unpublished %0% items + Unpublished %0% out of %1% item + Unpublished %0% out of %1% items + Moved %0% item + Moved %0% items + Moved %0% out of %1% item + Moved %0% out of %1% items + Copied %0% item + Copied %0% items + Copied %0% out of %1% item + Copied %0% out of %1% items + + + Link title + Link + Anchor / querystring + Name + Close this window + Are you sure you want to delete + Are you sure you want to disable + Are you sure? + Are you sure? + Cut + Edit Dictionary Item + Edit Language + Insert local link + Insert character + Insert graphic headline + Insert picture + Insert link + Click to add a Macro + Insert table + This will delete the language + Last Edited + Link + Internal link: + When using local links, insert "#" in front of link + Open in new window? + Macro Settings + This macro does not contain any properties you can edit + Paste + Edit permissions for + Set permissions for + Set permissions for %0% for user group %1% + Select the users groups you want to set permissions for + The items in the recycle bin are now being deleted. Please do not close this window while this operation takes place + The recycle bin is now empty + When items are deleted from the recycle bin, they will be gone forever + regexlib.com's webservice is currently experiencing some problems, which we have no control over. We are very sorry for this inconvenience.]]> + Search for a regular expression to add validation to a form field. Example: 'email, 'zip-code' 'url' + Remove Macro + Required Field + Site is reindexed + The website cache has been refreshed. All publish content is now up to date. While all unpublished content is still unpublished + The website cache will be refreshed. All published content will be updated, while unpublished content will stay unpublished. + Number of columns + Number of rows + Click on the image to see full size + Pick item + View Cache Item + Relate to original + Include descendants + The friendliest community + Link to page + Opens the linked document in a new window or tab + Link to media + Select content start node + Select media + Select icon + Select item + Select link + Select macro + Select content + Select media start node + Select member + Select member group + Select node + Select sections + Select users + No icons were found + There are no parameters for this macro + There are no macros available to insert + External login providers + Exception Details + Stacktrace + Inner Exception + Link your + Un-link your + account + Select editor + Select snippet + This will delete the node and all its languages. If you only want to delete one language go and unpublish it instead. + + + There are no dictionary items. + + + %0%' below
You can add additional languages under the 'languages' in the menu on the left + ]]> + Culture Name + + Dictionary overview + + + Configured Searchers + Shows properties and tools for any configured Searcher (i.e. such as a multi-index searcher) + Field values + Health status + The health status of the index and if it can be read + Indexers + Index info + Lists the properties of the index + Manage Examine's indexes + Allows you to view the details of each index and provides some tools for managing the indexes + Rebuild index + + Depending on how much content there is in your site this could take a while.
+ It is not recommended to rebuild an index during times of high website traffic or when editors are editing content. + ]]> + + Searchers + Search the index and view the results + Tools + Tools to manage the index + + + Enter your username + Enter your password + Confirm your password + Name the %0%... + Enter a name... + Enter an email... + Enter a username... + Label... + Enter a description... + Type to search... + Type to filter... + Type to add tags (press enter after each tag)... + Enter your email + Enter a message... + Your username is usually your email + #value or ?key=value + Enter alias... + Generating alias... + + + Allowed child node types + Create + Delete tab + Description + New tab + Tab + Thumbnail + Create custom list view + Remove custom list view + A content type, media type or member type with this alias already exists + + + Renamed + Enter a new folder name here + %0% was renamed to %1% + + + Add prevalue + Database datatype + Property editor GUID + Property editor + Buttons + Enable advanced settings for + Enable context menu + Maximum default size of inserted images + Related stylesheets + Show label + Width and height + All property types & property data + using this data type will be deleted permanently, please confirm you want to delete these as well + Yes, delete + and all property types & property data using this data type + Select the folder to move + to in the tree structure below + was moved underneath + + + Your data has been saved, but before you can publish this page there are some errors you need to fix first: + The current membership provider does not support changing password (EnablePasswordRetrieval need to be true) + %0% already exists + There were errors: + There were errors: + The password should be a minimum of %0% characters long and contain at least %1% non-alpha numeric character(s) + %0% must be an integer + The %0% field in the %1% tab is mandatory + %0% is a mandatory field + %0% at %1% is not in a correct format + %0% is not in a correct format + + + Received an error from the server + The specified file type has been disallowed by the administrator + NOTE! Even though CodeMirror is enabled by configuration, it is disabled in Internet Explorer because it's not stable enough. + Please fill both alias and name on the new property type! + There is a problem with read/write access to a specific file or folder + Error loading Partial View script (file: %0%) + Please enter a title + Please choose a type + You're about to make the picture larger than the original size. Are you sure that you want to proceed? + Startnode deleted, please contact your administrator + Please mark content before changing style + No active styles available + Please place cursor at the left of the two cells you wish to merge + You cannot split a cell that hasn't been merged. + + + Options + About + Action + Actions + Add + Alias + All + Are you sure? + Back + Back to overview + Border + by + Cancel + Cell margin + Choose + Close + Close Window + Comment + Confirm + Constrain + Constrain proportions + Content + Continue + Copy + Create + Database + Date + Default + Delete + Deleted + Deleting... + Design + Dictionary + Dimensions + Down + Download + Edit + Edited + Elements + Email + Error + Field + Find + First + General + Groups + Height + Help + Hide + History + Icon + Id + Import + Include subfolders in search + Info + Inner margin + Insert + Install + Invalid + Justify + Label + Language + Last + Layout + Links + Loading + Locked + Login + Log off + Logout + Macro + Mandatory + Message + Move + Name + New + Next + No + of + Off + OK + Open + On + or + Order by + Password + Path + One moment please... + Previous + Properties + Rebuild + Email to receive form data + Recycle Bin + Your recycle bin is empty + Reload + Remaining + Remove + Rename + Renew + Required + Retrieve + Retry + Permissions + Scheduled Publishing + Search + Sorry, we can not find what you are looking for. + No items have been added + Server + Settings + Show + Show page on Send + Size + Sort + Status + Submit + Type + Type to search... + under + Up + Update + Upgrade + Upload + Url + User + Username + Value + View + Welcome... + Width + Yes + Folder + Search results + Reorder + I am done reordering + Preview + Change password + to + List view + Saving... + current + Embed + selected + + + Blue + + + Add group + Add property + Add editor + Add template + Add child node + Add child + Edit data type + Navigate sections + Shortcuts + show shortcuts + Toggle list view + Toggle allow as root + Comment/Uncomment lines + Remove line + Copy Lines Up + Copy Lines Down + Move Lines Up + Move Lines Down + General + Editor + Toggle allow culture variants + + + Background color + Bold + Text color + Font + Text + + + Page + + + The installer cannot connect to the database. + Could not save the web.config file. Please modify the connection string manually. + Your database has been found and is identified as + Database configuration + install button to install the Umbraco %0% database + ]]> + Next to proceed.]]> + Database not found! Please check that the information in the "connection string" of the "web.config" file is correct.

+

To proceed, please edit the "web.config" file (using Visual Studio or your favourite text editor), scroll to the bottom, add the connection string for your database in the key named "UmbracoDbDSN" and save the file.

+

+ Click the retry button when + done.
+ More information on editing web.config here.

]]> + + Please contact your ISP if necessary. + If you're installing on a local machine or server you might need information from your system administrator.]]> + + Press the upgrade button to upgrade your database to Umbraco %0%

+

+ Don't worry - no content will be deleted and everything will continue working afterwards! +

+ ]]> + Press Next to + proceed. ]]> + next to continue the configuration wizard]]> + The Default users' password needs to be changed!]]> + The Default user has been disabled or has no access to Umbraco!

No further actions needs to be taken. Click Next to proceed.]]> + The Default user's password has been successfully changed since the installation!

No further actions needs to be taken. Click Next to proceed.]]> + The password is changed! + Get a great start, watch our introduction videos + By clicking the next button (or modifying the umbracoConfigurationStatus in web.config), you accept the license for this software as specified in the box below. Notice that this Umbraco distribution consists of two different licenses, the open source MIT license for the framework and the Umbraco freeware license that covers the UI. + Not installed yet. + Affected files and folders + More information on setting up permissions for Umbraco here + You need to grant ASP.NET modify permissions to the following files/folders + Your permission settings are almost perfect!

+ You can run Umbraco without problems, but you will not be able to install packages which are recommended to take full advantage of Umbraco.]]> + How to Resolve + Click here to read the text version + video tutorial on setting up folder permissions for Umbraco or read the text version.]]> + Your permission settings might be an issue! +

+ You can run Umbraco without problems, but you will not be able to create folders or install packages which are recommended to take full advantage of Umbraco.]]> + Your permission settings are not ready for Umbraco! +

+ In order to run Umbraco, you'll need to update your permission settings.]]> + Your permission settings are perfect!

+ You are ready to run Umbraco and install packages!]]> + Resolving folder issue + Follow this link for more information on problems with ASP.NET and creating folders + Setting up folder permissions + + I want to start from scratch + learn how) + You can still choose to install Runway later on. Please go to the Developer section and choose Packages. + ]]> + You've just set up a clean Umbraco platform. What do you want to do next? + Runway is installed + + This is our list of recommended modules, check off the ones you would like to install, or view the full list of modules + ]]> + Only recommended for experienced users + I want to start with a simple website + + "Runway" is a simple website providing some basic document types and templates. The installer can set up Runway for you automatically, + but you can easily edit, extend or remove it. It's not necessary and you can perfectly use Umbraco without it. However, + Runway offers an easy foundation based on best practices to get you started faster than ever. + If you choose to install Runway, you can optionally select basic building blocks called Runway Modules to enhance your Runway pages. +

+ + Included with Runway: Home page, Getting Started page, Installing Modules page.
+ Optional Modules: Top Navigation, Sitemap, Contact, Gallery. + + ]]> + What is Runway + Step 1/5 Accept license + Step 2/5: Database configuration + Step 3/5: Validating File Permissions + Step 4/5: Check Umbraco security + Step 5/5: Umbraco is ready to get you started + Thank you for choosing Umbraco + Browse your new site +You installed Runway, so why not see how your new website looks.]]> + Further help and information +Get help from our award winning community, browse the documentation or watch some free videos on how to build a simple site, how to use packages and a quick guide to the Umbraco terminology]]> + Umbraco %0% is installed and ready for use + /web.config file and update the AppSetting key UmbracoConfigurationStatus in the bottom to the value of '%0%'.]]> + started instantly by clicking the "Launch Umbraco" button below.
If you are new to Umbraco, +you can find plenty of resources on our getting started pages.]]> + Launch Umbraco +To manage your website, simply open the Umbraco back office and start adding content, updating the templates and stylesheets or add new functionality]]> + Connection to database failed. + Umbraco Version 3 + Umbraco Version 4 + Watch + Umbraco %0% for a fresh install or upgrading from version 3.0. +

+ Press "next" to start the wizard.]]> + + + Culture Code + Culture Name + + + You've been idle and logout will automatically occur in + Renew now to save your work + + + Happy super Sunday + Happy manic Monday + Happy tubular Tuesday + Happy wonderful Wednesday + Happy thunderous Thursday + Happy funky Friday + Happy Caturday + Log in below + Sign in with + Session timed out + © 2001 - %0%
Umbraco.com

]]> + Forgotten password? + An email will be sent to the address specified with a link to reset your password + An email with password reset instructions will be sent to the specified address if it matched our records + Show password + Hide password + Return to login form + Please provide a new password + Your Password has been updated + The link you have clicked on is invalid or has expired + Umbraco: Reset Password + + + + + + + + + + + +
+ + + + + +
+ +
+ +
+
+ + + + + + +
+
+
+ + + + +
+ + + + +
+

+ Password reset requested +

+

+ Your username to login to the Umbraco back-office is: %0% +

+

+ + + + + + +
+ + Click this link to reset your password + +
+

+

If you cannot click on the link, copy and paste this URL into your browser window:

+ + + + +
+ + %1% + +
+

+
+
+


+
+
+ + + ]]> + + + Dashboard + Sections + Content + + + Choose page above... + %0% has been copied to %1% + Select where the document %0% should be copied to below + %0% has been moved to %1% + Select where the document %0% should be moved to below + has been selected as the root of your new content, click 'ok' below. + No node selected yet, please select a node in the list above before clicking 'ok' + The current node is not allowed under the chosen node because of its type + The current node cannot be moved to one of its subpages + The current node cannot exist at the root + The action isn't allowed since you have insufficient permissions on 1 or more child documents. + Relate copied items to original + + + %0%]]> + Notification settings saved for + + The following languages have been modified %0% + + + + + + + + + + + +
+ + + + + +
+ +
+ +
+
+ + + + + + +
+
+
+ + + + +
+ + + + +
+

+ Hi %0%, +

+

+ This is an automated mail to inform you that the task '%1%' has been performed on the page '%2%' by the user '%3%' +

+ + + + + + +
+ +
+ EDIT
+
+

+

Update summary:

+ %6% +

+

+ Have a nice day!

+ Cheers from the Umbraco robot +

+
+
+


+
+
+ + + ]]> + The following languages have been modified:

+ %0% + ]]> + [%0%] Notification about %1% performed on %2% + Notifications + + + Actions + Created + Create package + + button and locating the package. Umbraco packages usually have a ".umb" or ".zip" extension. + ]]> + This will delete the package + Drop to upload + Include all child nodes + or click here to choose package file + Upload package + Install a local package by selecting it from your machine. Only install packages from sources you know and trust + Upload another package + Cancel and upload another package + I accept + terms of use + Path to file + Absolute path to file (ie: /bin/umbraco.bin) + Installed + Installed packages + Install local + Finish + This package has no configuration view + No packages have been created yet + You don’t have any packages installed + 'Packages' icon in the top right of your screen]]> + Package Actions + Author URL + Package Content + Package Files + Icon URL + Install package + License + License URL + Package Properties + Search for packages + Results for + We couldn’t find anything for + Please try searching for another package or browse through the categories + Popular + New releases + has + karma points + Information + Owner + Contributors + Created + Current version + .NET version + Downloads + Likes + Compatibility + This package is compatible with the following versions of Umbraco, as reported by community members. Full compatability cannot be guaranteed for versions reported below 100% + External sources + Author + Documentation + Package meta data + Package name + Package doesn't contain any items +
+ You can safely remove this from the system by clicking "uninstall package" below.]]> + Package options + Package readme + Package repository + Confirm package uninstall + Package was uninstalled + The package was successfully uninstalled + Uninstall package + + Notice: any documents, media etc depending on the items you remove, will stop working, and could lead to system instability, + so uninstall with caution. If in doubt, contact the package author.]]> + Package version + Upgrading from version + Package already installed + This package cannot be installed, it requires a minimum Umbraco version of + Uninstalling... + Downloading... + Importing... + Installing... + Restarting, please wait... + All done, your browser will now refresh, please wait... + Please click 'Finish' to complete installation and reload the page. + Uploading package... + + + Paste with full formatting (Not recommended) + The text you're trying to paste contains special characters or formatting. This could be caused by copying text from Microsoft Word. Umbraco can remove special characters or formatting automatically, so the pasted content will be more suitable for the web. + Paste as raw text without any formatting at all + Paste, but remove formatting (Recommended) + + + Group based protection + If you want to grant access to all members of specific member groups + You need to create a member group before you can use group based authentication + Error Page + Used when people are logged on, but do not have access + %0%]]> + %0% is now protected]]> + %0%]]> + Login Page + Choose the page that contains the login form + Remove protection... + %0%?]]> + Select the pages that contain login form and error messages + %0%]]> + %0%]]> + Specific members protection + If you wish to grant access to specific members + + + Insufficient user permissions to publish all descendant documents + + + + + + + + Validation failed for required language '%0%'. This language was saved but not published. + Publishing in progress - please wait... + %0% out of %1% pages have been published... + %0% has been published + %0% and subpages have been published + Publish %0% and all its subpages + Publish to publish %0% and thereby making its content publicly available.

+ You can publish this page and all its subpages by checking Include unpublished subpages below. + ]]> + + + You have not configured any approved colors + + + You have picked a content item currently deleted or in the recycle bin + You have picked content items currently deleted or in the recycle bin + + + You have picked a media item currently deleted or in the recycle bin + You have picked media items currently deleted or in the recycle bin + Trashed + + + enter external link + choose internal page + Caption + Link + Open in new window + enter the display caption + Enter the link + + + Reset crop + Save crop + Add new crop + Done + Undo edits + + + Select a version to compare with the current version + Current version + Red text will not be shown in the selected version. , green means added]]> + Document has been rolled back + This displays the selected version as HTML, if you wish to see the difference between 2 versions at the same time, use the diff view + Rollback to + Select version + View + + + Edit script file + + + Content + Forms + Media + Members + Packages + Settings + Translation + Users + + + The best Umbraco video tutorials + + + Default template + To import a document type, find the ".udt" file on your computer by clicking the "Browse" button and click "Import" (you'll be asked for confirmation on the next screen) + New Tab Title + Node type + Type + Stylesheet + Script + Tab + Tab Title + Tabs + Master Content Type enabled + This Content Type uses + as a Master Content Type. Tabs from Master Content Types are not shown and can only be edited on the Master Content Type itself + No properties defined on this tab. Click on the "add a new property" link at the top to create a new property. + Create matching template + Add icon + + + Sort order + Creation date + Sorting complete. + Drag the different items up or down below to set how they should be arranged. Or click the column headers to sort the entire collection of items + + This node has no child nodes to sort + + + Validation + Validation errors must be fixed before the item can be saved + Failed + Saved + Insufficient user permissions, could not complete the operation + Cancelled + Operation was cancelled by a 3rd party add-in + Property type already exists + Property type created + DataType: %1%]]> + Propertytype deleted + Document Type saved + Tab created + Tab deleted + Tab with id: %0% deleted + Stylesheet not saved + Stylesheet saved + Stylesheet saved without any errors + Datatype saved + Dictionary item saved + Content published + and is visible on the website + %0% documents published and visible on the website + %0% published and visible on the website + %0% documents published for languages %1% and visible on the website + Content saved + Remember to publish to make changes visible + A schedule for publishing has been updated + %0% saved + Sent For Approval + Changes have been sent for approval + %0% changes have been sent for approval + Media saved + Media saved without any errors + Member saved + Member group saved + Stylesheet Property Saved + Stylesheet saved + Template saved + Error saving user (check log) + User Saved + User type saved + User group saved + File not saved + file could not be saved. Please check file permissions + File saved + File saved without any errors + Language saved + Media Type saved + Member Type saved + Member Group saved + Template not saved + Please make sure that you do not have 2 templates with the same alias + Template saved + Template saved without any errors! + Content unpublished + Content variation %0% unpublished + The mandatory language '%0%' was unpublished. All languages for this content item are now unpublished. + Partial view saved + Partial view saved without any errors! + Partial view not saved + An error occurred saving the file. + Permissions saved for + Deleted %0% user groups + %0% was deleted + Enabled %0% users + Disabled %0% users + %0% is now enabled + %0% is now disabled + User groups have been set + Unlocked %0% users + %0% is now unlocked + Member was exported to file + An error occurred while exporting the member + User %0% was deleted + Invite user + Invitation has been re-sent to %0% + Cannot publish the document since the required '%0%' is not published + Validation failed for language '%0%' + Document type was exported to file + An error occurred while exporting the document type + The release date cannot be in the past + Cannot schedule the document for publishing since the required '%0%' is not published + Cannot schedule the document for publishing since the required '%0%' has a publish date later than a non mandatory language + The expire date cannot be in the past + The expire date cannot be before the release date + + + Add style + Edit style + Rich text editor styles + Define the styles that should be available in the rich text editor for this stylesheet + Edit stylesheet + Edit stylesheet property + The name displayed in the editor style selector + Preview + How the text will look like in the rich text editor. + Selector + Uses CSS syntax, e.g. "h1" or ".redHeader" + Styles + The CSS that should be applied in the rich text editor, e.g. "color:red;" + Code + Rich Text Editor + + + Failed to delete template with ID %0% + Edit template + Sections + Insert content area + Insert content area placeholder + Insert + Choose what to insert into your template + Dictionary item + A dictionary item is a placeholder for a translatable piece of text, which makes it easy to create designs for multilingual websites. + Macro + + A Macro is a configurable component which is great for + reusable parts of your design, where you need the option to provide parameters, + such as galleries, forms and lists. + + Value + Displays the value of a named field from the current page, with options to modify the value or fallback to alternative values. + Partial view + + A partial view is a separate template file which can be rendered inside another + template, it's great for reusing markup or for separating complex templates into separate files. + + Master template + No master + Render child template + @RenderBody() placeholder. + ]]> + Define a named section + @section { ... }. This can be rendered in a + specific area of the parent of this template, by using @RenderSection. + ]]> + Render a named section + @RenderSection(name) placeholder. + This renders an area of a child template which is wrapped in a corresponding @section [name]{ ... } definition. + ]]> + Section Name + Section is mandatory + + If mandatory, the child template must contain a @section definition, otherwise an error is shown. + + Query builder + items returned, in + I want + all content + content of type "%0%" + from + my website + where + and + is + is not + before + before (including selected date) + after + after (including selected date) + equals + does not equal + contains + does not contain + greater than + greater than or equal to + less than + less than or equal to + Id + Name + Created Date + Last Updated Date + order by + ascending + descending + Template + + + Image + Macro + Choose type of content + Choose a layout + Add a row + Add content + Drop content + Settings applied + This content is not allowed here + This content is allowed here + Click to embed + Click to insert image + Image caption... + Write here... + Grid Layouts + Layouts are the overall work area for the grid editor, usually you only need one or two different layouts + Add Grid Layout + Adjust the layout by setting column widths and adding additional sections + Row configurations + Rows are predefined cells arranged horizontally + Add row configuration + Adjust the row by setting cell widths and adding additional cells + Columns + Total combined number of columns in the grid layout + Settings + Configure what settings editors can change + Styles + Configure what styling editors can change + Allow all editors + Allow all row configurations + Maximum items + Leave blank or set to 0 for unlimited + Set as default + Choose extra + Choose default + are added + + + Compositions + You have not added any groups + Add group + Inherited from + Add property + Required label + Enable list view + Configures the content item to show a sortable and searchable list of its children, the children will not be shown in the tree + Allowed Templates + Choose which templates editors are allowed to use on content of this type + Allow as root + Allow editors to create content of this type in the root of the content tree + Allowed child node types + Allow content of the specified types to be created underneath content of this type + Choose child node + Inherit tabs and properties from an existing document type. New tabs will be added to the current document type or merged if a tab with an identical name exists. + This content type is used in a composition, and therefore cannot be composed itself. + There are no content types available to use as a composition. + Create new + Use existing + Editor settings + Configuration + Yes, delete + was moved underneath + was copied underneath + Select the folder to move + Select the folder to copy + to in the tree structure below + All Document types + All Documents + All media items + using this document type will be deleted permanently, please confirm you want to delete these as well. + using this media type will be deleted permanently, please confirm you want to delete these as well. + using this member type will be deleted permanently, please confirm you want to delete these as well + and all documents using this type + and all media items using this type + and all members using this type + Member can edit + Allow this property value to be edited by the member on their profile page + Is sensitive data + Hide this property value from content editors that don't have access to view sensitive information + Show on member profile + Allow this property value to be displayed on the member profile page + tab has no sort order + Where is this composition used? + This composition is currently used in the composition of the following content types: + Allow varying by culture + Allow editors to create content of this type in different languages + Allow varying by culture + Is an Element type + An Element type is meant to be used for instance in Nested Content, and not in the tree + This is not applicable for an Element type + + + Add language + Mandatory language + Properties on this language have to be filled out before the node can be published. + Default language + An Umbraco site can only have one default language set. + Switching default language may result in default content missing. + Falls back to + No fall back language + To allow multi-lingual content to fall back to another language if not present in the requested language, select it here. + Fall back language + + + Add parameter + Edit parameter + Enter macro name + Parameters + Define the parameters that should be available when using this macro. + + + Building models + this can take a bit of time, don't worry + Models generated + Models could not be generated + Models generation has failed, see exception in U log + + + Add fallback field + Fallback field + Add default value + Default value + Fallback field + Default value + Casing + Encoding + Choose field + Convert line breaks + Yes, convert line breaks + Replaces line breaks with 'br' html tag + Custom Fields + Date only + Format and encoding + Format as date + Format the value as a date, or a date with time, according to the active culture + HTML encode + Will replace special characters by their HTML equivalent. + Will be inserted after the field value + Will be inserted before the field value + Lowercase + Modify output + None + Output sample + Insert after field + Insert before field + Recursive + Yes, make it recursive + Separator + Standard Fields + Uppercase + URL encode + Will format special characters in URLs + Will only be used when the field values above are empty + This field will only be used if the primary field is empty + Date and time + + + Translation details + Download XML DTD + Fields + Include subpages + + No translator users found. Please create a translator user before you start sending content to translation + The page '%0%' has been send to translation + Send the page '%0%' to translation + Total words + Translate to + Translation completed. + You can preview the pages, you've just translated, by clicking below. If the original page is found, you will get a comparison of the 2 pages. + Translation failed, the XML file might be corrupt + Translation options + Translator + Upload translation XML + + + Content + Content Templates + Media + Cache Browser + Recycle Bin + Created packages + Data Types + Dictionary + Installed packages + Install skin + Install starter kit + Languages + Install local package + Macros + Media Types + Members + Member Groups + Member Roles + Member Types + Document Types + Relation Types + Packages + Packages + Partial Views + Partial View Macro Files + Install from repository + Install Runway + Runway modules + Scripting Files + Scripts + Stylesheets + Templates + Log Viewer + Users + Settings + Templating + Third Party + + + New update ready + %0% is ready, click here for download + No connection to server + Error checking for update. Please review trace-stack for further information + + + Access + Based on the assigned groups and start nodes, the user has access to the following nodes + Assign access + Administrator + Category field + User created + Change Your Password + Change photo + New password + hasn't been locked out + The password hasn't been changed + Confirm new password + You can change your password for accessing the Umbraco Back Office by filling out the form below and click the 'Change Password' button + Content Channel + Create another user + Create new users to give them access to Umbraco. When a new user is created a password will be generated that you can share with the user. + Description field + Disable User + Document Type + Editor + Excerpt field + Failed login attempts + Go to user profile + Add groups to assign access and permissions + Invite another user + Invite new users to give them access to Umbraco. An invite email will be sent to the user with information on how to log in to Umbraco. Invites last for 72 hours. + Language + Set the language you will see in menus and dialogs + Last lockout date + Last login + Password last changed + Username + Media start node + Limit the media library to a specific start node + Media start nodes + Limit the media library to specific start nodes + Sections + Disable Umbraco Access + has not logged in yet + Old password + Password + Reset password + Your password has been changed! + Please confirm the new password + Enter your new password + Your new password cannot be blank! + Current password + Invalid current password + There was a difference between the new password and the confirmed password. Please try again! + The confirmed password doesn't match the new password! + Replace child node permissions + You are currently modifying permissions for the pages: + Select pages to modify their permissions + Remove photo + Default permissions + Granular permissions + Set permissions for specific nodes + Profile + Search all children + Add sections to give users access + Select user groups + No start node selected + No start nodes selected + Content start node + Limit the content tree to a specific start node + Content start nodes + Limit the content tree to specific start nodes + User last updated + has been created + The new user has successfully been created. To log in to Umbraco use the password below. + User management + Name + User permissions + User group + has been invited + An invitation has been sent to the new user with details about how to log in to Umbraco. + Hello there and welcome to Umbraco! In just 1 minute you’ll be good to go, we just need you to setup a password and add a picture for your avatar. + Welcome to Umbraco! Unfortunately your invite has expired. Please contact your administrator and ask them to resend it. + Uploading a photo of yourself will make it easy for other users to recognize you. Click the circle above to upload your photo. + Writer + Change + Your profile + Your recent history + Session expires in + Invite user + Create user + Send invite + Back to users + Umbraco: Invitation + + + + + + + + + + + +
+ + + + + +
+ +
+ +
+
+ + + + + + +
+
+
+ + + + +
+ + + + +
+

+ Hi %0%, +

+

+ You have been invited by %1% to the Umbraco Back Office. +

+

+ Message from %1%: +
+ %2% +

+ + + + + + +
+ + + + + + +
+ + Click this link to accept the invite + +
+
+

If you cannot click on the link, copy and paste this URL into your browser window:

+ + + + +
+ + %3% + +
+

+
+
+


+
+
+ + ]]> + Invite + Resending invitation... + Delete User + Are you sure you wish to delete this user account? + All + Active + Disabled + Locked out + Invited + Inactive + Name (A-Z) + Name (Z-A) + Newest + Oldest + Last login + + + Validation + Validate as an email address + Validate as a number + Validate as a URL + ...or enter a custom validation + Field is mandatory + Enter a regular expression + You need to add at least + You can only have + items + items selected + Invalid date + Not a number + Invalid email + Value cannot be null + Value cannot be empty + Value is invalid, it does not match the correct pattern + Custom validation + + + + Value is set to the recommended value: '%0%'. + Value was set to '%1%' for XPath '%2%' in configuration file '%3%'. + Expected value '%1%' for '%2%' in configuration file '%3%', but found '%0%'. + Found unexpected value '%0%' for '%2%' in configuration file '%3%'. + + Custom errors are set to '%0%'. + Custom errors are currently set to '%0%'. It is recommended to set this to '%1%' before go live. + Custom errors successfully set to '%0%'. + MacroErrors are set to '%0%'. + MacroErrors are set to '%0%' which will prevent some or all pages in your site from loading completely if there are any errors in macros. Rectifying this will set the value to '%1%'. + MacroErrors are now set to '%0%'. + + Try Skip IIS Custom Errors is set to '%0%' and you're using IIS version '%1%'. + Try Skip IIS Custom Errors is currently '%0%'. It is recommended to set this to '%1%' for your IIS version (%2%). + Try Skip IIS Custom Errors successfully set to '%0%'. + + File does not exist: '%0%'. + '%0%' in config file '%1%'.]]> + There was an error, check log for full error: %0%. + Database - The database schema is correct for this version of Umbraco + %0% problems were detected with your database schema (Check the log for details) + Some errors were detected while validating the database schema against the current version of Umbraco. + Your website's certificate is valid. + Certificate validation error: '%0%' + Your website's SSL certificate has expired. + Your website's SSL certificate is expiring in %0% days. + Error pinging the URL %0% - '%1%' + You are currently %0% viewing the site using the HTTPS scheme. + The appSetting 'Umbraco.Core.UseHttps' is set to 'false' in your web.config file. Once you access this site using the HTTPS scheme, that should be set to 'true'. + The appSetting 'Umbraco.Core.UseHttps' is set to '%0%' in your web.config file, your cookies are %1% marked as secure. + Could not update the 'Umbraco.Core.UseHttps' setting in your web.config file. Error: %0% + + Enable HTTPS + Sets umbracoSSL setting to true in the appSettings of the web.config file. + The appSetting 'Umbraco.Core.UseHttps' is now set to 'true' in your web.config file, your cookies will be marked as secure. + Fix + Cannot fix a check with a value comparison type of 'ShouldNotEqual'. + Cannot fix a check with a value comparison type of 'ShouldEqual' with a provided value. + Value to fix check not provided. + Debug compilation mode is disabled. + Debug compilation mode is currently enabled. It is recommended to disable this setting before go live. + Debug compilation mode successfully disabled. + Trace mode is disabled. + Trace mode is currently enabled. It is recommended to disable this setting before go live. + Trace mode successfully disabled. + All folders have the correct permissions set. + + %0%.]]> + %0%. If they aren't being written to no action need be taken.]]> + All files have the correct permissions set. + + %0%.]]> + %0%. If they aren't being written to no action need be taken.]]> + X-Frame-Options used to control whether a site can be IFRAMEd by another was found.]]> + X-Frame-Options used to control whether a site can be IFRAMEd by another was not found.]]> + Set Header in Config + Adds a value to the httpProtocol/customHeaders section of web.config to prevent the site being IFRAMEd by other websites. + A setting to create a header preventing IFRAMEing of the site by other websites has been added to your web.config file. + Could not update web.config file. Error: %0% + X-Content-Type-Options used to protect against MIME sniffing vulnerabilities was found.]]> + X-Content-Type-Options used to protect against MIME sniffing vulnerabilities was not found.]]> + Adds a value to the httpProtocol/customHeaders section of web.config to protect against MIME sniffing vulnerabilities. + A setting to create a header protecting against MIME sniffing vulnerabilities has been added to your web.config file. + Strict-Transport-Security, also known as the HSTS-header, was found.]]> + Strict-Transport-Security was not found.]]> + Adds the header 'Strict-Transport-Security' with the value 'max-age=10886400; preload' to the httpProtocol/customHeaders section of web.config. Use this fix only if you will have your domains running with https for the next 18 weeks (minimum). + The HSTS header has been added to your web.config file. + X-XSS-Protection was found.]]> + X-XSS-Protection was not found.]]> + Adds the header 'X-XSS-Protection' with the value '1; mode=block' to the httpProtocol/customHeaders section of web.config. + The X-XSS-Protection header has been added to your web.config file. + + %0%.]]> + No headers revealing information about the website technology were found. + In the Web.config file, system.net/mailsettings could not be found. + In the Web.config file system.net/mailsettings section, the host is not configured. + SMTP settings are configured correctly and the service is operating as expected. + The SMTP server configured with host '%0%' and port '%1%' could not be reached. Please check to ensure the SMTP settings in the Web.config file system.net/mailsettings are correct. + %0%.]]> + %0%.]]> +

Results of the scheduled Umbraco Health Checks run on %0% at %1% are as follows:

%2%]]> + Umbraco Health Check Status: %0% + + + Disable URL tracker + Enable URL tracker + Culture + Original URL + Redirected To + Redirect Url Management + The following URLs redirect to this content item: + No redirects have been made + When a published page gets renamed or moved a redirect will automatically be made to the new page. + Are you sure you want to remove the redirect from '%0%' to '%1%'? + Redirect URL removed. + Error removing redirect URL. + This will remove the redirect + Are you sure you want to disable the URL tracker? + URL tracker has now been disabled. + Error disabling the URL tracker, more information can be found in your log file. + URL tracker has now been enabled. + Error enabling the URL tracker, more information can be found in your log file. + + + No Dictionary items to choose from + %0% characters left.]]> %1% too many.]]> - - - Trashed content with Id: {0} related to original parent content with Id: {1} - Trashed media with Id: {0} related to original parent media item with Id: {1} - Cannot automatically restore this item - There is no location where this item can be automatically restored. You can move the item manually using the tree below. - was restored under - - - Direction - Parent to child - Bidirectional - Parent - Child - Count - Relations - Created - Comment - Name - No relations for this relation type. - Relation Type - Relations - - - Getting Started - Redirect URL Management - Content - Welcome - Examine Management - Published Cache - Models Builder - Health Check - Getting Started - Install Umbraco Forms - - + + + Trashed content with Id: {0} related to original parent content with Id: {1} + Trashed media with Id: {0} related to original parent media item with Id: {1} + Cannot automatically restore this item + There is no location where this item can be automatically restored. You can move the item manually using the tree below. + was restored under + + + Direction + Parent to child + Bidirectional + Parent + Child + Count + Relations + Created + Comment + Name + No relations for this relation type. + Relation Type + Relations + + + Getting Started + Redirect URL Management + Content + Welcome + Examine Management + Published Cache + Models Builder + Health Check + Getting Started + Install Umbraco Forms + + diff --git a/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs b/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs index 493381a5a3..86ff709541 100644 --- a/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs +++ b/src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs @@ -4,6 +4,8 @@ using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Models; using Umbraco.Core.Models.PublishedContent; +using Umbraco.Core.Persistence.Repositories; +using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Services; using Umbraco.Core.Services.Changes; using Umbraco.Web.PublishedCache; @@ -14,14 +16,16 @@ namespace Umbraco.Web.Cache { private readonly IPublishedSnapshotService _publishedSnapshotService; private readonly IPublishedModelFactory _publishedModelFactory; + private readonly IContentTypeCommonRepository _contentTypeCommonRepository; private readonly IdkMap _idkMap; - public ContentTypeCacheRefresher(AppCaches appCaches, IPublishedSnapshotService publishedSnapshotService, IPublishedModelFactory publishedModelFactory, IdkMap idkMap) + public ContentTypeCacheRefresher(AppCaches appCaches, IPublishedSnapshotService publishedSnapshotService, IPublishedModelFactory publishedModelFactory, IdkMap idkMap, IContentTypeCommonRepository contentTypeCommonRepository) : base(appCaches) { _publishedSnapshotService = publishedSnapshotService; _publishedModelFactory = publishedModelFactory; _idkMap = idkMap; + _contentTypeCommonRepository = contentTypeCommonRepository; } #region Define @@ -44,6 +48,8 @@ namespace Umbraco.Web.Cache // we should NOT directly clear caches here, but instead ask whatever class // is managing the cache to please clear that cache properly + _contentTypeCommonRepository.ClearCache(); // always + if (payloads.Any(x => x.ItemType == typeof(IContentType).Name)) { ClearAllIsolatedCacheByEntityType(); diff --git a/src/Umbraco.Web/Composing/CompositionExtensions/WebMappingProfiles.cs b/src/Umbraco.Web/Composing/CompositionExtensions/WebMappingProfiles.cs index b4fce14385..2d32517001 100644 --- a/src/Umbraco.Web/Composing/CompositionExtensions/WebMappingProfiles.cs +++ b/src/Umbraco.Web/Composing/CompositionExtensions/WebMappingProfiles.cs @@ -1,10 +1,7 @@ -using AutoMapper; -using Umbraco.Core; +using Umbraco.Core; using Umbraco.Core.Composing; -using Umbraco.Core.Models; -using Umbraco.Web.Models.ContentEditing; +using Umbraco.Core.Mapping; using Umbraco.Web.Models.Mapping; -using Umbraco.Web.Trees; namespace Umbraco.Web.Composing.CompositionExtensions { @@ -12,37 +9,28 @@ namespace Umbraco.Web.Composing.CompositionExtensions { public static Composition ComposeWebMappingProfiles(this Composition composition) { - //register the profiles - composition.Register(); - composition.Register(); - composition.Register(); - composition.Register(); - composition.Register(); - composition.Register(); - composition.Register(); - composition.Register(); - composition.Register(); - composition.Register(); - composition.Register(); - composition.Register(); - composition.Register(); - composition.Register(); - composition.Register(); - composition.Register(); - composition.Register(); - composition.Register(); + composition.WithCollectionBuilder() + .Add() + .Add() + .Add() + .Add() + .Add() + .Add() + .Add() + .Add() + .Add() + .Add() + .Add() + .Add() + .Add() + .Add() + .Add() + .Add() + .Add() + .Add(); - //register any resolvers, etc.. that the profiles use - composition.Register(); - composition.Register>(); - composition.Register>(); - composition.Register>(); - composition.Register>(); - composition.Register(); - composition.Register(); - composition.Register(); - composition.Register(); - composition.Register(); + composition.Register(); + composition.Register(); return composition; } diff --git a/src/Umbraco.Web/Composing/Current.cs b/src/Umbraco.Web/Composing/Current.cs index 5dfd7251b8..420c0b8a4c 100644 --- a/src/Umbraco.Web/Composing/Current.cs +++ b/src/Umbraco.Web/Composing/Current.cs @@ -11,6 +11,7 @@ using Umbraco.Core.Models.PublishedContent; using Umbraco.Core.Persistence; using Umbraco.Core.Composing; using Umbraco.Core.Configuration; +using Umbraco.Core.Mapping; using Umbraco.Core.PackageActions; using Umbraco.Core.Packaging; using Umbraco.Core.PropertyEditors; @@ -164,6 +165,8 @@ namespace Umbraco.Web.Composing // proxy Core for convenience + public static UmbracoMapper Mapper => CoreCurrent.Mapper; + public static IRuntimeState RuntimeState => CoreCurrent.RuntimeState; public static TypeLoader TypeLoader => CoreCurrent.TypeLoader; diff --git a/src/Umbraco.Web/Editors/AuthenticationController.cs b/src/Umbraco.Web/Editors/AuthenticationController.cs index 4f339a36fd..cafb85c3b4 100644 --- a/src/Umbraco.Web/Editors/AuthenticationController.cs +++ b/src/Umbraco.Web/Editors/AuthenticationController.cs @@ -8,14 +8,12 @@ using System.Threading.Tasks; using System.Web; using System.Web.Http; using System.Web.Mvc; -using AutoMapper; using Microsoft.AspNet.Identity; using Microsoft.AspNet.Identity.Owin; using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Models; using Umbraco.Core.Models.Identity; -using Umbraco.Core.Security; using Umbraco.Core.Services; using Umbraco.Web.Models; using Umbraco.Web.Models.ContentEditing; diff --git a/src/Umbraco.Web/Editors/Binders/ContentItemBinder.cs b/src/Umbraco.Web/Editors/Binders/ContentItemBinder.cs index fd8951993b..11a876345d 100644 --- a/src/Umbraco.Web/Editors/Binders/ContentItemBinder.cs +++ b/src/Umbraco.Web/Editors/Binders/ContentItemBinder.cs @@ -2,7 +2,6 @@ using System.Linq; using System.Web.Http.Controllers; using System.Web.Http.ModelBinding; -using AutoMapper; using Umbraco.Core; using Umbraco.Core.Logging; using Umbraco.Core.Models; @@ -53,14 +52,14 @@ namespace Umbraco.Web.Editors.Binders if (variant.Culture.IsNullOrWhiteSpace()) { //map the property dto collection (no culture is passed to the mapping context so it will be invariant) - variant.PropertyCollectionDto = Mapper.Map(model.PersistedContent); + variant.PropertyCollectionDto = Current.Mapper.Map(model.PersistedContent); } else { //map the property dto collection with the culture of the current variant - variant.PropertyCollectionDto = Mapper.Map( + variant.PropertyCollectionDto = Current.Mapper.Map( model.PersistedContent, - options => options.SetCulture(variant.Culture)); + context => context.SetCulture(variant.Culture)); } //now map all of the saved values to the dto diff --git a/src/Umbraco.Web/Editors/Binders/MediaItemBinder.cs b/src/Umbraco.Web/Editors/Binders/MediaItemBinder.cs index bbba9d8122..1084aa16ea 100644 --- a/src/Umbraco.Web/Editors/Binders/MediaItemBinder.cs +++ b/src/Umbraco.Web/Editors/Binders/MediaItemBinder.cs @@ -1,14 +1,10 @@ using System; using System.Web.Http.Controllers; using System.Web.Http.ModelBinding; -using AutoMapper; -using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Services; using Umbraco.Web.Composing; using Umbraco.Web.Models.ContentEditing; -using Umbraco.Web.Models.Mapping; -using Umbraco.Web.WebApi; namespace Umbraco.Web.Editors.Binders { @@ -46,7 +42,7 @@ namespace Umbraco.Web.Editors.Binders //create the dto from the persisted model if (model.PersistedContent != null) { - model.PropertyCollectionDto = Mapper.Map(model.PersistedContent); + model.PropertyCollectionDto = Current.Mapper.Map(model.PersistedContent); //now map all of the saved values to the dto _modelBinderHelper.MapPropertyValuesFromSaved(model, model.PropertyCollectionDto); } diff --git a/src/Umbraco.Web/Editors/Binders/MemberBinder.cs b/src/Umbraco.Web/Editors/Binders/MemberBinder.cs index bceba2e04d..60b4f85c21 100644 --- a/src/Umbraco.Web/Editors/Binders/MemberBinder.cs +++ b/src/Umbraco.Web/Editors/Binders/MemberBinder.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Web.Http.Controllers; using System.Web.Http.ModelBinding; using System.Web.Security; -using AutoMapper; using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Security; @@ -50,7 +49,7 @@ namespace Umbraco.Web.Editors.Binders //create the dto from the persisted model if (model.PersistedContent != null) { - model.PropertyCollectionDto = Mapper.Map(model.PersistedContent); + model.PropertyCollectionDto = Current.Mapper.Map(model.PersistedContent); //now map all of the saved values to the dto _modelBinderHelper.MapPropertyValuesFromSaved(model, model.PropertyCollectionDto); } @@ -106,7 +105,7 @@ namespace Umbraco.Web.Editors.Binders //} //member.Key = convertResult.Result; - var member = Mapper.Map(membershipUser); + var member = Current.Mapper.Map(membershipUser); return member; } diff --git a/src/Umbraco.Web/Editors/CodeFileController.cs b/src/Umbraco.Web/Editors/CodeFileController.cs index 3f1ffa55d9..5ddbb506c9 100644 --- a/src/Umbraco.Web/Editors/CodeFileController.cs +++ b/src/Umbraco.Web/Editors/CodeFileController.cs @@ -1,5 +1,4 @@ using System; -using AutoMapper; using System.Collections.Generic; using System.IO; using System.Linq; diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs index a3788e4590..cafc7dba09 100644 --- a/src/Umbraco.Web/Editors/ContentController.cs +++ b/src/Umbraco.Web/Editors/ContentController.cs @@ -9,7 +9,6 @@ using System.Web.Http; using System.Web.Http.Controllers; using System.Web.Http.ModelBinding; using System.Web.Security; -using AutoMapper; using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Configuration; @@ -191,7 +190,7 @@ namespace Umbraco.Web.Editors //get all user groups and map their default permissions to the AssignedUserGroupPermissions model. //we do this because not all groups will have true assigned permissions for this node so if they don't have assigned permissions, we need to show the defaults. - var defaultPermissionsByGroup = Mapper.Map>(allUserGroups).ToArray(); + var defaultPermissionsByGroup = Mapper.MapEnumerable(allUserGroups); var defaultPermissionsAsDictionary = defaultPermissionsByGroup .ToDictionary(x => Convert.ToInt32(x.Id), x => x); @@ -505,14 +504,14 @@ namespace Umbraco.Web.Editors var pagedResult = new PagedResult>(totalChildren, pageNumber, pageSize); pagedResult.Items = children.Select(content => Mapper.Map>(content, - opts => + context => { - opts.SetCulture(cultureName); + context.SetCulture(cultureName); // if there's a list of property aliases to map - we will make sure to store this in the mapping context. if (!includeProperties.IsNullOrWhiteSpace()) - opts.SetIncludedProperties(includeProperties.Split(new[] { ", ", "," }, StringSplitOptions.RemoveEmptyEntries)); + context.SetIncludedProperties(includeProperties.Split(new[] { ", ", "," }, StringSplitOptions.RemoveEmptyEntries)); })) .ToList(); // evaluate now @@ -666,7 +665,7 @@ namespace Umbraco.Web.Editors //The default validation language will be either: The default languauge, else if the content is brand new and the default culture is // not marked to be saved, it will be the first culture in the list marked for saving. - var defaultCulture = _allLangs.Value.First(x => x.Value.IsDefault).Key; + var defaultCulture = _allLangs.Value.Values.FirstOrDefault(x => x.IsDefault)?.CultureName; var cultureForInvariantErrors = CultureImpact.GetCultureForInvariantErrors( contentItem.PersistedContent, contentItem.Variants.Where(x => x.Save).Select(x => x.Culture).ToArray(), diff --git a/src/Umbraco.Web/Editors/ContentTypeController.cs b/src/Umbraco.Web/Editors/ContentTypeController.cs index 1f00b88b6d..ede480e29a 100644 --- a/src/Umbraco.Web/Editors/ContentTypeController.cs +++ b/src/Umbraco.Web/Editors/ContentTypeController.cs @@ -1,5 +1,4 @@ -using AutoMapper; -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; diff --git a/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs b/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs index e46f32746e..e62438cc6f 100644 --- a/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs +++ b/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs @@ -5,7 +5,6 @@ using System.Net; using System.Net.Http; using System.Text; using System.Web.Http; -using AutoMapper; using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Configuration; @@ -15,7 +14,6 @@ using Umbraco.Core.Logging; using Umbraco.Core.Models; using Umbraco.Core.Persistence; using Umbraco.Core.Services; -using Umbraco.Web.Composing; using Umbraco.Web.Models.ContentEditing; using Umbraco.Web.Mvc; using Umbraco.Web.WebApi; @@ -502,13 +500,13 @@ namespace Umbraco.Web.Editors where TPropertyType : PropertyTypeBasic { InvalidCompositionException invalidCompositionException = null; - if (ex is AutoMapperMappingException && ex.InnerException is InvalidCompositionException) + if (ex is InvalidCompositionException) { - invalidCompositionException = (InvalidCompositionException)ex.InnerException; + invalidCompositionException = (InvalidCompositionException)ex; } else if (ex.InnerException is InvalidCompositionException) { - invalidCompositionException = (InvalidCompositionException)ex; + invalidCompositionException = (InvalidCompositionException)ex.InnerException; } if (invalidCompositionException != null) { diff --git a/src/Umbraco.Web/Editors/CurrentUserController.cs b/src/Umbraco.Web/Editors/CurrentUserController.cs index 30f3a431ad..3c8aed247e 100644 --- a/src/Umbraco.Web/Editors/CurrentUserController.cs +++ b/src/Umbraco.Web/Editors/CurrentUserController.cs @@ -1,12 +1,9 @@ using System; -using System.Collections; using System.Collections.Generic; using System.Globalization; using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; -using AutoMapper; -using Umbraco.Core.Composing; using Umbraco.Core.Services; using Umbraco.Web.Models; using Umbraco.Web.Models.ContentEditing; @@ -15,7 +12,6 @@ using Umbraco.Web.WebApi; using System.Linq; using Newtonsoft.Json; using Umbraco.Core; -using Umbraco.Core.Security; using Umbraco.Web.Security; using Umbraco.Web.WebApi.Filters; diff --git a/src/Umbraco.Web/Editors/DataTypeController.cs b/src/Umbraco.Web/Editors/DataTypeController.cs index e49754dff9..30c4162252 100644 --- a/src/Umbraco.Web/Editors/DataTypeController.cs +++ b/src/Umbraco.Web/Editors/DataTypeController.cs @@ -4,7 +4,6 @@ using System.Data; using System.Linq; using System.Net; using System.Web.Http; -using AutoMapper; using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.PropertyEditors; diff --git a/src/Umbraco.Web/Editors/DataTypeValidateAttribute.cs b/src/Umbraco.Web/Editors/DataTypeValidateAttribute.cs index 738dd05c75..1337545ee0 100644 --- a/src/Umbraco.Web/Editors/DataTypeValidateAttribute.cs +++ b/src/Umbraco.Web/Editors/DataTypeValidateAttribute.cs @@ -4,7 +4,6 @@ using System.Net; using System.Net.Http; using System.Web.Http.Controllers; using System.Web.Http.Filters; -using AutoMapper; using Umbraco.Core; using Umbraco.Core.Composing; using Umbraco.Core.Models; @@ -71,12 +70,12 @@ namespace Umbraco.Web.Editors return; } // map the model to the persisted instance - Mapper.Map(dataType, persisted); + Current.Mapper.Map(dataType, persisted); break; case ContentSaveAction.SaveNew: // create the persisted model from mapping the saved model - persisted = Mapper.Map(dataType); + persisted = Current.Mapper.Map(dataType); ((DataType) persisted).ResetIdentity(); break; diff --git a/src/Umbraco.Web/Editors/DictionaryController.cs b/src/Umbraco.Web/Editors/DictionaryController.cs index 85ca00dd5b..120ebeded7 100644 --- a/src/Umbraco.Web/Editors/DictionaryController.cs +++ b/src/Umbraco.Web/Editors/DictionaryController.cs @@ -4,7 +4,6 @@ using System.Linq; using System.Net; using System.Net.Http; using System.Web.Http; -using AutoMapper; using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Configuration; diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs index 2705fc531c..e648a4d140 100644 --- a/src/Umbraco.Web/Editors/EntityController.cs +++ b/src/Umbraco.Web/Editors/EntityController.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Net; using System.Web.Http; -using AutoMapper; using Umbraco.Core; using Umbraco.Core.Models.Membership; using Umbraco.Web.Models.ContentEditing; @@ -507,13 +506,15 @@ namespace Umbraco.Web.Editors var culture = ClientCulture(); var pagedResult = new PagedResult(totalRecords, pageNumber, pageSize) { - Items = entities.Select(entity => Mapper.Map(entity, options => - { - options.SetCulture(culture); - options.AfterMap((src, dest) => { dest.AdditionalData["hasChildren"] = src.HasChildren; }); - } - ) - ) + Items = entities.Select(source => + { + var target = Mapper.Map(source, context => + { + context.SetCulture(culture); + }); + target.AdditionalData["hasChildren"] = source.HasChildren; + return target; + }) }; return pagedResult; @@ -916,7 +917,7 @@ namespace Umbraco.Web.Editors .SelectMany(x => x.PropertyTypes) .DistinctBy(composition => composition.Alias); var filteredPropertyTypes = ExecutePostFilter(propertyTypes, postFilter); - return Mapper.Map, IEnumerable>(filteredPropertyTypes); + return Mapper.MapEnumerable(filteredPropertyTypes); case UmbracoEntityTypes.PropertyGroup: @@ -927,13 +928,13 @@ namespace Umbraco.Web.Editors .SelectMany(x => x.PropertyGroups) .DistinctBy(composition => composition.Name); var filteredpropertyGroups = ExecutePostFilter(propertyGroups, postFilter); - return Mapper.Map, IEnumerable>(filteredpropertyGroups); + return Mapper.MapEnumerable(filteredpropertyGroups); case UmbracoEntityTypes.User: var users = Services.UserService.GetAll(0, int.MaxValue, out _); var filteredUsers = ExecutePostFilter(users, postFilter); - return Mapper.Map, IEnumerable>(filteredUsers); + return Mapper.MapEnumerable(filteredUsers); case UmbracoEntityTypes.Stylesheet: @@ -1052,7 +1053,7 @@ namespace Umbraco.Web.Editors private EntityBasic MapEntity(object entity, string culture = null) { culture = culture ?? ClientCulture(); - return Mapper.Map(entity, opts => { opts.SetCulture(culture); }); + return Mapper.Map(entity, context => { context.SetCulture(culture); }); } private string ClientCulture() => Request.ClientCulture(); diff --git a/src/Umbraco.Web/Editors/Filters/UserGroupValidateAttribute.cs b/src/Umbraco.Web/Editors/Filters/UserGroupValidateAttribute.cs index fe6a049768..1bd7f766d4 100644 --- a/src/Umbraco.Web/Editors/Filters/UserGroupValidateAttribute.cs +++ b/src/Umbraco.Web/Editors/Filters/UserGroupValidateAttribute.cs @@ -3,8 +3,8 @@ using System.Net; using System.Net.Http; using System.Web.Http.Controllers; using System.Web.Http.Filters; -using AutoMapper; using Umbraco.Core; +using Umbraco.Core.Mapping; using Umbraco.Core.Composing; using Umbraco.Core.Models.Membership; using Umbraco.Core.Services; @@ -27,6 +27,8 @@ namespace Umbraco.Web.Editors.Filters _userService = userService; } + private static UmbracoMapper Mapper => Current.Mapper; + private IUserService UserService => _userService ?? Current.Services.UserService; // TODO: inject public override void OnActionExecuting(HttpActionContext actionContext) diff --git a/src/Umbraco.Web/Editors/LanguageController.cs b/src/Umbraco.Web/Editors/LanguageController.cs index 61d4d6939f..2ee77ca418 100644 --- a/src/Umbraco.Web/Editors/LanguageController.cs +++ b/src/Umbraco.Web/Editors/LanguageController.cs @@ -3,9 +3,7 @@ using System.Globalization; using System.Linq; using System.Net; using System.Net.Http; -using System.Threading; using System.Web.Http; -using AutoMapper; using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Web.Mvc; @@ -48,7 +46,7 @@ namespace Umbraco.Web.Editors { var allLanguages = Services.LocalizationService.GetAllLanguages(); - return Mapper.Map, IEnumerable>(allLanguages); + return Mapper.MapEnumerable(allLanguages); } [HttpGet] diff --git a/src/Umbraco.Web/Editors/LogController.cs b/src/Umbraco.Web/Editors/LogController.cs index 1cd7e79dc9..4f750920d3 100644 --- a/src/Umbraco.Web/Editors/LogController.cs +++ b/src/Umbraco.Web/Editors/LogController.cs @@ -1,8 +1,6 @@ -using AutoMapper; -using System; +using System; using System.Collections.Generic; using System.Linq; -using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Persistence.DatabaseModelDefinitions; using Umbraco.Web.Models.ContentEditing; @@ -47,7 +45,7 @@ namespace Umbraco.Web.Editors var dateQuery = sinceDate.HasValue ? SqlContext.Query().Where(x => x.CreateDate >= sinceDate) : null; var userId = Security.GetUserId().ResultOr(0); var result = Services.AuditService.GetPagedItemsByUser(userId, pageNumber - 1, pageSize, out totalRecords, orderDirection, customFilter:dateQuery); - var mapped = Mapper.Map>(result); + var mapped = Mapper.MapEnumerable(result); return new PagedResult(totalRecords, pageNumber, pageSize) { Items = MapAvatarsAndNames(mapped) diff --git a/src/Umbraco.Web/Editors/MacroRenderingController.cs b/src/Umbraco.Web/Editors/MacroRenderingController.cs index 49b58416cd..a2bbfe1dfd 100644 --- a/src/Umbraco.Web/Editors/MacroRenderingController.cs +++ b/src/Umbraco.Web/Editors/MacroRenderingController.cs @@ -8,10 +8,8 @@ using System.Text; using System.Threading; using System.Web.Http; using System.Web.SessionState; -using AutoMapper; using Umbraco.Web.Models.ContentEditing; using Umbraco.Web.Mvc; -using Umbraco.Web.Macros; using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Models.PublishedContent; diff --git a/src/Umbraco.Web/Editors/MediaController.cs b/src/Umbraco.Web/Editors/MediaController.cs index 845d971150..3b7142397b 100644 --- a/src/Umbraco.Web/Editors/MediaController.cs +++ b/src/Umbraco.Web/Editors/MediaController.cs @@ -8,7 +8,6 @@ using System.Text; using System.Threading.Tasks; using System.Web.Http; using System.Web.Http.ModelBinding; -using AutoMapper; using Umbraco.Core; using Umbraco.Core.IO; using Umbraco.Core.Logging; @@ -49,11 +48,10 @@ namespace Umbraco.Web.Editors [MediaControllerControllerConfiguration] public class MediaController : ContentControllerBase { - public MediaController(PropertyEditorCollection propertyEditors, IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider) + public MediaController(PropertyEditorCollection propertyEditors, IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper) : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper) { _propertyEditors = propertyEditors ?? throw new ArgumentNullException(nameof(propertyEditors)); - _contentTypeBaseServiceProvider = contentTypeBaseServiceProvider; } /// @@ -237,7 +235,6 @@ namespace Umbraco.Web.Editors private int[] _userStartNodes; private readonly PropertyEditorCollection _propertyEditors; - private readonly IContentTypeBaseServiceProvider _contentTypeBaseServiceProvider; protected int[] UserStartNodes { @@ -725,7 +722,7 @@ namespace Umbraco.Web.Editors if (fs == null) throw new InvalidOperationException("Could not acquire file stream"); using (fs) { - f.SetValue(_contentTypeBaseServiceProvider, Constants.Conventions.Media.File,fileName, fs); + f.SetValue(Services.ContentTypeBaseServices, Constants.Conventions.Media.File,fileName, fs); } var saveResult = mediaService.Save(f, Security.CurrentUser.Id); diff --git a/src/Umbraco.Web/Editors/MediaTypeController.cs b/src/Umbraco.Web/Editors/MediaTypeController.cs index ce0b0d7653..391f3b8cf9 100644 --- a/src/Umbraco.Web/Editors/MediaTypeController.cs +++ b/src/Umbraco.Web/Editors/MediaTypeController.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using System.Linq; -using AutoMapper; using Umbraco.Core.Models; using Umbraco.Web.Models.ContentEditing; using Umbraco.Web.Mvc; @@ -12,7 +11,6 @@ using System.Net.Http; using Umbraco.Web.WebApi; using Umbraco.Core.Services; using System; -using System.ComponentModel; using System.Web.Http.Controllers; using Umbraco.Core; using Umbraco.Core.Cache; diff --git a/src/Umbraco.Web/Editors/MemberController.cs b/src/Umbraco.Web/Editors/MemberController.cs index fb4bddb08c..477dced7d0 100644 --- a/src/Umbraco.Web/Editors/MemberController.cs +++ b/src/Umbraco.Web/Editors/MemberController.cs @@ -5,12 +5,9 @@ using System.Net; using System.Net.Http; using System.Net.Http.Formatting; using System.Net.Http.Headers; -using System.Threading.Tasks; -using System.Web; using System.Web.Http; using System.Web.Http.ModelBinding; using System.Web.Security; -using AutoMapper; using Umbraco.Core; using Umbraco.Core.Logging; using Umbraco.Core.Models; @@ -19,7 +16,6 @@ using Umbraco.Core.Persistence.DatabaseModelDefinitions; using Umbraco.Core.Security; using Umbraco.Core.Services; using Umbraco.Core.Services.Implement; -using Umbraco.Web.Models.Mapping; using Umbraco.Web.WebApi; using Umbraco.Web.Models.ContentEditing; using Umbraco.Web.Mvc; diff --git a/src/Umbraco.Web/Editors/MemberGroupController.cs b/src/Umbraco.Web/Editors/MemberGroupController.cs index caf158f6de..67bd126e6e 100644 --- a/src/Umbraco.Web/Editors/MemberGroupController.cs +++ b/src/Umbraco.Web/Editors/MemberGroupController.cs @@ -4,7 +4,6 @@ using System.Net; using System.Net.Http; using System.Web.Http; using System.Web.Security; -using AutoMapper; using Umbraco.Core.Models; using Umbraco.Core.Security; using Umbraco.Core.Services; diff --git a/src/Umbraco.Web/Editors/MemberTypeController.cs b/src/Umbraco.Web/Editors/MemberTypeController.cs index 59a9af14c2..df7faeccf4 100644 --- a/src/Umbraco.Web/Editors/MemberTypeController.cs +++ b/src/Umbraco.Web/Editors/MemberTypeController.cs @@ -5,7 +5,6 @@ using System.Net; using System.Net.Http; using System.Web.Http; using System.Web.Security; -using AutoMapper; using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Configuration; diff --git a/src/Umbraco.Web/Editors/RedirectUrlManagementController.cs b/src/Umbraco.Web/Editors/RedirectUrlManagementController.cs index 04a19ec437..4a3f6b43c3 100644 --- a/src/Umbraco.Web/Editors/RedirectUrlManagementController.cs +++ b/src/Umbraco.Web/Editors/RedirectUrlManagementController.cs @@ -4,8 +4,6 @@ using System.Xml; using System.Collections.Generic; using System.Linq; using System.Security; -using AutoMapper; -using Umbraco.Core.Configuration; using Umbraco.Core.Logging; using Umbraco.Core.Models; using Umbraco.Web.Models.ContentEditing; @@ -51,7 +49,7 @@ namespace Umbraco.Web.Editors ? redirectUrlService.GetAllRedirectUrls(page, pageSize, out resultCount) : redirectUrlService.SearchRedirectUrls(searchTerm, page, pageSize, out resultCount); - searchResult.SearchResults = Mapper.Map>(redirects).ToArray(); + searchResult.SearchResults = Mapper.MapEnumerable(redirects); searchResult.TotalCount = resultCount; searchResult.CurrentPage = page; searchResult.PageCount = ((int)resultCount + pageSize - 1) / pageSize; @@ -73,9 +71,10 @@ namespace Umbraco.Web.Editors { var redirectUrlService = Services.RedirectUrlService; var redirects = redirectUrlService.GetContentRedirectUrls(guidIdi.Guid); - redirectsResult.SearchResults = Mapper.Map>(redirects).ToArray(); + var mapped = Mapper.MapEnumerable(redirects); + redirectsResult.SearchResults = mapped; //not doing paging 'yet' - redirectsResult.TotalCount = redirects.Count(); + redirectsResult.TotalCount = mapped.Count(); redirectsResult.CurrentPage = 1; redirectsResult.PageCount = 1; } diff --git a/src/Umbraco.Web/Editors/RelationController.cs b/src/Umbraco.Web/Editors/RelationController.cs index 430f1af690..b7f9baba55 100644 --- a/src/Umbraco.Web/Editors/RelationController.cs +++ b/src/Umbraco.Web/Editors/RelationController.cs @@ -3,7 +3,6 @@ using System.Linq; using System.Net; using System.Net.Http; using System.Web.Http; -using AutoMapper; using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Web.Models.ContentEditing; @@ -35,11 +34,11 @@ namespace Umbraco.Web.Editors if (string.IsNullOrWhiteSpace(relationTypeAlias) == false) { return - Mapper.Map, IEnumerable>( + Mapper.MapEnumerable( relations.Where(x => x.RelationType.Alias.InvariantEquals(relationTypeAlias))); } - return Mapper.Map, IEnumerable>(relations); + return Mapper.MapEnumerable(relations); } [HttpDelete] diff --git a/src/Umbraco.Web/Editors/RelationTypeController.cs b/src/Umbraco.Web/Editors/RelationTypeController.cs index f0f4a440c7..faafbb79f1 100644 --- a/src/Umbraco.Web/Editors/RelationTypeController.cs +++ b/src/Umbraco.Web/Editors/RelationTypeController.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Net; using System.Net.Http; using System.Web.Http; -using AutoMapper; using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Configuration; @@ -49,7 +48,7 @@ namespace Umbraco.Web.Editors var relations = Services.RelationService.GetByRelationTypeId(relationType.Id); var display = Mapper.Map(relationType); - display.Relations = Mapper.Map, IEnumerable>(relations); + display.Relations = Mapper.MapEnumerable(relations); return display; } diff --git a/src/Umbraco.Web/Editors/SectionController.cs b/src/Umbraco.Web/Editors/SectionController.cs index 6d6a3bb987..ac98f576d4 100644 --- a/src/Umbraco.Web/Editors/SectionController.cs +++ b/src/Umbraco.Web/Editors/SectionController.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using AutoMapper; using Umbraco.Web.Mvc; using System.Linq; using Umbraco.Core; diff --git a/src/Umbraco.Web/Editors/TemplateController.cs b/src/Umbraco.Web/Editors/TemplateController.cs index e1b86c62ea..8da5e80f2e 100644 --- a/src/Umbraco.Web/Editors/TemplateController.cs +++ b/src/Umbraco.Web/Editors/TemplateController.cs @@ -1,5 +1,4 @@ -using AutoMapper; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using System.Net; using System.Net.Http; diff --git a/src/Umbraco.Web/Editors/UserGroupsController.cs b/src/Umbraco.Web/Editors/UserGroupsController.cs index c8f7d2b0df..e79cfd625c 100644 --- a/src/Umbraco.Web/Editors/UserGroupsController.cs +++ b/src/Umbraco.Web/Editors/UserGroupsController.cs @@ -4,8 +4,6 @@ using System.Linq; using System.Net; using System.Net.Http; using System.Web.Http; -using System.Web.Http.Filters; -using AutoMapper; using Umbraco.Core.Models; using Umbraco.Core.Models.Membership; using Umbraco.Core.Services; @@ -104,7 +102,7 @@ namespace Umbraco.Web.Editors /// public IEnumerable GetUserGroups(bool onlyCurrentUserGroups = true) { - var allGroups = Mapper.Map, IEnumerable>(Services.UserService.GetAllUserGroups()) + var allGroups = Mapper.MapEnumerable(Services.UserService.GetAllUserGroups()) .ToList(); var isAdmin = Security.CurrentUser.IsAdmin(); diff --git a/src/Umbraco.Web/Editors/UsersController.cs b/src/Umbraco.Web/Editors/UsersController.cs index 469a29da0f..e133d2e6b0 100644 --- a/src/Umbraco.Web/Editors/UsersController.cs +++ b/src/Umbraco.Web/Editors/UsersController.cs @@ -8,9 +8,7 @@ using System.Runtime.Serialization; using System.Threading.Tasks; using System.Web; using System.Web.Http; -using System.Web.Http.Controllers; using System.Web.Mvc; -using AutoMapper; using Microsoft.AspNet.Identity; using Umbraco.Core; using Umbraco.Core.Cache; @@ -24,7 +22,6 @@ using Umbraco.Core.Models.Identity; using Umbraco.Core.Models.Membership; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.DatabaseModelDefinitions; -using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Security; using Umbraco.Core.Services; using Umbraco.Web.Editors.Filters; @@ -32,7 +29,6 @@ using Umbraco.Web.Models.ContentEditing; using Umbraco.Web.Mvc; using Umbraco.Web.WebApi; using Umbraco.Web.WebApi.Filters; -using ActionFilterAttribute = System.Web.Http.Filters.ActionFilterAttribute; using Constants = Umbraco.Core.Constants; using IUser = Umbraco.Core.Models.Membership.IUser; using Task = System.Threading.Tasks.Task; @@ -242,7 +238,7 @@ namespace Umbraco.Web.Editors var paged = new PagedUserResult(total, pageNumber, pageSize) { - Items = Mapper.Map>(result), + Items = Mapper.MapEnumerable(result), UserStates = Services.UserService.GetUserStates() }; diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentTypeCompositionDisplay.cs b/src/Umbraco.Web/Models/ContentEditing/ContentTypeCompositionDisplay.cs index e5e74c2749..96b540d3ba 100644 --- a/src/Umbraco.Web/Models/ContentEditing/ContentTypeCompositionDisplay.cs +++ b/src/Umbraco.Web/Models/ContentEditing/ContentTypeCompositionDisplay.cs @@ -1,12 +1,6 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.Linq; using System.Runtime.Serialization; -using System.Text; -using System.Threading.Tasks; -using Umbraco.Core.Models.Validation; namespace Umbraco.Web.Models.ContentEditing { @@ -22,14 +16,6 @@ namespace Umbraco.Web.Models.ContentEditing //name, alias, icon, thumb, desc, inherited from basic - //List view - [DataMember(Name = "isContainer")] - public bool IsContainer { get; set; } - - //Element - [DataMember(Name = "isElement")] - public bool IsElement { get; set; } - [DataMember(Name = "listViewEditorName")] [ReadOnly(true)] public string ListViewEditorName { get; set; } @@ -84,6 +70,5 @@ namespace Umbraco.Web.Models.ContentEditing //Tabs [DataMember(Name = "groups")] public IEnumerable> Groups { get; set; } - } } diff --git a/src/Umbraco.Web/Models/Mapping/ActionButtonsResolver.cs b/src/Umbraco.Web/Models/Mapping/ActionButtonsResolver.cs deleted file mode 100644 index 9c5a4a0b88..0000000000 --- a/src/Umbraco.Web/Models/Mapping/ActionButtonsResolver.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using Umbraco.Core.Models; -using Umbraco.Core.Services; -using Umbraco.Web.Composing; - -namespace Umbraco.Web.Models.Mapping -{ - /// - /// Creates the list of action buttons allowed for this user - Publish, Send to publish, save, unpublish returned as the button's 'letter' - /// - internal class ActionButtonsResolver - { - public ActionButtonsResolver(IUserService userService, IContentService contentService) - { - UserService = userService; - ContentService = contentService; - } - - private IUserService UserService { get; } - private IContentService ContentService { get; } - - public IEnumerable Resolve(IContent source) - { - //cannot check permissions without a context - if (Current.UmbracoContext == null) - return Enumerable.Empty(); - - string path; - if (source.HasIdentity) - path = source.Path; - else - { - var parent = ContentService.GetById(source.ParentId); - path = parent == null ? "-1" : parent.Path; - } - - // TODO: This is certainly not ideal usage here - perhaps the best way to deal with this in the future is - // with the IUmbracoContextAccessor. In the meantime, if used outside of a web app this will throw a null - // reference exception :( - return UserService.GetPermissionsForPath(Current.UmbracoContext.Security.CurrentUser, path).GetAllPermissions(); - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/AuditMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/AuditMapDefinition.cs new file mode 100644 index 0000000000..9bc0229550 --- /dev/null +++ b/src/Umbraco.Web/Models/Mapping/AuditMapDefinition.cs @@ -0,0 +1,26 @@ +using Umbraco.Core.Mapping; +using Umbraco.Core.Models; +using Umbraco.Web.Models.ContentEditing; + +namespace Umbraco.Web.Models.Mapping +{ + internal class AuditMapDefinition : IMapDefinition + { + public void DefineMaps(UmbracoMapper mapper) + { + mapper.Define((source, context) => new AuditLog(), Map); + } + + // Umbraco.Code.MapAll -UserAvatars -UserName + private void Map(IAuditItem source, AuditLog target, MapperContext context) + { + target.UserId = source.UserId; + target.NodeId = source.Id; + target.Timestamp = source.CreateDate; + target.LogType = source.AuditType.ToString(); + target.EntityType = source.EntityType; + target.Comment = source.Comment; + target.Parameters = source.Parameters; + } + } +} diff --git a/src/Umbraco.Web/Models/Mapping/AuditMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/AuditMapperProfile.cs deleted file mode 100644 index 34749c51c6..0000000000 --- a/src/Umbraco.Web/Models/Mapping/AuditMapperProfile.cs +++ /dev/null @@ -1,20 +0,0 @@ -using AutoMapper; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Web.Models.ContentEditing; - -namespace Umbraco.Web.Models.Mapping -{ - internal class AuditMapperProfile : Profile - { - public AuditMapperProfile() - { - CreateMap() - .ForMember(log => log.UserAvatars, expression => expression.Ignore()) - .ForMember(log => log.UserName, expression => expression.Ignore()) - .ForMember(log => log.NodeId, expression => expression.MapFrom(item => item.Id)) - .ForMember(log => log.Timestamp, expression => expression.MapFrom(item => item.CreateDate)) - .ForMember(log => log.LogType, expression => expression.MapFrom(item => item.AuditType)); - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/AvailablePropertyEditorsResolver.cs b/src/Umbraco.Web/Models/Mapping/AvailablePropertyEditorsResolver.cs deleted file mode 100644 index d13857434f..0000000000 --- a/src/Umbraco.Web/Models/Mapping/AvailablePropertyEditorsResolver.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using AutoMapper; -using Umbraco.Core.Configuration.UmbracoSettings; -using Umbraco.Core.Models; -using Umbraco.Web.Composing; -using Umbraco.Web.Models.ContentEditing; - -namespace Umbraco.Web.Models.Mapping -{ - internal class AvailablePropertyEditorsResolver - { - private readonly IContentSection _contentSection; - - public AvailablePropertyEditorsResolver(IContentSection contentSection) - { - _contentSection = contentSection; - } - - public IEnumerable Resolve(IDataType source) - { - return Current.PropertyEditors - .Where(x => !x.IsDeprecated || _contentSection.ShowDeprecatedPropertyEditors || source.EditorAlias == x.Alias) - .OrderBy(x => x.Name) - .Select(Mapper.Map); - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/CodeFileMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/CodeFileMapDefinition.cs new file mode 100644 index 0000000000..6af9d9149e --- /dev/null +++ b/src/Umbraco.Web/Models/Mapping/CodeFileMapDefinition.cs @@ -0,0 +1,75 @@ +using Umbraco.Core.Mapping; +using Umbraco.Core.Models; +using Umbraco.Web.Models.ContentEditing; +using Stylesheet = Umbraco.Core.Models.Stylesheet; + +namespace Umbraco.Web.Models.Mapping +{ + public class CodeFileMapDefinition : IMapDefinition + { + public void DefineMaps(UmbracoMapper mapper) + { + mapper.Define((source, context) => new EntityBasic(), Map); + mapper.Define((source, context) => new CodeFileDisplay(), Map); + mapper.Define((source, context) => new CodeFileDisplay(), Map); + mapper.Define((source, context) => new CodeFileDisplay(), Map); + mapper.Define(Map); + mapper.Define(Map); + + } + + // Umbraco.Code.MapAll -Trashed -Udi -Icon + private static void Map(Stylesheet source, EntityBasic target, MapperContext context) + { + target.Alias = source.Alias; + target.Id = source.Id; + target.Key = source.Key; + target.Name = source.Name; + target.ParentId = -1; + target.Path = source.Path; + } + + // Umbraco.Code.MapAll -FileType -Notifications -Path -Snippet + private static void Map(IPartialView source, CodeFileDisplay target, MapperContext context) + { + target.Content = source.Content; + target.Id = source.Id.ToString(); + target.Name = source.Name; + target.VirtualPath = source.VirtualPath; + } + + // Umbraco.Code.MapAll -FileType -Notifications -Path -Snippet + private static void Map(Script source, CodeFileDisplay target, MapperContext context) + { + target.Content = source.Content; + target.Id = source.Id.ToString(); + target.Name = source.Name; + target.VirtualPath = source.VirtualPath; + } + + // Umbraco.Code.MapAll -FileType -Notifications -Path -Snippet + private static void Map(Stylesheet source, CodeFileDisplay target, MapperContext context) + { + target.Content = source.Content; + target.Id = source.Id.ToString(); + target.Name = source.Name; + target.VirtualPath = source.VirtualPath; + } + + // Umbraco.Code.MapAll -CreateDate -DeleteDate -UpdateDate + // Umbraco.Code.MapAll -Id -Key -Alias -Name -OriginalPath -Path + private static void Map(CodeFileDisplay source, IPartialView target, MapperContext context) + { + target.Content = source.Content; + target.VirtualPath = source.VirtualPath; + } + + // Umbraco.Code.MapAll -CreateDate -DeleteDate -UpdateDate -GetFileContent + // Umbraco.Code.MapAll -Id -Key -Alias -Name -OriginalPath -Path + private static void Map(CodeFileDisplay source, Script target, MapperContext context) + { + target.Content = source.Content; + target.VirtualPath = source.VirtualPath; + } + } +} diff --git a/src/Umbraco.Web/Models/Mapping/CodeFileMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/CodeFileMapperProfile.cs deleted file mode 100644 index 563935676f..0000000000 --- a/src/Umbraco.Web/Models/Mapping/CodeFileMapperProfile.cs +++ /dev/null @@ -1,65 +0,0 @@ -using AutoMapper; -using Umbraco.Core.Models; -using Umbraco.Web.Models.ContentEditing; -using Stylesheet = Umbraco.Core.Models.Stylesheet; - -namespace Umbraco.Web.Models.Mapping -{ - public class CodeFileMapperProfile : Profile - { - public CodeFileMapperProfile() - { - CreateMap() - .ForMember(dest => dest.Id, opt => opt.MapFrom(sheet => sheet.Id)) - .ForMember(dest => dest.Alias, opt => opt.MapFrom(sheet => sheet.Alias)) - .ForMember(dest => dest.Key, opt => opt.MapFrom(sheet => sheet.Key)) - .ForMember(dest => dest.Name, opt => opt.MapFrom(sheet => sheet.Name)) - .ForMember(dest => dest.ParentId, opt => opt.MapFrom(_ => -1)) - .ForMember(dest => dest.Path, opt => opt.MapFrom(sheet => sheet.Path)) - .ForMember(dest => dest.Trashed, opt => opt.Ignore()) - .ForMember(dest => dest.AdditionalData, opt => opt.Ignore()) - .ForMember(dest => dest.Udi, opt => opt.Ignore()) - .ForMember(dest => dest.Icon, opt => opt.Ignore()); - - CreateMap() - .ForMember(dest => dest.FileType, opt => opt.Ignore()) - .ForMember(dest => dest.Notifications, opt => opt.Ignore()) - .ForMember(dest => dest.Path, opt => opt.Ignore()) - .ForMember(dest => dest.Snippet, opt => opt.Ignore()); - - CreateMap() - .ForMember(dest => dest.FileType, opt => opt.Ignore()) - .ForMember(dest => dest.Notifications, opt => opt.Ignore()) - .ForMember(dest => dest.Path, opt => opt.Ignore()) - .ForMember(dest => dest.Snippet, opt => opt.Ignore()); - - CreateMap() - .ForMember(dest => dest.FileType, opt => opt.Ignore()) - .ForMember(dest => dest.Notifications, opt => opt.Ignore()) - .ForMember(dest => dest.Path, opt => opt.Ignore()) - .ForMember(dest => dest.Snippet, opt => opt.Ignore()); - - CreateMap() - .IgnoreEntityCommonProperties() - .ForMember(dest => dest.Id, opt => opt.Ignore()) - .ForMember(dest => dest.Key, opt => opt.Ignore()) - .ForMember(dest => dest.Path, opt => opt.Ignore()) - .ForMember(dest => dest.Path, opt => opt.Ignore()) - .ForMember(dest => dest.Alias, opt => opt.Ignore()) - .ForMember(dest => dest.Name, opt => opt.Ignore()) - .ForMember(dest => dest.OriginalPath, opt => opt.Ignore()) - .ForMember(dest => dest.HasIdentity, opt => opt.Ignore()); - - CreateMap() - .IgnoreEntityCommonProperties() - .ForMember(dest => dest.Id, opt => opt.Ignore()) - .ForMember(dest => dest.Key, opt => opt.Ignore()) - .ForMember(dest => dest.Path, opt => opt.Ignore()) - .ForMember(dest => dest.Path, opt => opt.Ignore()) - .ForMember(dest => dest.Alias, opt => opt.Ignore()) - .ForMember(dest => dest.Name, opt => opt.Ignore()) - .ForMember(dest => dest.OriginalPath, opt => opt.Ignore()) - .ForMember(dest => dest.HasIdentity, opt => opt.Ignore()); - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/CommonMapper.cs b/src/Umbraco.Web/Models/Mapping/CommonMapper.cs new file mode 100644 index 0000000000..7bf4a94b1c --- /dev/null +++ b/src/Umbraco.Web/Models/Mapping/CommonMapper.cs @@ -0,0 +1,101 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.Mvc; +using Umbraco.Core; +using Umbraco.Core.Mapping; +using Umbraco.Core.Models; +using Umbraco.Core.Models.ContentEditing; +using Umbraco.Core.Models.Membership; +using Umbraco.Core.Services; +using Umbraco.Web.ContentApps; +using Umbraco.Web.Models.ContentEditing; +using Umbraco.Web.Trees; +using UserProfile = Umbraco.Web.Models.ContentEditing.UserProfile; + +namespace Umbraco.Web.Models.Mapping +{ + internal class CommonMapper + { + private readonly IUserService _userService; + private readonly IContentTypeBaseServiceProvider _contentTypeBaseServiceProvider; + private readonly IUmbracoContextAccessor _umbracoContextAccessor; + private readonly ContentAppFactoryCollection _contentAppDefinitions; + private readonly ILocalizedTextService _localizedTextService; + + public CommonMapper(IUserService userService, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider, IUmbracoContextAccessor umbracoContextAccessor, + ContentAppFactoryCollection contentAppDefinitions, ILocalizedTextService localizedTextService) + { + _userService = userService; + _contentTypeBaseServiceProvider = contentTypeBaseServiceProvider; + _umbracoContextAccessor = umbracoContextAccessor; + _contentAppDefinitions = contentAppDefinitions; + _localizedTextService = localizedTextService; + } + + public UserProfile GetOwner(IContentBase source, MapperContext context) + { + var profile = source.GetCreatorProfile(_userService); + return profile == null ? null : context.Map(profile); + } + + public UserProfile GetCreator(IContent source, MapperContext context) + { + var profile = source.GetWriterProfile(_userService); + return profile == null ? null : context.Map(profile); + } + + public ContentTypeBasic GetContentType(IContentBase source, MapperContext context) + { + // TODO: We can resolve the UmbracoContext from the IValueResolver options! + // OMG + if (HttpContext.Current != null && Composing.Current.UmbracoContext != null && Composing.Current.UmbracoContext.Security.CurrentUser != null + && Composing.Current.UmbracoContext.Security.CurrentUser.AllowedSections.Any(x => x.Equals(Constants.Applications.Settings))) + { + var contentType = _contentTypeBaseServiceProvider.GetContentTypeOf(source); + var contentTypeBasic = context.Map(contentType); + + return contentTypeBasic; + } + //no access + return null; + } + + public string GetTreeNodeUrl(IContentBase source) + where TController : ContentTreeControllerBase + { + var umbracoContext = _umbracoContextAccessor.UmbracoContext; + if (umbracoContext == null) return null; + + var urlHelper = new UrlHelper(umbracoContext.HttpContext.Request.RequestContext); + return urlHelper.GetUmbracoApiService(controller => controller.GetTreeNode(source.Key.ToString("N"), null)); + } + + public string GetMemberTreeNodeUrl(IContentBase source) + { + var umbracoContext = _umbracoContextAccessor.UmbracoContext; + if (umbracoContext == null) return null; + + var urlHelper = new UrlHelper(umbracoContext.HttpContext.Request.RequestContext); + return urlHelper.GetUmbracoApiService(controller => controller.GetTreeNode(source.Key.ToString("N"), null)); + } + + public IEnumerable GetContentApps(IContentBase source) + { + var apps = _contentAppDefinitions.GetContentAppsFor(source).ToArray(); + + // localize content app names + foreach (var app in apps) + { + var localizedAppName = _localizedTextService.Localize($"apps/{app.Alias}"); + if (localizedAppName.Equals($"[{app.Alias}]", StringComparison.OrdinalIgnoreCase) == false) + { + app.Name = localizedAppName; + } + } + + return apps; + } + } +} diff --git a/src/Umbraco.Web/Models/Mapping/ContentAppResolver.cs b/src/Umbraco.Web/Models/Mapping/ContentAppResolver.cs deleted file mode 100644 index 6d9ae77009..0000000000 --- a/src/Umbraco.Web/Models/Mapping/ContentAppResolver.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using AutoMapper; -using Umbraco.Core.Models; -using Umbraco.Core.Models.ContentEditing; -using Umbraco.Core.Services; -using Umbraco.Web.ContentApps; -using Umbraco.Web.Models.ContentEditing; - -namespace Umbraco.Web.Models.Mapping -{ - // injected into ContentMapperProfile, - // maps ContentApps when mapping IContent to ContentItemDisplay - internal class ContentAppResolver : IValueResolver> - { - private readonly ContentAppFactoryCollection _contentAppDefinitions; - private readonly ILocalizedTextService _localizedTextService; - - public ContentAppResolver(ContentAppFactoryCollection contentAppDefinitions, ILocalizedTextService localizedTextService) - { - _contentAppDefinitions = contentAppDefinitions; - _localizedTextService = localizedTextService; - } - - public IEnumerable Resolve(IContent source, ContentItemDisplay destination, IEnumerable destMember, ResolutionContext context) - { - var apps = _contentAppDefinitions.GetContentAppsFor(source).ToArray(); - - // localize content app names - foreach (var app in apps) - { - var localizedAppName = _localizedTextService.Localize($"apps/{app.Alias}"); - if (localizedAppName.Equals($"[{app.Alias}]", StringComparison.OrdinalIgnoreCase) == false) - { - app.Name = localizedAppName; - } - } - - return apps; - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/ContentChildOfListViewResolver.cs b/src/Umbraco.Web/Models/Mapping/ContentChildOfListViewResolver.cs deleted file mode 100644 index a2f250d6f3..0000000000 --- a/src/Umbraco.Web/Models/Mapping/ContentChildOfListViewResolver.cs +++ /dev/null @@ -1,26 +0,0 @@ -using AutoMapper; -using Umbraco.Core.Models; -using Umbraco.Core.Services; -using Umbraco.Web.Models.ContentEditing; - -namespace Umbraco.Web.Models.Mapping -{ - internal class ContentChildOfListViewResolver : IValueResolver - { - private readonly IContentService _contentService; - private readonly IContentTypeService _contentTypeService; - - public ContentChildOfListViewResolver(IContentService contentService, IContentTypeService contentTypeService) - { - _contentService = contentService; - _contentTypeService = contentTypeService; - } - - public bool Resolve(IContent source, ContentItemDisplay destination, bool destMember, ResolutionContext context) - { - // map the IsChildOfListView (this is actually if it is a descendant of a list view!) - var parent = _contentService.GetParent(source); - return parent != null && (parent.ContentType.IsContainer || _contentTypeService.HasContainerInPath(parent.Path)); - } - } -} \ No newline at end of file diff --git a/src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs new file mode 100644 index 0000000000..2b30b0ac5a --- /dev/null +++ b/src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs @@ -0,0 +1,254 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using Umbraco.Core; +using Umbraco.Core.Logging; +using Umbraco.Core.Mapping; +using Umbraco.Core.Models; +using Umbraco.Core.Services; +using Umbraco.Web.Models.ContentEditing; +using Umbraco.Web.Routing; +using Umbraco.Web.Trees; + +namespace Umbraco.Web.Models.Mapping +{ + /// + /// Declares how model mappings for content + /// + internal class ContentMapDefinition : IMapDefinition + { + private readonly CommonMapper _commonMapper; + private readonly ILocalizedTextService _localizedTextService; + private readonly IContentService _contentService; + private readonly IContentTypeService _contentTypeService; + private readonly IFileService _fileService; + private readonly IUmbracoContextAccessor _umbracoContextAccessor; + private readonly IPublishedRouter _publishedRouter; + private readonly ILocalizationService _localizationService; + private readonly ILogger _logger; + private readonly IUserService _userService; + private readonly TabsAndPropertiesMapper _tabsAndPropertiesMapper; + private readonly ContentSavedStateMapper _stateMapper; + private readonly ContentBasicSavedStateMapper _basicStateMapper; + private readonly ContentVariantMapper _contentVariantMapper; + + public ContentMapDefinition(CommonMapper commonMapper, ILocalizedTextService localizedTextService, IContentService contentService, IContentTypeService contentTypeService, + IFileService fileService, IUmbracoContextAccessor umbracoContextAccessor, IPublishedRouter publishedRouter, ILocalizationService localizationService, ILogger logger, + IUserService userService) + { + _commonMapper = commonMapper; + _localizedTextService = localizedTextService; + _contentService = contentService; + _contentTypeService = contentTypeService; + _fileService = fileService; + _umbracoContextAccessor = umbracoContextAccessor; + _publishedRouter = publishedRouter; + _localizationService = localizationService; + _logger = logger; + _userService = userService; + + _tabsAndPropertiesMapper = new TabsAndPropertiesMapper(localizedTextService); + _stateMapper = new ContentSavedStateMapper(); + _basicStateMapper = new ContentBasicSavedStateMapper(); + _contentVariantMapper = new ContentVariantMapper(_localizationService); + } + + public void DefineMaps(UmbracoMapper mapper) + { + mapper.Define((source, context) => new ContentPropertyCollectionDto(), Map); + mapper.Define((source, context) => new ContentItemDisplay(), Map); + mapper.Define((source, context) => new ContentVariantDisplay(), Map); + mapper.Define>((source, context) => new ContentItemBasic(), Map); + } + + // Umbraco.Code.MapAll + private static void Map(IContent source, ContentPropertyCollectionDto target, MapperContext context) + { + target.Properties = context.MapEnumerable(source.Properties); + } + + // Umbraco.Code.MapAll -AllowPreview -Errors -PersistedContent + private void Map(IContent source, ContentItemDisplay target, MapperContext context) + { + target.AllowedActions = GetActions(source); + target.AllowedTemplates = GetAllowedTemplates(source); + target.ContentApps = _commonMapper.GetContentApps(source); + target.ContentTypeAlias = source.ContentType.Alias; + target.ContentTypeName = _localizedTextService.UmbracoDictionaryTranslate(source.ContentType.Name); + target.DocumentType = _commonMapper.GetContentType(source, context); + target.Icon = source.ContentType.Icon; + target.Id = source.Id; + target.IsBlueprint = source.Blueprint; + target.IsChildOfListView = DermineIsChildOfListView(source); + target.IsContainer = source.ContentType.IsContainer; + target.IsElement = source.ContentType.IsElement; + target.Key = source.Key; + target.Owner = _commonMapper.GetOwner(source, context); + target.ParentId = source.ParentId; + target.Path = source.Path; + target.SortOrder = source.SortOrder; + target.TemplateAlias = GetDefaultTemplate(source); + target.TemplateId = source.TemplateId ?? default; + target.Trashed = source.Trashed; + target.TreeNodeUrl = _commonMapper.GetTreeNodeUrl(source); + target.Udi = Udi.Create(source.Blueprint ? Constants.UdiEntityType.DocumentBlueprint : Constants.UdiEntityType.Document, source.Key); + target.UpdateDate = source.UpdateDate; + target.Updater = _commonMapper.GetCreator(source, context); + target.Urls = GetUrls(source); + target.Variants = _contentVariantMapper.Map(source, context); + + target.ContentDto = new ContentPropertyCollectionDto(); + target.ContentDto.Properties = context.MapEnumerable(source.Properties); + } + + // Umbraco.Code.MapAll -Segment -Language + private void Map(IContent source, ContentVariantDisplay target, MapperContext context) + { + target.CreateDate = source.CreateDate; + target.ExpireDate = GetScheduledDate(source, ContentScheduleAction.Expire, context); + target.Name = source.Name; + target.PublishDate = source.PublishDate; + target.ReleaseDate = GetScheduledDate(source, ContentScheduleAction.Release, context); + target.State = _stateMapper.Map(source, context); + target.Tabs = _tabsAndPropertiesMapper.Map(source, context); + target.UpdateDate = source.UpdateDate; + } + + // Umbraco.Code.MapAll -Alias + private void Map(IContent source, ContentItemBasic target, MapperContext context) + { + target.ContentTypeAlias = source.ContentType.Alias; + target.CreateDate = source.CreateDate; + target.Edited = source.Edited; + target.Icon = source.ContentType.Icon; + target.Id = source.Id; + target.Key = source.Key; + target.Name = GetName(source, context); + target.Owner = _commonMapper.GetOwner(source, context); + target.ParentId = source.ParentId; + target.Path = source.Path; + target.Properties = context.MapEnumerable(source.Properties); + target.SortOrder = source.SortOrder; + target.State = _basicStateMapper.Map(source, context); + target.Trashed = source.Trashed; + target.Udi = Udi.Create(source.Blueprint ? Constants.UdiEntityType.DocumentBlueprint : Constants.UdiEntityType.Document, source.Key); + target.UpdateDate = GetUpdateDate(source, context); + target.Updater = _commonMapper.GetCreator(source, context); + target.VariesByCulture = source.ContentType.VariesByCulture(); + } + + private IEnumerable GetActions(IContent source) + { + var umbracoContext = _umbracoContextAccessor.UmbracoContext; + + //cannot check permissions without a context + if (umbracoContext == null) + return Enumerable.Empty(); + + string path; + if (source.HasIdentity) + path = source.Path; + else + { + var parent = _contentService.GetById(source.ParentId); + path = parent == null ? "-1" : parent.Path; + } + + // TODO: This is certainly not ideal usage here - perhaps the best way to deal with this in the future is + // with the IUmbracoContextAccessor. In the meantime, if used outside of a web app this will throw a null + // reference exception :( + return _userService.GetPermissionsForPath(umbracoContext.Security.CurrentUser, path).GetAllPermissions(); + } + + private UrlInfo[] GetUrls(IContent source) + { + if (source.ContentType.IsElement) + return Array.Empty(); + + var umbracoContext = _umbracoContextAccessor.UmbracoContext; + + var urls = umbracoContext == null + ? new[] { UrlInfo.Message("Cannot generate urls without a current Umbraco Context") } + : source.GetContentUrls(_publishedRouter, umbracoContext, _localizationService, _localizedTextService, _contentService, _logger).ToArray(); + + return urls; + } + + private DateTime GetUpdateDate(IContent source, MapperContext context) + { + // invariant = global date + if (!source.ContentType.VariesByCulture()) return source.UpdateDate; + + // variant = depends on culture + var culture = context.GetCulture(); + + // if there's no culture here, the issue is somewhere else (UI, whatever) - throw! + if (culture == null) + throw new InvalidOperationException("Missing culture in mapping options."); + + // if we don't have a date for a culture, it means the culture is not available, and + // hey we should probably not be mapping it, but it's too late, return a fallback date + var date = source.GetUpdateDate(culture); + return date ?? source.UpdateDate; + } + + private string GetName(IContent source, MapperContext context) + { + // invariant = only 1 name + if (!source.ContentType.VariesByCulture()) return source.Name; + + // variant = depends on culture + var culture = context.GetCulture(); + + // if there's no culture here, the issue is somewhere else (UI, whatever) - throw! + if (culture == null) + throw new InvalidOperationException("Missing culture in mapping options."); + + // if we don't have a name for a culture, it means the culture is not available, and + // hey we should probably not be mapping it, but it's too late, return a fallback name + return source.CultureInfos.TryGetValue(culture, out var name) && !name.Name.IsNullOrWhiteSpace() ? name.Name : $"({source.Name})"; + } + + private bool DermineIsChildOfListView(IContent source) + { + // map the IsChildOfListView (this is actually if it is a descendant of a list view!) + var parent = _contentService.GetParent(source); + return parent != null && (parent.ContentType.IsContainer || _contentTypeService.HasContainerInPath(parent.Path)); + } + + private DateTime? GetScheduledDate(IContent source, ContentScheduleAction action, MapperContext context) + { + var culture = context.GetCulture() ?? string.Empty; + var schedule = source.ContentSchedule.GetSchedule(culture, action); + return schedule.FirstOrDefault()?.Date; // take the first, it's ordered by date + } + + private IDictionary GetAllowedTemplates(IContent source) + { + var contentType = _contentTypeService.Get(source.ContentTypeId); + + return contentType.AllowedTemplates + .Where(t => t.Alias.IsNullOrWhiteSpace() == false && t.Name.IsNullOrWhiteSpace() == false) + .ToDictionary(t => t.Alias, t => _localizedTextService.UmbracoDictionaryTranslate(t.Name)); + } + + private string GetDefaultTemplate(IContent source) + { + if (source == null) + return null; + + // If no template id was set... + if (!source.TemplateId.HasValue) + { + // ... and no default template is set, return null... + // ... otherwise return the content type default template alias. + return string.IsNullOrWhiteSpace(source.ContentType.DefaultTemplate?.Alias) + ? null + : source.ContentType.DefaultTemplate?.Alias; + } + + var template = _fileService.GetTemplate(source.TemplateId.Value); + return template.Alias; + } + } +} diff --git a/src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs deleted file mode 100644 index 5318552eef..0000000000 --- a/src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs +++ /dev/null @@ -1,169 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using AutoMapper; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; -using Umbraco.Web.Models.ContentEditing; -using Umbraco.Web.Trees; - -namespace Umbraco.Web.Models.Mapping -{ - /// - /// Declares how model mappings for content - /// - internal class ContentMapperProfile : Profile - { - public ContentMapperProfile( - ContentUrlResolver contentUrlResolver, - ContentTreeNodeUrlResolver contentTreeNodeUrlResolver, - TabsAndPropertiesResolver tabsAndPropertiesResolver, - ContentAppResolver contentAppResolver, - IUserService userService, - IContentService contentService, - IContentTypeService contentTypeService, - IContentTypeBaseServiceProvider contentTypeBaseServiceProvider, - ILocalizationService localizationService, - ILocalizedTextService localizedTextService) - { - // create, capture, cache - var contentOwnerResolver = new OwnerResolver(userService); - var creatorResolver = new CreatorResolver(userService); - var actionButtonsResolver = new ActionButtonsResolver(userService, contentService); - var childOfListViewResolver = new ContentChildOfListViewResolver(contentService, contentTypeService); - var contentTypeBasicResolver = new ContentTypeBasicResolver(contentTypeBaseServiceProvider); - var allowedTemplatesResolver = new AllowedTemplatesResolver(contentTypeService, localizedTextService); - var defaultTemplateResolver = new DefaultTemplateResolver(); - var variantResolver = new ContentVariantResolver(localizationService); - var schedPublishReleaseDateResolver = new ScheduledPublishDateResolver(ContentScheduleAction.Release); - var schedPublishExpireDateResolver = new ScheduledPublishDateResolver(ContentScheduleAction.Expire); - - //FROM IContent TO ContentItemDisplay - CreateMap() - .ForMember(dest => dest.Udi, opt => opt.MapFrom(src => Udi.Create(src.Blueprint ? Constants.UdiEntityType.DocumentBlueprint : Constants.UdiEntityType.Document, src.Key))) - .ForMember(dest => dest.Owner, opt => opt.MapFrom(src => contentOwnerResolver.Resolve(src))) - .ForMember(dest => dest.Updater, opt => opt.MapFrom(src => creatorResolver.Resolve(src))) - .ForMember(dest => dest.Variants, opt => opt.MapFrom(variantResolver)) - .ForMember(dest => dest.ContentApps, opt => opt.MapFrom(contentAppResolver)) - .ForMember(dest => dest.Icon, opt => opt.MapFrom(src => src.ContentType.Icon)) - .ForMember(dest => dest.ContentTypeAlias, opt => opt.MapFrom(src => src.ContentType.Alias)) - .ForMember(dest => dest.ContentTypeName, opt => opt.MapFrom(src => localizedTextService.UmbracoDictionaryTranslate(src.ContentType.Name))) - .ForMember(dest => dest.IsContainer, opt => opt.MapFrom(src => src.ContentType.IsContainer)) - .ForMember(dest => dest.IsElement, opt => opt.MapFrom(src => src.ContentType.IsElement)) - .ForMember(dest => dest.IsBlueprint, opt => opt.MapFrom(src => src.Blueprint)) - .ForMember(dest => dest.IsChildOfListView, opt => opt.MapFrom(childOfListViewResolver)) - .ForMember(dest => dest.Trashed, opt => opt.MapFrom(src => src.Trashed)) - .ForMember(dest => dest.TemplateAlias, opt => opt.MapFrom(defaultTemplateResolver)) - .ForMember(dest => dest.Urls, opt => opt.MapFrom(contentUrlResolver)) - .ForMember(dest => dest.AllowPreview, opt => opt.Ignore()) - .ForMember(dest => dest.TreeNodeUrl, opt => opt.MapFrom(contentTreeNodeUrlResolver)) - .ForMember(dest => dest.Notifications, opt => opt.Ignore()) - .ForMember(dest => dest.Errors, opt => opt.Ignore()) - .ForMember(dest => dest.DocumentType, opt => opt.MapFrom(contentTypeBasicResolver)) - .ForMember(dest => dest.AllowedTemplates, opt => opt.MapFrom(allowedTemplatesResolver)) - .ForMember(dest => dest.AllowedActions, opt => opt.MapFrom(src => actionButtonsResolver.Resolve(src))) - .ForMember(dest => dest.AdditionalData, opt => opt.Ignore()); - - CreateMap() - .ForMember(dest => dest.PublishDate, opt => opt.MapFrom(src => src.PublishDate)) - .ForMember(dest => dest.ReleaseDate, opt => opt.MapFrom(schedPublishReleaseDateResolver)) - .ForMember(dest => dest.ExpireDate, opt => opt.MapFrom(schedPublishExpireDateResolver)) - .ForMember(dest => dest.Segment, opt => opt.Ignore()) - .ForMember(dest => dest.Language, opt => opt.Ignore()) - .ForMember(dest => dest.Notifications, opt => opt.Ignore()) - .ForMember(dest => dest.State, opt => opt.MapFrom>()) - .ForMember(dest => dest.Tabs, opt => opt.MapFrom(tabsAndPropertiesResolver)); - - //FROM IContent TO ContentItemBasic - CreateMap>() - .ForMember(dest => dest.Udi, opt => opt.MapFrom(src => - Udi.Create(src.Blueprint ? Constants.UdiEntityType.DocumentBlueprint : Constants.UdiEntityType.Document, src.Key))) - .ForMember(dest => dest.Owner, opt => opt.MapFrom(src => contentOwnerResolver.Resolve(src))) - .ForMember(dest => dest.Updater, opt => opt.MapFrom(src => creatorResolver.Resolve(src))) - .ForMember(dest => dest.Icon, opt => opt.MapFrom(src => src.ContentType.Icon)) - .ForMember(dest => dest.Trashed, opt => opt.MapFrom(src => src.Trashed)) - .ForMember(dest => dest.ContentTypeAlias, opt => opt.MapFrom(src => src.ContentType.Alias)) - .ForMember(dest => dest.Alias, opt => opt.Ignore()) - .ForMember(dest => dest.AdditionalData, opt => opt.Ignore()) - .ForMember(dest => dest.UpdateDate, opt => opt.MapFrom()) - .ForMember(dest => dest.Name, opt => opt.MapFrom()) - .ForMember(dest => dest.State, opt => opt.MapFrom>()) - .ForMember(dest => dest.VariesByCulture, opt => opt.MapFrom(src => src.ContentType.VariesByCulture())); - - //FROM IContent TO ContentPropertyCollectionDto - //NOTE: the property mapping for cultures relies on a culture being set in the mapping context - CreateMap(); - } - - /// - /// Resolves the update date for a content item/content variant - /// - private class UpdateDateResolver : IValueResolver, DateTime> - { - public DateTime Resolve(IContent source, ContentItemBasic destination, DateTime destMember, ResolutionContext context) - { - // invariant = global date - if (!source.ContentType.VariesByCulture()) return source.UpdateDate; - - // variant = depends on culture - var culture = context.Options.GetCulture(); - - // if there's no culture here, the issue is somewhere else (UI, whatever) - throw! - if (culture == null) - throw new InvalidOperationException("Missing culture in mapping options."); - - // if we don't have a date for a culture, it means the culture is not available, and - // hey we should probably not be mapping it, but it's too late, return a fallback date - var date = source.GetUpdateDate(culture); - return date ?? source.UpdateDate; - } - } - - /// - /// Resolves the name for a content item/content variant - /// - private class NameResolver : IValueResolver, string> - { - public string Resolve(IContent source, ContentItemBasic destination, string destMember, ResolutionContext context) - { - // invariant = only 1 name - if (!source.ContentType.VariesByCulture()) return source.Name; - - // variant = depends on culture - var culture = context.Options.GetCulture(); - - // if there's no culture here, the issue is somewhere else (UI, whatever) - throw! - if (culture == null) - throw new InvalidOperationException("Missing culture in mapping options."); - - // if we don't have a name for a culture, it means the culture is not available, and - // hey we should probably not be mapping it, but it's too late, return a fallback name - return source.CultureInfos.TryGetValue(culture, out var name) && !name.Name.IsNullOrWhiteSpace() ? name.Name : $"({source.Name})"; - } - } - - - private class AllowedTemplatesResolver : IValueResolver> - { - private readonly IContentTypeService _contentTypeService; - private readonly ILocalizedTextService _localizedTextService; - - public AllowedTemplatesResolver(IContentTypeService contentTypeService, ILocalizedTextService localizedTextService) - { - _contentTypeService = contentTypeService; - _localizedTextService = localizedTextService; - } - - public IDictionary Resolve(IContent source, ContentItemDisplay destination, IDictionary destMember, ResolutionContext context) - { - var contentType = _contentTypeService.Get(source.ContentTypeId); - - return contentType.AllowedTemplates - .Where(t => t.Alias.IsNullOrWhiteSpace() == false && t.Name.IsNullOrWhiteSpace() == false) - .ToDictionary(t => t.Alias, t => _localizedTextService.UmbracoDictionaryTranslate(t.Name)); - } - } - } - -} diff --git a/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicConverter.cs b/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs similarity index 69% rename from src/Umbraco.Web/Models/Mapping/ContentPropertyBasicConverter.cs rename to src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs index effa59fd63..e7c53f5728 100644 --- a/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicConverter.cs +++ b/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs @@ -1,29 +1,26 @@ using System; -using System.Collections.Generic; using System.Linq; -using AutoMapper; using Umbraco.Core; using Umbraco.Core.Logging; +using Umbraco.Core.Mapping; using Umbraco.Core.Models; using Umbraco.Core.PropertyEditors; using Umbraco.Core.Services; -using Umbraco.Web.Composing; using Umbraco.Web.Models.ContentEditing; -using ContentVariation = Umbraco.Core.Models.ContentVariation; namespace Umbraco.Web.Models.Mapping { /// /// Creates a base generic ContentPropertyBasic from a Property /// - internal class ContentPropertyBasicConverter : ITypeConverter + internal class ContentPropertyBasicMapper where TDestination : ContentPropertyBasic, new() { private readonly ILogger _logger; private readonly PropertyEditorCollection _propertyEditors; protected IDataTypeService DataTypeService { get; } - public ContentPropertyBasicConverter(IDataTypeService dataTypeService, ILogger logger, PropertyEditorCollection propertyEditors) + public ContentPropertyBasicMapper(IDataTypeService dataTypeService, ILogger logger, PropertyEditorCollection propertyEditors) { _logger = logger; _propertyEditors = propertyEditors; @@ -34,12 +31,12 @@ namespace Umbraco.Web.Models.Mapping /// Assigns the PropertyEditor, Id, Alias and Value to the property /// /// - public virtual TDestination Convert(Property property, TDestination dest, ResolutionContext context) + public virtual void Map(Property property, TDestination dest, MapperContext context) { var editor = _propertyEditors[property.PropertyType.PropertyEditorAlias]; if (editor == null) { - _logger.Error>( + _logger.Error>( new NullReferenceException("The property editor with alias " + property.PropertyType.PropertyEditorAlias + " does not exist"), "No property editor '{PropertyEditorAlias}' found, converting to a Label", property.PropertyType.PropertyEditorAlias); @@ -47,22 +44,19 @@ namespace Umbraco.Web.Models.Mapping editor = _propertyEditors[Constants.PropertyEditors.Aliases.Label]; } - var result = new TDestination - { - Id = property.Id, - Alias = property.Alias, - PropertyEditor = editor, - Editor = editor.Alias - }; + dest.Id = property.Id; + dest.Alias = property.Alias; + dest.PropertyEditor = editor; + dest.Editor = editor.Alias; // if there's a set of property aliases specified, we will check if the current property's value should be mapped. // if it isn't one of the ones specified in 'includeProperties', we will just return the result without mapping the Value. - var includedProperties = context.Options.GetIncludedProperties(); + var includedProperties = context.GetIncludedProperties(); if (includedProperties != null && !includedProperties.Contains(property.Alias)) - return result; + return; //Get the culture from the context which will be set during the mapping operation for each property - var culture = context.Options.GetCulture(); + var culture = context.GetCulture(); //a culture needs to be in the context for a property type that can vary if (culture == null && property.PropertyType.VariesByCulture()) @@ -71,11 +65,10 @@ namespace Umbraco.Web.Models.Mapping //set the culture to null if it's an invariant property type culture = !property.PropertyType.VariesByCulture() ? null : culture; - result.Culture = culture; + dest.Culture = culture; // if no 'IncludeProperties' were specified or this property is set to be included - we will map the value and return. - result.Value = editor.GetValueEditor().ToEditor(property, DataTypeService, culture); - return result; + dest.Value = editor.GetValueEditor().ToEditor(property, DataTypeService, culture); } } } diff --git a/src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayConverter.cs b/src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayMapper.cs similarity index 50% rename from src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayConverter.cs rename to src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayMapper.cs index 84eaabf52b..8a45548e9c 100644 --- a/src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayConverter.cs +++ b/src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayMapper.cs @@ -1,9 +1,5 @@ -using System; -using System.Linq; -using AutoMapper; -using Umbraco.Core; -using Umbraco.Core.Configuration; -using Umbraco.Core.Logging; +using Umbraco.Core.Logging; +using Umbraco.Core.Mapping; using Umbraco.Core.Models; using Umbraco.Core.PropertyEditors; using Umbraco.Core.Services; @@ -14,18 +10,18 @@ namespace Umbraco.Web.Models.Mapping /// /// Creates a ContentPropertyDisplay from a Property /// - internal class ContentPropertyDisplayConverter : ContentPropertyBasicConverter + internal class ContentPropertyDisplayMapper : ContentPropertyBasicMapper { private readonly ILocalizedTextService _textService; - public ContentPropertyDisplayConverter(IDataTypeService dataTypeService, ILocalizedTextService textService, ILogger logger, PropertyEditorCollection propertyEditors) + public ContentPropertyDisplayMapper(IDataTypeService dataTypeService, ILocalizedTextService textService, ILogger logger, PropertyEditorCollection propertyEditors) : base(dataTypeService, logger, propertyEditors) { _textService = textService; } - public override ContentPropertyDisplay Convert(Property originalProp, ContentPropertyDisplay dest, ResolutionContext context) + public override void Map(Property originalProp, ContentPropertyDisplay dest, MapperContext context) { - var display = base.Convert(originalProp, dest, context); + base.Map(originalProp, dest, context); var config = DataTypeService.GetDataType(originalProp.PropertyType.DataTypeId).Configuration; @@ -36,37 +32,35 @@ namespace Umbraco.Web.Models.Mapping // - does it make any sense to use a IDataValueEditor without configuring it? // configure the editor for display with configuration - var valEditor = display.PropertyEditor.GetValueEditor(config); + var valEditor = dest.PropertyEditor.GetValueEditor(config); //set the display properties after mapping - display.Alias = originalProp.Alias; - display.Description = originalProp.PropertyType.Description; - display.Label = originalProp.PropertyType.Name; - display.HideLabel = valEditor.HideLabel; + dest.Alias = originalProp.Alias; + dest.Description = originalProp.PropertyType.Description; + dest.Label = originalProp.PropertyType.Name; + dest.HideLabel = valEditor.HideLabel; //add the validation information - display.Validation.Mandatory = originalProp.PropertyType.Mandatory; - display.Validation.Pattern = originalProp.PropertyType.ValidationRegExp; + dest.Validation.Mandatory = originalProp.PropertyType.Mandatory; + dest.Validation.Pattern = originalProp.PropertyType.ValidationRegExp; - if (display.PropertyEditor == null) + if (dest.PropertyEditor == null) { //display.Config = PreValueCollection.AsDictionary(preVals); //if there is no property editor it means that it is a legacy data type // we cannot support editing with that so we'll just render the readonly value view. - display.View = "views/propertyeditors/readonlyvalue/readonlyvalue.html"; + dest.View = "views/propertyeditors/readonlyvalue/readonlyvalue.html"; } else { //let the property editor format the pre-values - display.Config = display.PropertyEditor.GetConfigurationEditor().ToValueEditor(config); - display.View = valEditor.View; + dest.Config = dest.PropertyEditor.GetConfigurationEditor().ToValueEditor(config); + dest.View = valEditor.View; } //Translate - display.Label = _textService.UmbracoDictionaryTranslate(display.Label); - display.Description = _textService.UmbracoDictionaryTranslate(display.Description); - - return display; + dest.Label = _textService.UmbracoDictionaryTranslate(dest.Label); + dest.Description = _textService.UmbracoDictionaryTranslate(dest.Description); } } } diff --git a/src/Umbraco.Web/Models/Mapping/ContentPropertyDtoConverter.cs b/src/Umbraco.Web/Models/Mapping/ContentPropertyDtoConverter.cs deleted file mode 100644 index b8333b6229..0000000000 --- a/src/Umbraco.Web/Models/Mapping/ContentPropertyDtoConverter.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System; -using AutoMapper; -using Umbraco.Core; -using Umbraco.Core.Logging; -using Umbraco.Core.Models; -using Umbraco.Core.PropertyEditors; -using Umbraco.Core.Services; -using Umbraco.Web.Models.ContentEditing; - -namespace Umbraco.Web.Models.Mapping -{ - /// - /// Creates a ContentPropertyDto from a Property - /// - internal class ContentPropertyDtoConverter : ContentPropertyBasicConverter - { - public ContentPropertyDtoConverter(IDataTypeService dataTypeService, ILogger logger, PropertyEditorCollection propertyEditors) - : base(dataTypeService, logger, propertyEditors) - { } - - public override ContentPropertyDto Convert(Property property, ContentPropertyDto dest, ResolutionContext context) - { - var propertyDto = base.Convert(property, dest, context); - - propertyDto.IsRequired = property.PropertyType.Mandatory; - propertyDto.ValidationRegExp = property.PropertyType.ValidationRegExp; - propertyDto.Description = property.PropertyType.Description; - propertyDto.Label = property.PropertyType.Name; - propertyDto.DataType = DataTypeService.GetDataType(property.PropertyType.DataTypeId); - - return propertyDto; - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/ContentPropertyDtoMapper.cs b/src/Umbraco.Web/Models/Mapping/ContentPropertyDtoMapper.cs new file mode 100644 index 0000000000..f192cd32ce --- /dev/null +++ b/src/Umbraco.Web/Models/Mapping/ContentPropertyDtoMapper.cs @@ -0,0 +1,30 @@ +using Umbraco.Core.Logging; +using Umbraco.Core.Mapping; +using Umbraco.Core.Models; +using Umbraco.Core.PropertyEditors; +using Umbraco.Core.Services; +using Umbraco.Web.Models.ContentEditing; + +namespace Umbraco.Web.Models.Mapping +{ + /// + /// Creates a ContentPropertyDto from a Property + /// + internal class ContentPropertyDtoMapper : ContentPropertyBasicMapper + { + public ContentPropertyDtoMapper(IDataTypeService dataTypeService, ILogger logger, PropertyEditorCollection propertyEditors) + : base(dataTypeService, logger, propertyEditors) + { } + + public override void Map(Property property, ContentPropertyDto dest, MapperContext context) + { + base.Map(property, dest, context); + + dest.IsRequired = property.PropertyType.Mandatory; + dest.ValidationRegExp = property.PropertyType.ValidationRegExp; + dest.Description = property.PropertyType.Description; + dest.Label = property.PropertyType.Name; + dest.DataType = DataTypeService.GetDataType(property.PropertyType.DataTypeId); + } + } +} diff --git a/src/Umbraco.Web/Models/Mapping/ContentPropertyMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/ContentPropertyMapDefinition.cs new file mode 100644 index 0000000000..226560c516 --- /dev/null +++ b/src/Umbraco.Web/Models/Mapping/ContentPropertyMapDefinition.cs @@ -0,0 +1,61 @@ +using Umbraco.Core.Logging; +using Umbraco.Core.Mapping; +using Umbraco.Core.Models; +using Umbraco.Core.PropertyEditors; +using Umbraco.Core.Services; +using Umbraco.Web.Models.ContentEditing; + +namespace Umbraco.Web.Models.Mapping +{ + /// + /// A mapper which declares how to map content properties. These mappings are shared among media (and probably members) which is + /// why they are in their own mapper + /// + internal class ContentPropertyMapDefinition : IMapDefinition + { + private readonly ContentPropertyBasicMapper _contentPropertyBasicConverter; + private readonly ContentPropertyDtoMapper _contentPropertyDtoConverter; + private readonly ContentPropertyDisplayMapper _contentPropertyDisplayMapper; + + public ContentPropertyMapDefinition(IDataTypeService dataTypeService, ILocalizedTextService textService, ILogger logger, PropertyEditorCollection propertyEditors) + { + _contentPropertyBasicConverter = new ContentPropertyBasicMapper(dataTypeService, logger, propertyEditors); + _contentPropertyDtoConverter = new ContentPropertyDtoMapper(dataTypeService, logger, propertyEditors); + _contentPropertyDisplayMapper = new ContentPropertyDisplayMapper(dataTypeService, textService, logger, propertyEditors); + } + + public void DefineMaps(UmbracoMapper mapper) + { + mapper.Define>((source, context) => new Tab(), Map); + mapper.Define((source, context) => new ContentPropertyBasic(), Map); + mapper.Define((source, context) => new ContentPropertyDto(), Map); + mapper.Define((source, context) => new ContentPropertyDisplay(), Map); + } + + // Umbraco.Code.MapAll -Properties -Alias -Expanded + private void Map(PropertyGroup source, Tab target, MapperContext mapper) + { + target.Id = source.Id; + target.IsActive = true; + target.Label = source.Name; +} + + private void Map(Property source, ContentPropertyBasic target, MapperContext context) + { + // assume this is mapping everything and no MapAll is required + _contentPropertyBasicConverter.Map(source, target, context); + } + + private void Map(Property source, ContentPropertyDto target, MapperContext context) + { + // assume this is mapping everything and no MapAll is required + _contentPropertyDtoConverter.Map(source, target, context); + } + + private void Map(Property source, ContentPropertyDisplay target, MapperContext context) + { + // assume this is mapping everything and no MapAll is required + _contentPropertyDisplayMapper.Map(source, target, context); + } + } +} diff --git a/src/Umbraco.Web/Models/Mapping/ContentPropertyMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/ContentPropertyMapperProfile.cs deleted file mode 100644 index f9ed72fc11..0000000000 --- a/src/Umbraco.Web/Models/Mapping/ContentPropertyMapperProfile.cs +++ /dev/null @@ -1,40 +0,0 @@ -using AutoMapper; -using Umbraco.Core.Logging; -using Umbraco.Core.Models; -using Umbraco.Core.PropertyEditors; -using Umbraco.Core.Services; -using Umbraco.Web.Models.ContentEditing; - -namespace Umbraco.Web.Models.Mapping -{ - /// - /// A mapper which declares how to map content properties. These mappings are shared among media (and probably members) which is - /// why they are in their own mapper - /// - internal class ContentPropertyMapperProfile : Profile - { - public ContentPropertyMapperProfile(IDataTypeService dataTypeService, ILocalizedTextService textService, ILogger logger, PropertyEditorCollection propertyEditors) - { - var contentPropertyBasicConverter = new ContentPropertyBasicConverter(dataTypeService, logger, propertyEditors); - var contentPropertyDtoConverter = new ContentPropertyDtoConverter(dataTypeService, logger, propertyEditors); - var contentPropertyDisplayConverter = new ContentPropertyDisplayConverter(dataTypeService, textService, logger, propertyEditors); - - //FROM Property TO ContentPropertyBasic - CreateMap>() - .ForMember(tab => tab.Label, expression => expression.MapFrom(@group => @group.Name)) - .ForMember(tab => tab.IsActive, expression => expression.MapFrom(_ => true)) - .ForMember(tab => tab.Properties, expression => expression.Ignore()) - .ForMember(tab => tab.Alias, expression => expression.Ignore()) - .ForMember(tab => tab.Expanded, expression => expression.Ignore()); - - //FROM Property TO ContentPropertyBasic - CreateMap().ConvertUsing(contentPropertyBasicConverter); - - //FROM Property TO ContentPropertyDto - CreateMap().ConvertUsing(contentPropertyDtoConverter); - - //FROM Property TO ContentPropertyDisplay - CreateMap().ConvertUsing(contentPropertyDisplayConverter); - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/ContentSavedStateResolver.cs b/src/Umbraco.Web/Models/Mapping/ContentSavedStateMapper.cs similarity index 75% rename from src/Umbraco.Web/Models/Mapping/ContentSavedStateResolver.cs rename to src/Umbraco.Web/Models/Mapping/ContentSavedStateMapper.cs index 2b0395b2c6..dfb334621d 100644 --- a/src/Umbraco.Web/Models/Mapping/ContentSavedStateResolver.cs +++ b/src/Umbraco.Web/Models/Mapping/ContentSavedStateMapper.cs @@ -1,24 +1,23 @@ using System; -using AutoMapper; using Umbraco.Core; +using Umbraco.Core.Mapping; using Umbraco.Core.Models; using Umbraco.Web.Models.ContentEditing; namespace Umbraco.Web.Models.Mapping { - /// /// Returns the for an item /// /// - internal class ContentBasicSavedStateResolver : IValueResolver, ContentSavedState?> + internal class ContentBasicSavedStateMapper where T : ContentPropertyBasic { - private readonly ContentSavedStateResolver _inner = new ContentSavedStateResolver(); + private readonly ContentSavedStateMapper _inner = new ContentSavedStateMapper(); - public ContentSavedState? Resolve(IContent source, IContentProperties destination, ContentSavedState? destMember, ResolutionContext context) + public ContentSavedState? Map(IContent source, MapperContext context) { - return _inner.Resolve(source, destination, default, context); + return _inner.Map(source, context); } } @@ -26,10 +25,10 @@ namespace Umbraco.Web.Models.Mapping /// Returns the for an item ///
/// - internal class ContentSavedStateResolver : IValueResolver, ContentSavedState> + internal class ContentSavedStateMapper where T : ContentPropertyBasic { - public ContentSavedState Resolve(IContent source, IContentProperties destination, ContentSavedState destMember, ResolutionContext context) + public ContentSavedState Map(IContent source, MapperContext context) { PublishedState publishedState; bool isEdited; @@ -38,7 +37,7 @@ namespace Umbraco.Web.Models.Mapping if (source.ContentType.VariesByCulture()) { //Get the culture from the context which will be set during the mapping operation for each variant - var culture = context.Options.GetCulture(); + var culture = context.GetCulture(); //a culture needs to be in the context for a variant content item if (culture == null) diff --git a/src/Umbraco.Web/Models/Mapping/ContentTreeNodeUrlResolver.cs b/src/Umbraco.Web/Models/Mapping/ContentTreeNodeUrlResolver.cs deleted file mode 100644 index 91420fbe21..0000000000 --- a/src/Umbraco.Web/Models/Mapping/ContentTreeNodeUrlResolver.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System.Web.Mvc; -using AutoMapper; -using Umbraco.Core.Models; -using Umbraco.Web.Trees; - -namespace Umbraco.Web.Models.Mapping -{ - /// - /// Gets the tree node url for the content or media - /// - internal class ContentTreeNodeUrlResolver : IValueResolver - where TSource : IContentBase - where TController : ContentTreeControllerBase - { - private readonly IUmbracoContextAccessor _umbracoContextAccessor; - - public ContentTreeNodeUrlResolver(IUmbracoContextAccessor umbracoContextAccessor) - { - _umbracoContextAccessor = umbracoContextAccessor ?? throw new System.ArgumentNullException(nameof(umbracoContextAccessor)); - } - - public string Resolve(TSource source, object destination, string destMember, ResolutionContext context) - { - var umbracoContext = _umbracoContextAccessor.UmbracoContext; - if (umbracoContext == null) return null; - - var urlHelper = new UrlHelper(umbracoContext.HttpContext.Request.RequestContext); - return urlHelper.GetUmbracoApiService(controller => controller.GetTreeNode(source.Key.ToString("N"), null)); - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/ContentTypeBasicResolver.cs b/src/Umbraco.Web/Models/Mapping/ContentTypeBasicResolver.cs deleted file mode 100644 index 8b5f3d4296..0000000000 --- a/src/Umbraco.Web/Models/Mapping/ContentTypeBasicResolver.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System; -using System.Linq; -using System.Web; -using AutoMapper; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; -using Umbraco.Web.Composing; -using Umbraco.Web.Models.ContentEditing; - -namespace Umbraco.Web.Models.Mapping -{ - /// - /// Resolves a from the item and checks if the current user - /// has access to see this data - /// - internal class ContentTypeBasicResolver : IValueResolver - where TSource : IContentBase - { - private readonly IContentTypeBaseServiceProvider _contentTypeBaseServiceProvider; - - public ContentTypeBasicResolver(IContentTypeBaseServiceProvider contentTypeBaseServiceProvider) - { - _contentTypeBaseServiceProvider = contentTypeBaseServiceProvider; - } - - public ContentTypeBasic Resolve(TSource source, TDestination destination, ContentTypeBasic destMember, ResolutionContext context) - { - // TODO: We can resolve the UmbracoContext from the IValueResolver options! - // OMG - if (HttpContext.Current != null && Current.UmbracoContext != null && Current.UmbracoContext.Security.CurrentUser != null - && Current.UmbracoContext.Security.CurrentUser.AllowedSections.Any(x => x.Equals(Constants.Applications.Settings))) - { - var contentType = _contentTypeBaseServiceProvider.GetContentTypeOf(source); - var contentTypeBasic = Mapper.Map(contentType); - - return contentTypeBasic; - } - //no access - return null; - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs new file mode 100644 index 0000000000..a438f04781 --- /dev/null +++ b/src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs @@ -0,0 +1,676 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using Umbraco.Core; +using Umbraco.Core.Logging; +using Umbraco.Core.Mapping; +using Umbraco.Core.Models; +using Umbraco.Core.PropertyEditors; +using Umbraco.Web.Models.ContentEditing; +using Umbraco.Core.Services; + +namespace Umbraco.Web.Models.Mapping +{ + /// + /// Defines mappings for content/media/members type mappings + /// + internal class ContentTypeMapDefinition : IMapDefinition + { + private readonly PropertyEditorCollection _propertyEditors; + private readonly IDataTypeService _dataTypeService; + private readonly IFileService _fileService; + private readonly IContentTypeService _contentTypeService; + private readonly IMediaTypeService _mediaTypeService; + private readonly IMemberTypeService _memberTypeService; + private readonly ILogger _logger; + + public ContentTypeMapDefinition(PropertyEditorCollection propertyEditors, IDataTypeService dataTypeService, IFileService fileService, + IContentTypeService contentTypeService, IMediaTypeService mediaTypeService, IMemberTypeService memberTypeService, + ILogger logger) + { + _propertyEditors = propertyEditors; + _dataTypeService = dataTypeService; + _fileService = fileService; + _contentTypeService = contentTypeService; + _mediaTypeService = mediaTypeService; + _memberTypeService = memberTypeService; + _logger = logger; + } + + public void DefineMaps(UmbracoMapper mapper) + { + mapper.Define((source, context) => new ContentType(source.ParentId), Map); + mapper.Define((source, context) => new MediaType(source.ParentId), Map); + mapper.Define((source, context) => new MemberType(source.ParentId), Map); + + mapper.Define((source, context) => new DocumentTypeDisplay(), Map); + mapper.Define((source, context) => new MediaTypeDisplay(), Map); + mapper.Define((source, context) => new MemberTypeDisplay(), Map); + + mapper.Define( + (source, context) => + { + var dataType = _dataTypeService.GetDataType(source.DataTypeId); + if (dataType == null) throw new NullReferenceException("No data type found with id " + source.DataTypeId); + return new PropertyType(dataType, source.Alias); + }, Map); + + // TODO: isPublishing in ctor? + mapper.Define, PropertyGroup>((source, context) => new PropertyGroup(false), Map); + mapper.Define, PropertyGroup>((source, context) => new PropertyGroup(false), Map); + + mapper.Define((source, context) => new ContentTypeBasic(), Map); + mapper.Define((source, context) => new ContentTypeBasic(), Map); + mapper.Define((source, context) => new ContentTypeBasic(), Map); + mapper.Define((source, context) => new ContentTypeBasic(), Map); + + mapper.Define((source, context) => new DocumentTypeDisplay(), Map); + mapper.Define((source, context) => new MediaTypeDisplay(), Map); + mapper.Define((source, context) => new MemberTypeDisplay(), Map); + + mapper.Define, PropertyGroupDisplay>((source, context) => new PropertyGroupDisplay(), Map); + mapper.Define, PropertyGroupDisplay>((source, context) => new PropertyGroupDisplay(), Map); + + mapper.Define((source, context) => new PropertyTypeDisplay(), Map); + mapper.Define((source, context) => new MemberPropertyTypeDisplay(), Map); + } + + // no MapAll - take care + private void Map(DocumentTypeSave source, IContentType target, MapperContext context) + { + MapSaveToTypeBase(source, target, context); + MapComposition(source, target, alias => _contentTypeService.Get(alias)); + + target.AllowedTemplates = source.AllowedTemplates + .Where(x => x != null) + .Select(_fileService.GetTemplate) + .Where(x => x != null) + .ToArray(); + + target.SetDefaultTemplate(source.DefaultTemplate == null ? null : _fileService.GetTemplate(source.DefaultTemplate)); + } + + // no MapAll - take care + private void Map(MediaTypeSave source, IMediaType target, MapperContext context) + { + MapSaveToTypeBase(source, target, context); + MapComposition(source, target, alias => _mediaTypeService.Get(alias)); + } + + // no MapAll - take care + private void Map(MemberTypeSave source, IMemberType target, MapperContext context) + { + MapSaveToTypeBase(source, target, context); + MapComposition(source, target, alias => _memberTypeService.Get(alias)); + + foreach (var propertyType in source.Groups.SelectMany(x => x.Properties)) + { + var localCopy = propertyType; + var destProp = target.PropertyTypes.SingleOrDefault(x => x.Alias.InvariantEquals(localCopy.Alias)); + if (destProp == null) continue; + target.SetMemberCanEditProperty(localCopy.Alias, localCopy.MemberCanEditProperty); + target.SetMemberCanViewProperty(localCopy.Alias, localCopy.MemberCanViewProperty); + target.SetIsSensitiveProperty(localCopy.Alias, localCopy.IsSensitiveData); + } + } + + // no MapAll - take care + private void Map(IContentType source, DocumentTypeDisplay target, MapperContext context) + { + MapTypeToDisplayBase(source, target); + + target.AllowCultureVariant = source.VariesByCulture(); + + //sync templates + target.AllowedTemplates = context.MapEnumerable(source.AllowedTemplates); + + if (source.DefaultTemplate != null) + target.DefaultTemplate = context.Map(source.DefaultTemplate); + + //default listview + target.ListViewEditorName = Constants.Conventions.DataTypes.ListViewPrefix + "Content"; + + if (string.IsNullOrEmpty(source.Alias)) return; + + var name = Constants.Conventions.DataTypes.ListViewPrefix + source.Alias; + if (_dataTypeService.GetDataType(name) != null) + target.ListViewEditorName = name; + } + + // no MapAll - take care + private void Map(IMediaType source, MediaTypeDisplay target, MapperContext context) + { + MapTypeToDisplayBase(source, target); + + //default listview + target.ListViewEditorName = Constants.Conventions.DataTypes.ListViewPrefix + "Media"; + + if (string.IsNullOrEmpty(source.Name)) return; + + var name = Constants.Conventions.DataTypes.ListViewPrefix + source.Name; + if (_dataTypeService.GetDataType(name) != null) + target.ListViewEditorName = name; + } + + // no MapAll - take care + private void Map(IMemberType source, MemberTypeDisplay target, MapperContext context) + { + MapTypeToDisplayBase(source, target); + + //map the MemberCanEditProperty,MemberCanViewProperty,IsSensitiveData + foreach (var propertyType in source.PropertyTypes) + { + var localCopy = propertyType; + var displayProp = target.Groups.SelectMany(dest => dest.Properties).SingleOrDefault(dest => dest.Alias.InvariantEquals(localCopy.Alias)); + if (displayProp == null) continue; + displayProp.MemberCanEditProperty = source.MemberCanEditProperty(localCopy.Alias); + displayProp.MemberCanViewProperty = source.MemberCanViewProperty(localCopy.Alias); + displayProp.IsSensitiveData = source.IsSensitiveProperty(localCopy.Alias); + } + } + + // Umbraco.Code.MapAll -Blueprints + private static void Map(IContentTypeBase source, ContentTypeBasic target, string entityType) + { + target.Udi = Udi.Create(entityType, source.Key); + target.Alias = source.Alias; + target.CreateDate = source.CreateDate; + target.Description = source.Description; + target.Icon = source.Icon; + target.Id = source.Id; + target.IsContainer = source.IsContainer; + target.IsElement = source.IsElement; + target.Key = source.Key; + target.Name = source.Name; + target.ParentId = source.ParentId; + target.Path = source.Path; + target.Thumbnail = source.Thumbnail; + target.Trashed = source.Trashed; + target.UpdateDate = source.UpdateDate; + } + + // no MapAll - uses the IContentTypeBase map method, which has MapAll + private static void Map(IContentTypeComposition source, ContentTypeBasic target, MapperContext context) + { + Map(source, target, Constants.UdiEntityType.MemberType); + } + + // no MapAll - uses the IContentTypeBase map method, which has MapAll + private static void Map(IContentType source, ContentTypeBasic target, MapperContext context) + { + Map(source, target, Constants.UdiEntityType.DocumentType); + } + + // no MapAll - uses the IContentTypeBase map method, which has MapAll + private static void Map(IMediaType source, ContentTypeBasic target, MapperContext context) + { + Map(source, target, Constants.UdiEntityType.MediaType); + } + + // no MapAll - uses the IContentTypeBase map method, which has MapAll + private static void Map(IMemberType source, ContentTypeBasic target, MapperContext context) + { + Map(source, target, Constants.UdiEntityType.MemberType); + } + + // Umbraco.Code.MapAll -CreateDate -DeleteDate -UpdateDate + // Umbraco.Code.MapAll -SupportsPublishing -Key -PropertyEditorAlias -ValueStorageType + private static void Map(PropertyTypeBasic source, PropertyType target, MapperContext context) + { + target.Name = source.Label; + target.DataTypeId = source.DataTypeId; + target.Mandatory = source.Validation.Mandatory; + target.ValidationRegExp = source.Validation.Pattern; + target.Variations = source.AllowCultureVariant ? ContentVariation.Culture : ContentVariation.Nothing; + + if (source.Id > 0) + target.Id = source.Id; + + if (source.GroupId > 0) + target.PropertyGroupId = new Lazy(() => source.GroupId, false); + + target.Alias = source.Alias; + target.Description = source.Description; + target.SortOrder = source.SortOrder; + } + + // no MapAll - take care + private void Map(DocumentTypeSave source, DocumentTypeDisplay target, MapperContext context) + { + MapTypeToDisplayBase(source, target, context); + + //sync templates + var destAllowedTemplateAliases = target.AllowedTemplates.Select(x => x.Alias); + //if the dest is set and it's the same as the source, then don't change + if (destAllowedTemplateAliases.SequenceEqual(source.AllowedTemplates) == false) + { + var templates = _fileService.GetTemplates(source.AllowedTemplates.ToArray()); + target.AllowedTemplates = source.AllowedTemplates + .Select(x => + { + var template = templates.SingleOrDefault(t => t.Alias == x); + return template != null + ? context.Map(template) + : null; + }) + .WhereNotNull() + .ToArray(); + } + + if (source.DefaultTemplate.IsNullOrWhiteSpace() == false) + { + //if the dest is set and it's the same as the source, then don't change + if (target.DefaultTemplate == null || source.DefaultTemplate != target.DefaultTemplate.Alias) + { + var template = _fileService.GetTemplate(source.DefaultTemplate); + target.DefaultTemplate = template == null ? null : context.Map(template); + } + } + else + { + target.DefaultTemplate = null; + } + } + + // no MapAll - take care + private void Map(MediaTypeSave source, MediaTypeDisplay target, MapperContext context) + { + MapTypeToDisplayBase(source, target, context); + } + + // no MapAll - take care + private void Map(MemberTypeSave source, MemberTypeDisplay target, MapperContext context) + { + MapTypeToDisplayBase(source, target, context); + } + + // Umbraco.Code.MapAll -CreateDate -UpdateDate -DeleteDate -Key -PropertyTypes + private static void Map(PropertyGroupBasic source, PropertyGroup target, MapperContext context) + { + if (source.Id > 0) + target.Id = source.Id; + target.Name = source.Name; + target.SortOrder = source.SortOrder; + } + + // Umbraco.Code.MapAll -CreateDate -UpdateDate -DeleteDate -Key -PropertyTypes + private static void Map(PropertyGroupBasic source, PropertyGroup target, MapperContext context) + { + if (source.Id > 0) + target.Id = source.Id; + target.Name = source.Name; + target.SortOrder = source.SortOrder; + } + + // Umbraco.Code.MapAll -ContentTypeId -ParentTabContentTypes -ParentTabContentTypeNames + private static void Map(PropertyGroupBasic source, PropertyGroupDisplay target, MapperContext context) + { + if (source.Id > 0) + target.Id = source.Id; + + target.Inherited = source.Inherited; + target.Name = source.Name; + target.SortOrder = source.SortOrder; + + target.Properties = context.MapEnumerable(source.Properties); + } + + // Umbraco.Code.MapAll -ContentTypeId -ParentTabContentTypes -ParentTabContentTypeNames + private static void Map(PropertyGroupBasic source, PropertyGroupDisplay target, MapperContext context) + { + if (source.Id > 0) + target.Id = source.Id; + + target.Inherited = source.Inherited; + target.Name = source.Name; + target.SortOrder = source.SortOrder; + + target.Properties = context.MapEnumerable(source.Properties); + } + + // Umbraco.Code.MapAll -Editor -View -Config -ContentTypeId -ContentTypeName -Locked + private static void Map(PropertyTypeBasic source, PropertyTypeDisplay target, MapperContext context) + { + target.Alias = source.Alias; + target.AllowCultureVariant = source.AllowCultureVariant; + target.DataTypeId = source.DataTypeId; + target.Description = source.Description; + target.GroupId = source.GroupId; + target.Id = source.Id; + target.Inherited = source.Inherited; + target.Label = source.Label; + target.SortOrder = source.SortOrder; + target.Validation = source.Validation; + } + + // Umbraco.Code.MapAll -Editor -View -Config -ContentTypeId -ContentTypeName -Locked + private static void Map(MemberPropertyTypeBasic source, MemberPropertyTypeDisplay target, MapperContext context) + { + target.Alias = source.Alias; + target.AllowCultureVariant = source.AllowCultureVariant; + target.DataTypeId = source.DataTypeId; + target.Description = source.Description; + target.GroupId = source.GroupId; + target.Id = source.Id; + target.Inherited = source.Inherited; + target.IsSensitiveData = source.IsSensitiveData; + target.Label = source.Label; + target.MemberCanEditProperty = source.MemberCanEditProperty; + target.MemberCanViewProperty = source.MemberCanViewProperty; + target.SortOrder = source.SortOrder; + target.Validation = source.Validation; + } + + // Umbraco.Code.MapAll -CreatorId -Level -SortOrder + // Umbraco.Code.MapAll -CreateDate -UpdateDate -DeleteDate + // Umbraco.Code.MapAll -ContentTypeComposition (done by AfterMapSaveToType) + private static void MapSaveToTypeBase(TSource source, IContentTypeComposition target, MapperContext context) + where TSource : ContentTypeSave + where TSourcePropertyType : PropertyTypeBasic + { + // TODO: not so clean really + var isPublishing = target is IContentType; + + var id = Convert.ToInt32(source.Id); + if (id > 0) + target.Id = id; + + target.Alias = source.Alias; + target.Description = source.Description; + target.Icon = source.Icon; + target.IsContainer = source.IsContainer; + target.IsElement = source.IsElement; + target.Key = source.Key; + target.Name = source.Name; + target.ParentId = source.ParentId; + target.Path = source.Path; + target.Thumbnail = source.Thumbnail; + + target.AllowedAsRoot = source.AllowAsRoot; + target.AllowedContentTypes = source.AllowedContentTypes.Select((t, i) => new ContentTypeSort(t, i)); + + if (!(target is IMemberType)) + { + target.Variations = ContentVariation.Nothing; + if (source.AllowCultureVariant) + target.Variations |= ContentVariation.Culture; + } + + // handle property groups and property types + // note that ContentTypeSave has + // - all groups, inherited and local; only *one* occurrence per group *name* + // - potentially including the generic properties group + // - all properties, inherited and local + // + // also, see PropertyTypeGroupResolver.ResolveCore: + // - if a group is local *and* inherited, then Inherited is true + // and the identifier is the identifier of the *local* group + // + // IContentTypeComposition AddPropertyGroup, AddPropertyType methods do some + // unique-alias-checking, etc that is *not* compatible with re-mapping everything + // the way we do it here, so we should exclusively do it by + // - managing a property group's PropertyTypes collection + // - managing the content type's PropertyTypes collection (for generic properties) + + // handle actual groups (non-generic-properties) + var destOrigGroups = target.PropertyGroups.ToArray(); // local groups + var destOrigProperties = target.PropertyTypes.ToArray(); // all properties, in groups or not + var destGroups = new List(); + var sourceGroups = source.Groups.Where(x => x.IsGenericProperties == false).ToArray(); + foreach (var sourceGroup in sourceGroups) + { + // get the dest group + var destGroup = MapSaveGroup(sourceGroup, destOrigGroups, context); + + // handle local properties + var destProperties = sourceGroup.Properties + .Where(x => x.Inherited == false) + .Select(x => MapSaveProperty(x, destOrigProperties, context)) + .ToArray(); + + // if the group has no local properties, skip it, ie sort-of garbage-collect + // local groups which would not have local properties anymore + if (destProperties.Length == 0) + continue; + + // ensure no duplicate alias, then assign the group properties collection + EnsureUniqueAliases(destProperties); + destGroup.PropertyTypes = new PropertyTypeCollection(isPublishing, destProperties); + destGroups.Add(destGroup); + } + + // ensure no duplicate name, then assign the groups collection + EnsureUniqueNames(destGroups); + target.PropertyGroups = new PropertyGroupCollection(destGroups); + + // because the property groups collection was rebuilt, there is no need to remove + // the old groups - they are just gone and will be cleared by the repository + + // handle non-grouped (ie generic) properties + var genericPropertiesGroup = source.Groups.FirstOrDefault(x => x.IsGenericProperties); + if (genericPropertiesGroup != null) + { + // handle local properties + var destProperties = genericPropertiesGroup.Properties + .Where(x => x.Inherited == false) + .Select(x => MapSaveProperty(x, destOrigProperties, context)) + .ToArray(); + + // ensure no duplicate alias, then assign the generic properties collection + EnsureUniqueAliases(destProperties); + target.NoGroupPropertyTypes = new PropertyTypeCollection(isPublishing, destProperties); + } + + // because all property collections were rebuilt, there is no need to remove + // some old properties, they are just gone and will be cleared by the repository + } + + // Umbraco.Code.MapAll -Blueprints -Errors -ListViewEditorName -Trashed + private void MapTypeToDisplayBase(IContentTypeComposition source, ContentTypeCompositionDisplay target) + { + target.Alias = source.Alias; + target.AllowAsRoot = source.AllowedAsRoot; + target.CreateDate = source.CreateDate; + target.Description = source.Description; + target.Icon = source.Icon; + target.Id = source.Id; + target.IsContainer = source.IsContainer; + target.IsElement = source.IsElement; + target.Key = source.Key; + target.Name = source.Name; + target.ParentId = source.ParentId; + target.Path = source.Path; + target.Thumbnail = source.Thumbnail; + target.Udi = MapContentTypeUdi(source); + target.UpdateDate = source.UpdateDate; + + target.AllowedContentTypes = source.AllowedContentTypes.Select(x => x.Id.Value); + target.CompositeContentTypes = source.ContentTypeComposition.Select(x => x.Alias); + target.LockedCompositeContentTypes = MapLockedCompositions(source); + } + + // no MapAll - relies on the non-generic method + private void MapTypeToDisplayBase(IContentTypeComposition source, TTarget target) + where TTarget : ContentTypeCompositionDisplay + where TTargetPropertyType : PropertyTypeDisplay, new() + { + MapTypeToDisplayBase(source, target); + + var groupsMapper = new PropertyTypeGroupMapper(_propertyEditors, _dataTypeService, _logger); + target.Groups = groupsMapper.Map(source); + } + + // Umbraco.Code.MapAll -CreateDate -UpdateDate -ListViewEditorName -Errors -LockedCompositeContentTypes + private void MapTypeToDisplayBase(ContentTypeSave source, ContentTypeCompositionDisplay target) + { + target.Alias = source.Alias; + target.AllowAsRoot = source.AllowAsRoot; + target.AllowedContentTypes = source.AllowedContentTypes; + target.Blueprints = source.Blueprints; + target.CompositeContentTypes = source.CompositeContentTypes; + target.Description = source.Description; + target.Icon = source.Icon; + target.Id = source.Id; + target.IsContainer = source.IsContainer; + target.IsElement = source.IsElement; + target.Key = source.Key; + target.Name = source.Name; + target.ParentId = source.ParentId; + target.Path = source.Path; + target.Thumbnail = source.Thumbnail; + target.Trashed = source.Trashed; + target.Udi = source.Udi; + } + + // no MapAll - relies on the non-generic method + private void MapTypeToDisplayBase(TSource source, TTarget target, MapperContext context) + where TSource : ContentTypeSave + where TSourcePropertyType : PropertyTypeBasic + where TTarget : ContentTypeCompositionDisplay + where TTargetPropertyType : PropertyTypeDisplay + { + MapTypeToDisplayBase(source, target); + + target.Groups = context.MapEnumerable, PropertyGroupDisplay>(source.Groups); + } + + private IEnumerable MapLockedCompositions(IContentTypeComposition source) + { + // get ancestor ids from path of parent if not root + if (source.ParentId == Constants.System.Root) + return Enumerable.Empty(); + + var parent = _contentTypeService.Get(source.ParentId); + if (parent == null) + return Enumerable.Empty(); + + var aliases = new List(); + var ancestorIds = parent.Path.Split(',').Select(int.Parse); + // loop through all content types and return ordered aliases of ancestors + var allContentTypes = _contentTypeService.GetAll().ToArray(); + foreach (var ancestorId in ancestorIds) + { + var ancestor = allContentTypes.FirstOrDefault(x => x.Id == ancestorId); + if (ancestor != null) + aliases.Add(ancestor.Alias); + } + return aliases.OrderBy(x => x); + } + + internal static Udi MapContentTypeUdi(IContentTypeComposition source) + { + if (source == null) return null; + + string udiType; + switch (source) + { + case IMemberType _: + udiType = Constants.UdiEntityType.MemberType; + break; + case IMediaType _: + udiType = Constants.UdiEntityType.MediaType; + break; + case IContentType _: + udiType = Constants.UdiEntityType.DocumentType; + break; + default: + throw new Exception("panic"); + } + + return Udi.Create(udiType, source.Key); + } + + private static PropertyGroup MapSaveGroup(PropertyGroupBasic sourceGroup, IEnumerable destOrigGroups, MapperContext context) + where TPropertyType : PropertyTypeBasic + { + PropertyGroup destGroup; + if (sourceGroup.Id > 0) + { + // update an existing group + // ensure it is still there, then map/update + destGroup = destOrigGroups.FirstOrDefault(x => x.Id == sourceGroup.Id); + if (destGroup != null) + { + context.Map(sourceGroup, destGroup); + return destGroup; + } + + // force-clear the ID as it does not match anything + sourceGroup.Id = 0; + } + + // insert a new group, or update an existing group that has + // been deleted in the meantime and we need to re-create + // map/create + destGroup = context.Map(sourceGroup); + return destGroup; + } + + private static PropertyType MapSaveProperty(PropertyTypeBasic sourceProperty, IEnumerable destOrigProperties, MapperContext context) + { + PropertyType destProperty; + if (sourceProperty.Id > 0) + { + // updating an existing property + // ensure it is still there, then map/update + destProperty = destOrigProperties.FirstOrDefault(x => x.Id == sourceProperty.Id); + if (destProperty != null) + { + context.Map(sourceProperty, destProperty); + return destProperty; + } + + // force-clear the ID as it does not match anything + sourceProperty.Id = 0; + } + + // insert a new property, or update an existing property that has + // been deleted in the meantime and we need to re-create + // map/create + destProperty = context.Map(sourceProperty); + return destProperty; + } + + private static void EnsureUniqueAliases(IEnumerable properties) + { + var propertiesA = properties.ToArray(); + var distinctProperties = propertiesA + .Select(x => x.Alias.ToUpperInvariant()) + .Distinct() + .Count(); + if (distinctProperties != propertiesA.Length) + throw new InvalidOperationException("Cannot map properties due to alias conflict."); + } + + private static void EnsureUniqueNames(IEnumerable groups) + { + var groupsA = groups.ToArray(); + var distinctProperties = groupsA + .Select(x => x.Name.ToUpperInvariant()) + .Distinct() + .Count(); + if (distinctProperties != groupsA.Length) + throw new InvalidOperationException("Cannot map groups due to name conflict."); + } + + private static void MapComposition(ContentTypeSave source, IContentTypeComposition target, Func getContentType) + { + var current = target.CompositionAliases().ToArray(); + var proposed = source.CompositeContentTypes; + + var remove = current.Where(x => !proposed.Contains(x)); + var add = proposed.Where(x => !current.Contains(x)); + + foreach (var alias in remove) + target.RemoveContentType(alias); + + foreach (var alias in add) + { + // TODO: Remove N+1 lookup + var contentType = getContentType(alias); + if (contentType != null) + target.AddContentType(contentType); + } + } + } +} diff --git a/src/Umbraco.Web/Models/Mapping/ContentTypeMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/ContentTypeMapperProfile.cs deleted file mode 100644 index cc2c7b0cb9..0000000000 --- a/src/Umbraco.Web/Models/Mapping/ContentTypeMapperProfile.cs +++ /dev/null @@ -1,268 +0,0 @@ -using System; -using System.Linq; -using AutoMapper; -using Umbraco.Core; -using Umbraco.Core.Logging; -using Umbraco.Core.Models; -using Umbraco.Core.PropertyEditors; -using Umbraco.Web.Models.ContentEditing; -using Umbraco.Core.Services; -using ContentVariation = Umbraco.Core.Models.ContentVariation; - -namespace Umbraco.Web.Models.Mapping -{ - /// - /// Defines mappings for content/media/members type mappings - /// - internal class ContentTypeMapperProfile : Profile - { - public ContentTypeMapperProfile(PropertyEditorCollection propertyEditors, IDataTypeService dataTypeService, IFileService fileService, IContentTypeService contentTypeService, IMediaTypeService mediaTypeService, ILogger logger) - { - CreateMap() - //do the base mapping - .MapBaseContentTypeSaveToEntity() - .ConstructUsing((source) => new ContentType(source.ParentId)) - .ForMember(source => source.AllowedTemplates, opt => opt.Ignore()) - .ForMember(dto => dto.DefaultTemplate, opt => opt.Ignore()) - .AfterMap((source, dest) => - { - dest.AllowedTemplates = source.AllowedTemplates - .Where(x => x != null) - .Select(fileService.GetTemplate) - .Where(x => x != null) - .ToArray(); - - if (source.DefaultTemplate != null) - dest.SetDefaultTemplate(fileService.GetTemplate(source.DefaultTemplate)); - else - dest.SetDefaultTemplate(null); - - ContentTypeProfileExtensions.AfterMapContentTypeSaveToEntity(source, dest, contentTypeService); - }); - - CreateMap() - //do the base mapping - .MapBaseContentTypeSaveToEntity() - .ConstructUsing((source) => new MediaType(source.ParentId)) - .AfterMap((source, dest) => - { - ContentTypeProfileExtensions.AfterMapMediaTypeSaveToEntity(source, dest, mediaTypeService); - }); - - CreateMap() - //do the base mapping - .MapBaseContentTypeSaveToEntity() - .ConstructUsing(source => new MemberType(source.ParentId)) - .AfterMap((source, dest) => - { - ContentTypeProfileExtensions.AfterMapContentTypeSaveToEntity(source, dest, contentTypeService); - - //map the MemberCanEditProperty,MemberCanViewProperty,IsSensitiveData - foreach (var propertyType in source.Groups.SelectMany(x => x.Properties)) - { - var localCopy = propertyType; - var destProp = dest.PropertyTypes.SingleOrDefault(x => x.Alias.InvariantEquals(localCopy.Alias)); - if (destProp != null) - { - dest.SetMemberCanEditProperty(localCopy.Alias, localCopy.MemberCanEditProperty); - dest.SetMemberCanViewProperty(localCopy.Alias, localCopy.MemberCanViewProperty); - dest.SetIsSensitiveProperty(localCopy.Alias, localCopy.IsSensitiveData); - } - } - }); - - CreateMap().ConvertUsing(dest => dest.Alias); - - CreateMap() - //map base logic - .MapBaseContentTypeEntityToDisplay(propertyEditors, dataTypeService, contentTypeService, logger) - .AfterMap((memberType, display) => - { - //map the MemberCanEditProperty,MemberCanViewProperty,IsSensitiveData - foreach (var propertyType in memberType.PropertyTypes) - { - var localCopy = propertyType; - var displayProp = display.Groups.SelectMany(dest => dest.Properties).SingleOrDefault(dest => dest.Alias.InvariantEquals(localCopy.Alias)); - if (displayProp != null) - { - displayProp.MemberCanEditProperty = memberType.MemberCanEditProperty(localCopy.Alias); - displayProp.MemberCanViewProperty = memberType.MemberCanViewProperty(localCopy.Alias); - displayProp.IsSensitiveData = memberType.IsSensitiveProperty(localCopy.Alias); - } - } - }); - - CreateMap() - //map base logic - .MapBaseContentTypeEntityToDisplay(propertyEditors, dataTypeService, contentTypeService, logger) - .AfterMap((source, dest) => - { - //default listview - dest.ListViewEditorName = Constants.Conventions.DataTypes.ListViewPrefix + "Media"; - - if (string.IsNullOrEmpty(source.Name) == false) - { - var name = Constants.Conventions.DataTypes.ListViewPrefix + source.Name; - if (dataTypeService.GetDataType(name) != null) - dest.ListViewEditorName = name; - } - }); - - CreateMap() - //map base logic - .MapBaseContentTypeEntityToDisplay(propertyEditors, dataTypeService, contentTypeService, logger) - .ForMember(dto => dto.AllowedTemplates, opt => opt.Ignore()) - .ForMember(dto => dto.DefaultTemplate, opt => opt.Ignore()) - .ForMember(display => display.Notifications, opt => opt.Ignore()) - .ForMember(display => display.AllowCultureVariant, opt => opt.MapFrom(type => type.VariesByCulture())) - .AfterMap((source, dest) => - { - //sync templates - dest.AllowedTemplates = source.AllowedTemplates.Select(Mapper.Map).ToArray(); - - if (source.DefaultTemplate != null) - dest.DefaultTemplate = Mapper.Map(source.DefaultTemplate); - - //default listview - dest.ListViewEditorName = Constants.Conventions.DataTypes.ListViewPrefix + "Content"; - - if (string.IsNullOrEmpty(source.Alias) == false) - { - var name = Constants.Conventions.DataTypes.ListViewPrefix + source.Alias; - if (dataTypeService.GetDataType(name) != null) - dest.ListViewEditorName = name; - } - - }); - - CreateMap() - .ForMember(dest => dest.Udi, opt => opt.MapFrom(source => Udi.Create(Constants.UdiEntityType.MemberType, source.Key))) - .ForMember(dest => dest.Blueprints, opt => opt.Ignore()) - .ForMember(dest => dest.AdditionalData, opt => opt.Ignore()); - CreateMap() - .ForMember(dest => dest.Udi, opt => opt.MapFrom(source => Udi.Create(Constants.UdiEntityType.MemberType, source.Key))) - .ForMember(dest => dest.Blueprints, opt => opt.Ignore()) - .ForMember(dest => dest.AdditionalData, opt => opt.Ignore()); - CreateMap() - .ForMember(dest => dest.Udi, opt => opt.MapFrom(source => Udi.Create(Constants.UdiEntityType.MediaType, source.Key))) - .ForMember(dest => dest.Blueprints, opt => opt.Ignore()) - .ForMember(dest => dest.AdditionalData, opt => opt.Ignore()); - CreateMap() - .ForMember(dest => dest.Udi, opt => opt.MapFrom(source => Udi.Create(Constants.UdiEntityType.DocumentType, source.Key))) - .ForMember(dest => dest.Blueprints, opt => opt.Ignore()) - .ForMember(dest => dest.AdditionalData, opt => opt.Ignore()); - - CreateMap() - - .ConstructUsing((propertyTypeBasic, context) => - { - var dataType = dataTypeService.GetDataType(propertyTypeBasic.DataTypeId); - if (dataType == null) throw new NullReferenceException("No data type found with id " + propertyTypeBasic.DataTypeId); - return new PropertyType(dataType, propertyTypeBasic.Alias); - }) - - .IgnoreEntityCommonProperties() - - .ForMember(dest => dest.SupportsPublishing, opt => opt.Ignore()) - - // see note above - have to do this here? - .ForMember(dest => dest.PropertyEditorAlias, opt => opt.Ignore()) - .ForMember(dest => dest.DeleteDate, opt => opt.Ignore()) - - .ForMember(dto => dto.Variations, opt => opt.MapFrom()) - - //only map if it is actually set - .ForMember(dest => dest.Id, opt => opt.Condition(source => source.Id > 0)) - //only map if it is actually set, if it's not set, it needs to be handled differently and will be taken care of in the - // IContentType.AddPropertyType - .ForMember(dest => dest.PropertyGroupId, opt => opt.Condition(source => source.GroupId > 0)) - .ForMember(dest => dest.PropertyGroupId, opt => opt.MapFrom(display => new Lazy(() => display.GroupId, false))) - .ForMember(dest => dest.Key, opt => opt.Ignore()) - .ForMember(dest => dest.HasIdentity, opt => opt.Ignore()) - //ignore because this is set in the ctor NOT ON UPDATE, STUPID! - //.ForMember(type => type.Alias, opt => opt.Ignore()) - //ignore because this is obsolete and shouldn't be used - .ForMember(dest => dest.DataTypeId, opt => opt.Ignore()) - .ForMember(dest => dest.Mandatory, opt => opt.MapFrom(source => source.Validation.Mandatory)) - .ForMember(dest => dest.ValidationRegExp, opt => opt.MapFrom(source => source.Validation.Pattern)) - .ForMember(dest => dest.DataTypeId, opt => opt.MapFrom(source => source.DataTypeId)) - .ForMember(dest => dest.Name, opt => opt.MapFrom(source => source.Label)); - - #region *** Used for mapping on top of an existing display object from a save object *** - - CreateMap() - .MapBaseContentTypeSaveToDisplay(); - - CreateMap() - .MapBaseContentTypeSaveToDisplay(); - - CreateMap() - .MapBaseContentTypeSaveToDisplay() - .ForMember(dto => dto.AllowedTemplates, opt => opt.Ignore()) - .ForMember(dto => dto.DefaultTemplate, opt => opt.Ignore()) - .AfterMap((source, dest) => - { - //sync templates - var destAllowedTemplateAliases = dest.AllowedTemplates.Select(x => x.Alias); - //if the dest is set and it's the same as the source, then don't change - if (destAllowedTemplateAliases.SequenceEqual(source.AllowedTemplates) == false) - { - var templates = fileService.GetTemplates(source.AllowedTemplates.ToArray()); - dest.AllowedTemplates = source.AllowedTemplates - .Select(x => Mapper.Map(templates.SingleOrDefault(t => t.Alias == x))) - .WhereNotNull() - .ToArray(); - } - - if (source.DefaultTemplate.IsNullOrWhiteSpace() == false) - { - //if the dest is set and it's the same as the source, then don't change - if (dest.DefaultTemplate == null || source.DefaultTemplate != dest.DefaultTemplate.Alias) - { - var template = fileService.GetTemplate(source.DefaultTemplate); - dest.DefaultTemplate = template == null ? null : Mapper.Map(template); - } - } - else - { - dest.DefaultTemplate = null; - } - }); - - //for doc types, media types - CreateMap, PropertyGroup>() - .MapPropertyGroupBasicToPropertyGroupPersistence, PropertyTypeBasic>(); - - //for members - CreateMap, PropertyGroup>() - .MapPropertyGroupBasicToPropertyGroupPersistence, MemberPropertyTypeBasic>(); - - //for doc types, media types - CreateMap, PropertyGroupDisplay>() - .MapPropertyGroupBasicToPropertyGroupDisplay, PropertyTypeBasic, PropertyTypeDisplay>(); - - //for members - CreateMap, PropertyGroupDisplay>() - .MapPropertyGroupBasicToPropertyGroupDisplay, MemberPropertyTypeBasic, MemberPropertyTypeDisplay>(); - - CreateMap() - .ForMember(g => g.Editor, opt => opt.Ignore()) - .ForMember(g => g.View, opt => opt.Ignore()) - .ForMember(g => g.Config, opt => opt.Ignore()) - .ForMember(g => g.ContentTypeId, opt => opt.Ignore()) - .ForMember(g => g.ContentTypeName, opt => opt.Ignore()) - .ForMember(g => g.Locked, exp => exp.Ignore()); - - CreateMap() - .ForMember(g => g.Editor, opt => opt.Ignore()) - .ForMember(g => g.View, opt => opt.Ignore()) - .ForMember(g => g.Config, opt => opt.Ignore()) - .ForMember(g => g.ContentTypeId, opt => opt.Ignore()) - .ForMember(g => g.ContentTypeName, opt => opt.Ignore()) - .ForMember(g => g.Locked, exp => exp.Ignore()); - - #endregion - - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/ContentTypeProfileExtensions.cs b/src/Umbraco.Web/Models/Mapping/ContentTypeProfileExtensions.cs deleted file mode 100644 index 9ec8e572b3..0000000000 --- a/src/Umbraco.Web/Models/Mapping/ContentTypeProfileExtensions.cs +++ /dev/null @@ -1,342 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using AutoMapper; -using Umbraco.Core.Logging; -using Umbraco.Core.Models; -using Umbraco.Core.PropertyEditors; -using Umbraco.Core.Services; -using Umbraco.Web.Models.ContentEditing; - -namespace Umbraco.Web.Models.Mapping -{ - /// - /// Used as a shared way to do the underlying mapping for content types base classes - /// - /// - /// We used to use 'Include' Automapper inheritance functionality and although this works, the unit test - /// to assert mappings fails which is an Automapper bug. So instead we will use an extension method for the mappings - /// to re-use mappings. - /// - internal static class ContentTypeProfileExtensions - { - public static IMappingExpression MapPropertyGroupBasicToPropertyGroupPersistence( - this IMappingExpression mapping) - where TSource : PropertyGroupBasic - where TPropertyTypeBasic : PropertyTypeBasic - { - return mapping - .ConstructUsing(x => new PropertyGroup(false)) // TODO: we have NO idea of isPublishing here = so what? - .IgnoreEntityCommonProperties() - .ForMember(dest => dest.Id, map => map.Condition(src => src.Id > 0)) - .ForMember(dest => dest.Key, map => map.Ignore()) - .ForMember(dest => dest.HasIdentity, map => map.Ignore()) - .ForMember(dest => dest.DeleteDate, map => map.Ignore()) - .ForMember(dest => dest.PropertyTypes, map => map.Ignore()); - } - - public static IMappingExpression> MapPropertyGroupBasicToPropertyGroupDisplay( - this IMappingExpression> mapping) - where TSource : PropertyGroupBasic - where TPropertyTypeBasic : PropertyTypeBasic - where TPropertyTypeDisplay : PropertyTypeDisplay - { - return mapping - .ForMember(dest => dest.Id, opt => opt.Condition(src => src.Id > 0)) - .ForMember(dest => dest.ContentTypeId, opt => opt.Ignore()) - .ForMember(dest => dest.ParentTabContentTypes, opt => opt.Ignore()) - .ForMember(dest => dest.ParentTabContentTypeNames, opt => opt.Ignore()) - .ForMember(dest => dest.Properties, opt => opt.MapFrom(src => src.Properties.Select(Mapper.Map))); - } - - public static void AfterMapContentTypeSaveToEntity(TSource source, TDestination dest, IContentTypeService contentTypeService) - where TSource : ContentTypeSave - where TDestination : IContentTypeComposition - { - //sync compositions - var current = dest.CompositionAliases().ToArray(); - var proposed = source.CompositeContentTypes; - - var remove = current.Where(x => proposed.Contains(x) == false); - var add = proposed.Where(x => current.Contains(x) == false); - - foreach (var rem in remove) - { - dest.RemoveContentType(rem); - } - - foreach (var a in add) - { - // TODO: Remove N+1 lookup - var addCt = contentTypeService.Get(a); - if (addCt != null) - dest.AddContentType(addCt); - } - } - - public static void AfterMapMediaTypeSaveToEntity(TSource source, TDestination dest, IMediaTypeService mediaTypeService) - where TSource : MediaTypeSave - where TDestination : IContentTypeComposition - { - //sync compositions - var current = dest.CompositionAliases().ToArray(); - var proposed = source.CompositeContentTypes; - - var remove = current.Where(x => proposed.Contains(x) == false); - var add = proposed.Where(x => current.Contains(x) == false); - - foreach (var rem in remove) - { - dest.RemoveContentType(rem); - } - - foreach (var a in add) - { - // TODO: Remove N+1 lookup - var addCt = mediaTypeService.Get(a); - if (addCt != null) - dest.AddContentType(addCt); - } - } - - public static IMappingExpression MapBaseContentTypeSaveToDisplay( - this IMappingExpression mapping) - where TSource : ContentTypeSave - where TDestination : ContentTypeCompositionDisplay - where TPropertyTypeDestination : PropertyTypeDisplay - where TPropertyTypeSource : PropertyTypeBasic - { - var propertyGroupDisplayResolver = new PropertyGroupDisplayResolver(); - - return mapping - .ForMember(dest => dest.CreateDate, opt => opt.Ignore()) - .ForMember(dest => dest.UpdateDate, opt => opt.Ignore()) - .ForMember(dest => dest.ListViewEditorName, opt => opt.Ignore()) - .ForMember(dest => dest.Notifications, opt => opt.Ignore()) - .ForMember(dest => dest.Errors, opt => opt.Ignore()) - .ForMember(dest => dest.LockedCompositeContentTypes, opt => opt.Ignore()) - .ForMember(dest => dest.Groups, opt => opt.MapFrom(src => propertyGroupDisplayResolver.Resolve(src))); - } - - public static IMappingExpression MapBaseContentTypeEntityToDisplay( - this IMappingExpression mapping, PropertyEditorCollection propertyEditors, - IDataTypeService dataTypeService, IContentTypeService contentTypeService, ILogger logger) - where TSource : IContentTypeComposition - where TDestination : ContentTypeCompositionDisplay - where TPropertyTypeDisplay : PropertyTypeDisplay, new() - { - var contentTypeUdiResolver = new ContentTypeUdiResolver(); - var lockedCompositionsResolver = new LockedCompositionsResolver(contentTypeService); - var propertyTypeGroupResolver = new PropertyTypeGroupResolver(propertyEditors, dataTypeService, logger); - - return mapping - .ForMember(dest => dest.Udi, opt => opt.MapFrom(src => contentTypeUdiResolver.Resolve(src))) - .ForMember(dest => dest.Notifications, opt => opt.Ignore()) - .ForMember(dest => dest.Blueprints, opt => opt.Ignore()) - .ForMember(dest => dest.Errors, opt => opt.Ignore()) - .ForMember(dest => dest.AllowAsRoot, opt => opt.MapFrom(src => src.AllowedAsRoot)) - .ForMember(dest => dest.ListViewEditorName, opt => opt.Ignore()) - //Ignore because this is not actually used for content types - .ForMember(dest => dest.Trashed, opt => opt.Ignore()) - - .ForMember(dest => dest.AllowedContentTypes, opt => opt.MapFrom(src => src.AllowedContentTypes.Select(x => x.Id.Value))) - .ForMember(dest => dest.CompositeContentTypes, opt => opt.MapFrom(src => src.ContentTypeComposition)) - .ForMember(dest => dest.LockedCompositeContentTypes, opt => opt.MapFrom(src => lockedCompositionsResolver.Resolve(src))) - .ForMember(dest => dest.Groups, opt => opt.MapFrom(src => propertyTypeGroupResolver.Resolve(src))) - .ForMember(dest => dest.AdditionalData, opt => opt.Ignore()); - } - - /// - /// Display -> Entity class base mapping logic - /// - /// - /// - /// - /// - /// - public static IMappingExpression MapBaseContentTypeSaveToEntity( - this IMappingExpression mapping) - //where TSource : ContentTypeCompositionDisplay - where TSource : ContentTypeSave - where TDestination : IContentTypeComposition - where TSourcePropertyType : PropertyTypeBasic - { - // TODO: not so clean really - var isPublishing = typeof(IContentType).IsAssignableFrom(typeof(TDestination)); - - mapping = mapping - //only map id if set to something higher then zero - .ForMember(dest => dest.Id, opt => opt.Condition(src => (Convert.ToInt32(src.Id) > 0))) - .ForMember(dest => dest.Id, opt => opt.MapFrom(src => Convert.ToInt32(src.Id))) - - //These get persisted as part of the saving procedure, nothing to do with the display model - .IgnoreEntityCommonProperties() - - .ForMember(dest => dest.AllowedAsRoot, opt => opt.MapFrom(src => src.AllowAsRoot)) - .ForMember(dest => dest.CreatorId, opt => opt.Ignore()) - .ForMember(dest => dest.Level, opt => opt.Ignore()) - .ForMember(dest => dest.SortOrder, opt => opt.Ignore()) - //ignore, we'll do this in after map - .ForMember(dest => dest.PropertyGroups, opt => opt.Ignore()) - .ForMember(dest => dest.NoGroupPropertyTypes, opt => opt.Ignore()) - // ignore, composition is managed in AfterMapContentTypeSaveToEntity - .ForMember(dest => dest.ContentTypeComposition, opt => opt.Ignore()); - - // ignore for members - mapping = typeof(TDestination) == typeof(IMemberType) - ? mapping.ForMember(dto => dto.Variations, opt => opt.Ignore()) - : mapping.ForMember(dto => dto.Variations, opt => opt.MapFrom>()); - - mapping = mapping - .ForMember( - dest => dest.AllowedContentTypes, - opt => opt.MapFrom(src => src.AllowedContentTypes.Select((t, i) => new ContentTypeSort(t, i)))) - - .AfterMap((src, dest) => - { - // handle property groups and property types - // note that ContentTypeSave has - // - all groups, inherited and local; only *one* occurrence per group *name* - // - potentially including the generic properties group - // - all properties, inherited and local - // - // also, see PropertyTypeGroupResolver.ResolveCore: - // - if a group is local *and* inherited, then Inherited is true - // and the identifier is the identifier of the *local* group - // - // IContentTypeComposition AddPropertyGroup, AddPropertyType methods do some - // unique-alias-checking, etc that is *not* compatible with re-mapping everything - // the way we do it here, so we should exclusively do it by - // - managing a property group's PropertyTypes collection - // - managing the content type's PropertyTypes collection (for generic properties) - - // handle actual groups (non-generic-properties) - var destOrigGroups = dest.PropertyGroups.ToArray(); // local groups - var destOrigProperties = dest.PropertyTypes.ToArray(); // all properties, in groups or not - var destGroups = new List(); - var sourceGroups = src.Groups.Where(x => x.IsGenericProperties == false).ToArray(); - foreach (var sourceGroup in sourceGroups) - { - // get the dest group - var destGroup = MapSaveGroup(sourceGroup, destOrigGroups); - - // handle local properties - var destProperties = sourceGroup.Properties - .Where(x => x.Inherited == false) - .Select(x => MapSaveProperty(x, destOrigProperties)) - .ToArray(); - - // if the group has no local properties, skip it, ie sort-of garbage-collect - // local groups which would not have local properties anymore - if (destProperties.Length == 0) - continue; - - // ensure no duplicate alias, then assign the group properties collection - EnsureUniqueAliases(destProperties); - destGroup.PropertyTypes = new PropertyTypeCollection(isPublishing, destProperties); - destGroups.Add(destGroup); - } - - // ensure no duplicate name, then assign the groups collection - EnsureUniqueNames(destGroups); - dest.PropertyGroups = new PropertyGroupCollection(destGroups); - - // because the property groups collection was rebuilt, there is no need to remove - // the old groups - they are just gone and will be cleared by the repository - - // handle non-grouped (ie generic) properties - var genericPropertiesGroup = src.Groups.FirstOrDefault(x => x.IsGenericProperties); - if (genericPropertiesGroup != null) - { - // handle local properties - var destProperties = genericPropertiesGroup.Properties - .Where(x => x.Inherited == false) - .Select(x => MapSaveProperty(x, destOrigProperties)) - .ToArray(); - - // ensure no duplicate alias, then assign the generic properties collection - EnsureUniqueAliases(destProperties); - dest.NoGroupPropertyTypes = new PropertyTypeCollection(isPublishing, destProperties); - } - - // because all property collections were rebuilt, there is no need to remove - // some old properties, they are just gone and will be cleared by the repository - }); - - return mapping; - } - - private static PropertyGroup MapSaveGroup(PropertyGroupBasic sourceGroup, IEnumerable destOrigGroups) - where TPropertyType : PropertyTypeBasic - { - PropertyGroup destGroup; - if (sourceGroup.Id > 0) - { - // update an existing group - // ensure it is still there, then map/update - destGroup = destOrigGroups.FirstOrDefault(x => x.Id == sourceGroup.Id); - if (destGroup != null) - { - Mapper.Map(sourceGroup, destGroup); - return destGroup; - } - - // force-clear the ID as it does not match anything - sourceGroup.Id = 0; - } - - // insert a new group, or update an existing group that has - // been deleted in the meantime and we need to re-create - // map/create - destGroup = Mapper.Map(sourceGroup); - return destGroup; - } - - private static PropertyType MapSaveProperty(PropertyTypeBasic sourceProperty, IEnumerable destOrigProperties) - { - PropertyType destProperty; - if (sourceProperty.Id > 0) - { - // updating an existing property - // ensure it is still there, then map/update - destProperty = destOrigProperties.FirstOrDefault(x => x.Id == sourceProperty.Id); - if (destProperty != null) - { - Mapper.Map(sourceProperty, destProperty); - return destProperty; - } - - // force-clear the ID as it does not match anything - sourceProperty.Id = 0; - } - - // insert a new property, or update an existing property that has - // been deleted in the meantime and we need to re-create - // map/create - destProperty = Mapper.Map(sourceProperty); - return destProperty; - } - - private static void EnsureUniqueAliases(IEnumerable properties) - { - var propertiesA = properties.ToArray(); - var distinctProperties = propertiesA - .Select(x => x.Alias.ToUpperInvariant()) - .Distinct() - .Count(); - if (distinctProperties != propertiesA.Length) - throw new InvalidOperationException("Cannot map properties due to alias conflict."); - } - - private static void EnsureUniqueNames(IEnumerable groups) - { - var groupsA = groups.ToArray(); - var distinctProperties = groupsA - .Select(x => x.Name.ToUpperInvariant()) - .Distinct() - .Count(); - if (distinctProperties != groupsA.Length) - throw new InvalidOperationException("Cannot map groups due to name conflict."); - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/ContentTypeUdiResolver.cs b/src/Umbraco.Web/Models/Mapping/ContentTypeUdiResolver.cs deleted file mode 100644 index b819a38064..0000000000 --- a/src/Umbraco.Web/Models/Mapping/ContentTypeUdiResolver.cs +++ /dev/null @@ -1,22 +0,0 @@ -using Umbraco.Core; -using Umbraco.Core.Models; - -namespace Umbraco.Web.Models.Mapping -{ - /// - /// Resolves a UDI for a content type based on it's type - /// - internal class ContentTypeUdiResolver - { - public Udi Resolve(IContentTypeComposition source) - { - if (source == null) return null; - - return Udi.Create( - source.GetType() == typeof(IMemberType) - ? Constants.UdiEntityType.MemberType - : source.GetType() == typeof(IMediaType) - ? Constants.UdiEntityType.MediaType : Constants.UdiEntityType.DocumentType, source.Key); - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/ContentTypeVariationsResolver.cs b/src/Umbraco.Web/Models/Mapping/ContentTypeVariationsResolver.cs deleted file mode 100644 index e25568868f..0000000000 --- a/src/Umbraco.Web/Models/Mapping/ContentTypeVariationsResolver.cs +++ /dev/null @@ -1,24 +0,0 @@ -using AutoMapper; -using Umbraco.Core.Models; -using Umbraco.Web.Models.ContentEditing; -using ContentVariation = Umbraco.Core.Models.ContentVariation; - -namespace Umbraco.Web.Models.Mapping -{ - internal class ContentTypeVariationsResolver : IValueResolver - where TSource : ContentTypeSave - where TDestination : IContentTypeComposition - where TSourcePropertyType : PropertyTypeBasic - { - public ContentVariation Resolve(TSource source, TDestination destination, ContentVariation destMember, ResolutionContext context) - { - //this will always be the case, a content type will always be allowed to be invariant - var result = ContentVariation.Nothing; - - if (source.AllowCultureVariant) - result |= ContentVariation.Culture; - - return result; - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/ContentUrlResolver.cs b/src/Umbraco.Web/Models/Mapping/ContentUrlResolver.cs deleted file mode 100644 index 42c4997d86..0000000000 --- a/src/Umbraco.Web/Models/Mapping/ContentUrlResolver.cs +++ /dev/null @@ -1,52 +0,0 @@ -using System.Linq; -using AutoMapper; -using Umbraco.Core.Logging; -using Umbraco.Core.Models; -using Umbraco.Core.Services; -using Umbraco.Web.Models.ContentEditing; -using Umbraco.Web.Routing; - -namespace Umbraco.Web.Models.Mapping -{ - internal class ContentUrlResolver : IValueResolver - { - private readonly IUmbracoContextAccessor _umbracoContextAccessor; - private readonly IPublishedRouter _publishedRouter; - private readonly ILocalizationService _localizationService; - private readonly ILocalizedTextService _textService; - private readonly IContentService _contentService; - private readonly ILogger _logger; - - public ContentUrlResolver( - IUmbracoContextAccessor umbracoContextAccessor, - IPublishedRouter publishedRouter, - ILocalizationService localizationService, - ILocalizedTextService textService, - IContentService contentService, - ILogger logger) - { - _umbracoContextAccessor = umbracoContextAccessor ?? throw new System.ArgumentNullException(nameof(umbracoContextAccessor)); - _publishedRouter = publishedRouter ?? throw new System.ArgumentNullException(nameof(publishedRouter)); - _localizationService = localizationService ?? throw new System.ArgumentNullException(nameof(localizationService)); - _textService = textService ?? throw new System.ArgumentNullException(nameof(textService)); - _contentService = contentService ?? throw new System.ArgumentNullException(nameof(contentService)); - _logger = logger ?? throw new System.ArgumentNullException(nameof(logger)); - } - - public UrlInfo[] Resolve(IContent source, ContentItemDisplay destination, UrlInfo[] destMember, ResolutionContext context) - { - if (source.ContentType.IsElement) - { - return new UrlInfo[0]; - } - - var umbracoContext = _umbracoContextAccessor.UmbracoContext; - - var urls = umbracoContext == null - ? new[] { UrlInfo.Message("Cannot generate urls without a current Umbraco Context") } - : source.GetContentUrls(_publishedRouter, umbracoContext, _localizationService, _textService, _contentService, _logger).ToArray(); - - return urls; - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/ContentItemDisplayVariationResolver.cs b/src/Umbraco.Web/Models/Mapping/ContentVariantMapper.cs similarity index 74% rename from src/Umbraco.Web/Models/Mapping/ContentItemDisplayVariationResolver.cs rename to src/Umbraco.Web/Models/Mapping/ContentVariantMapper.cs index 01e57bd872..560d398a2c 100644 --- a/src/Umbraco.Web/Models/Mapping/ContentItemDisplayVariationResolver.cs +++ b/src/Umbraco.Web/Models/Mapping/ContentVariantMapper.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; using System.Linq; -using AutoMapper; using Umbraco.Core; +using Umbraco.Core.Mapping; using Umbraco.Core.Models; using Umbraco.Core.Services; using Umbraco.Web.Models.ContentEditing; @@ -10,37 +10,37 @@ using Language = Umbraco.Web.Models.ContentEditing.Language; namespace Umbraco.Web.Models.Mapping { - internal class ContentVariantResolver : IValueResolver> + internal class ContentVariantMapper { private readonly ILocalizationService _localizationService; - public ContentVariantResolver(ILocalizationService localizationService) + public ContentVariantMapper(ILocalizationService localizationService) { _localizationService = localizationService ?? throw new ArgumentNullException(nameof(localizationService)); } - public IEnumerable Resolve(IContent source, ContentItemDisplay destination, IEnumerable destMember, ResolutionContext context) + public IEnumerable Map(IContent source, MapperContext context) { var result = new List(); if (!source.ContentType.VariesByCulture()) { //this is invariant so just map the IContent instance to ContentVariationDisplay - result.Add(context.Mapper.Map(source)); + result.Add(context.Map(source)); } else { var allLanguages = _localizationService.GetAllLanguages().OrderBy(x => x.Id).ToList(); if (allLanguages.Count == 0) return Enumerable.Empty(); //this should never happen - var langs = context.Mapper.Map, IEnumerable>(allLanguages, null, context).ToList(); + var langs = context.MapEnumerable(allLanguages).ToList(); //create a variant for each language, then we'll populate the values var variants = langs.Select(x => { //We need to set the culture in the mapping context since this is needed to ensure that the correct property values //are resolved during the mapping - context.Options.SetCulture(x.IsoCode); - return context.Mapper.Map(source, null, context); + context.SetCulture(x.IsoCode); + return context.Map(source); }).ToList(); for (int i = 0; i < langs.Count; i++) @@ -69,5 +69,4 @@ namespace Umbraco.Web.Models.Mapping return result; } } - } diff --git a/src/Umbraco.Web/Models/Mapping/CreatorResolver.cs b/src/Umbraco.Web/Models/Mapping/CreatorResolver.cs deleted file mode 100644 index 40ebc801eb..0000000000 --- a/src/Umbraco.Web/Models/Mapping/CreatorResolver.cs +++ /dev/null @@ -1,27 +0,0 @@ -using AutoMapper; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Models.Membership; -using Umbraco.Core.Services; -using UserProfile = Umbraco.Web.Models.ContentEditing.UserProfile; - -namespace Umbraco.Web.Models.Mapping -{ - /// - /// Maps the Creator for content - /// - internal class CreatorResolver - { - private readonly IUserService _userService; - - public CreatorResolver(IUserService userService) - { - _userService = userService; - } - - public UserProfile Resolve(IContent source) - { - return Mapper.Map(source.GetWriterProfile(_userService)); - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/DataTypeConfigurationFieldDisplayResolver.cs b/src/Umbraco.Web/Models/Mapping/DataTypeConfigurationFieldDisplayResolver.cs deleted file mode 100644 index cca64eb164..0000000000 --- a/src/Umbraco.Web/Models/Mapping/DataTypeConfigurationFieldDisplayResolver.cs +++ /dev/null @@ -1,64 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using AutoMapper; -using Umbraco.Core.Logging; -using Umbraco.Core.Models; -using Umbraco.Web.Composing; -using Umbraco.Web.Models.ContentEditing; - -namespace Umbraco.Web.Models.Mapping -{ - internal class DataTypeConfigurationFieldDisplayResolver - { - private readonly ILogger _logger; - - public DataTypeConfigurationFieldDisplayResolver(ILogger logger) - { - _logger = logger ?? throw new ArgumentNullException(nameof(logger)); - } - - /// - /// Maps pre-values in the dictionary to the values for the fields - /// - internal static void MapConfigurationFields(ILogger logger, DataTypeConfigurationFieldDisplay[] fields, IDictionary configuration) - { - if (fields == null) throw new ArgumentNullException(nameof(fields)); - if (configuration == null) throw new ArgumentNullException(nameof(configuration)); - - // now we need to wire up the pre-values values with the actual fields defined - foreach (var field in fields) - { - if (configuration.TryGetValue(field.Key, out var value)) - field.Value = value; - else - { - // weird - just leave the field without a value - but warn - logger.Warn("Could not find a value for configuration field '{ConfigField}'", field.Key); - } - - } - } - - /// - /// Creates a set of configuration fields for a data type. - /// - public IEnumerable Resolve(IDataType dataType) - { - // in v7 it was apparently fine to have an empty .EditorAlias here, in which case we would map onto - // an empty fields list, which made no sense since there would be nothing to map to - and besides, - // a datatype without an editor alias is a serious issue - v8 wants an editor here - - if (string.IsNullOrWhiteSpace(dataType.EditorAlias) || !Current.PropertyEditors.TryGet(dataType.EditorAlias, out var editor)) - throw new InvalidOperationException($"Could not find a property editor with alias \"{dataType.EditorAlias}\"."); - - var configurationEditor = editor.GetConfigurationEditor(); - var fields = configurationEditor.Fields.Select(Mapper.Map).ToArray(); - var configurationDictionary = configurationEditor.ToConfigurationEditor(dataType.Configuration); - - MapConfigurationFields(_logger, fields, configurationDictionary); - - return fields; - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/DataTypeMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/DataTypeMapDefinition.cs new file mode 100644 index 0000000000..4c4a03939d --- /dev/null +++ b/src/Umbraco.Web/Models/Mapping/DataTypeMapDefinition.cs @@ -0,0 +1,202 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using Umbraco.Core; +using Umbraco.Core.Logging; +using Umbraco.Core.Mapping; +using Umbraco.Core.Models; +using Umbraco.Core.PropertyEditors; +using Umbraco.Web.Composing; +using Umbraco.Web.Models.ContentEditing; + +namespace Umbraco.Web.Models.Mapping +{ + internal class DataTypeMapDefinition : IMapDefinition + { + private readonly PropertyEditorCollection _propertyEditors; + private readonly ILogger _logger; + + public DataTypeMapDefinition(PropertyEditorCollection propertyEditors, ILogger logger) + { + _propertyEditors = propertyEditors; + _logger = logger; + } + + private static readonly int[] SystemIds = + { + Constants.DataTypes.DefaultContentListView, + Constants.DataTypes.DefaultMediaListView, + Constants.DataTypes.DefaultMembersListView + }; + + public void DefineMaps(UmbracoMapper mapper) + { + mapper.Define((source, context) => new PropertyEditorBasic(), Map); + mapper.Define((source, context) => new DataTypeConfigurationFieldDisplay(), Map); + mapper.Define((source, context) => new DataTypeBasic(), Map); + mapper.Define((source, context) => new DataTypeBasic(), Map); + mapper.Define((source, context) => new DataTypeDisplay(), Map); + mapper.Define>(MapPreValues); + mapper.Define((source, context) => new DataType(_propertyEditors[source.EditorAlias]) { CreateDate = DateTime.Now },Map); + mapper.Define>(MapPreValues); + } + + // Umbraco.Code.MapAll + private static void Map(IDataEditor source, PropertyEditorBasic target, MapperContext context) + { + target.Alias = source.Alias; + target.Icon = source.Icon; + target.Name = source.Name; + } + + // Umbraco.Code.MapAll -Value + private static void Map(ConfigurationField source, DataTypeConfigurationFieldDisplay target, MapperContext context) + { + target.Config = source.Config; + target.Description = source.Description; + target.HideLabel = source.HideLabel; + target.Key = source.Key; + target.Name = source.Name; + target.View = source.View; + } + + // Umbraco.Code.MapAll -Udi -HasPrevalues -IsSystemDataType -Id -Trashed -Key + // Umbraco.Code.MapAll -ParentId -Path + private static void Map(IDataEditor source, DataTypeBasic target, MapperContext context) + { + target.Alias = source.Alias; + target.Group = source.Group; + target.Icon = source.Icon; + target.Name = source.Name; + } + + // Umbraco.Code.MapAll -HasPrevalues + private void Map(IDataType source, DataTypeBasic target, MapperContext context) + { + target.Id = source.Id; + target.IsSystemDataType = SystemIds.Contains(source.Id); + target.Key = source.Key; + target.Name = source.Name; + target.ParentId = source.ParentId; + target.Path = source.Path; + target.Trashed = source.Trashed; + target.Udi = Udi.Create(Constants.UdiEntityType.DataType, source.Key); + + if (!_propertyEditors.TryGet(source.EditorAlias, out var editor)) + return; + + target.Alias = editor.Alias; + target.Group = editor.Group; + target.Icon = editor.Icon; + } + + // Umbraco.Code.MapAll -HasPrevalues + private void Map(IDataType source, DataTypeDisplay target, MapperContext context) + { + target.AvailableEditors = MapAvailableEditors(source, context); + target.Id = source.Id; + target.IsSystemDataType = SystemIds.Contains(source.Id); + target.Key = source.Key; + target.Name = source.Name; + target.ParentId = source.ParentId; + target.Path = source.Path; + target.PreValues = MapPreValues(source, context); + target.SelectedEditor = source.EditorAlias.IsNullOrWhiteSpace() ? null : source.EditorAlias; + target.Trashed = source.Trashed; + target.Udi = Udi.Create(Constants.UdiEntityType.DataType, source.Key); + + if (!_propertyEditors.TryGet(source.EditorAlias, out var editor)) + return; + + target.Alias = editor.Alias; + target.Group = editor.Group; + target.Icon = editor.Icon; + } + + // Umbraco.Code.MapAll -CreateDate -DeleteDate -UpdateDate + // Umbraco.Code.MapAll -Key -Path -CreatorId -Level -SortOrder -Configuration + private void Map(DataTypeSave source, IDataType target, MapperContext context) + { + target.DatabaseType = MapDatabaseType(source); + target.Editor = _propertyEditors[source.EditorAlias]; + target.Id = Convert.ToInt32(source.Id); + target.Name = source.Name; + target.ParentId = source.ParentId; + } + + private IEnumerable MapAvailableEditors(IDataType source, MapperContext context) + { + var contentSection = Current.Configs.Settings().Content; + var properties = _propertyEditors + .Where(x => !x.IsDeprecated || contentSection.ShowDeprecatedPropertyEditors || source.EditorAlias == x.Alias) + .OrderBy(x => x.Name); + return context.MapEnumerable(properties); + } + + private IEnumerable MapPreValues(IDataType dataType, MapperContext context) + { + // in v7 it was apparently fine to have an empty .EditorAlias here, in which case we would map onto + // an empty fields list, which made no sense since there would be nothing to map to - and besides, + // a datatype without an editor alias is a serious issue - v8 wants an editor here + + if (string.IsNullOrWhiteSpace(dataType.EditorAlias) || !Current.PropertyEditors.TryGet(dataType.EditorAlias, out var editor)) + throw new InvalidOperationException($"Could not find a property editor with alias \"{dataType.EditorAlias}\"."); + + var configurationEditor = editor.GetConfigurationEditor(); + var fields = context.MapEnumerable(configurationEditor.Fields); + var configurationDictionary = configurationEditor.ToConfigurationEditor(dataType.Configuration); + + MapConfigurationFields(fields, configurationDictionary); + + return fields; + } + + private void MapConfigurationFields(List fields, IDictionary configuration) + { + if (fields == null) throw new ArgumentNullException(nameof(fields)); + if (configuration == null) throw new ArgumentNullException(nameof(configuration)); + + // now we need to wire up the pre-values values with the actual fields defined + foreach (var field in fields) + { + if (configuration.TryGetValue(field.Key, out var value)) + { + field.Value = value; + } + else + { + // weird - just leave the field without a value - but warn + _logger.Warn("Could not find a value for configuration field '{ConfigField}'", field.Key); + } + } + } + + private ValueStorageType MapDatabaseType(DataTypeSave source) + { + if (!_propertyEditors.TryGet(source.EditorAlias, out var editor)) + throw new InvalidOperationException($"Could not find property editor \"{source.EditorAlias}\"."); + + // TODO: what about source.PropertyEditor? can we get the configuration here? 'cos it may change the storage type?! + var valueType = editor.GetValueEditor().ValueType; + return ValueTypes.ToStorageType(valueType); + } + + private IEnumerable MapPreValues(IDataEditor source, MapperContext context) + { + // this is a new data type, initialize default configuration + // get the configuration editor, + // get the configuration fields and map to UI, + // get the configuration default values and map to UI + + var configurationEditor = source.GetConfigurationEditor(); + + var fields = context.MapEnumerable(configurationEditor.Fields); + + var defaultConfiguration = configurationEditor.DefaultConfiguration; + if (defaultConfiguration != null) + MapConfigurationFields(fields, defaultConfiguration); + + return fields; + } + } +} diff --git a/src/Umbraco.Web/Models/Mapping/DataTypeMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/DataTypeMapperProfile.cs deleted file mode 100644 index f707003ffe..0000000000 --- a/src/Umbraco.Web/Models/Mapping/DataTypeMapperProfile.cs +++ /dev/null @@ -1,129 +0,0 @@ -using System; -using System.Collections.Generic; -using AutoMapper; -using System.Linq; -using Umbraco.Core; -using Umbraco.Core.Logging; -using Umbraco.Core.Configuration; -using Umbraco.Core.Models; -using Umbraco.Core.PropertyEditors; -using Umbraco.Web.Composing; -using Umbraco.Web.Models.ContentEditing; - -namespace Umbraco.Web.Models.Mapping -{ - /// - /// Configures model mappings for datatypes. - /// - internal class DataTypeMapperProfile : Profile - { - public DataTypeMapperProfile(PropertyEditorCollection propertyEditors, ILogger logger) - { - // create, capture, cache - var availablePropertyEditorsResolver = new AvailablePropertyEditorsResolver(Current.Configs.Settings().Content); - var configurationDisplayResolver = new DataTypeConfigurationFieldDisplayResolver(logger); - var databaseTypeResolver = new DatabaseTypeResolver(); - - CreateMap(); - - // map the standard properties, not the values - CreateMap() - .ForMember(dest => dest.Value, opt => opt.Ignore()); - - var systemIds = new[] - { - Constants.DataTypes.DefaultContentListView, - Constants.DataTypes.DefaultMediaListView, - Constants.DataTypes.DefaultMembersListView - }; - - CreateMap() - .ForMember(dest => dest.Udi, opt => opt.Ignore()) - .ForMember(dest => dest.HasPrevalues, opt => opt.Ignore()) - .ForMember(dest => dest.IsSystemDataType, opt => opt.Ignore()) - .ForMember(dest => dest.Id, opt => opt.Ignore()) - .ForMember(dest => dest.Trashed, opt => opt.Ignore()) - .ForMember(dest => dest.Key, opt => opt.Ignore()) - .ForMember(dest => dest.ParentId, opt => opt.Ignore()) - .ForMember(dest => dest.Path, opt => opt.Ignore()) - .ForMember(dest => dest.AdditionalData, opt => opt.Ignore()); - - CreateMap() - .ForMember(dest => dest.Udi, opt => opt.MapFrom(src => Udi.Create(Constants.UdiEntityType.DataType, src.Key))) - .ForMember(dest => dest.HasPrevalues, opt => opt.Ignore()) - .ForMember(dest => dest.Icon, opt => opt.Ignore()) - .ForMember(dest => dest.Alias, opt => opt.Ignore()) - .ForMember(dest => dest.Group, opt => opt.Ignore()) - .ForMember(dest => dest.IsSystemDataType, opt => opt.MapFrom(src => systemIds.Contains(src.Id))) - .ForMember(dest => dest.AdditionalData, opt => opt.Ignore()) - .AfterMap((src, dest) => - { - if (Current.PropertyEditors.TryGet(src.EditorAlias, out var editor)) - { - dest.Alias = editor.Alias; - dest.Group = editor.Group; - dest.Icon = editor.Icon; - } - }); - - CreateMap() - .ForMember(dest => dest.Udi, opt => opt.MapFrom(src => Udi.Create(Constants.UdiEntityType.DataType, src.Key))) - .ForMember(dest => dest.AvailableEditors, opt => opt.MapFrom(src => availablePropertyEditorsResolver.Resolve(src))) - .ForMember(dest => dest.PreValues, opt => opt.MapFrom(src => configurationDisplayResolver.Resolve(src))) - .ForMember(dest => dest.SelectedEditor, opt => opt.MapFrom(src => src.EditorAlias.IsNullOrWhiteSpace() ? null : src.EditorAlias)) - .ForMember(dest => dest.HasPrevalues, opt => opt.Ignore()) - .ForMember(dest => dest.Notifications, opt => opt.Ignore()) - .ForMember(dest => dest.Icon, opt => opt.Ignore()) - .ForMember(dest => dest.Alias, opt => opt.Ignore()) - .ForMember(dest => dest.Group, opt => opt.Ignore()) - .ForMember(dest => dest.IsSystemDataType, opt => opt.MapFrom(src => systemIds.Contains(src.Id))) - .ForMember(dest => dest.AdditionalData, opt => opt.Ignore()) - .AfterMap((src, dest) => - { - if (Current.PropertyEditors.TryGet(src.EditorAlias, out var editor)) - { - dest.Group = editor.Group; - dest.Icon = editor.Icon; - } - }); - - //gets a list of PreValueFieldDisplay objects from the data type definition - CreateMap>() - .ConvertUsing(src => configurationDisplayResolver.Resolve(src)); - - CreateMap() - .ConstructUsing(src => new DataType(propertyEditors[src.EditorAlias], -1) {CreateDate = DateTime.Now}) - .IgnoreEntityCommonProperties() - .ForMember(dest => dest.Id, opt => opt.MapFrom(src => Convert.ToInt32(src.Id))) - .ForMember(dest => dest.Key, opt => opt.Ignore()) // ignore key, else resets UniqueId - U4-3911 - .ForMember(dest => dest.Path, opt => opt.Ignore()) - .ForMember(dest => dest.EditorAlias, opt => opt.MapFrom(src => src.EditorAlias)) - .ForMember(dest => dest.DatabaseType, opt => opt.MapFrom(src => databaseTypeResolver.Resolve(src))) - .ForMember(dest => dest.CreatorId, opt => opt.Ignore()) - .ForMember(dest => dest.Level, opt => opt.Ignore()) - .ForMember(dest => dest.SortOrder, opt => opt.Ignore()) - .ForMember(dest => dest.Configuration, opt => opt.Ignore()) - .ForMember(dest => dest.Editor, opt => opt.MapFrom(src => propertyEditors[src.EditorAlias])); - - //Converts a property editor to a new list of pre-value fields - used when creating a new data type or changing a data type with new pre-vals - CreateMap>() - .ConvertUsing((dataEditor, configurationFieldDisplays) => - { - // this is a new data type, initialize default configuration - // get the configuration editor, - // get the configuration fields and map to UI, - // get the configuration default values and map to UI - - var configurationEditor = dataEditor.GetConfigurationEditor(); - - var fields = configurationEditor.Fields.Select(Mapper.Map).ToArray(); - - var defaultConfiguration = configurationEditor.DefaultConfiguration; - if (defaultConfiguration != null) - DataTypeConfigurationFieldDisplayResolver.MapConfigurationFields(logger, fields, defaultConfiguration); - - return fields; - }); - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/DatabaseTypeResolver.cs b/src/Umbraco.Web/Models/Mapping/DatabaseTypeResolver.cs deleted file mode 100644 index 35702719dc..0000000000 --- a/src/Umbraco.Web/Models/Mapping/DatabaseTypeResolver.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; -using Umbraco.Core.Models; -using Umbraco.Core.PropertyEditors; -using Umbraco.Web.Composing; -using Umbraco.Web.Models.ContentEditing; - -namespace Umbraco.Web.Models.Mapping -{ - /// - /// Gets the DataTypeDatabaseType from the selected property editor for the data type - /// - internal class DatabaseTypeResolver - { - public ValueStorageType Resolve(DataTypeSave source) - { - if (!Current.PropertyEditors.TryGet(source.EditorAlias, out var editor)) - throw new InvalidOperationException($"Could not find property editor \"{source.EditorAlias}\"."); - - // TODO: what about source.PropertyEditor? can we get the configuration here? 'cos it may change the storage type?! - var valueType = editor.GetValueEditor().ValueType; - return ValueTypes.ToStorageType(valueType); - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/DefaultTemplateResolver.cs b/src/Umbraco.Web/Models/Mapping/DefaultTemplateResolver.cs deleted file mode 100644 index 12caf93681..0000000000 --- a/src/Umbraco.Web/Models/Mapping/DefaultTemplateResolver.cs +++ /dev/null @@ -1,33 +0,0 @@ -using AutoMapper; -using System.Web.Mvc; -using Umbraco.Core.Models; -using Umbraco.Core.Services; -using Umbraco.Web.Models.ContentEditing; - -namespace Umbraco.Web.Models.Mapping -{ - internal class DefaultTemplateResolver : IValueResolver - { - public string Resolve(IContent source, ContentItemDisplay destination, string destMember, ResolutionContext context) - { - if (source == null) - return null; - - // If no template id was set... - if (!source.TemplateId.HasValue) - { - // ... and no default template is set, return null... - if (string.IsNullOrWhiteSpace(source.ContentType.DefaultTemplate?.Alias)) - return null; - - // ... otherwise return the content type default template alias. - return source.ContentType.DefaultTemplate?.Alias; - } - - var fileService = DependencyResolver.Current.GetService(); - var template = fileService.GetTemplate(source.TemplateId.Value); - - return template.Alias; - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/DictionaryMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/DictionaryMapDefinition.cs new file mode 100644 index 0000000000..c7ae0cb717 --- /dev/null +++ b/src/Umbraco.Web/Models/Mapping/DictionaryMapDefinition.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using Umbraco.Core; +using Umbraco.Core.Mapping; +using Umbraco.Core.Models; +using Umbraco.Core.Services; +using Umbraco.Web.Models.ContentEditing; + +namespace Umbraco.Web.Models.Mapping +{ + /// + /// + /// The dictionary model mapper. + /// + internal class DictionaryMapDefinition : IMapDefinition + { + private readonly ILocalizationService _localizationService; + + public DictionaryMapDefinition(ILocalizationService localizationService) + { + _localizationService = localizationService; + } + + public void DefineMaps(UmbracoMapper mapper) + { + mapper.Define((source, context) => new EntityBasic(), Map); + mapper.Define((source, context) => new DictionaryDisplay(), Map); + mapper.Define((source, context) => new DictionaryOverviewDisplay(), Map); + } + + // Umbraco.Code.MapAll -ParentId -Path -Trashed -Udi -Icon + private static void Map(IDictionaryItem source, EntityBasic target, MapperContext context) + { + target.Alias = source.ItemKey; + target.Id = source.Id; + target.Key = source.Key; + target.Name = source.ItemKey; + } + + // Umbraco.Code.MapAll -Icon -Trashed -Alias + private void Map(IDictionaryItem source, DictionaryDisplay target, MapperContext context) + { + target.Id = source.Id; + target.Key = source.Key; + target.Name = source.ItemKey; + target.ParentId = source.ParentId ?? Guid.Empty; + target.Udi = Udi.Create(Constants.UdiEntityType.DictionaryItem, source.Key); + + // build up the path to make it possible to set active item in tree + // TODO: check if there is a better way + if (source.ParentId.HasValue) + { + var ids = new List { -1 }; + var parentIds = new List(); + GetParentId(source.ParentId.Value, _localizationService, parentIds); + parentIds.Reverse(); + ids.AddRange(parentIds); + ids.Add(source.Id); + target.Path = string.Join(",", ids); + } + else + { + target.Path = "-1," + source.Id; + } + + // add all languages and the translations + foreach (var lang in _localizationService.GetAllLanguages()) + { + var langId = lang.Id; + var translation = source.Translations.FirstOrDefault(x => x.LanguageId == langId); + + target.Translations.Add(new DictionaryTranslationDisplay + { + IsoCode = lang.IsoCode, + DisplayName = lang.CultureInfo.DisplayName, + Translation = (translation != null) ? translation.Value : string.Empty, + LanguageId = lang.Id + }); + } + } + + // Umbraco.Code.MapAll -Level -Translations + private void Map(IDictionaryItem source, DictionaryOverviewDisplay target, MapperContext context) + { + target.Id = source.Id; + target.Name = source.ItemKey; + + // add all languages and the translations + foreach (var lang in _localizationService.GetAllLanguages()) + { + var langId = lang.Id; + var translation = source.Translations.FirstOrDefault(x => x.LanguageId == langId); + + target.Translations.Add( + new DictionaryOverviewTranslationDisplay + { + DisplayName = lang.CultureInfo.DisplayName, + HasTranslation = translation != null && string.IsNullOrEmpty(translation.Value) == false + }); + } + } + + private static void GetParentId(Guid parentId, ILocalizationService localizationService, List ids) + { + var dictionary = localizationService.GetDictionaryItemById(parentId); + if (dictionary == null) + return; + + ids.Add(dictionary.Id); + + if (dictionary.ParentId.HasValue) + GetParentId(dictionary.ParentId.Value, localizationService, ids); + } + } +} diff --git a/src/Umbraco.Web/Models/Mapping/DictionaryMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/DictionaryMapperProfile.cs deleted file mode 100644 index 01fcfa6f13..0000000000 --- a/src/Umbraco.Web/Models/Mapping/DictionaryMapperProfile.cs +++ /dev/null @@ -1,139 +0,0 @@ -using AutoMapper; -using System; -using System.Collections.Generic; -using System.Linq; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; -using Umbraco.Web.Models.ContentEditing; - -namespace Umbraco.Web.Models.Mapping -{ - /// - /// - /// The dictionary model mapper. - /// - internal class DictionaryMapperProfile : Profile - { - public DictionaryMapperProfile(ILocalizationService localizationService) - { - CreateMap() - .ForMember(dest => dest.Id, opt => opt.MapFrom(sheet => sheet.Id)) - .ForMember(dest => dest.Alias, opt => opt.MapFrom(sheet => sheet.ItemKey)) - .ForMember(dest => dest.Key, opt => opt.MapFrom(sheet => sheet.Key)) - .ForMember(dest => dest.Name, opt => opt.MapFrom(sheet => sheet.ItemKey)) - .ForMember(dest => dest.ParentId, opt => opt.Ignore()) - .ForMember(dest => dest.Path, opt => opt.Ignore()) - .ForMember(dest => dest.Trashed, opt => opt.Ignore()) - .ForMember(dest => dest.AdditionalData, opt => opt.Ignore()) - .ForMember(dest => dest.Udi, opt => opt.Ignore()) - .ForMember(dest => dest.Icon, opt => opt.Ignore()); - - CreateMap() - .ForMember(x => x.Translations, expression => expression.Ignore()) - .ForMember(x => x.Notifications, expression => expression.Ignore()) - .ForMember(x => x.Icon, expression => expression.Ignore()) - .ForMember(x => x.Trashed, expression => expression.Ignore()) - .ForMember(x => x.Alias, expression => expression.Ignore()) - .ForMember(x => x.Path, expression => expression.Ignore()) - .ForMember(x => x.AdditionalData, expression => expression.Ignore()) - .ForMember( - x => x.Udi, - expression => expression.MapFrom( - content => Udi.Create(Constants.UdiEntityType.DictionaryItem, content.Key))).ForMember( - x => x.Name, - expression => expression.MapFrom(content => content.ItemKey)) - .AfterMap( - (src, dest) => - { - // build up the path to make it possible to set active item in tree - // TODO: check if there is a better way - if (src.ParentId.HasValue) - { - var ids = new List { -1 }; - - - var parentIds = new List(); - - this.GetParentId(src.ParentId.Value, localizationService, parentIds); - - parentIds.Reverse(); - - ids.AddRange(parentIds); - - ids.Add(src.Id); - - dest.Path = string.Join(",", ids); - } - else - { - dest.Path = "-1," + src.Id; - } - - // add all languages and the translations - foreach (var lang in localizationService.GetAllLanguages()) - { - var langId = lang.Id; - var translation = src.Translations.FirstOrDefault(x => x.LanguageId == langId); - - dest.Translations.Add(new DictionaryTranslationDisplay - { - IsoCode = lang.IsoCode, - DisplayName = lang.CultureInfo.DisplayName, - Translation = (translation != null) ? translation.Value : string.Empty, - LanguageId = lang.Id - }); - } - }); - - CreateMap() - .ForMember(dest => dest.Level, expression => expression.Ignore()) - .ForMember(dest => dest.Translations, expression => expression.Ignore()) - .ForMember( - x => x.Name, - expression => expression.MapFrom(content => content.ItemKey)) - .AfterMap( - (src, dest) => - { - // add all languages and the translations - foreach (var lang in localizationService.GetAllLanguages()) - { - var langId = lang.Id; - var translation = src.Translations.FirstOrDefault(x => x.LanguageId == langId); - - dest.Translations.Add( - new DictionaryOverviewTranslationDisplay - { - DisplayName = lang.CultureInfo.DisplayName, - HasTranslation = translation != null && string.IsNullOrEmpty(translation.Value) == false - }); - } - }); - } - - /// - /// Goes up the dictionary tree to get all parent ids - /// - /// - /// The parent id. - /// - /// - /// The localization service. - /// - /// - /// The ids. - /// - private void GetParentId(Guid parentId, ILocalizationService localizationService, List ids) - { - var dictionary = localizationService.GetDictionaryItemById(parentId); - - if (dictionary == null) - return; - - ids.Add(dictionary.Id); - - if (dictionary.ParentId.HasValue) - GetParentId(dictionary.ParentId.Value, localizationService, ids); - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/EntityMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/EntityMapDefinition.cs new file mode 100644 index 0000000000..78c25ced33 --- /dev/null +++ b/src/Umbraco.Web/Models/Mapping/EntityMapDefinition.cs @@ -0,0 +1,238 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using Examine; +using Examine.LuceneEngine.Providers; +using Umbraco.Core; +using Umbraco.Core.Mapping; +using Umbraco.Core.Models; +using Umbraco.Core.Models.Entities; +using Umbraco.Core.Models.Membership; +using Umbraco.Web.Models.ContentEditing; +using Umbraco.Examine; + +namespace Umbraco.Web.Models.Mapping +{ + internal class EntityMapDefinition : IMapDefinition + { + public void DefineMaps(UmbracoMapper mapper) + { + mapper.Define((source, context) => new EntityBasic(), Map); + mapper.Define((source, context) => new EntityBasic(), Map); + mapper.Define((source, context) => new EntityBasic(), Map); + mapper.Define((source, context) => new EntityBasic(), Map); + mapper.Define((source, context) => new EntityBasic(), Map); + mapper.Define((source, context) => new ContentTypeSort(), Map); + mapper.Define((source, context) => new EntityBasic(), Map); + mapper.Define((source, context) => new SearchResultEntity(), Map); + mapper.Define((source, context) => new SearchResultEntity(), Map); + mapper.Define>((source, context) => context.MapEnumerable(source)); + mapper.Define, IEnumerable>((source, context) => context.MapEnumerable(source)); + } + + // Umbraco.Code.MapAll -Alias + private static void Map(IEntitySlim source, EntityBasic target, MapperContext context) + { + target.Icon = MapContentTypeIcon(source); + target.Id = source.Id; + target.Key = source.Key; + target.Name = MapName(source, context); + target.ParentId = source.ParentId; + target.Path = source.Path; + target.Trashed = source.Trashed; + target.Udi = Udi.Create(ObjectTypes.GetUdiType(source.NodeObjectType), source.Key); + + if (source.NodeObjectType == Constants.ObjectTypes.Member && target.Icon.IsNullOrWhiteSpace()) + target.Icon = "icon-user"; + + // NOTE: we're mapping the objects in AdditionalData by object reference here. + // it works fine for now, but it's something to keep in mind in the future + foreach(var kvp in source.AdditionalData) + { + target.AdditionalData[kvp.Key] = kvp.Value; + } + + target.AdditionalData.Add("IsContainer", source.IsContainer); + } + + // Umbraco.Code.MapAll -Udi -Trashed + private static void Map(PropertyType source, EntityBasic target, MapperContext context) + { + target.Alias = source.Alias; + target.Icon = "icon-box"; + target.Id = source.Id; + target.Key = source.Key; + target.Name = source.Name; + target.ParentId = -1; + target.Path = ""; + } + + // Umbraco.Code.MapAll -Udi -Trashed + private static void Map(PropertyGroup source, EntityBasic target, MapperContext context) + { + target.Alias = source.Name.ToLowerInvariant(); + target.Icon = "icon-tab"; + target.Id = source.Id; + target.Key = source.Key; + target.Name = source.Name; + target.ParentId = -1; + target.Path = ""; + } + + // Umbraco.Code.MapAll -Udi -Trashed + private static void Map(IUser source, EntityBasic target, MapperContext context) + { + target.Alias = source.Username; + target.Icon = "icon-user"; + target.Id = source.Id; + target.Key = source.Key; + target.Name = source.Name; + target.ParentId = -1; + target.Path = ""; + } + + // Umbraco.Code.MapAll -Trashed + private static void Map(ITemplate source, EntityBasic target, MapperContext context) + { + target.Alias = source.Alias; + target.Icon = "icon-layout"; + target.Id = source.Id; + target.Key = source.Key; + target.Name = source.Name; + target.ParentId = -1; + target.Path = source.Path; + target.Udi = Udi.Create(Constants.UdiEntityType.Template, source.Key); + } + + // Umbraco.Code.MapAll -SortOrder + private static void Map(EntityBasic source, ContentTypeSort target, MapperContext context) + { + target.Alias = source.Alias; + target.Id = new Lazy(() => Convert.ToInt32(source.Id)); + } + + // Umbraco.Code.MapAll -Trashed + private static void Map(IContentTypeComposition source, EntityBasic target, MapperContext context) + { + target.Alias = source.Alias; + target.Icon = source.Icon; + target.Id = source.Id; + target.Key = source.Key; + target.Name = source.Name; + target.ParentId = source.ParentId; + target.Path = source.Path; + target.Udi = ContentTypeMapDefinition.MapContentTypeUdi(source); + } + + // Umbraco.Code.MapAll -Trashed -Alias -Score + private static void Map(EntitySlim source, SearchResultEntity target, MapperContext context) + { + target.Icon = MapContentTypeIcon(source); + target.Id = source.Id; + target.Key = source.Key; + target.Name = source.Name; + target.ParentId = source.ParentId; + target.Path = source.Path; + target.Udi = Udi.Create(ObjectTypes.GetUdiType(source.NodeObjectType), source.Key); + + if (target.Icon.IsNullOrWhiteSpace()) + { + if (source.NodeObjectType == Constants.ObjectTypes.Member) + target.Icon = "icon-user"; + else if (source.NodeObjectType == Constants.ObjectTypes.DataType) + target.Icon = "icon-autofill"; + else if (source.NodeObjectType == Constants.ObjectTypes.DocumentType) + target.Icon = "icon-item-arrangement"; + else if (source.NodeObjectType == Constants.ObjectTypes.MediaType) + target.Icon = "icon-thumbnails"; + else if (source.NodeObjectType == Constants.ObjectTypes.TemplateType) + target.Icon = "icon-newspaper-alt"; + } + } + + // Umbraco.Code.MapAll -Alias -Trashed + private static void Map(ISearchResult source, SearchResultEntity target, MapperContext context) + { + target.Id = source.Id; + target.Score = source.Score; + + // TODO: Properly map this (not aftermap) + + //get the icon if there is one + target.Icon = source.Values.ContainsKey(UmbracoExamineIndex.IconFieldName) + ? source.Values[UmbracoExamineIndex.IconFieldName] + : "icon-document"; + + target.Name = source.Values.ContainsKey("nodeName") ? source.Values["nodeName"] : "[no name]"; + + if (source.Values.ContainsKey(UmbracoExamineIndex.NodeKeyFieldName)) + { + if (Guid.TryParse(source.Values[UmbracoExamineIndex.NodeKeyFieldName], out var key)) + { + target.Key = key; + + //need to set the UDI + if (source.Values.ContainsKey(LuceneIndex.CategoryFieldName)) + { + switch (source.Values[LuceneIndex.CategoryFieldName]) + { + case IndexTypes.Member: + target.Udi = new GuidUdi(Constants.UdiEntityType.Member, target.Key); + break; + case IndexTypes.Content: + target.Udi = new GuidUdi(Constants.UdiEntityType.Document, target.Key); + break; + case IndexTypes.Media: + target.Udi = new GuidUdi(Constants.UdiEntityType.Media, target.Key); + break; + } + } + } + } + + if (source.Values.ContainsKey("parentID")) + { + if (int.TryParse(source.Values["parentID"], out var parentId)) + { + target.ParentId = parentId; + } + else + { + target.ParentId = -1; + } + } + + target.Path = source.Values.ContainsKey(UmbracoExamineIndex.IndexPathFieldName) ? source.Values[UmbracoExamineIndex.IndexPathFieldName] : ""; + + if (source.Values.ContainsKey(LuceneIndex.ItemTypeFieldName)) + { + target.AdditionalData.Add("contentType", source.Values[LuceneIndex.ItemTypeFieldName]); + } + } + + private static string MapContentTypeIcon(IEntitySlim entity) + => entity is ContentEntitySlim contentEntity ? contentEntity.ContentTypeIcon : null; + + private static string MapName(IEntitySlim source, MapperContext context) + { + if (!(source is DocumentEntitySlim doc)) + return source.Name; + + // invariant = only 1 name + if (!doc.Variations.VariesByCulture()) return source.Name; + + // variant = depends on culture + var culture = context.GetCulture(); + + // if there's no culture here, the issue is somewhere else (UI, whatever) - throw! + if (culture == null) + //throw new InvalidOperationException("Missing culture in mapping options."); + // TODO: we should throw, but this is used in various places that won't set a culture yet + return source.Name; + + // if we don't have a name for a culture, it means the culture is not available, and + // hey we should probably not be mapping it, but it's too late, return a fallback name + return doc.CultureNames.TryGetValue(culture, out var name) && !name.IsNullOrWhiteSpace() ? name : $"({source.Name})"; + } + } +} diff --git a/src/Umbraco.Web/Models/Mapping/EntityMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/EntityMapperProfile.cs deleted file mode 100644 index 5b711d7251..0000000000 --- a/src/Umbraco.Web/Models/Mapping/EntityMapperProfile.cs +++ /dev/null @@ -1,216 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using AutoMapper; -using Examine; -using Examine.LuceneEngine.Providers; -using Examine.LuceneEngine; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Models.Entities; -using Umbraco.Core.Models.Membership; -using Umbraco.Web.Models.ContentEditing; -using Umbraco.Examine; - -namespace Umbraco.Web.Models.Mapping -{ - internal class EntityMapperProfile : Profile - { - private static string GetContentTypeIcon(IEntitySlim entity) - => entity is ContentEntitySlim contentEntity ? contentEntity.ContentTypeIcon : null; - - public EntityMapperProfile() - { - // create, capture, cache - var contentTypeUdiResolver = new ContentTypeUdiResolver(); - - CreateMap() - .ForMember(dest => dest.Name, opt => opt.MapFrom()) - .ForMember(dest => dest.Udi, opt => opt.MapFrom(src => Udi.Create(ObjectTypes.GetUdiType(src.NodeObjectType), src.Key))) - .ForMember(dest => dest.Icon, opt => opt.MapFrom(src => GetContentTypeIcon(src))) - .ForMember(dest => dest.Trashed, opt => opt.MapFrom(src => src.Trashed)) - .ForMember(dest => dest.Alias, opt => opt.Ignore()) - .AfterMap((src, dest) => - { - if (src.NodeObjectType == Constants.ObjectTypes.Member && dest.Icon.IsNullOrWhiteSpace()) - { - dest.Icon = "icon-user"; - } - - dest.AdditionalData.Add("IsContainer", src.IsContainer); - }); - - CreateMap() - .ForMember(dest => dest.Udi, opt => opt.Ignore()) - .ForMember(dest => dest.Icon, opt => opt.MapFrom(_ => "icon-box")) - .ForMember(dest => dest.Path, opt => opt.MapFrom(_ => "")) - .ForMember(dest => dest.ParentId, opt => opt.MapFrom(_ => -1)) - .ForMember(dest => dest.Trashed, opt => opt.Ignore()) - .ForMember(dest => dest.AdditionalData, opt => opt.Ignore()); - - CreateMap() - .ForMember(dest => dest.Udi, opt => opt.Ignore()) - .ForMember(dest => dest.Icon, opt => opt.MapFrom(_ => "icon-tab")) - .ForMember(dest => dest.Path, opt => opt.MapFrom(_ => "")) - .ForMember(dest => dest.ParentId, opt => opt.MapFrom(_ => -1)) - //in v6 the 'alias' is it's lower cased name so we'll stick to that. - .ForMember(dest => dest.Alias, opt => opt.MapFrom(src => src.Name.ToLowerInvariant())) - .ForMember(dest => dest.Trashed, opt => opt.Ignore()) - .ForMember(dest => dest.AdditionalData, opt => opt.Ignore()); - - CreateMap() - .ForMember(dest => dest.Udi, opt => opt.Ignore()) - .ForMember(dest => dest.Icon, opt => opt.MapFrom(_ => "icon-user")) - .ForMember(dest => dest.Path, opt => opt.MapFrom(_ => "")) - .ForMember(dest => dest.ParentId, opt => opt.MapFrom(_ => -1)) - .ForMember(dest => dest.Alias, opt => opt.MapFrom(src => src.Username)) - .ForMember(dest => dest.Trashed, opt => opt.Ignore()) - .ForMember(dest => dest.AdditionalData, opt => opt.Ignore()); - - CreateMap() - .ForMember(dest => dest.Udi, opt => opt.MapFrom(src => Udi.Create(Constants.UdiEntityType.Template, src.Key))) - .ForMember(dest => dest.Icon, opt => opt.MapFrom(_ => "icon-layout")) - .ForMember(dest => dest.Path, opt => opt.MapFrom(src => src.Path)) - .ForMember(dest => dest.ParentId, opt => opt.MapFrom(_ => -1)) - .ForMember(dest => dest.Trashed, opt => opt.Ignore()) - .ForMember(dest => dest.AdditionalData, opt => opt.Ignore()); - - CreateMap() - .ForMember(dest => dest.Id, opt => opt.MapFrom(src => new Lazy(() => Convert.ToInt32(src.Id)))) - .ForMember(dest => dest.SortOrder, opt => opt.Ignore()); - - CreateMap() - .ForMember(dest => dest.Udi, opt => opt.MapFrom(src => contentTypeUdiResolver.Resolve(src))) - .ForMember(dest => dest.Path, opt => opt.MapFrom(src => src.Path)) - .ForMember(dest => dest.ParentId, opt => opt.MapFrom(src => src.ParentId)) - .ForMember(dest => dest.Trashed, opt => opt.Ignore()) - .ForMember(dest => dest.AdditionalData, opt => opt.Ignore()); - - CreateMap() - .ForMember(dest => dest.Udi, opt => opt.MapFrom(src => Udi.Create(ObjectTypes.GetUdiType(src.NodeObjectType), src.Key))) - .ForMember(dest => dest.Icon, opt => opt.MapFrom(src=> GetContentTypeIcon(src))) - .ForMember(dest => dest.Trashed, opt => opt.Ignore()) - .ForMember(dest => dest.Alias, opt => opt.Ignore()) - .ForMember(dest => dest.Score, opt => opt.Ignore()) - .AfterMap((entity, basic) => - { - if (basic.Icon.IsNullOrWhiteSpace()) - { - if (entity.NodeObjectType == Constants.ObjectTypes.Member) - basic.Icon = "icon-user"; - else if (entity.NodeObjectType == Constants.ObjectTypes.DataType) - basic.Icon = "icon-autofill"; - else if (entity.NodeObjectType == Constants.ObjectTypes.DocumentType) - basic.Icon = "icon-item-arrangement"; - else if (entity.NodeObjectType == Constants.ObjectTypes.MediaType) - basic.Icon = "icon-thumbnails"; - else if (entity.NodeObjectType == Constants.ObjectTypes.TemplateType) - basic.Icon = "icon-newspaper-alt"; - } - }); - - CreateMap() - //default to document icon - .ForMember(dest => dest.Score, opt => opt.MapFrom(result => result.Score)) - .ForMember(dest => dest.Udi, opt => opt.Ignore()) - .ForMember(dest => dest.Icon, opt => opt.Ignore()) - .ForMember(dest => dest.Id, opt => opt.MapFrom(src => src.Id)) - .ForMember(dest => dest.Name, opt => opt.Ignore()) - .ForMember(dest => dest.Key, opt => opt.Ignore()) - .ForMember(dest => dest.ParentId, opt => opt.Ignore()) - .ForMember(dest => dest.Alias, opt => opt.Ignore()) - .ForMember(dest => dest.Path, opt => opt.Ignore()) - .ForMember(dest => dest.Trashed, opt => opt.Ignore()) - .ForMember(dest => dest.AdditionalData, opt => opt.Ignore()) - .AfterMap((src, dest) => - { - // TODO: Properly map this (not aftermap) - - //get the icon if there is one - dest.Icon = src.Values.ContainsKey(UmbracoExamineIndex.IconFieldName) - ? src.Values[UmbracoExamineIndex.IconFieldName] - : "icon-document"; - - dest.Name = src.Values.ContainsKey("nodeName") ? src.Values["nodeName"] : "[no name]"; - if (src.Values.ContainsKey(UmbracoExamineIndex.NodeKeyFieldName)) - { - Guid key; - if (Guid.TryParse(src.Values[UmbracoExamineIndex.NodeKeyFieldName], out key)) - { - dest.Key = key; - - //need to set the UDI - if (src.Values.ContainsKey(LuceneIndex.CategoryFieldName)) - { - switch (src.Values[LuceneIndex.CategoryFieldName]) - { - case IndexTypes.Member: - dest.Udi = new GuidUdi(Constants.UdiEntityType.Member, dest.Key); - break; - case IndexTypes.Content: - dest.Udi = new GuidUdi(Constants.UdiEntityType.Document, dest.Key); - break; - case IndexTypes.Media: - dest.Udi = new GuidUdi(Constants.UdiEntityType.Media, dest.Key); - break; - } - } - } - } - - if (src.Values.ContainsKey("parentID")) - { - int parentId; - if (int.TryParse(src.Values["parentID"], out parentId)) - { - dest.ParentId = parentId; - } - else - { - dest.ParentId = -1; - } - } - dest.Path = src.Values.ContainsKey(UmbracoExamineIndex.IndexPathFieldName) ? src.Values[UmbracoExamineIndex.IndexPathFieldName] : ""; - - if (src.Values.ContainsKey(LuceneIndex.ItemTypeFieldName)) - { - dest.AdditionalData.Add("contentType", src.Values[LuceneIndex.ItemTypeFieldName]); - } - }); - - CreateMap>() - .ConvertUsing(results => results.Select(Mapper.Map).ToList()); - - CreateMap, IEnumerable>() - .ConvertUsing(results => results.Select(Mapper.Map).ToList()); - } - - /// - /// Resolves the name for a content item/content variant - /// - private class NameResolver : IValueResolver - { - public string Resolve(IEntitySlim source, EntityBasic destination, string destMember, ResolutionContext context) - { - if (!(source is DocumentEntitySlim doc)) - return source.Name; - - // invariant = only 1 name - if (!doc.Variations.VariesByCulture()) return source.Name; - - // variant = depends on culture - var culture = context.Options.GetCulture(); - - // if there's no culture here, the issue is somewhere else (UI, whatever) - throw! - if (culture == null) - //throw new InvalidOperationException("Missing culture in mapping options."); - // TODO: we should throw, but this is used in various places that won't set a culture yet - return source.Name; - - // if we don't have a name for a culture, it means the culture is not available, and - // hey we should probably not be mapping it, but it's too late, return a fallback name - return doc.CultureNames.TryGetValue(culture, out var name) && !name.IsNullOrWhiteSpace() ? name : $"({source.Name})"; - } - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/EntityProfileExtensions.cs b/src/Umbraco.Web/Models/Mapping/EntityProfileExtensions.cs deleted file mode 100644 index 46d48c2b1a..0000000000 --- a/src/Umbraco.Web/Models/Mapping/EntityProfileExtensions.cs +++ /dev/null @@ -1,26 +0,0 @@ -using AutoMapper; -using Umbraco.Core.Models.Entities; - -namespace Umbraco.Web.Models.Mapping -{ - /// - /// Mapping extension methods for re-use with other mappers (saves code duplication) - /// - internal static class EntityProfileExtensions - { - /// - /// Ignores readonly properties and the date values - /// - /// - /// - public static IMappingExpression IgnoreEntityCommonProperties(this IMappingExpression mapping) - where TDest : IEntity - { - return mapping - .IgnoreAllPropertiesWithAnInaccessibleSetter() - .ForMember(dest => dest.CreateDate, opt => opt.Ignore()) - .ForMember(dest => dest.UpdateDate, opt => opt.Ignore()) - .ForMember(dest => dest.DeleteDate, opt => opt.Ignore()); - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/LanguageMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/LanguageMapDefinition.cs new file mode 100644 index 0000000000..28074d4817 --- /dev/null +++ b/src/Umbraco.Web/Models/Mapping/LanguageMapDefinition.cs @@ -0,0 +1,58 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using Umbraco.Core.Mapping; +using Umbraco.Core.Models; +using Umbraco.Web.Models.ContentEditing; +using Language = Umbraco.Web.Models.ContentEditing.Language; + +namespace Umbraco.Web.Models.Mapping +{ + internal class LanguageMapDefinition : IMapDefinition + { + public void DefineMaps(UmbracoMapper mapper) + { + mapper.Define((source, context) => new EntityBasic(), Map); + mapper.Define((source, context) => new Language(), Map); + mapper.Define, IEnumerable>((source, context) => new List(), Map); + } + + // Umbraco.Code.MapAll -Udi -Path -Trashed -AdditionalData -Icon + private static void Map(ILanguage source, EntityBasic target, MapperContext context) + { + target.Name = source.CultureName; + target.Key = source.Key; + target.ParentId = -1; + target.Alias = source.IsoCode; + target.Id = source.Id; + } + + // Umbraco.Code.MapAll + private static void Map(ILanguage source, Language target, MapperContext context) + { + target.Id = source.Id; + target.IsoCode = source.IsoCode; + target.Name = source.CultureInfo.DisplayName; + target.IsDefault = source.IsDefault; + target.IsMandatory = source.IsMandatory; + target.FallbackLanguageId = source.FallbackLanguageId; + } + + private static void Map(IEnumerable source, IEnumerable target, MapperContext context) + { + if (target == null) + throw new ArgumentNullException(nameof(target)); + if (!(target is List list)) + throw new NotSupportedException($"{nameof(target)} must be a List."); + + var temp = context.MapEnumerable(source); + + //Put the default language first in the list & then sort rest by a-z + var defaultLang = temp.SingleOrDefault(x => x.IsDefault); + + // insert default lang first, then remaining language a-z + list.Add(defaultLang); + list.AddRange(temp.Where(x => x != defaultLang).OrderBy(x => x.Name)); + } + } +} diff --git a/src/Umbraco.Web/Models/Mapping/LanguageMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/LanguageMapperProfile.cs deleted file mode 100644 index a838180622..0000000000 --- a/src/Umbraco.Web/Models/Mapping/LanguageMapperProfile.cs +++ /dev/null @@ -1,61 +0,0 @@ -using System.Collections.Generic; -using System.Globalization; -using System.Linq; -using AutoMapper; -using Umbraco.Core.Models; -using Umbraco.Web.Models.ContentEditing; -using Language = Umbraco.Web.Models.ContentEditing.Language; - -namespace Umbraco.Web.Models.Mapping -{ - internal class LanguageMapperProfile : Profile - { - public LanguageMapperProfile() - { - CreateMap() - .ForMember(dest => dest.Id, opt => opt.MapFrom(x => x.Id)) - .ForMember(dest => dest.Name, opt => opt.MapFrom(x => x.CultureName)) - .ForMember(dest => dest.Key, opt => opt.MapFrom(x => x.Key)) - .ForMember(dest => dest.Alias, opt => opt.MapFrom(x => x.IsoCode)) - .ForMember(dest => dest.ParentId, opt => opt.MapFrom(_ => -1)) - .ForMember(dest => dest.Path, opt => opt.Ignore()) - .ForMember(dest => dest.Trashed, opt => opt.Ignore()) - .ForMember(dest => dest.AdditionalData, opt => opt.Ignore()) - .ForMember(dest => dest.Udi, opt => opt.Ignore()) - .ForMember(dest => dest.Icon, opt => opt.Ignore()); - - CreateMap() - .ForMember(l => l.Name, expression => expression.MapFrom(x => x.CultureInfo.DisplayName)); - - CreateMap, IEnumerable>() - .ConvertUsing(); - - } - - /// - /// Converts a list of to a list of and ensures the correct order and defaults are set - /// - // ReSharper disable once ClassNeverInstantiated.Local - private class LanguageCollectionTypeConverter : ITypeConverter, IEnumerable> - { - public IEnumerable Convert(IEnumerable source, IEnumerable destination, ResolutionContext context) - { - var langs = source.Select(x => context.Mapper.Map(x, null, context)).ToList(); - - //Put the default language first in the list & then sort rest by a-z - var defaultLang = langs.SingleOrDefault(x => x.IsDefault); - - //Remove the default language from the list for now - langs.Remove(defaultLang); - - //Sort the remaining languages a-z - langs = langs.OrderBy(x => x.Name).ToList(); - - //Insert the default language as the first item - langs.Insert(0, defaultLang); - - return langs; - } - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/LockedCompositionsResolver.cs b/src/Umbraco.Web/Models/Mapping/LockedCompositionsResolver.cs deleted file mode 100644 index f1dcd2d40f..0000000000 --- a/src/Umbraco.Web/Models/Mapping/LockedCompositionsResolver.cs +++ /dev/null @@ -1,44 +0,0 @@ -using AutoMapper; -using System.Collections.Generic; -using System.Linq; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; - -namespace Umbraco.Web.Models.Mapping -{ - internal class LockedCompositionsResolver - { - private readonly IContentTypeService _contentTypeService; - - public LockedCompositionsResolver(IContentTypeService contentTypeService) - { - _contentTypeService = contentTypeService; - } - - public IEnumerable Resolve(IContentTypeComposition source) - { - var aliases = new List(); - // get ancestor ids from path of parent if not root - if (source.ParentId != Constants.System.Root) - { - var parent = _contentTypeService.Get(source.ParentId); - if (parent != null) - { - var ancestorIds = parent.Path.Split(',').Select(int.Parse); - // loop through all content types and return ordered aliases of ancestors - var allContentTypes = _contentTypeService.GetAll().ToArray(); - foreach (var ancestorId in ancestorIds) - { - var ancestor = allContentTypes.FirstOrDefault(x => x.Id == ancestorId); - if (ancestor != null) - { - aliases.Add(ancestor.Alias); - } - } - } - } - return aliases.OrderBy(x => x); - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/MacroMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/MacroMapDefinition.cs new file mode 100644 index 0000000000..089f5d5d71 --- /dev/null +++ b/src/Umbraco.Web/Models/Mapping/MacroMapDefinition.cs @@ -0,0 +1,72 @@ +using System.Collections.Generic; +using System.Linq; +using Umbraco.Core; +using Umbraco.Core.Logging; +using Umbraco.Core.Mapping; +using Umbraco.Core.Models; +using Umbraco.Core.PropertyEditors; +using Umbraco.Web.Models.ContentEditing; + +namespace Umbraco.Web.Models.Mapping +{ + internal class MacroMapDefinition : IMapDefinition + { + private readonly ParameterEditorCollection _parameterEditors; + private readonly ILogger _logger; + + public MacroMapDefinition(ParameterEditorCollection parameterEditors, ILogger logger) + { + _parameterEditors = parameterEditors; + _logger = logger; + } + + public void DefineMaps(UmbracoMapper mapper) + { + mapper.Define((source, context) => new EntityBasic(), Map); + mapper.Define>((source, context) => context.MapEnumerable(source.Properties.Values)); + mapper.Define((source, context) => new MacroParameter(), Map); + } + + // Umbraco.Code.MapAll -Trashed -AdditionalData + private static void Map(IMacro source, EntityBasic target, MapperContext context) + { + target.Alias = source.Alias; + target.Icon = "icon-settings-alt"; + target.Id = source.Id; + target.Key = source.Key; + target.Name = source.Name; + target.ParentId = -1; + target.Path = "-1," + source.Id; + target.Udi = Udi.Create(Constants.UdiEntityType.Macro, source.Key); + } + + // Umbraco.Code.MapAll -Value + private void Map(IMacroProperty source, MacroParameter target, MapperContext context) + { + target.Alias = source.Alias; + target.Name = source.Name; + target.SortOrder = source.SortOrder; + + //map the view and the config + // we need to show the deprecated ones for backwards compatibility + var paramEditor = _parameterEditors[source.EditorAlias]; // TODO: include/filter deprecated?! + if (paramEditor == null) + { + //we'll just map this to a text box + paramEditor = _parameterEditors[Constants.PropertyEditors.Aliases.TextBox]; + _logger.Warn("Could not resolve a parameter editor with alias {PropertyEditorAlias}, a textbox will be rendered in it's place", source.EditorAlias); + } + + target.View = paramEditor.GetValueEditor().View; + + // sets the parameter configuration to be the default configuration editor's configuration, + // ie configurationEditor.DefaultConfigurationObject, prepared for the value editor, ie + // after ToValueEditor - important to use DefaultConfigurationObject here, because depending + // on editors, ToValueEditor expects the actual strongly typed configuration - not the + // dictionary thing returned by DefaultConfiguration + + var configurationEditor = paramEditor.GetConfigurationEditor(); + target.Configuration = configurationEditor.ToValueEditor(configurationEditor.DefaultConfigurationObject); + } + } +} diff --git a/src/Umbraco.Web/Models/Mapping/MacroMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/MacroMapperProfile.cs deleted file mode 100644 index a507cc4c03..0000000000 --- a/src/Umbraco.Web/Models/Mapping/MacroMapperProfile.cs +++ /dev/null @@ -1,60 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using AutoMapper; -using Umbraco.Core; -using Umbraco.Core.Logging; -using Umbraco.Core.Models; -using Umbraco.Web.Composing; -using Umbraco.Web.Models.ContentEditing; - -namespace Umbraco.Web.Models.Mapping -{ - /// - /// Declares model mappings for macros. - /// - internal class MacroMapperProfile : Profile - { - public MacroMapperProfile() - { - //FROM IMacro TO EntityBasic - CreateMap() - .ForMember(x => x.Udi, expression => expression.MapFrom(content => Udi.Create(Constants.UdiEntityType.Macro, content.Key))) - .ForMember(entityBasic => entityBasic.Icon, expression => expression.MapFrom(_ => "icon-settings-alt")) - .ForMember(dto => dto.ParentId, expression => expression.MapFrom(_ => -1)) - .ForMember(dto => dto.Path, expression => expression.MapFrom(macro => "-1," + macro.Id)) - .ForMember(dto => dto.Trashed, expression => expression.Ignore()) - .ForMember(dto => dto.AdditionalData, expression => expression.Ignore()); - - CreateMap>() - .ConvertUsing(macro => macro.Properties.Values.Select(Mapper.Map).ToList()); - - CreateMap() - .ForMember(x => x.View, expression => expression.Ignore()) - .ForMember(x => x.Configuration, expression => expression.Ignore()) - .ForMember(x => x.Value, expression => expression.Ignore()) - .AfterMap((property, parameter) => - { - //map the view and the config - // we need to show the deprecated ones for backwards compatibility - var paramEditor = Current.ParameterEditors[property.EditorAlias]; // TODO: include/filter deprecated?! - if (paramEditor == null) - { - //we'll just map this to a text box - paramEditor = Current.ParameterEditors[Constants.PropertyEditors.Aliases.TextBox]; - Current.Logger.Warn("Could not resolve a parameter editor with alias {PropertyEditorAlias}, a textbox will be rendered in it's place", property.EditorAlias); - } - - parameter.View = paramEditor.GetValueEditor().View; - - // sets the parameter configuration to be the default configuration editor's configuration, - // ie configurationEditor.DefaultConfigurationObject, prepared for the value editor, ie - // after ToValueEditor - important to use DefaultConfigurationObject here, because depending - // on editors, ToValueEditor expects the actual strongly typed configuration - not the - // dictionary thing returned by DefaultConfiguration - - var configurationEditor = paramEditor.GetConfigurationEditor(); - parameter.Configuration = configurationEditor.ToValueEditor(configurationEditor.DefaultConfigurationObject); - }); - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/MapperContextExtensions.cs b/src/Umbraco.Web/Models/Mapping/MapperContextExtensions.cs new file mode 100644 index 0000000000..1538f1a987 --- /dev/null +++ b/src/Umbraco.Web/Models/Mapping/MapperContextExtensions.cs @@ -0,0 +1,45 @@ +using Umbraco.Core.Mapping; + +namespace Umbraco.Web.Models.Mapping +{ + /// + /// Provides extension methods for the class. + /// + internal static class MapperContextExtensions + { + private const string CultureKey = "Map.Culture"; + private const string IncludedPropertiesKey = "Map.IncludedProperties"; + + /// + /// Gets the context culture. + /// + public static string GetCulture(this MapperContext context) + { + return context.HasItems && context.Items.TryGetValue(CultureKey, out var obj) && obj is string s ? s : null; + } + + /// + /// Sets a context culture. + /// + public static void SetCulture(this MapperContext context, string culture) + { + context.Items[CultureKey] = culture; + } + + /// + /// Get included properties. + /// + public static string[] GetIncludedProperties(this MapperContext context) + { + return context.HasItems && context.Items.TryGetValue(IncludedPropertiesKey, out var obj) && obj is string[] s ? s : null; + } + + /// + /// Sets included properties. + /// + public static void SetIncludedProperties(this MapperContext context, string[] properties) + { + context.Items[IncludedPropertiesKey] = properties; + } + } +} \ No newline at end of file diff --git a/src/Umbraco.Web/Models/Mapping/MappingOperationOptionsExtensions.cs b/src/Umbraco.Web/Models/Mapping/MappingOperationOptionsExtensions.cs deleted file mode 100644 index e704272ddb..0000000000 --- a/src/Umbraco.Web/Models/Mapping/MappingOperationOptionsExtensions.cs +++ /dev/null @@ -1,45 +0,0 @@ -using AutoMapper; - -namespace Umbraco.Web.Models.Mapping -{ - /// - /// Provides extension methods for AutoMapper's . - /// - internal static class MappingOperationOptionsExtensions - { - private const string CultureKey = "MappingOperationOptions.Culture"; - private const string IncludedPropertiesKey = "MappingOperationOptions.IncludeProperties"; - - /// - /// Gets the context culture. - /// - public static string GetCulture(this IMappingOperationOptions options) - { - return options.Items.TryGetValue(CultureKey, out var obj) && obj is string s ? s : null; - } - - /// - /// Sets a context culture. - /// - public static void SetCulture(this IMappingOperationOptions options, string culture) - { - options.Items[CultureKey] = culture; - } - - /// - /// Get included properties. - /// - public static string[] GetIncludedProperties(this IMappingOperationOptions options) - { - return options.Items.TryGetValue(IncludedPropertiesKey, out var obj) && obj is string[] s ? s : null; - } - - /// - /// Sets included properties. - /// - public static void SetIncludedProperties(this IMappingOperationOptions options, string[] properties) - { - options.Items[IncludedPropertiesKey] = properties; - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/MediaAppResolver.cs b/src/Umbraco.Web/Models/Mapping/MediaAppResolver.cs deleted file mode 100644 index 2e3afac549..0000000000 --- a/src/Umbraco.Web/Models/Mapping/MediaAppResolver.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Collections.Generic; -using AutoMapper; -using Umbraco.Core.Models; -using Umbraco.Core.Models.ContentEditing; -using Umbraco.Web.ContentApps; -using Umbraco.Web.Models.ContentEditing; - -namespace Umbraco.Web.Models.Mapping -{ - // injected into ContentMapperProfile, - // maps ContentApps when mapping IMedia to MediaItemDisplay - internal class MediaAppResolver : IValueResolver> - { - private readonly ContentAppFactoryCollection _contentAppDefinitions; - - public MediaAppResolver(ContentAppFactoryCollection contentAppDefinitions) - { - _contentAppDefinitions = contentAppDefinitions; - } - - public IEnumerable Resolve(IMedia source, MediaItemDisplay destination, IEnumerable destMember, ResolutionContext context) - { - return _contentAppDefinitions.GetContentAppsFor(source); - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/MediaChildOfListViewResolver.cs b/src/Umbraco.Web/Models/Mapping/MediaChildOfListViewResolver.cs deleted file mode 100644 index 997c900f84..0000000000 --- a/src/Umbraco.Web/Models/Mapping/MediaChildOfListViewResolver.cs +++ /dev/null @@ -1,26 +0,0 @@ -using AutoMapper; -using Umbraco.Core.Models; -using Umbraco.Core.Services; -using Umbraco.Web.Models.ContentEditing; - -namespace Umbraco.Web.Models.Mapping -{ - internal class MediaChildOfListViewResolver : IValueResolver - { - private readonly IMediaService _mediaService; - private readonly IMediaTypeService _mediaTypeService; - - public MediaChildOfListViewResolver(IMediaService mediaService, IMediaTypeService mediaTypeService) - { - _mediaService = mediaService; - _mediaTypeService = mediaTypeService; - } - - public bool Resolve(IMedia source, MediaItemDisplay destination, bool destMember, ResolutionContext context) - { - // map the IsChildOfListView (this is actually if it is a descendant of a list view!) - var parent = _mediaService.GetParent(source); - return parent != null && (parent.ContentType.IsContainer || _mediaTypeService.HasContainerInPath(parent.Path)); - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/MediaMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/MediaMapDefinition.cs new file mode 100644 index 0000000000..3da61bc9c0 --- /dev/null +++ b/src/Umbraco.Web/Models/Mapping/MediaMapDefinition.cs @@ -0,0 +1,103 @@ +using System.Linq; +using Umbraco.Core; +using Umbraco.Core.Composing; +using Umbraco.Core.Logging; +using Umbraco.Core.Mapping; +using Umbraco.Core.Models; +using Umbraco.Core.Services; +using Umbraco.Web.Models.ContentEditing; +using Umbraco.Web.Trees; + +namespace Umbraco.Web.Models.Mapping +{ + /// + /// Declares model mappings for media. + /// + internal class MediaMapDefinition : IMapDefinition + { + private readonly CommonMapper _commonMapper; + private readonly ILogger _logger; + private readonly IMediaService _mediaService; + private readonly IMediaTypeService _mediaTypeService; + private readonly TabsAndPropertiesMapper _tabsAndPropertiesMapper; + + public MediaMapDefinition(ILogger logger, CommonMapper commonMapper, IMediaService mediaService, IMediaTypeService mediaTypeService, + ILocalizedTextService localizedTextService) + { + _logger = logger; + _commonMapper = commonMapper; + _mediaService = mediaService; + _mediaTypeService = mediaTypeService; + + _tabsAndPropertiesMapper = new TabsAndPropertiesMapper(localizedTextService); + } + + public void DefineMaps(UmbracoMapper mapper) + { + mapper.Define((source, context) => new ContentPropertyCollectionDto(), Map); + mapper.Define((source, context) => new MediaItemDisplay(), Map); + mapper.Define>((source, context) => new ContentItemBasic(), Map); + } + + // Umbraco.Code.MapAll + private static void Map(IMedia source, ContentPropertyCollectionDto target, MapperContext context) + { + target.Properties = context.MapEnumerable(source.Properties); + } + + // Umbraco.Code.MapAll -Properties -Errors -Edited -Updater -Alias -IsContainer + private void Map(IMedia source, MediaItemDisplay target, MapperContext context) + { + target.ContentApps = _commonMapper.GetContentApps(source); + target.ContentType = _commonMapper.GetContentType(source, context); + target.ContentTypeAlias = source.ContentType.Alias; + target.ContentTypeName = source.ContentType.Name; + target.CreateDate = source.CreateDate; + target.Icon = source.ContentType.Icon; + target.Id = source.Id; + target.IsChildOfListView = DermineIsChildOfListView(source); + target.Key = source.Key; + target.MediaLink = string.Join(",", source.GetUrls(Current.Configs.Settings().Content, _logger)); + target.Name = source.Name; + target.Owner = _commonMapper.GetOwner(source, context); + target.ParentId = source.ParentId; + target.Path = source.Path; + target.SortOrder = source.SortOrder; + target.State = null; + target.Tabs = _tabsAndPropertiesMapper.Map(source, context); + target.Trashed = source.Trashed; + target.TreeNodeUrl = _commonMapper.GetTreeNodeUrl(source); + target.Udi = Udi.Create(Constants.UdiEntityType.Media, source.Key); + target.UpdateDate = source.UpdateDate; + target.VariesByCulture = source.ContentType.VariesByCulture(); + } + + // Umbraco.Code.MapAll -Edited -Updater -Alias + private void Map(IMedia source, ContentItemBasic target, MapperContext context) + { + target.ContentTypeAlias = source.ContentType.Alias; + target.CreateDate = source.CreateDate; + target.Icon = source.ContentType.Icon; + target.Id = source.Id; + target.Key = source.Key; + target.Name = source.Name; + target.Owner = _commonMapper.GetOwner(source, context); + target.ParentId = source.ParentId; + target.Path = source.Path; + target.Properties = context.MapEnumerable(source.Properties); + target.SortOrder = source.SortOrder; + target.State = null; + target.Trashed = source.Trashed; + target.Udi = Udi.Create(Constants.UdiEntityType.Media, source.Key); + target.UpdateDate = source.UpdateDate; + target.VariesByCulture = source.ContentType.VariesByCulture(); + } + + private bool DermineIsChildOfListView(IMedia source) + { + // map the IsChildOfListView (this is actually if it is a descendant of a list view!) + var parent = _mediaService.GetParent(source); + return parent != null && (parent.ContentType.IsContainer || _mediaTypeService.HasContainerInPath(parent.Path)); + } + } +} diff --git a/src/Umbraco.Web/Models/Mapping/MediaMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/MediaMapperProfile.cs deleted file mode 100644 index f5182f0b3b..0000000000 --- a/src/Umbraco.Web/Models/Mapping/MediaMapperProfile.cs +++ /dev/null @@ -1,88 +0,0 @@ -using AutoMapper; -using Umbraco.Core; -using Umbraco.Core.Composing; -using Umbraco.Core.Configuration; -using Umbraco.Core.Logging; -using Umbraco.Core.Models; -using Umbraco.Core.PropertyEditors; -using Umbraco.Core.Services; -using Umbraco.Web.Models.ContentEditing; -using Umbraco.Web.Trees; - -namespace Umbraco.Web.Models.Mapping -{ - /// - /// Declares model mappings for media. - /// - internal class MediaMapperProfile : Profile - { - public MediaMapperProfile(TabsAndPropertiesResolver tabsAndPropertiesResolver, - ContentTreeNodeUrlResolver contentTreeNodeUrlResolver, - MediaAppResolver mediaAppResolver, - IUserService userService, - ILocalizedTextService textService, - IDataTypeService dataTypeService, - IMediaService mediaService, - IMediaTypeService mediaTypeService, - ILogger logger, - IContentTypeBaseServiceProvider contentTypeBaseServiceProvider) - { - // create, capture, cache - var mediaOwnerResolver = new OwnerResolver(userService); - var childOfListViewResolver = new MediaChildOfListViewResolver(mediaService, mediaTypeService); - var mediaTypeBasicResolver = new ContentTypeBasicResolver(contentTypeBaseServiceProvider); - - //FROM IMedia TO MediaItemDisplay - CreateMap() - .ForMember(dest => dest.Udi, opt => opt.MapFrom(content => Udi.Create(Constants.UdiEntityType.Media, content.Key))) - .ForMember(dest => dest.Owner, opt => opt.MapFrom(src => mediaOwnerResolver.Resolve(src))) - .ForMember(dest => dest.Icon, opt => opt.MapFrom(content => content.ContentType.Icon)) - .ForMember(dest => dest.ContentTypeAlias, opt => opt.MapFrom(content => content.ContentType.Alias)) - .ForMember(dest => dest.IsChildOfListView, opt => opt.MapFrom(childOfListViewResolver)) - .ForMember(dest => dest.Trashed, opt => opt.MapFrom(content => content.Trashed)) - .ForMember(dest => dest.ContentTypeName, opt => opt.MapFrom(content => content.ContentType.Name)) - .ForMember(dest => dest.Properties, opt => opt.Ignore()) - .ForMember(dest => dest.TreeNodeUrl, opt => opt.MapFrom(contentTreeNodeUrlResolver)) - .ForMember(dest => dest.Notifications, opt => opt.Ignore()) - .ForMember(dest => dest.Errors, opt => opt.Ignore()) - .ForMember(dest => dest.State, opt => opt.MapFrom(_ => null)) - .ForMember(dest => dest.Edited, opt => opt.Ignore()) - .ForMember(dest => dest.Updater, opt => opt.Ignore()) - .ForMember(dest => dest.Alias, opt => opt.Ignore()) - .ForMember(dest => dest.IsContainer, opt => opt.Ignore()) - .ForMember(dest => dest.Tabs, opt => opt.MapFrom(tabsAndPropertiesResolver)) - .ForMember(dest => dest.AdditionalData, opt => opt.Ignore()) - .ForMember(dest => dest.ContentType, opt => opt.MapFrom(mediaTypeBasicResolver)) - .ForMember(dest => dest.MediaLink, opt => opt.MapFrom(content => string.Join(",", content.GetUrls(Current.Configs.Settings().Content, logger)))) - .ForMember(dest => dest.ContentApps, opt => opt.MapFrom(mediaAppResolver)) - .ForMember(dest => dest.VariesByCulture, opt => opt.MapFrom(src => src.ContentType.VariesByCulture())); - - - //FROM IMedia TO ContentItemBasic - CreateMap>() - .ForMember(dest => dest.Udi, opt => opt.MapFrom(src => Udi.Create(Constants.UdiEntityType.Media, src.Key))) - .ForMember(dest => dest.Owner, opt => opt.MapFrom(src => mediaOwnerResolver.Resolve(src))) - .ForMember(dest => dest.Icon, opt => opt.MapFrom(src => src.ContentType.Icon)) - .ForMember(dest => dest.Trashed, opt => opt.MapFrom(src => src.Trashed)) - .ForMember(dest => dest.ContentTypeAlias, opt => opt.MapFrom(src => src.ContentType.Alias)) - .ForMember(dest => dest.State, opt => opt.MapFrom(_ => null)) - .ForMember(dest => dest.Edited, opt => opt.Ignore()) - .ForMember(dest => dest.Updater, opt => opt.Ignore()) - .ForMember(dest => dest.Alias, opt => opt.Ignore()) - .ForMember(dest => dest.AdditionalData, opt => opt.Ignore()) - .ForMember(dest => dest.VariesByCulture, opt => opt.MapFrom(src => src.ContentType.VariesByCulture())); - - - //FROM IMedia TO ContentItemDto - CreateMap(); - //.ForMember(dest => dest.Udi, opt => opt.MapFrom(src => Udi.Create(Constants.UdiEntityType.Media, src.Key))) - //.ForMember(dest => dest.Owner, opt => opt.MapFrom(src => mediaOwnerResolver.Resolve(src))) - //.ForMember(dest => dest.Published, opt => opt.Ignore()) - //.ForMember(dest => dest.Edited, opt => opt.Ignore()) - //.ForMember(dest => dest.Updater, opt => opt.Ignore()) - //.ForMember(dest => dest.Icon, opt => opt.Ignore()) - //.ForMember(dest => dest.Alias, opt => opt.Ignore()) - //.ForMember(dest => dest.AdditionalData, opt => opt.Ignore()); - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/MemberBasicPropertiesResolver.cs b/src/Umbraco.Web/Models/Mapping/MemberBasicPropertiesResolver.cs deleted file mode 100644 index e1ee0631a9..0000000000 --- a/src/Umbraco.Web/Models/Mapping/MemberBasicPropertiesResolver.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using AutoMapper; -using Umbraco.Core.Models; -using Umbraco.Core.Services; -using Umbraco.Web.Models.ContentEditing; - -namespace Umbraco.Web.Models.Mapping -{ - /// - /// A resolver to map properties to a collection of - /// - internal class MemberBasicPropertiesResolver : IValueResolver> - { - private readonly IUmbracoContextAccessor _umbracoContextAccessor; - private readonly IMemberTypeService _memberTypeService; - - public MemberBasicPropertiesResolver(IUmbracoContextAccessor umbracoContextAccessor, IMemberTypeService memberTypeService) - { - _umbracoContextAccessor = umbracoContextAccessor ?? throw new ArgumentNullException(nameof(umbracoContextAccessor)); - _memberTypeService = memberTypeService ?? throw new ArgumentNullException(nameof(memberTypeService)); - } - - public IEnumerable Resolve(IMember source, MemberBasic destination, IEnumerable destMember, ResolutionContext context) - { - var umbracoContext = _umbracoContextAccessor.UmbracoContext; - if (umbracoContext == null) throw new InvalidOperationException("Cannot resolve value without an UmbracoContext available"); - - var result = Mapper.Map, IEnumerable>( - // Sort properties so items from different compositions appear in correct order (see U4-9298). Map sorted properties. - source.Properties.OrderBy(prop => prop.PropertyType.SortOrder)) - .ToList(); - - var memberType = _memberTypeService.Get(source.ContentTypeId); - - //now update the IsSensitive value - foreach (var prop in result) - { - //check if this property is flagged as sensitive - var isSensitiveProperty = memberType.IsSensitiveProperty(prop.Alias); - //check permissions for viewing sensitive data - if (isSensitiveProperty && umbracoContext.Security.CurrentUser.HasAccessToSensitiveData() == false) - { - //mark this property as sensitive - prop.IsSensitive = true; - //clear the value - prop.Value = null; - } - } - return result; - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/MemberDtoPropertiesResolver.cs b/src/Umbraco.Web/Models/Mapping/MemberDtoPropertiesResolver.cs deleted file mode 100644 index 0d6478d737..0000000000 --- a/src/Umbraco.Web/Models/Mapping/MemberDtoPropertiesResolver.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using AutoMapper; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Web.Models.ContentEditing; - -namespace Umbraco.Web.Models.Mapping -{ - /// - /// This ensures that the custom membership provider properties are not mapped - these property values are controller by the membership provider - /// - /// - /// Because these properties don't exist on the form, if we don't remove them for this map we'll get validation errors when posting data - /// - internal class MemberDtoPropertiesResolver - { - public IEnumerable Resolve(IMember source) - { - var defaultProps = Constants.Conventions.Member.GetStandardPropertyTypeStubs(); - - //remove all membership properties, these values are set with the membership provider. - var exclude = defaultProps.Select(x => x.Value.Alias).ToArray(); - - return source.Properties - .Where(x => exclude.Contains(x.Alias) == false) - .Select(Mapper.Map); - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/MemberMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/MemberMapDefinition.cs new file mode 100644 index 0000000000..b230dcfe15 --- /dev/null +++ b/src/Umbraco.Web/Models/Mapping/MemberMapDefinition.cs @@ -0,0 +1,193 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web.Security; +using Umbraco.Core; +using Umbraco.Core.Mapping; +using Umbraco.Core.Models; +using Umbraco.Core.Models.Membership; +using Umbraco.Core.Security; +using Umbraco.Core.Services; +using Umbraco.Web.Models.ContentEditing; +using Umbraco.Core.Services.Implement; +using UserProfile = Umbraco.Web.Models.ContentEditing.UserProfile; + +namespace Umbraco.Web.Models.Mapping +{ + /// + /// Declares model mappings for members. + /// + internal class MemberMapDefinition : IMapDefinition + { + private readonly CommonMapper _commonMapper; + private readonly IMemberTypeService _memberTypeService; + private readonly MemberTabsAndPropertiesMapper _tabsAndPropertiesMapper; + + public MemberMapDefinition(CommonMapper commonMapper, IMemberTypeService memberTypeService, MemberTabsAndPropertiesMapper tabsAndPropertiesMapper) + { + _commonMapper = commonMapper; + _memberTypeService = memberTypeService; + + _tabsAndPropertiesMapper = tabsAndPropertiesMapper; + } + + public void DefineMaps(UmbracoMapper mapper) + { + mapper.Define((source, context) => new MemberDisplay(), Map); + mapper.Define((source, context) => MemberService.CreateGenericMembershipProviderMember(source.UserName, source.Email, source.UserName, ""), Map); + mapper.Define((source, context) => new MemberDisplay(), Map); + mapper.Define((source, context) => new MemberBasic(), Map); + mapper.Define((source, context) => new MemberBasic(), Map); + mapper.Define((source, context) => new MemberGroupDisplay(), Map); + mapper.Define((source, context) => new ContentPropertyCollectionDto(), Map); + } + + private void Map(MembershipUser source, MemberDisplay target, MapperContext context) + { + //first convert to IMember + var member = context.Map(source); + //then convert to MemberDisplay + context.Map(member); + } + + // TODO: SD: I can't remember why this mapping is here? + // Umbraco.Code.MapAll -Properties -CreatorId -Level -Name -CultureInfos -ParentId + // Umbraco.Code.MapAll -Path -SortOrder -DeleteDate -WriterId -VersionId -PasswordQuestion + // Umbraco.Code.MapAll -RawPasswordAnswerValue -FailedPasswordAttempts + private void Map(MembershipUser source, IMember target, MapperContext context) + { + target.Comments = source.Comment; + target.CreateDate = source.CreationDate; + target.Email = source.Email; + target.Id = int.MaxValue; + target.IsApproved = source.IsApproved; + target.IsLockedOut = source.IsLockedOut; + target.Key = source.ProviderUserKey.TryConvertTo().Result; + target.LastLockoutDate = source.LastLockoutDate; + target.LastLoginDate = source.LastLoginDate; + target.LastPasswordChangeDate = source.LastPasswordChangedDate; + target.ProviderUserKey = source.ProviderUserKey; + target.RawPasswordValue = source.CreationDate > DateTime.MinValue ? Guid.NewGuid().ToString("N") : ""; + target.UpdateDate = source.LastActivityDate; + target.Username = source.UserName; + } + + // Umbraco.Code.MapAll -Properties -Errors -Edited -Updater -Alias -IsChildOfListView + // Umbraco.Code.MapAll -Trashed -IsContainer -VariesByCulture + private void Map(IMember source, MemberDisplay target, MapperContext context) + { + target.ContentTypeAlias = source.ContentType.Alias; + target.ContentTypeName = source.ContentType.Name; + target.CreateDate = source.CreateDate; + target.Email = source.Email; + target.Icon = source.ContentType.Icon; + target.Id = source.Id; + target.Key = source.Key; + target.MemberProviderFieldMapping = GetMemberProviderFieldMapping(); + target.MembershipScenario = GetMembershipScenario(); + target.Name = source.Name; + target.Owner = _commonMapper.GetOwner(source, context); + target.ParentId = source.ParentId; + target.Path = source.Path; + target.SortOrder = source.SortOrder; + target.State = null; + target.Tabs = _tabsAndPropertiesMapper.Map(source, context); + target.TreeNodeUrl = _commonMapper.GetMemberTreeNodeUrl(source); + target.Udi = Udi.Create(Constants.UdiEntityType.Member, source.Key); + target.UpdateDate = source.UpdateDate; + target.Username = source.Username; + } + + // Umbraco.Code.MapAll -Trashed -Edited -Updater -Alias -VariesByCulture + private void Map(IMember source, MemberBasic target, MapperContext context) + { + target.ContentTypeAlias = source.ContentType.Alias; + target.CreateDate = source.CreateDate; + target.Email = source.Email; + target.Icon = source.ContentType.Icon; + target.Id = int.MaxValue; + target.Key = source.Key; + target.Name = source.Name; + target.Owner = _commonMapper.GetOwner(source, context); + target.ParentId = source.ParentId; + target.Path = source.Path; + target.Properties = context.MapEnumerable(source.Properties); + target.SortOrder = source.SortOrder; + target.State = null; + target.Udi = Udi.Create(Constants.UdiEntityType.Member, source.Key); + target.UpdateDate = source.UpdateDate; + target.Username = source.Username; + } + + //TODO: SD: I can't remember why this mapping is here? + // Umbraco.Code.MapAll -Udi -Properties -ParentId -Path -SortOrder -Edited -Updater + // Umbraco.Code.MapAll -Trashed -Alias -ContentTypeAlias -VariesByCulture + private void Map(MembershipUser source, MemberBasic target, MapperContext context) + { + target.CreateDate = source.CreationDate; + target.Email = source.Email; + target.Icon = "icon-user"; + target.Id = int.MaxValue; + target.Key = source.ProviderUserKey.TryConvertTo().Result; + target.Name = source.UserName; + target.Owner = new UserProfile { Name = "Admin", UserId = -1 }; + target.State = ContentSavedState.Draft; + target.UpdateDate = source.LastActivityDate; + target.Username = source.UserName; +} + + // Umbraco.Code.MapAll -Icon -Trashed -ParentId -Alias + private void Map(IMemberGroup source, MemberGroupDisplay target, MapperContext context) + { + target.Id = source.Id; + target.Key = source.Key; + target.Name = source.Name; + target.Path = "-1" + source.Id; + target.Udi = Udi.Create(Constants.UdiEntityType.MemberGroup, source.Key); + } + + // Umbraco.Code.MapAll + private static void Map(IMember source, ContentPropertyCollectionDto target, MapperContext context) + { + target.Properties = context.MapEnumerable(source.Properties); + } + + private MembershipScenario GetMembershipScenario() + { + var provider = Core.Security.MembershipProviderExtensions.GetMembersMembershipProvider(); + + if (provider.IsUmbracoMembershipProvider()) + { + return MembershipScenario.NativeUmbraco; + } + var memberType = _memberTypeService.Get(Constants.Conventions.MemberTypes.DefaultAlias); + return memberType != null + ? MembershipScenario.CustomProviderWithUmbracoLink + : MembershipScenario.StandaloneCustomProvider; + } + + private static IDictionary GetMemberProviderFieldMapping() + { + var provider = Core.Security.MembershipProviderExtensions.GetMembersMembershipProvider(); + + if (provider.IsUmbracoMembershipProvider() == false) + { + return new Dictionary + { + {Constants.Conventions.Member.IsLockedOut, Constants.Conventions.Member.IsLockedOut}, + {Constants.Conventions.Member.IsApproved, Constants.Conventions.Member.IsApproved}, + {Constants.Conventions.Member.Comments, Constants.Conventions.Member.Comments} + }; + } + + var umbracoProvider = (IUmbracoMemberTypeMembershipProvider)provider; + + return new Dictionary + { + {Constants.Conventions.Member.IsLockedOut, umbracoProvider.LockPropertyTypeAlias}, + {Constants.Conventions.Member.IsApproved, umbracoProvider.ApprovedPropertyTypeAlias}, + {Constants.Conventions.Member.Comments, umbracoProvider.CommentPropertyTypeAlias} + }; + } + } +} diff --git a/src/Umbraco.Web/Models/Mapping/MemberMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/MemberMapperProfile.cs deleted file mode 100644 index a721714a14..0000000000 --- a/src/Umbraco.Web/Models/Mapping/MemberMapperProfile.cs +++ /dev/null @@ -1,154 +0,0 @@ -using System; -using System.Web.Security; -using AutoMapper; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; -using Umbraco.Web.Models.ContentEditing; -using Umbraco.Core.Services.Implement; - -namespace Umbraco.Web.Models.Mapping -{ - /// - /// Declares model mappings for members. - /// - internal class MemberMapperProfile : Profile - { - public MemberMapperProfile( - MemberTabsAndPropertiesResolver tabsAndPropertiesResolver, - MemberTreeNodeUrlResolver memberTreeNodeUrlResolver, - MemberBasicPropertiesResolver memberBasicPropertiesResolver, - IUserService userService, - IMemberTypeService memberTypeService, - IMemberService memberService) - { - // create, capture, cache - var memberOwnerResolver = new OwnerResolver(userService); - var memberProfiderFieldMappingResolver = new MemberProviderFieldResolver(); - var membershipScenarioMappingResolver = new MembershipScenarioResolver(memberTypeService); - var memberDtoPropertiesResolver = new MemberDtoPropertiesResolver(); - - //FROM MembershipUser TO MediaItemDisplay - used when using a non-umbraco membership provider - CreateMap().ConvertUsing(); - - //FROM MembershipUser TO IMember - used when using a non-umbraco membership provider - CreateMap() - .ConstructUsing(src => MemberService.CreateGenericMembershipProviderMember(src.UserName, src.Email, src.UserName, "")) - //we're giving this entity an ID of int.MaxValue - TODO: SD: I can't remember why this mapping is here? - .ForMember(dest => dest.Id, opt => opt.MapFrom(src => int.MaxValue)) - .ForMember(dest => dest.Comments, opt => opt.MapFrom(src => src.Comment)) - .ForMember(dest => dest.CreateDate, opt => opt.MapFrom(src => src.CreationDate)) - .ForMember(dest => dest.UpdateDate, opt => opt.MapFrom(src => src.LastActivityDate)) - .ForMember(dest => dest.LastPasswordChangeDate, opt => opt.MapFrom(src => src.LastPasswordChangedDate)) - .ForMember(dest => dest.Key, opt => opt.MapFrom(src => src.ProviderUserKey.TryConvertTo().Result.ToString("N"))) - //This is a special case for password - we don't actually care what the password is but it either needs to be something or nothing - // so we'll set it to something if the member is actually created, otherwise nothing if it is a new member. - .ForMember(dest => dest.RawPasswordValue, opt => opt.MapFrom(src => src.CreationDate > DateTime.MinValue ? Guid.NewGuid().ToString("N") : "")) - .ForMember(dest => dest.Properties, opt => opt.Ignore()) - .ForMember(dest => dest.CreatorId, opt => opt.Ignore()) - .ForMember(dest => dest.Level, opt => opt.Ignore()) - .ForMember(dest => dest.Name, opt => opt.Ignore()) - .ForMember(dest => dest.CultureInfos, opt => opt.Ignore()) - .ForMember(dest => dest.ParentId, opt => opt.Ignore()) - .ForMember(dest => dest.Path, opt => opt.Ignore()) - .ForMember(dest => dest.SortOrder, opt => opt.Ignore()) - .ForMember(dest => dest.AdditionalData, opt => opt.Ignore()) - .ForMember(dest => dest.FailedPasswordAttempts, opt => opt.Ignore()) - .ForMember(dest => dest.DeleteDate, opt => opt.Ignore()) - .ForMember(dest => dest.WriterId, opt => opt.Ignore()) - .ForMember(dest => dest.VersionId, opt => opt.Ignore()) - // TODO: Support these eventually - .ForMember(dest => dest.PasswordQuestion, opt => opt.Ignore()) - .ForMember(dest => dest.RawPasswordAnswerValue, opt => opt.Ignore()); - - //FROM IMember TO MemberDisplay - CreateMap() - .ForMember(dest => dest.Udi, opt => opt.MapFrom(content => Udi.Create(Constants.UdiEntityType.Member, content.Key))) - .ForMember(dest => dest.Owner, opt => opt.MapFrom(src => memberOwnerResolver.Resolve(src))) - .ForMember(dest => dest.Icon, opt => opt.MapFrom(src => src.ContentType.Icon)) - .ForMember(dest => dest.ContentTypeAlias, opt => opt.MapFrom(src => src.ContentType.Alias)) - .ForMember(dest => dest.ContentTypeName, opt => opt.MapFrom(src => src.ContentType.Name)) - .ForMember(dest => dest.Properties, opt => opt.Ignore()) - .ForMember(dest => dest.Tabs, opt => opt.MapFrom(tabsAndPropertiesResolver)) - .ForMember(dest => dest.MemberProviderFieldMapping, opt => opt.MapFrom(src => memberProfiderFieldMappingResolver.Resolve(src))) - .ForMember(dest => dest.MembershipScenario, opt => opt.MapFrom(src => membershipScenarioMappingResolver.Resolve(src))) - .ForMember(dest => dest.Notifications, opt => opt.Ignore()) - .ForMember(dest => dest.Errors, opt => opt.Ignore()) - .ForMember(dest => dest.State, opt => opt.MapFrom(_ => null)) - .ForMember(dest => dest.Edited, opt => opt.Ignore()) - .ForMember(dest => dest.Updater, opt => opt.Ignore()) - .ForMember(dest => dest.Alias, opt => opt.Ignore()) - .ForMember(dest => dest.IsChildOfListView, opt => opt.Ignore()) - .ForMember(dest => dest.Trashed, opt => opt.Ignore()) - .ForMember(dest => dest.IsContainer, opt => opt.Ignore()) - .ForMember(dest => dest.TreeNodeUrl, opt => opt.MapFrom(memberTreeNodeUrlResolver)) - .ForMember(dest => dest.VariesByCulture, opt => opt.Ignore()); - - //FROM IMember TO MemberBasic - CreateMap() - //we're giving this entity an ID of int.MaxValue - this is kind of a hack to force angular to use the Key instead of the Id in list views - .ForMember(dest => dest.Id, opt => opt.MapFrom(src => int.MaxValue)) - .ForMember(dest => dest.Udi, opt => opt.MapFrom(content => Udi.Create(Constants.UdiEntityType.Member, content.Key))) - .ForMember(dest => dest.Owner, opt => opt.MapFrom(src => memberOwnerResolver.Resolve(src))) - .ForMember(dest => dest.Icon, opt => opt.MapFrom(src => src.ContentType.Icon)) - .ForMember(dest => dest.ContentTypeAlias, opt => opt.MapFrom(src => src.ContentType.Alias)) - .ForMember(dest => dest.Email, opt => opt.MapFrom(src => src.Email)) - .ForMember(dest => dest.Username, opt => opt.MapFrom(src => src.Username)) - .ForMember(dest => dest.Trashed, opt => opt.Ignore()) - .ForMember(dest => dest.State, opt => opt.MapFrom(_ => null)) - .ForMember(dest => dest.Edited, opt => opt.Ignore()) - .ForMember(dest => dest.Updater, opt => opt.Ignore()) - .ForMember(dest => dest.Alias, opt => opt.Ignore()) - .ForMember(dto => dto.Properties, expression => expression.MapFrom(memberBasicPropertiesResolver)) - .ForMember(dest => dest.VariesByCulture, opt => opt.Ignore()); - - //FROM MembershipUser TO MemberBasic - CreateMap() - //we're giving this entity an ID of int.MaxValue - TODO: SD: I can't remember why this mapping is here? - .ForMember(dest => dest.Id, opt => opt.MapFrom(src => int.MaxValue)) - .ForMember(dest => dest.Udi, opt => opt.Ignore()) - .ForMember(dest => dest.CreateDate, opt => opt.MapFrom(src => src.CreationDate)) - .ForMember(dest => dest.UpdateDate, opt => opt.MapFrom(src => src.LastActivityDate)) - .ForMember(dest => dest.Key, opt => opt.MapFrom(src => src.ProviderUserKey.TryConvertTo().Result.ToString("N"))) - .ForMember(dest => dest.Owner, opt => opt.MapFrom(_ => new UserProfile {Name = "Admin", UserId = -1 })) - .ForMember(dest => dest.Icon, opt => opt.MapFrom(_ => "icon-user")) - .ForMember(dest => dest.Name, opt => opt.MapFrom(src => src.UserName)) - .ForMember(dest => dest.Email, opt => opt.MapFrom(src => src.Email)) - .ForMember(dest => dest.Username, opt => opt.MapFrom(src => src.UserName)) - .ForMember(dest => dest.Properties, opt => opt.Ignore()) - .ForMember(dest => dest.ParentId, opt => opt.Ignore()) - .ForMember(dest => dest.Path, opt => opt.Ignore()) - .ForMember(dest => dest.SortOrder, opt => opt.Ignore()) - .ForMember(dest => dest.AdditionalData, opt => opt.Ignore()) - .ForMember(dest => dest.State, opt => opt.MapFrom(_ => ContentSavedState.Draft)) - .ForMember(dest => dest.Edited, opt => opt.Ignore()) - .ForMember(dest => dest.Updater, opt => opt.Ignore()) - .ForMember(dest => dest.Trashed, opt => opt.Ignore()) - .ForMember(dest => dest.Alias, opt => opt.Ignore()) - .ForMember(dest => dest.ContentTypeAlias, opt => opt.Ignore()) - .ForMember(dest => dest.VariesByCulture, opt => opt.Ignore()); - - //FROM IMember TO ContentItemDto - CreateMap() - //.ForMember(dest => dest.Udi, opt => opt.MapFrom(content => Udi.Create(Constants.UdiEntityType.Member, content.Key))) - //.ForMember(dest => dest.Owner, opt => opt.MapFrom(src => memberOwnerResolver.Resolve(src))) - //.ForMember(dest => dest.Published, opt => opt.Ignore()) - //.ForMember(dest => dest.Edited, opt => opt.Ignore()) - //.ForMember(dest => dest.Updater, opt => opt.Ignore()) - //.ForMember(dest => dest.Icon, opt => opt.Ignore()) - //.ForMember(dest => dest.Alias, opt => opt.Ignore()) - //do no map the custom member properties (currently anyways, they were never there in 6.x) - .ForMember(dest => dest.Properties, opt => opt.MapFrom(src => memberDtoPropertiesResolver.Resolve(src))); - - //FROM IMemberGroup TO MemberGroupDisplay - CreateMap() - .ForMember(dest => dest.Udi, opt => opt.MapFrom(src => Udi.Create(Constants.UdiEntityType.MemberGroup, src.Key))) - .ForMember(dest => dest.Path, opt => opt.MapFrom(group => "-1," + group.Id)) - .ForMember(dest => dest.Notifications, opt => opt.Ignore()) - .ForMember(dest => dest.Icon, opt => opt.Ignore()) - .ForMember(dest => dest.Trashed, opt => opt.Ignore()) - .ForMember(dest => dest.ParentId, opt => opt.Ignore()) - .ForMember(dest => dest.Alias, opt => opt.Ignore()); - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/MemberProviderFieldResolver.cs b/src/Umbraco.Web/Models/Mapping/MemberProviderFieldResolver.cs deleted file mode 100644 index 4325ebd566..0000000000 --- a/src/Umbraco.Web/Models/Mapping/MemberProviderFieldResolver.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System.Collections.Generic; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Security; - -namespace Umbraco.Web.Models.Mapping -{ - /// - /// A resolver to map the provider field aliases - /// - internal class MemberProviderFieldResolver - { - public IDictionary Resolve(IMember source) - { - var provider = Core.Security.MembershipProviderExtensions.GetMembersMembershipProvider(); - - if (provider.IsUmbracoMembershipProvider() == false) - { - return new Dictionary - { - {Constants.Conventions.Member.IsLockedOut, Constants.Conventions.Member.IsLockedOut}, - {Constants.Conventions.Member.IsApproved, Constants.Conventions.Member.IsApproved}, - {Constants.Conventions.Member.Comments, Constants.Conventions.Member.Comments} - }; - } - else - { - var umbracoProvider = (IUmbracoMemberTypeMembershipProvider) provider; - - return new Dictionary - { - {Constants.Conventions.Member.IsLockedOut, umbracoProvider.LockPropertyTypeAlias}, - {Constants.Conventions.Member.IsApproved, umbracoProvider.ApprovedPropertyTypeAlias}, - {Constants.Conventions.Member.Comments, umbracoProvider.CommentPropertyTypeAlias} - }; - } - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesResolver.cs b/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesMapper.cs similarity index 95% rename from src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesResolver.cs rename to src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesMapper.cs index 1e93618547..a96ef24e6f 100644 --- a/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesResolver.cs +++ b/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesMapper.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Linq; using System.Web.Security; -using AutoMapper; using Umbraco.Core; +using Umbraco.Core.Mapping; using Umbraco.Core.Composing; using Umbraco.Core.Models; using Umbraco.Core.Models.Membership; @@ -21,7 +21,7 @@ namespace Umbraco.Web.Models.Mapping /// This also ensures that the IsLocked out property is readonly when the member is not locked out - this is because /// an admin cannot actually set isLockedOut = true, they can only unlock. /// - internal class MemberTabsAndPropertiesResolver : TabsAndPropertiesResolver + internal class MemberTabsAndPropertiesMapper : TabsAndPropertiesMapper { private readonly IUmbracoContextAccessor _umbracoContextAccessor; private readonly ILocalizedTextService _localizedTextService; @@ -29,7 +29,7 @@ namespace Umbraco.Web.Models.Mapping private readonly IMemberService _memberService; private readonly IUserService _userService; - public MemberTabsAndPropertiesResolver(IUmbracoContextAccessor umbracoContextAccessor, ILocalizedTextService localizedTextService, IMemberService memberService, IUserService userService, IMemberTypeService memberTypeService) + public MemberTabsAndPropertiesMapper(IUmbracoContextAccessor umbracoContextAccessor, ILocalizedTextService localizedTextService, IMemberService memberService, IUserService userService, IMemberTypeService memberTypeService) : base(localizedTextService) { _umbracoContextAccessor = umbracoContextAccessor ?? throw new ArgumentNullException(nameof(umbracoContextAccessor)); @@ -41,7 +41,7 @@ namespace Umbraco.Web.Models.Mapping /// /// Overridden to deal with custom member properties and permissions. - public override IEnumerable> Resolve(IMember source, MemberDisplay destination, IEnumerable> destMember, ResolutionContext context) + public override IEnumerable> Map(IMember source, MapperContext context) { var provider = Core.Security.MembershipProviderExtensions.GetMembersMembershipProvider(); @@ -52,7 +52,7 @@ namespace Umbraco.Web.Models.Mapping .Select(x => x.Alias) .ToArray(); - var resolved = base.Resolve(source, destination, destMember, context); + var resolved = base.Map(source, context); if (provider.IsUmbracoMembershipProvider() == false) { @@ -176,7 +176,7 @@ namespace Umbraco.Web.Models.Mapping /// /// /// - protected override List MapProperties(IContentBase content, List properties, ResolutionContext context) + protected override List MapProperties(IContentBase content, List properties, MapperContext context) { var result = base.MapProperties(content, properties, context); var member = (IMember)content; diff --git a/src/Umbraco.Web/Models/Mapping/MemberTreeNodeUrlResolver.cs b/src/Umbraco.Web/Models/Mapping/MemberTreeNodeUrlResolver.cs deleted file mode 100644 index c4655294d7..0000000000 --- a/src/Umbraco.Web/Models/Mapping/MemberTreeNodeUrlResolver.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.Web.Mvc; -using AutoMapper; -using Umbraco.Core.Models; -using Umbraco.Web.Models.ContentEditing; -using Umbraco.Web.Trees; - -namespace Umbraco.Web.Models.Mapping -{ - /// - /// Gets the tree node url for the IMember - /// - internal class MemberTreeNodeUrlResolver : IValueResolver - { - private readonly IUmbracoContextAccessor _umbracoContextAccessor; - - public MemberTreeNodeUrlResolver(IUmbracoContextAccessor umbracoContextAccessor) - { - _umbracoContextAccessor = umbracoContextAccessor ?? throw new System.ArgumentNullException(nameof(umbracoContextAccessor)); - } - - public string Resolve(IMember source, MemberDisplay destination, string destMember, ResolutionContext context) - { - var umbracoContext = _umbracoContextAccessor.UmbracoContext; - if (umbracoContext == null) return null; - - var urlHelper = new UrlHelper(umbracoContext.HttpContext.Request.RequestContext); - return urlHelper.GetUmbracoApiService(controller => controller.GetTreeNode(source.Key.ToString("N"), null)); - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/MembershipScenarioResolver.cs b/src/Umbraco.Web/Models/Mapping/MembershipScenarioResolver.cs deleted file mode 100644 index 3c3e0af5aa..0000000000 --- a/src/Umbraco.Web/Models/Mapping/MembershipScenarioResolver.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Models.Membership; -using Umbraco.Core.Security; -using Umbraco.Core.Services; - -namespace Umbraco.Web.Models.Mapping -{ - internal class MembershipScenarioResolver - { - private readonly IMemberTypeService _memberTypeService; - - public MembershipScenarioResolver(IMemberTypeService memberTypeService) - { - _memberTypeService = memberTypeService; - } - - public MembershipScenario Resolve(IMember source) - { - var provider = Core.Security.MembershipProviderExtensions.GetMembersMembershipProvider(); - - if (provider.IsUmbracoMembershipProvider()) - { - return MembershipScenario.NativeUmbraco; - } - var memberType = _memberTypeService.Get(Constants.Conventions.MemberTypes.DefaultAlias); - return memberType != null - ? MembershipScenario.CustomProviderWithUmbracoLink - : MembershipScenario.StandaloneCustomProvider; - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/MembershipUserTypeConverter.cs b/src/Umbraco.Web/Models/Mapping/MembershipUserTypeConverter.cs deleted file mode 100644 index 38482cca49..0000000000 --- a/src/Umbraco.Web/Models/Mapping/MembershipUserTypeConverter.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Web.Security; -using AutoMapper; -using Umbraco.Core.Models; -using Umbraco.Web.Models.ContentEditing; - -namespace Umbraco.Web.Models.Mapping -{ - /// - /// A converter to go from a to a - /// - internal class MembershipUserTypeConverter : ITypeConverter - { - public MemberDisplay Convert(MembershipUser source, MemberDisplay destination, ResolutionContext context) - { - //first convert to IMember - var member = Mapper.Map(source); - //then convert to MemberDisplay - return Mapper.Map(member); - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/OwnerResolver.cs b/src/Umbraco.Web/Models/Mapping/OwnerResolver.cs deleted file mode 100644 index 76937886a9..0000000000 --- a/src/Umbraco.Web/Models/Mapping/OwnerResolver.cs +++ /dev/null @@ -1,30 +0,0 @@ -using AutoMapper; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Models.Membership; -using Umbraco.Core.Services; -using UserProfile = Umbraco.Web.Models.ContentEditing.UserProfile; - -namespace Umbraco.Web.Models.Mapping -{ - /// - /// Maps the Owner for IContentBase - /// - /// - internal class OwnerResolver - where TPersisted : IContentBase - { - private readonly IUserService _userService; - - public OwnerResolver(IUserService userService) - { - _userService = userService; - } - - public UserProfile Resolve(TPersisted source) - { - var profile = source.GetCreatorProfile(_userService); - return profile == null ? null : Mapper.Map(profile); - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/PropertyGroupDisplayResolver.cs b/src/Umbraco.Web/Models/Mapping/PropertyGroupDisplayResolver.cs deleted file mode 100644 index ba165f44b4..0000000000 --- a/src/Umbraco.Web/Models/Mapping/PropertyGroupDisplayResolver.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using AutoMapper; -using Umbraco.Web.Models.ContentEditing; - -namespace Umbraco.Web.Models.Mapping -{ - internal class PropertyGroupDisplayResolver - where TSource : ContentTypeSave - where TPropertyTypeDestination : PropertyTypeDisplay - where TPropertyTypeSource : PropertyTypeBasic - { - public IEnumerable> Resolve(TSource source) - { - return source.Groups.Select(Mapper.Map>); - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/PropertyTypeGroupResolver.cs b/src/Umbraco.Web/Models/Mapping/PropertyTypeGroupMapper.cs similarity index 97% rename from src/Umbraco.Web/Models/Mapping/PropertyTypeGroupResolver.cs rename to src/Umbraco.Web/Models/Mapping/PropertyTypeGroupMapper.cs index ea0411eb15..8c5f347799 100644 --- a/src/Umbraco.Web/Models/Mapping/PropertyTypeGroupResolver.cs +++ b/src/Umbraco.Web/Models/Mapping/PropertyTypeGroupMapper.cs @@ -1,5 +1,4 @@ -using AutoMapper; -using System; +using System; using System.Collections.Generic; using System.Linq; using Umbraco.Core; @@ -11,14 +10,14 @@ using Umbraco.Web.Models.ContentEditing; namespace Umbraco.Web.Models.Mapping { - internal class PropertyTypeGroupResolver + internal class PropertyTypeGroupMapper where TPropertyType : PropertyTypeDisplay, new() { private readonly PropertyEditorCollection _propertyEditors; private readonly IDataTypeService _dataTypeService; private readonly ILogger _logger; - public PropertyTypeGroupResolver(PropertyEditorCollection propertyEditors, IDataTypeService dataTypeService, ILogger logger) + public PropertyTypeGroupMapper(PropertyEditorCollection propertyEditors, IDataTypeService dataTypeService, ILogger logger) { _propertyEditors = propertyEditors; _dataTypeService = dataTypeService; @@ -65,7 +64,7 @@ namespace Umbraco.Web.Models.Mapping .FirstOrDefault(x => x != null); } - public IEnumerable> Resolve(IContentTypeComposition source) + public IEnumerable> Map(IContentTypeComposition source) { // deal with groups var groups = new List>(); diff --git a/src/Umbraco.Web/Models/Mapping/PropertyTypeVariationsResolver.cs b/src/Umbraco.Web/Models/Mapping/PropertyTypeVariationsResolver.cs deleted file mode 100644 index 00472a291c..0000000000 --- a/src/Umbraco.Web/Models/Mapping/PropertyTypeVariationsResolver.cs +++ /dev/null @@ -1,18 +0,0 @@ -using AutoMapper; -using Umbraco.Core.Models; -using Umbraco.Web.Models.ContentEditing; -using ContentVariation = Umbraco.Core.Models.ContentVariation; - -namespace Umbraco.Web.Models.Mapping -{ - /// - /// Returns the for a - /// - internal class PropertyTypeVariationsResolver: IValueResolver - { - public ContentVariation Resolve(PropertyTypeBasic source, PropertyType destination, ContentVariation destMember, ResolutionContext context) - { - return source.AllowCultureVariant ? ContentVariation.Culture : ContentVariation.Nothing; - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/RedirectUrlMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/RedirectUrlMapDefinition.cs new file mode 100644 index 0000000000..73123a0407 --- /dev/null +++ b/src/Umbraco.Web/Models/Mapping/RedirectUrlMapDefinition.cs @@ -0,0 +1,34 @@ +using Umbraco.Core.Mapping; +using Umbraco.Core.Models; +using Umbraco.Web.Models.ContentEditing; + +namespace Umbraco.Web.Models.Mapping +{ + internal class RedirectUrlMapDefinition : IMapDefinition + { + private readonly IUmbracoContextAccessor _umbracoContextAccessor; + + public RedirectUrlMapDefinition(IUmbracoContextAccessor umbracoContextAccessor) + { + _umbracoContextAccessor = umbracoContextAccessor; + } + + private UmbracoContext UmbracoContext => _umbracoContextAccessor.UmbracoContext; + + public void DefineMaps(UmbracoMapper mapper) + { + mapper.Define((source, context) => new ContentRedirectUrl(), Map); + } + + // Umbraco.Code.MapAll + private void Map(IRedirectUrl source, ContentRedirectUrl target, MapperContext context) + { + target.ContentId = source.ContentId; + target.CreateDateUtc = source.CreateDateUtc; + target.Culture = source.Culture; + target.DestinationUrl = source.ContentId > 0 ? UmbracoContext?.UrlProvider?.GetUrl(source.ContentId, source.Culture) : "#"; + target.OriginalUrl = UmbracoContext?.UrlProvider?.GetUrlFromRoute(source.ContentId, source.Url, source.Culture); + target.RedirectId = source.Key; + } + } +} diff --git a/src/Umbraco.Web/Models/Mapping/RedirectUrlMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/RedirectUrlMapperProfile.cs deleted file mode 100644 index 7ce5c8927f..0000000000 --- a/src/Umbraco.Web/Models/Mapping/RedirectUrlMapperProfile.cs +++ /dev/null @@ -1,22 +0,0 @@ -using AutoMapper; -using Umbraco.Core.Models; -using Umbraco.Web.Composing; -using Umbraco.Web.Models.ContentEditing; -using Umbraco.Web.Routing; - -namespace Umbraco.Web.Models.Mapping -{ - internal class RedirectUrlMapperProfile : Profile - { - - public RedirectUrlMapperProfile(IUmbracoContextAccessor umbracoContextAccessor) - { - CreateMap() - .ForMember(x => x.OriginalUrl, expression => expression.MapFrom(item => Current.UmbracoContext.UrlProvider.GetUrlFromRoute(item.ContentId, item.Url, item.Culture))) - .ForMember(x => x.DestinationUrl, expression => expression.MapFrom(item => item.ContentId > 0 ? GetUrl(umbracoContextAccessor, item) : "#")) - .ForMember(x => x.RedirectId, expression => expression.MapFrom(item => item.Key)); - } - - private static string GetUrl(IUmbracoContextAccessor umbracoContextAccessor, IRedirectUrl item) => umbracoContextAccessor?.UmbracoContext?.UrlProvider?.GetUrl(item.ContentId, item.Culture); - } -} diff --git a/src/Umbraco.Web/Models/Mapping/RelationMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/RelationMapDefinition.cs new file mode 100644 index 0000000000..7787750e54 --- /dev/null +++ b/src/Umbraco.Web/Models/Mapping/RelationMapDefinition.cs @@ -0,0 +1,57 @@ +using Umbraco.Core; +using Umbraco.Core.Mapping; +using Umbraco.Core.Models; +using Umbraco.Web.Models.ContentEditing; + +namespace Umbraco.Web.Models.Mapping +{ + internal class RelationMapDefinition : IMapDefinition + { + public void DefineMaps(UmbracoMapper mapper) + { + mapper.Define((source, context) => new RelationTypeDisplay(), Map); + mapper.Define((source, context) => new RelationDisplay(), Map); + mapper.Define(Map); + } + + // Umbraco.Code.MapAll -Icon -Trashed -AdditionalData + // Umbraco.Code.MapAll -Relations -ParentId -Notifications + private static void Map(IRelationType source, RelationTypeDisplay target, MapperContext context) + { + target.ChildObjectType = source.ChildObjectType; + target.Id = source.Id; + target.IsBidirectional = source.IsBidirectional; + target.Key = source.Key; + target.Name = source.Name; + target.Alias = source.Alias; + target.ParentObjectType = source.ParentObjectType; + target.Udi = Udi.Create(Constants.UdiEntityType.RelationType, source.Key); + target.Path = "-1," + source.Id; + + // Set the "friendly" names for the parent and child object types + target.ParentObjectTypeName = ObjectTypes.GetUmbracoObjectType(source.ParentObjectType).GetFriendlyName(); + target.ChildObjectTypeName = ObjectTypes.GetUmbracoObjectType(source.ChildObjectType).GetFriendlyName(); + } + + // Umbraco.Code.MapAll -ParentName -ChildName + private static void Map(IRelation source, RelationDisplay target, MapperContext context) + { + target.ChildId = source.ChildId; + target.Comment = source.Comment; + target.CreateDate = source.CreateDate; + target.ParentId = source.ParentId; + } + + // Umbraco.Code.MapAll -CreateDate -UpdateDate -DeleteDate + private static void Map(RelationTypeSave source, IRelationType target, MapperContext context) + { + target.Alias = source.Alias; + target.ChildObjectType = source.ChildObjectType; + target.Id = source.Id.TryConvertTo().Result; + target.IsBidirectional = source.IsBidirectional; + target.Key = source.Key; + target.Name = source.Name; + target.ParentObjectType = source.ParentObjectType; + } + } +} diff --git a/src/Umbraco.Web/Models/Mapping/RelationMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/RelationMapperProfile.cs deleted file mode 100644 index e31b1877d3..0000000000 --- a/src/Umbraco.Web/Models/Mapping/RelationMapperProfile.cs +++ /dev/null @@ -1,47 +0,0 @@ -using AutoMapper; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Web.Models.ContentEditing; - -namespace Umbraco.Web.Models.Mapping -{ - internal class RelationMapperProfile : Profile - { - public RelationMapperProfile() - { - // FROM IRelationType to RelationTypeDisplay - CreateMap() - .ForMember(dest => dest.Icon, opt => opt.Ignore()) - .ForMember(dest => dest.Trashed, opt => opt.Ignore()) - .ForMember(dest => dest.Alias, opt => opt.Ignore()) - .ForMember(dest => dest.Path, opt => opt.Ignore()) - .ForMember(dest => dest.AdditionalData, opt => opt.Ignore()) - .ForMember(dest => dest.ChildObjectTypeName, opt => opt.Ignore()) - .ForMember(dest => dest.ParentObjectTypeName, opt => opt.Ignore()) - .ForMember(dest => dest.Relations, opt => opt.Ignore()) - .ForMember(dest => dest.ParentId, opt => opt.Ignore()) - .ForMember(dest => dest.Notifications, opt => opt.Ignore()) - .ForMember(dest => dest.Udi, opt => opt.MapFrom(content => Udi.Create(Constants.UdiEntityType.RelationType, content.Key))) - .AfterMap((src, dest) => - { - // Build up the path - dest.Path = "-1," + src.Id; - - // Set the "friendly" names for the parent and child object types - dest.ParentObjectTypeName = ObjectTypes.GetUmbracoObjectType(src.ParentObjectType).GetFriendlyName(); - dest.ChildObjectTypeName = ObjectTypes.GetUmbracoObjectType(src.ChildObjectType).GetFriendlyName(); - }); - - // FROM IRelation to RelationDisplay - CreateMap() - .ForMember(dest => dest.ParentName, opt => opt.Ignore()) - .ForMember(dest => dest.ChildName, opt => opt.Ignore()); - - // FROM RelationTypeSave to IRelationType - CreateMap() - .ForMember(dest => dest.CreateDate, opt => opt.Ignore()) - .ForMember(dest => dest.UpdateDate, opt => opt.Ignore()) - .ForMember(dest => dest.DeleteDate, opt => opt.Ignore()); - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/ScheduledPublishDateResolver.cs b/src/Umbraco.Web/Models/Mapping/ScheduledPublishDateResolver.cs deleted file mode 100644 index 57e6ca8065..0000000000 --- a/src/Umbraco.Web/Models/Mapping/ScheduledPublishDateResolver.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using AutoMapper; -using Umbraco.Core.Models; -using Umbraco.Web.Models.ContentEditing; - -namespace Umbraco.Web.Models.Mapping -{ - internal class ScheduledPublishDateResolver : IValueResolver - { - private readonly ContentScheduleAction _changeType; - - public ScheduledPublishDateResolver(ContentScheduleAction changeType) - { - _changeType = changeType; - } - - public DateTime? Resolve(IContent source, ContentVariantDisplay destination, DateTime? destMember, ResolutionContext context) - { - var culture = context.Options.GetCulture(); - var sched = source.ContentSchedule.GetSchedule(culture ?? string.Empty, _changeType); - foreach(var s in sched) - return s.Date; // take the first, it's ordered by date - - return null; - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/SectionMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/SectionMapDefinition.cs new file mode 100644 index 0000000000..e05e6e5c84 --- /dev/null +++ b/src/Umbraco.Web/Models/Mapping/SectionMapDefinition.cs @@ -0,0 +1,48 @@ +using Umbraco.Core.Manifest; +using Umbraco.Core.Mapping; +using Umbraco.Core.Models.Sections; +using Umbraco.Core.Services; +using Umbraco.Web.Models.ContentEditing; +using Umbraco.Web.Sections; + +namespace Umbraco.Web.Models.Mapping +{ + internal class SectionMapDefinition : IMapDefinition + { + private readonly ILocalizedTextService _textService; + public SectionMapDefinition(ILocalizedTextService textService) + { + _textService = textService; + } + + public void DefineMaps(UmbracoMapper mapper) + { + mapper.Define((source, context) => new Section(), Map); + + // this is for AutoMapper ReverseMap - but really? + mapper.Define(); + mapper.Define(); + mapper.Define(Map); + mapper.Define(); + mapper.Define(); + mapper.Define(); + mapper.Define(); + mapper.Define(); + mapper.Define(); + } + + // Umbraco.Code.MapAll -RoutePath + private void Map(ISection source, Section target, MapperContext context) + { + target.Alias = source.Alias; + target.Name = _textService.Localize("sections/" + source.Alias); + } + + // Umbraco.Code.MapAll + private static void Map(Section source, ManifestSection target, MapperContext context) + { + target.Alias = source.Alias; + target.Name = source.Name; + } + } +} diff --git a/src/Umbraco.Web/Models/Mapping/SectionMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/SectionMapperProfile.cs deleted file mode 100644 index 61dd8dcadc..0000000000 --- a/src/Umbraco.Web/Models/Mapping/SectionMapperProfile.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Collections.Generic; -using AutoMapper; -using Umbraco.Core.Models.Sections; -using Umbraco.Core.Services; -using Umbraco.Web.Models.ContentEditing; - -namespace Umbraco.Web.Models.Mapping -{ - internal class SectionMapperProfile : Profile - { - public SectionMapperProfile(ILocalizedTextService textService) - { - CreateMap() - .ForMember(dest => dest.RoutePath, opt => opt.Ignore()) - .ForMember(dest => dest.Name, opt => opt.MapFrom(src => textService.Localize("sections/" + src.Alias, (IDictionary)null))) - .ReverseMap(); //backwards too! - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs b/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesMapper.cs similarity index 83% rename from src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs rename to src/Umbraco.Web/Models/Mapping/TabsAndPropertiesMapper.cs index dc3cc9e74f..b8d76572fb 100644 --- a/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs +++ b/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesMapper.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; using System.Linq; -using AutoMapper; using Umbraco.Core; +using Umbraco.Core.Mapping; using Umbraco.Core.Models; using Umbraco.Core.Services; using Umbraco.Web.Models.ContentEditing; @@ -10,23 +10,23 @@ using Umbraco.Web.Composing; namespace Umbraco.Web.Models.Mapping { - internal abstract class TabsAndPropertiesResolver + internal abstract class TabsAndPropertiesMapper { protected ILocalizedTextService LocalizedTextService { get; } protected IEnumerable IgnoreProperties { get; set; } - protected TabsAndPropertiesResolver(ILocalizedTextService localizedTextService) + protected TabsAndPropertiesMapper(ILocalizedTextService localizedTextService) { LocalizedTextService = localizedTextService ?? throw new ArgumentNullException(nameof(localizedTextService)); IgnoreProperties = new List(); } - protected TabsAndPropertiesResolver(ILocalizedTextService localizedTextService, IEnumerable ignoreProperties) + protected TabsAndPropertiesMapper(ILocalizedTextService localizedTextService, IEnumerable ignoreProperties) : this(localizedTextService) { IgnoreProperties = ignoreProperties ?? throw new ArgumentNullException(nameof(ignoreProperties)); } - + /// /// Returns a collection of custom generic properties that exist on the generic properties tab /// @@ -46,7 +46,7 @@ namespace Umbraco.Web.Models.Mapping /// The generic properties tab is responsible for /// setting up the properties such as Created date, updated date, template selected, etc... /// - protected virtual void MapGenericProperties(IContentBase content, List> tabs, ResolutionContext context) + protected virtual void MapGenericProperties(IContentBase content, List> tabs, MapperContext context) { // add the generic properties tab, for properties that don't belong to a tab // get the properties, map and translate them, then add the tab @@ -103,30 +103,23 @@ namespace Umbraco.Web.Models.Mapping /// /// /// - protected virtual List MapProperties(IContentBase content, List properties, ResolutionContext context) + protected virtual List MapProperties(IContentBase content, List properties, MapperContext context) { - //we need to map this way to pass the context through, I don't like it but we'll see what AutoMapper says: https://github.com/AutoMapper/AutoMapper/issues/2588 - var result = context.Mapper.Map, IEnumerable>( - properties.OrderBy(prop => prop.PropertyType.SortOrder), - null, - context) - .ToList(); - - return result; + return context.MapEnumerable(properties.OrderBy(x => x.PropertyType.SortOrder)); } } /// /// Creates the tabs collection with properties assigned for display models /// - internal class TabsAndPropertiesResolver : TabsAndPropertiesResolver, IValueResolver>> + internal class TabsAndPropertiesMapper : TabsAndPropertiesMapper where TSource : IContentBase { - public TabsAndPropertiesResolver(ILocalizedTextService localizedTextService) + public TabsAndPropertiesMapper(ILocalizedTextService localizedTextService) : base(localizedTextService) { } - public virtual IEnumerable> Resolve(TSource source, TDestination destination, IEnumerable> destMember, ResolutionContext context) + public virtual IEnumerable> Map(TSource source, MapperContext context) { var tabs = new List>(); diff --git a/src/Umbraco.Web/Models/Mapping/TagMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/TagMapDefinition.cs new file mode 100644 index 0000000000..2161183504 --- /dev/null +++ b/src/Umbraco.Web/Models/Mapping/TagMapDefinition.cs @@ -0,0 +1,22 @@ +using Umbraco.Core.Mapping; +using Umbraco.Core.Models; + +namespace Umbraco.Web.Models.Mapping +{ + internal class TagMapDefinition : IMapDefinition + { + public void DefineMaps(UmbracoMapper mapper) + { + mapper.Define((source, context) => new TagModel(), Map); + } + + // Umbraco.Code.MapAll + private static void Map(ITag source, TagModel target, MapperContext context) + { + target.Id = source.Id; + target.Text = source.Text; + target.Group = source.Group; + target.NodeCount = source.NodeCount; + } + } +} diff --git a/src/Umbraco.Web/Models/Mapping/TagMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/TagMapperProfile.cs deleted file mode 100644 index bcb6c2bb23..0000000000 --- a/src/Umbraco.Web/Models/Mapping/TagMapperProfile.cs +++ /dev/null @@ -1,13 +0,0 @@ -using AutoMapper; -using Umbraco.Core.Models; - -namespace Umbraco.Web.Models.Mapping -{ - internal class TagMapperProfile : Profile - { - public TagMapperProfile() - { - CreateMap(); - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/TemplateMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/TemplateMapDefinition.cs new file mode 100644 index 0000000000..3751cd65b7 --- /dev/null +++ b/src/Umbraco.Web/Models/Mapping/TemplateMapDefinition.cs @@ -0,0 +1,43 @@ +using Umbraco.Core.Mapping; +using Umbraco.Core.Models; +using Umbraco.Web.Models.ContentEditing; + +namespace Umbraco.Web.Models.Mapping +{ + internal class TemplateMapDefinition : IMapDefinition + { + public void DefineMaps(UmbracoMapper mapper) + { + mapper.Define((source, context) => new TemplateDisplay(), Map); + mapper.Define((source, context) => new Template(source.Name, source.Alias), Map); + } + + // Umbraco.Code.MapAll + private static void Map(ITemplate source, TemplateDisplay target, MapperContext context) + { + target.Id = source.Id; + target.Name = source.Name; + target.Alias = source.Alias; + target.Key = source.Key; + target.Content = source.Content; + target.Path = source.Path; + target.VirtualPath = source.VirtualPath; + target.MasterTemplateAlias = source.MasterTemplateAlias; + target.IsMasterTemplate = source.IsMasterTemplate; + } + + // Umbraco.Code.MapAll -CreateDate -UpdateDate -DeleteDate + // Umbraco.Code.MapAll -Path -VirtualPath -MasterTemplateId -IsMasterTemplate + // Umbraco.Code.MapAll -GetFileContent + private static void Map(TemplateDisplay source, ITemplate target, MapperContext context) + { + // don't need to worry about mapping MasterTemplateAlias here; + // the template controller handles any changes made to the master template + target.Name = source.Name; + target.Alias = source.Alias; + target.Content = source.Content; + target.Id = source.Id; + target.Key = source.Key; + } + } +} diff --git a/src/Umbraco.Web/Models/Mapping/TemplateMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/TemplateMapperProfile.cs deleted file mode 100644 index 3c283cb3a5..0000000000 --- a/src/Umbraco.Web/Models/Mapping/TemplateMapperProfile.cs +++ /dev/null @@ -1,24 +0,0 @@ -using AutoMapper; -using Umbraco.Core.Models; -using Umbraco.Web.Models.ContentEditing; - -namespace Umbraco.Web.Models.Mapping -{ - internal class TemplateMapperProfile : Profile - { - public TemplateMapperProfile() - { - CreateMap() - .ForMember(dest => dest.Notifications, opt => opt.Ignore()); - - CreateMap() - .IgnoreEntityCommonProperties() - .ForMember(dest => dest.Path, opt => opt.Ignore()) - .ForMember(dest => dest.VirtualPath, opt => opt.Ignore()) - .ForMember(dest => dest.Path, opt => opt.Ignore()) - .ForMember(dest => dest.MasterTemplateId, opt => opt.Ignore()) // ok, assigned when creating the template - .ForMember(dest => dest.IsMasterTemplate, opt => opt.Ignore()) - .ForMember(dest => dest.HasIdentity, opt => opt.Ignore()); - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/UserGroupDefaultPermissionsResolver.cs b/src/Umbraco.Web/Models/Mapping/UserGroupDefaultPermissionsResolver.cs deleted file mode 100644 index b13b5cda10..0000000000 --- a/src/Umbraco.Web/Models/Mapping/UserGroupDefaultPermissionsResolver.cs +++ /dev/null @@ -1,53 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Linq; -using Umbraco.Core; -using Umbraco.Core.CodeAnnotations; -using Umbraco.Core.Models.Membership; -using Umbraco.Core.Services; -using Umbraco.Web.Actions; -using Umbraco.Web.Models.ContentEditing; - - -namespace Umbraco.Web.Models.Mapping -{ - /// - /// Converts an IUserGroup instance into a dictionary of permissions by category - /// - internal class UserGroupDefaultPermissionsResolver - { - private readonly ILocalizedTextService _textService; - private readonly ActionCollection _actions; - - public UserGroupDefaultPermissionsResolver(ILocalizedTextService textService, ActionCollection actions) - { - _actions = actions; - _textService = textService ?? throw new ArgumentNullException(nameof(textService)); - } - - public IDictionary> Resolve(IUserGroup source) - { - return _actions - .Where(x => x.CanBePermissionAssigned) - .Select(x => GetPermission(x, source)) - .GroupBy(x => x.Category) - .ToDictionary(x => x.Key, x => (IEnumerable) x.ToArray()); - } - - private Permission GetPermission(IAction action, IUserGroup source) - { - var result = new Permission(); - - result.Category = action.Category.IsNullOrWhiteSpace() - ? _textService.Localize($"actionCategories/{Constants.Conventions.PermissionCategories.OtherCategory}") - : _textService.Localize($"actionCategories/{action.Category}"); - result.Name = _textService.Localize($"actions/{action.Alias}"); - result.Description = _textService.Localize($"actionDescriptions/{action.Alias}"); - result.Icon = action.Icon; - result.Checked = source.Permissions != null && source.Permissions.Contains(action.Letter.ToString(CultureInfo.InvariantCulture)); - result.PermissionCode = action.Letter.ToString(CultureInfo.InvariantCulture); - return result; - } - } -} diff --git a/src/Umbraco.Web/Models/Mapping/UserMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/UserMapDefinition.cs new file mode 100644 index 0000000000..1b245cdce2 --- /dev/null +++ b/src/Umbraco.Web/Models/Mapping/UserMapDefinition.cs @@ -0,0 +1,434 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using Umbraco.Core; +using Umbraco.Core.Cache; +using Umbraco.Core.Configuration; +using Umbraco.Core.Mapping; +using Umbraco.Core.Models.Membership; +using Umbraco.Web.Models.ContentEditing; +using Umbraco.Core.Models; +using Umbraco.Core.Models.Entities; +using Umbraco.Core.Models.Sections; +using Umbraco.Core.Services; +using Umbraco.Web.Actions; +using Umbraco.Web.Services; + +namespace Umbraco.Web.Models.Mapping +{ + internal class UserMapDefinition : IMapDefinition + { + private readonly ISectionService _sectionService; + private readonly IEntityService _entityService; + private readonly IUserService _userService; + private readonly ILocalizedTextService _textService; + private readonly ActionCollection _actions; + private readonly AppCaches _appCaches; + private readonly IGlobalSettings _globalSettings; + + public UserMapDefinition(ILocalizedTextService textService, IUserService userService, IEntityService entityService, ISectionService sectionService, + AppCaches appCaches, ActionCollection actions, IGlobalSettings globalSettings) + { + _sectionService = sectionService; + _entityService = entityService; + _userService = userService; + _textService = textService; + _actions = actions; + _appCaches = appCaches; + _globalSettings = globalSettings; + } + + public void DefineMaps(UmbracoMapper mapper) + { + mapper.Define((source, context) => new UserGroup { CreateDate = DateTime.UtcNow }, Map); + mapper.Define(Map); + mapper.Define((source, context) => new ContentEditing.UserProfile(), Map); + mapper.Define((source, context) => new UserGroupBasic(), Map); + mapper.Define((source, context) => new UserGroupBasic(), Map); + mapper.Define((source, context) => new AssignedUserGroupPermissions(), Map); + mapper.Define((source, context) => new AssignedContentPermissions(), Map); + mapper.Define((source, context) => new UserGroupDisplay(), Map); + mapper.Define((source, context) => new UserBasic(), Map); + mapper.Define((source, context) => new UserDetail(), Map); + + // used for merging existing UserSave to an existing IUser instance - this will not create an IUser instance! + mapper.Define(Map); + + // important! Currently we are never mapping to multiple UserDisplay objects but if we start doing that + // this will cause an N+1 and we'll need to change how this works. + mapper.Define((source, context) => new UserDisplay(), Map); + } + + // mappers + + private static void Map(UserGroupSave source, IUserGroup target, MapperContext context) + { + if (!(target is UserGroup ttarget)) + throw new NotSupportedException($"{nameof(target)} must be a UserGroup."); + Map(source, ttarget); + } + + // Umbraco.Code.MapAll -CreateDate -UpdateDate -DeleteDate + private static void Map(UserGroupSave source, UserGroup target) + { + target.StartMediaId = source.StartMediaId; + target.StartContentId = source.StartContentId; + target.Icon = source.Icon; + target.Alias = source.Alias; + target.Name = source.Name; + target.Permissions = source.DefaultPermissions; + target.Key = source.Key; + + var id = GetIntId(source.Id); + if (id > 0) + target.Id = id; + + target.ClearAllowedSections(); + foreach (var section in source.Sections) + target.AddAllowedSection(section); + } + + // Umbraco.Code.MapAll -CreateDate -UpdateDate -DeleteDate + // Umbraco.Code.MapAll -Id -TourData -StartContentIds -StartMediaIds -Language -Username + // Umbraco.Code.MapAll -PasswordQuestion -SessionTimeout -EmailConfirmedDate -InvitedDate + // Umbraco.Code.MapAll -SecurityStamp -Avatar -ProviderUserKey -RawPasswordValue + // Umbraco.Code.MapAll -RawPasswordAnswerValue -Comments -IsApproved -IsLockedOut -LastLoginDate + // Umbraco.Code.MapAll -LastPasswordChangeDate -LastLockoutDate -FailedPasswordAttempts + private void Map(UserInvite source, IUser target, MapperContext context) + { + target.Email = source.Email; + target.Key = source.Key; + target.Name = source.Name; + target.IsApproved = false; + + target.ClearGroups(); + var groups = _userService.GetUserGroupsByAlias(source.UserGroups.ToArray()); + foreach (var group in groups) + target.AddGroup(group.ToReadOnlyGroup()); + } + + // Umbraco.Code.MapAll -CreateDate -UpdateDate -DeleteDate + // Umbraco.Code.MapAll -TourData -SessionTimeout -EmailConfirmedDate -InvitedDate -SecurityStamp -Avatar + // Umbraco.Code.MapAll -ProviderUserKey -RawPasswordValue -RawPasswordAnswerValue -PasswordQuestion -Comments + // Umbraco.Code.MapAll -IsApproved -IsLockedOut -LastLoginDate -LastPasswordChangeDate -LastLockoutDate + // Umbraco.Code.MapAll -FailedPasswordAttempts + private void Map(UserSave source, IUser target, MapperContext context) + { + target.Name = source.Name; + target.StartContentIds = source.StartContentIds ?? Array.Empty(); + target.StartMediaIds = source.StartMediaIds ?? Array.Empty(); + target.Language = source.Culture; + target.Email = source.Email; + target.Key = source.Key; + target.Username = source.Username; + target.Id = source.Id; + + target.ClearGroups(); + var groups = _userService.GetUserGroupsByAlias(source.UserGroups.ToArray()); + foreach (var group in groups) + target.AddGroup(group.ToReadOnlyGroup()); + } + + // Umbraco.Code.MapAll + private static void Map(IProfile source, ContentEditing.UserProfile target, MapperContext context) + { + target.Name = source.Name; + target.UserId = source.Id; + } + + // Umbraco.Code.MapAll -ContentStartNode -UserCount -MediaStartNode -Key -Sections + // Umbraco.Code.MapAll -Notifications -Udi -Trashed -AdditionalData + private void Map(IReadOnlyUserGroup source, UserGroupBasic target, MapperContext context) + { + target.Alias = source.Alias; + target.Icon = source.Icon; + target.Id = source.Id; + target.Name = source.Name; + target.ParentId = -1; + target.Path = "-1," + source.Id; + MapUserGroupBasic(target, source.AllowedSections, source.StartContentId, source.StartMediaId, context); + } + + // Umbraco.Code.MapAll -ContentStartNode -MediaStartNode -Sections -Notifications + // Umbraco.Code.MapAll -Udi -Trashed -AdditionalData + private void Map(IUserGroup source, UserGroupBasic target, MapperContext context) + { + target.Alias = source.Alias; + target.Icon = source.Icon; + target.Id = source.Id; + target.Key = source.Key; + target.Name = source.Name; + target.ParentId = -1; + target.Path = "-1," + source.Id; + target.UserCount = source.UserCount; + MapUserGroupBasic(target, source.AllowedSections, source.StartContentId, source.StartMediaId, context); + } + + // Umbraco.Code.MapAll -Udi -Trashed -AdditionalData -AssignedPermissions + private void Map(IUserGroup source, AssignedUserGroupPermissions target, MapperContext context) + { + target.Id = source.Id; + target.Alias = source.Alias; + target.Icon = source.Icon; + target.Key = source.Key; + target.Name = source.Name; + target.ParentId = -1; + target.Path = "-1," + source.Id; + + target.DefaultPermissions = MapUserGroupDefaultPermissions(source); + + if (target.Icon.IsNullOrWhiteSpace()) + target.Icon = "icon-users"; + } + + // Umbraco.Code.MapAll -Trashed -Alias -AssignedPermissions + private static void Map(EntitySlim source, AssignedContentPermissions target, MapperContext context) + { + target.Icon = MapContentTypeIcon(source); + target.Id = source.Id; + target.Key = source.Key; + target.Name = source.Name; + target.ParentId = source.ParentId; + target.Path = source.Path; + target.Udi = Udi.Create(ObjectTypes.GetUdiType(source.NodeObjectType), source.Key); + + if (source.NodeObjectType == Constants.ObjectTypes.Member && target.Icon.IsNullOrWhiteSpace()) + target.Icon = "icon-user"; + } + + // Umbraco.Code.MapAll -ContentStartNode -MediaStartNode -Sections -Notifications -Udi + // Umbraco.Code.MapAll -Trashed -AdditionalData -Users -AssignedPermissions + private void Map(IUserGroup source, UserGroupDisplay target, MapperContext context) + { + target.Alias = source.Alias; + target.DefaultPermissions = MapUserGroupDefaultPermissions(source); + target.Icon = source.Icon; + target.Id = source.Id; + target.Key = source.Key; + target.Name = source.Name; + target.ParentId = -1; + target.Path = "-1," + source.Id; + target.UserCount = source.UserCount; + + MapUserGroupBasic(target, source.AllowedSections, source.StartContentId, source.StartMediaId, context); + + //Important! Currently we are never mapping to multiple UserGroupDisplay objects but if we start doing that + // this will cause an N+1 and we'll need to change how this works. + var users = _userService.GetAllInGroup(source.Id); + target.Users = context.MapEnumerable(users); + + //Deal with assigned permissions: + + var allContentPermissions = _userService.GetPermissions(source, true) + .ToDictionary(x => x.EntityId, x => x); + + IEntitySlim[] contentEntities; + if (allContentPermissions.Keys.Count == 0) + { + contentEntities = Array.Empty(); + } + else + { + // a group can end up with way more than 2000 assigned permissions, + // so we need to break them into groups in order to avoid breaking + // the entity service due to too many Sql parameters. + + var list = new List(); + foreach (var idGroup in allContentPermissions.Keys.InGroupsOf(2000)) + list.AddRange(_entityService.GetAll(UmbracoObjectTypes.Document, idGroup.ToArray())); + contentEntities = list.ToArray(); + } + + var allAssignedPermissions = new List(); + foreach (var entity in contentEntities) + { + var contentPermissions = allContentPermissions[entity.Id]; + + var assignedContentPermissions = context.Map(entity); + assignedContentPermissions.AssignedPermissions = AssignedUserGroupPermissions.ClonePermissions(target.DefaultPermissions); + + //since there is custom permissions assigned to this node for this group, we need to clear all of the default permissions + //and we'll re-check it if it's one of the explicitly assigned ones + foreach (var permission in assignedContentPermissions.AssignedPermissions.SelectMany(x => x.Value)) + { + permission.Checked = false; + permission.Checked = contentPermissions.AssignedPermissions.Contains(permission.PermissionCode, StringComparer.InvariantCulture); + } + + allAssignedPermissions.Add(assignedContentPermissions); + } + + target.AssignedPermissions = allAssignedPermissions; + } + + // Umbraco.Code.MapAll -Notifications -Udi -Icon -IsCurrentUser -Trashed -ResetPasswordValue + // Umbraco.Code.MapAll -Alias -AdditionalData + private void Map(IUser source, UserDisplay target, MapperContext context) + { + target.AvailableCultures = _textService.GetSupportedCultures().ToDictionary(x => x.Name, x => x.DisplayName); + target.Avatars = source.GetUserAvatarUrls(_appCaches.RuntimeCache); + target.CalculatedStartContentIds = GetStartNodes(source.CalculateContentStartNodeIds(_entityService), UmbracoObjectTypes.Document, "content/contentRoot", context); + target.CalculatedStartMediaIds = GetStartNodes(source.CalculateMediaStartNodeIds(_entityService), UmbracoObjectTypes.Media, "media/mediaRoot", context); + target.CreateDate = source.CreateDate; + target.Culture = source.GetUserCulture(_textService, _globalSettings).ToString(); + target.Email = source.Email; + target.EmailHash = source.Email.ToLowerInvariant().Trim().GenerateHash(); + target.FailedPasswordAttempts = source.FailedPasswordAttempts; + target.Id = source.Id; + target.Key = source.Key; + target.LastLockoutDate = source.LastLockoutDate; + target.LastLoginDate = source.LastLoginDate == default ? null : (DateTime?) source.LastLoginDate; + target.LastPasswordChangeDate = source.LastPasswordChangeDate; + target.Name = source.Name; + target.Navigation = CreateUserEditorNavigation(); + target.ParentId = -1; + target.Path = "-1," + source.Id; + target.StartContentIds = GetStartNodes(source.StartContentIds.ToArray(), UmbracoObjectTypes.Document, "content/contentRoot", context); + target.StartMediaIds = GetStartNodes(source.StartMediaIds.ToArray(), UmbracoObjectTypes.Media, "media/mediaRoot", context); + target.UpdateDate = source.UpdateDate; + target.UserGroups = context.MapEnumerable(source.Groups); + target.Username = source.Username; + target.UserState = source.UserState; + } + + // Umbraco.Code.MapAll -Notifications -IsCurrentUser -Udi -Icon -Trashed -Alias -AdditionalData + private void Map(IUser source, UserBasic target, MapperContext context) + { + //Loading in the user avatar's requires an external request if they don't have a local file avatar, this means that initial load of paging may incur a cost + //Alternatively, if this is annoying the back office UI would need to be updated to request the avatars for the list of users separately so it doesn't look + //like the load time is waiting. + target.Avatars = source.GetUserAvatarUrls(_appCaches.RuntimeCache); + target.Culture = source.GetUserCulture(_textService, _globalSettings).ToString(); + target.Email = source.Email; + target.EmailHash = source.Email.ToLowerInvariant().Trim().ToMd5(); + target.Id = source.Id; + target.Key = source.Key; + target.LastLoginDate = source.LastLoginDate == default ? null : (DateTime?) source.LastLoginDate; + target.Name = source.Name; + target.ParentId = -1; + target.Path = "-1," + source.Id; + target.UserGroups = context.MapEnumerable(source.Groups); + target.Username = source.Username; + target.UserState = source.UserState; + } + + // Umbraco.Code.MapAll -SecondsUntilTimeout + private void Map(IUser source, UserDetail target, MapperContext context) + { + target.AllowedSections = source.AllowedSections; + target.Avatars = source.GetUserAvatarUrls(_appCaches.RuntimeCache); + target.Culture = source.GetUserCulture(_textService, _globalSettings).ToString(); + target.Email = source.Email; + target.EmailHash = source.Email.ToLowerInvariant().Trim().GenerateHash(); + target.Name = source.Name; + target.StartContentIds = source.CalculateContentStartNodeIds(_entityService); + target.StartMediaIds = source.CalculateMediaStartNodeIds(_entityService); + target.UserId = source.Id; + + //we need to map the legacy UserType + //the best we can do here is to return the user's first user group as a IUserType object + //but we should attempt to return any group that is the built in ones first + target.UserGroups = source.Groups.Select(x => x.Alias).ToArray(); + } + + // helpers + + private void MapUserGroupBasic(UserGroupBasic target, IEnumerable sourceAllowedSections, int? sourceStartContentId, int? sourceStartMediaId, MapperContext context) + { + var allSections = _sectionService.GetSections(); + target.Sections = context.MapEnumerable(allSections.Where(x => sourceAllowedSections.Contains(x.Alias))); + + if (sourceStartMediaId > 0) + target.MediaStartNode = context.Map(_entityService.Get(sourceStartMediaId.Value, UmbracoObjectTypes.Media)); + else if (sourceStartMediaId == -1) + target.MediaStartNode = CreateRootNode(_textService.Localize("media/mediaRoot")); + + if (sourceStartContentId > 0) + target.ContentStartNode = context.Map(_entityService.Get(sourceStartContentId.Value, UmbracoObjectTypes.Document)); + else if (sourceStartContentId == -1) + target.ContentStartNode = CreateRootNode(_textService.Localize("content/contentRoot")); + + if (target.Icon.IsNullOrWhiteSpace()) + target.Icon = "icon-users"; + } + + private IDictionary> MapUserGroupDefaultPermissions(IUserGroup source) + { + Permission GetPermission(IAction action) + => new Permission + { + Category = action.Category.IsNullOrWhiteSpace() + ? _textService.Localize($"actionCategories/{Constants.Conventions.PermissionCategories.OtherCategory}") + : _textService.Localize($"actionCategories/{action.Category}"), + Name = _textService.Localize($"actions/{action.Alias}"), + Description = _textService.Localize($"actionDescriptions/{action.Alias}"), + Icon = action.Icon, + Checked = source.Permissions != null && source.Permissions.Contains(action.Letter.ToString(CultureInfo.InvariantCulture)), + PermissionCode = action.Letter.ToString(CultureInfo.InvariantCulture) + }; + + return _actions + .Where(x => x.CanBePermissionAssigned) + .Select(GetPermission) + .GroupBy(x => x.Category) + .ToDictionary(x => x.Key, x => (IEnumerable)x.ToArray()); + } + + private static string MapContentTypeIcon(EntitySlim entity) + => entity is ContentEntitySlim contentEntity ? contentEntity.ContentTypeIcon : null; + + private IEnumerable GetStartNodes(int[] startNodeIds, UmbracoObjectTypes objectType, string localizedKey, MapperContext context) + { + if (startNodeIds.Length <= 0) + return Enumerable.Empty(); + + var startNodes = new List(); + if (startNodeIds.Contains(-1)) + startNodes.Add(CreateRootNode(_textService.Localize(localizedKey))); + + var mediaItems = _entityService.GetAll(objectType, startNodeIds); + startNodes.AddRange(context.MapEnumerable(mediaItems)); + return startNodes; + } + + private IEnumerable CreateUserEditorNavigation() + { + return new[] + { + new EditorNavigation + { + Active = true, + Alias = "details", + Icon = "icon-umb-users", + Name = _textService.Localize("general/user"), + View = "views/users/views/user/details.html" + } + }; + } + + private static int GetIntId(object id) + { + var result = id.TryConvertTo(); + if (result.Success == false) + { + throw new InvalidOperationException( + "Cannot convert the profile to a " + typeof(UserDetail).Name + " object since the id is not an integer"); + } + return result.Result; + } + + private EntityBasic CreateRootNode(string name) + { + return new EntityBasic + { + Name = name, + Path = "-1", + Icon = "icon-folder", + Id = -1, + Trashed = false, + ParentId = -1 + }; + } + } +} diff --git a/src/Umbraco.Web/Models/Mapping/UserMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/UserMapperProfile.cs deleted file mode 100644 index 84660d2602..0000000000 --- a/src/Umbraco.Web/Models/Mapping/UserMapperProfile.cs +++ /dev/null @@ -1,429 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using AutoMapper; -using Umbraco.Core; -using Umbraco.Core.Cache; -using Umbraco.Core.Configuration; -using Umbraco.Core.Models.Membership; -using Umbraco.Web.Models.ContentEditing; -using Umbraco.Core.Models; -using Umbraco.Core.Models.Entities; -using Umbraco.Core.Security; -using Umbraco.Core.Services; -using Umbraco.Web.Actions; -using Umbraco.Web.Services; - - -namespace Umbraco.Web.Models.Mapping -{ - internal class UserMapperProfile : Profile - { - private static string GetContentTypeIcon(EntitySlim entity) - => entity is ContentEntitySlim contentEntity ? contentEntity.ContentTypeIcon : null; - - public UserMapperProfile(ILocalizedTextService textService, IUserService userService, IEntityService entityService, ISectionService sectionService, - AppCaches appCaches, ActionCollection actions, IGlobalSettings globalSettings) - { - var userGroupDefaultPermissionsResolver = new UserGroupDefaultPermissionsResolver(textService, actions); - - CreateMap() - .ConstructUsing(save => new UserGroup { CreateDate = DateTime.UtcNow }) - .IgnoreEntityCommonProperties() - .ForMember(dest => dest.Id, opt => opt.Condition(source => GetIntId(source.Id) > 0)) - .ForMember(dest => dest.Id, opt => opt.MapFrom(source => GetIntId(source.Id))) - .ForMember(dest => dest.Permissions, opt => opt.MapFrom(source => source.DefaultPermissions)) - .AfterMap((save, userGroup) => - { - userGroup.ClearAllowedSections(); - foreach (var section in save.Sections) - { - userGroup.AddAllowedSection(section); - } - }); - - //Used for merging existing UserSave to an existing IUser instance - this will not create an IUser instance! - CreateMap() - .IgnoreEntityCommonProperties() - .ForMember(dest => dest.Id, opt => opt.Condition(src => GetIntId(src.Id) > 0)) - .ForMember(detail => detail.TourData, opt => opt.Ignore()) - .ForMember(dest => dest.SessionTimeout, opt => opt.Ignore()) - .ForMember(dest => dest.EmailConfirmedDate, opt => opt.Ignore()) - .ForMember(dest => dest.InvitedDate, opt => opt.Ignore()) - .ForMember(dest => dest.SecurityStamp, opt => opt.Ignore()) - .ForMember(dest => dest.Avatar, opt => opt.Ignore()) - .ForMember(dest => dest.ProviderUserKey, opt => opt.Ignore()) - .ForMember(dest => dest.RawPasswordValue, opt => opt.Ignore()) - .ForMember(dest => dest.RawPasswordAnswerValue, opt => opt.Ignore()) - .ForMember(dest => dest.PasswordQuestion, opt => opt.Ignore()) - .ForMember(dest => dest.Comments, opt => opt.Ignore()) - .ForMember(dest => dest.IsApproved, opt => opt.Ignore()) - .ForMember(dest => dest.IsLockedOut, opt => opt.Ignore()) - .ForMember(dest => dest.LastLoginDate, opt => opt.Ignore()) - .ForMember(dest => dest.LastPasswordChangeDate, opt => opt.Ignore()) - .ForMember(dest => dest.LastLockoutDate, opt => opt.Ignore()) - .ForMember(dest => dest.FailedPasswordAttempts, opt => opt.Ignore()) - .ForMember(user => user.Language, opt => opt.MapFrom(save => save.Culture)) - .AfterMap((save, user) => - { - user.ClearGroups(); - var foundGroups = userService.GetUserGroupsByAlias(save.UserGroups.ToArray()); - foreach (var group in foundGroups) - { - user.AddGroup(group.ToReadOnlyGroup()); - } - }); - - CreateMap() - .IgnoreEntityCommonProperties() - .ForMember(dest => dest.Id, opt => opt.Ignore()) - .ForMember(detail => detail.TourData, opt => opt.Ignore()) - .ForMember(dest => dest.StartContentIds, opt => opt.Ignore()) - .ForMember(dest => dest.StartMediaIds, opt => opt.Ignore()) - .ForMember(dest => dest.Language, opt => opt.Ignore()) - .ForMember(dest => dest.Username, opt => opt.Ignore()) - .ForMember(dest => dest.PasswordQuestion, opt => opt.Ignore()) - .ForMember(dest => dest.SessionTimeout, opt => opt.Ignore()) - .ForMember(dest => dest.EmailConfirmedDate, opt => opt.Ignore()) - .ForMember(dest => dest.InvitedDate, opt => opt.Ignore()) - .ForMember(dest => dest.SecurityStamp, opt => opt.Ignore()) - .ForMember(dest => dest.Avatar, opt => opt.Ignore()) - .ForMember(dest => dest.ProviderUserKey, opt => opt.Ignore()) - .ForMember(dest => dest.RawPasswordValue, opt => opt.Ignore()) - .ForMember(dest => dest.RawPasswordAnswerValue, opt => opt.Ignore()) - .ForMember(dest => dest.Comments, opt => opt.Ignore()) - .ForMember(dest => dest.IsApproved, opt => opt.Ignore()) - .ForMember(dest => dest.IsLockedOut, opt => opt.Ignore()) - .ForMember(dest => dest.LastLoginDate, opt => opt.Ignore()) - .ForMember(dest => dest.LastPasswordChangeDate, opt => opt.Ignore()) - .ForMember(dest => dest.LastLockoutDate, opt => opt.Ignore()) - .ForMember(dest => dest.FailedPasswordAttempts, opt => opt.Ignore()) - //all invited users will not be approved, completing the invite will approve the user - .ForMember(user => user.IsApproved, opt => opt.MapFrom(_ => false)) - .AfterMap((invite, user) => - { - user.ClearGroups(); - var foundGroups = userService.GetUserGroupsByAlias(invite.UserGroups.ToArray()); - foreach (var group in foundGroups) - { - user.AddGroup(group.ToReadOnlyGroup()); - } - }); - - CreateMap() - .ForMember(dest => dest.ContentStartNode, opt => opt.Ignore()) - .ForMember(dest => dest.UserCount, opt => opt.Ignore()) - .ForMember(dest => dest.MediaStartNode, opt => opt.Ignore()) - .ForMember(dest => dest.Key, opt => opt.Ignore()) - .ForMember(dest => dest.Sections, opt => opt.Ignore()) - .ForMember(dest => dest.Notifications, opt => opt.Ignore()) - .ForMember(dest => dest.Udi, opt => opt.Ignore()) - .ForMember(dest => dest.Trashed, opt => opt.Ignore()) - .ForMember(dest => dest.ParentId, opt => opt.MapFrom(_ => -1)) - .ForMember(dest => dest.Path, opt => opt.MapFrom(userGroup => "-1," + userGroup.Id)) - .ForMember(dest => dest.AdditionalData, opt => opt.Ignore()) - .AfterMap((group, display) => - { - MapUserGroupBasic(sectionService, entityService, textService, group, display); - }); - - CreateMap() - .ForMember(dest => dest.ContentStartNode, opt => opt.Ignore()) - .ForMember(dest => dest.MediaStartNode, opt => opt.Ignore()) - .ForMember(dest => dest.Sections, opt => opt.Ignore()) - .ForMember(dest => dest.Notifications, opt => opt.Ignore()) - .ForMember(dest => dest.Udi, opt => opt.Ignore()) - .ForMember(dest => dest.Trashed, opt => opt.Ignore()) - .ForMember(dest => dest.ParentId, opt => opt.MapFrom(_ => -1)) - .ForMember(dest => dest.Path, opt => opt.MapFrom(userGroup => "-1," + userGroup.Id)) - .ForMember(dest => dest.AdditionalData, opt => opt.Ignore()) - .AfterMap((group, display) => - { - MapUserGroupBasic(sectionService, entityService, textService, group, display); - }); - - //create a map to assign a user group's default permissions to the AssignedUserGroupPermissions instance - CreateMap() - .ForMember(dest => dest.Udi, opt => opt.Ignore()) - .ForMember(dest => dest.Trashed, opt => opt.Ignore()) - .ForMember(dest => dest.AdditionalData, opt => opt.Ignore()) - .ForMember(dest => dest.Id, opt => opt.MapFrom(group => group.Id)) - .ForMember(dest => dest.ParentId, opt => opt.MapFrom(_ => -1)) - .ForMember(dest => dest.Path, opt => opt.MapFrom(userGroup => "-1," + userGroup.Id)) - .ForMember(dest => dest.DefaultPermissions, opt => opt.MapFrom(src => userGroupDefaultPermissionsResolver.Resolve(src))) - //these will be manually mapped and by default they are null - .ForMember(dest => dest.AssignedPermissions, opt => opt.Ignore()) - .AfterMap((group, display) => - { - if (display.Icon.IsNullOrWhiteSpace()) - { - display.Icon = "icon-users"; - } - }); - - CreateMap() - .ForMember(x => x.Udi, opt => opt.MapFrom(x => Udi.Create(ObjectTypes.GetUdiType(x.NodeObjectType), x.Key))) - .ForMember(basic => basic.Icon, opt => opt.MapFrom(entity => GetContentTypeIcon(entity))) - .ForMember(dto => dto.Trashed, opt => opt.Ignore()) - .ForMember(x => x.Alias, opt => opt.Ignore()) - .ForMember(x => x.AssignedPermissions, opt => opt.Ignore()) - .AfterMap((entity, basic) => - { - if (entity.NodeObjectType == Constants.ObjectTypes.Member && basic.Icon.IsNullOrWhiteSpace()) - { - basic.Icon = "icon-user"; - } - }); - - CreateMap() - .ForMember(dest => dest.ContentStartNode, opt => opt.Ignore()) - .ForMember(dest => dest.MediaStartNode, opt => opt.Ignore()) - .ForMember(dest => dest.Sections, opt => opt.Ignore()) - .ForMember(dest => dest.Notifications, opt => opt.Ignore()) - .ForMember(dest => dest.Udi, opt => opt.Ignore()) - .ForMember(dest => dest.Trashed, opt => opt.Ignore()) - .ForMember(dest => dest.ParentId, opt => opt.MapFrom(_ => -1)) - .ForMember(dest => dest.Path, opt => opt.MapFrom(userGroup => "-1," + userGroup.Id)) - .ForMember(dest => dest.AdditionalData, opt => opt.Ignore()) - .ForMember(dest => dest.Users, opt => opt.Ignore()) - .ForMember(dest => dest.DefaultPermissions, opt => opt.MapFrom(src => userGroupDefaultPermissionsResolver.Resolve(src))) - .ForMember(dest => dest.AssignedPermissions, opt => opt.Ignore()) - .AfterMap((group, display) => - { - MapUserGroupBasic(sectionService, entityService, textService, group, display); - - //Important! Currently we are never mapping to multiple UserGroupDisplay objects but if we start doing that - // this will cause an N+1 and we'll need to change how this works. - var users = userService.GetAllInGroup(group.Id); - display.Users = Mapper.Map>(users); - - //Deal with assigned permissions: - - var allContentPermissions = userService.GetPermissions(@group, true) - .ToDictionary(x => x.EntityId, x => x); - - IEntitySlim[] contentEntities; - if (allContentPermissions.Keys.Count == 0) - { - contentEntities = Array.Empty(); - } - else - { - // a group can end up with way more than 2000 assigned permissions, - // so we need to break them into groups in order to avoid breaking - // the entity service due to too many Sql parameters. - - var list = new List(); - foreach (var idGroup in allContentPermissions.Keys.InGroupsOf(2000)) - list.AddRange(entityService.GetAll(UmbracoObjectTypes.Document, idGroup.ToArray())); - contentEntities = list.ToArray(); - } - - var allAssignedPermissions = new List(); - foreach (var entity in contentEntities) - { - var contentPermissions = allContentPermissions[entity.Id]; - - var assignedContentPermissions = Mapper.Map(entity); - assignedContentPermissions.AssignedPermissions = AssignedUserGroupPermissions.ClonePermissions(display.DefaultPermissions); - - //since there is custom permissions assigned to this node for this group, we need to clear all of the default permissions - //and we'll re-check it if it's one of the explicitly assigned ones - foreach (var permission in assignedContentPermissions.AssignedPermissions.SelectMany(x => x.Value)) - { - permission.Checked = false; - permission.Checked = contentPermissions.AssignedPermissions.Contains(permission.PermissionCode, StringComparer.InvariantCulture); - } - - allAssignedPermissions.Add(assignedContentPermissions); - } - - display.AssignedPermissions = allAssignedPermissions; - }); - - //Important! Currently we are never mapping to multiple UserDisplay objects but if we start doing that - // this will cause an N+1 and we'll need to change how this works. - CreateMap() - .ForMember(dest => dest.Avatars, opt => opt.MapFrom(user => user.GetUserAvatarUrls(appCaches.RuntimeCache))) - .ForMember(dest => dest.Username, opt => opt.MapFrom(user => user.Username)) - .ForMember(dest => dest.LastLoginDate, opt => opt.MapFrom(user => user.LastLoginDate == default(DateTime) ? null : (DateTime?)user.LastLoginDate)) - .ForMember(dest => dest.UserGroups, opt => opt.MapFrom(user => user.Groups)) - .ForMember(detail => detail.Navigation, opt => opt.MapFrom(user => CreateUserEditorNavigation(textService))) - .ForMember( - dest => dest.CalculatedStartContentIds, - opt => opt.MapFrom(src => GetStartNodeValues( - src.CalculateContentStartNodeIds(entityService), - textService, entityService, UmbracoObjectTypes.Document, "content/contentRoot"))) - .ForMember( - dest => dest.CalculatedStartMediaIds, - opt => opt.MapFrom(src => GetStartNodeValues( - src.CalculateMediaStartNodeIds(entityService), - textService, entityService, UmbracoObjectTypes.Media, "media/mediaRoot"))) - .ForMember( - dest => dest.StartContentIds, - opt => opt.MapFrom(src => GetStartNodeValues( - src.StartContentIds.ToArray(), - textService, entityService, UmbracoObjectTypes.Document, "content/contentRoot"))) - .ForMember( - dest => dest.StartMediaIds, - opt => opt.MapFrom(src => GetStartNodeValues( - src.StartMediaIds.ToArray(), - textService, entityService, UmbracoObjectTypes.Media, "media/mediaRoot"))) - .ForMember(dest => dest.Culture, opt => opt.MapFrom(user => user.GetUserCulture(textService, globalSettings))) - .ForMember( - dest => dest.AvailableCultures, - opt => opt.MapFrom(user => textService.GetSupportedCultures().ToDictionary(x => x.Name, x => x.DisplayName))) - .ForMember( - dest => dest.EmailHash, - opt => opt.MapFrom(user => user.Email.ToLowerInvariant().Trim().GenerateHash())) - .ForMember(dest => dest.ParentId, opt => opt.MapFrom(_ => -1)) - .ForMember(dest => dest.Path, opt => opt.MapFrom(user => "-1," + user.Id)) - .ForMember(dest => dest.Notifications, opt => opt.Ignore()) - .ForMember(dest => dest.Udi, opt => opt.Ignore()) - .ForMember(dest => dest.Icon, opt => opt.Ignore()) - .ForMember(dest => dest.IsCurrentUser, opt => opt.Ignore()) - .ForMember(dest => dest.Trashed, opt => opt.Ignore()) - .ForMember(dest => dest.ResetPasswordValue, opt => opt.Ignore()) - .ForMember(dest => dest.Alias, opt => opt.Ignore()) - .ForMember(dest => dest.Trashed, opt => opt.Ignore()) - .ForMember(dest => dest.AdditionalData, opt => opt.Ignore()); - - CreateMap() - //Loading in the user avatar's requires an external request if they don't have a local file avatar, this means that initial load of paging may incur a cost - //Alternatively, if this is annoying the back office UI would need to be updated to request the avatars for the list of users separately so it doesn't look - //like the load time is waiting. - .ForMember(detail => - detail.Avatars, - opt => opt.MapFrom(user => user.GetUserAvatarUrls(appCaches.RuntimeCache))) - .ForMember(dest => dest.Username, opt => opt.MapFrom(user => user.Username)) - .ForMember(dest => dest.UserGroups, opt => opt.MapFrom(user => user.Groups)) - .ForMember(dest => dest.LastLoginDate, opt => opt.MapFrom(user => user.LastLoginDate == default(DateTime) ? null : (DateTime?)user.LastLoginDate)) - .ForMember(dest => dest.Culture, opt => opt.MapFrom(user => user.GetUserCulture(textService, globalSettings))) - .ForMember( - dest => dest.EmailHash, - opt => opt.MapFrom(user => user.Email.ToLowerInvariant().Trim().ToMd5())) - .ForMember(dest => dest.ParentId, opt => opt.MapFrom(_ => -1)) - .ForMember(dest => dest.Path, opt => opt.MapFrom(user => "-1," + user.Id)) - .ForMember(dest => dest.Notifications, opt => opt.Ignore()) - .ForMember(dest => dest.IsCurrentUser, opt => opt.Ignore()) - .ForMember(dest => dest.Udi, opt => opt.Ignore()) - .ForMember(dest => dest.Icon, opt => opt.Ignore()) - .ForMember(dest => dest.Trashed, opt => opt.Ignore()) - .ForMember(dest => dest.Alias, opt => opt.Ignore()) - .ForMember(dest => dest.Trashed, opt => opt.Ignore()) - .ForMember(dest => dest.AdditionalData, opt => opt.Ignore()); - - CreateMap() - .ForMember(dest => dest.Avatars, opt => opt.MapFrom(user => user.GetUserAvatarUrls(appCaches.RuntimeCache))) - .ForMember(dest => dest.UserId, opt => opt.MapFrom(user => GetIntId(user.Id))) - .ForMember(dest => dest.StartContentIds, opt => opt.MapFrom(user => user.CalculateContentStartNodeIds(entityService))) - .ForMember(dest => dest.StartMediaIds, opt => opt.MapFrom(user => user.CalculateMediaStartNodeIds(entityService))) - .ForMember(dest => dest.Culture, opt => opt.MapFrom(user => user.GetUserCulture(textService, globalSettings))) - .ForMember( - dest => dest.EmailHash, - opt => opt.MapFrom(user => user.Email.ToLowerInvariant().Trim().GenerateHash())) - .ForMember(dest => dest.SecondsUntilTimeout, opt => opt.Ignore()) - .ForMember(dest => dest.UserGroups, opt => opt.Ignore()) - .AfterMap((user, detail) => - { - //we need to map the legacy UserType - //the best we can do here is to return the user's first user group as a IUserType object - //but we should attempt to return any group that is the built in ones first - var groups = user.Groups.ToArray(); - detail.UserGroups = user.Groups.Select(x => x.Alias).ToArray(); - - }); - - CreateMap() - .ForMember(dest => dest.UserId, opt => opt.MapFrom(profile => GetIntId(profile.Id))); - } - - private IEnumerable CreateUserEditorNavigation(ILocalizedTextService textService) - { - return new[] - { - new EditorNavigation - { - Active = true, - Alias = "details", - Icon = "icon-umb-users", - Name = textService.Localize("general/user"), - View = "views/users/views/user/details.html" - } - }; - } - - private IEnumerable GetStartNodeValues(int[] startNodeIds, - ILocalizedTextService textService, IEntityService entityService, UmbracoObjectTypes objectType, - string localizedKey) - { - if (startNodeIds.Length <= 0) - return Enumerable.Empty(); - - var startNodes = new List(); - if (startNodeIds.Contains(-1)) - startNodes.Add(RootNode(textService.Localize(localizedKey))); - - var mediaItems = entityService.GetAll(objectType, startNodeIds); - startNodes.AddRange(Mapper.Map, IEnumerable>(mediaItems)); - return startNodes; - } - - private void MapUserGroupBasic(ISectionService sectionService, IEntityService entityService, ILocalizedTextService textService, dynamic group, UserGroupBasic display) - { - var allSections = sectionService.GetSections(); - display.Sections = allSections.Where(x => Enumerable.Contains(group.AllowedSections, x.Alias)).Select(Mapper.Map); - - if (group.StartMediaId > 0) - { - display.MediaStartNode = Mapper.Map( - entityService.Get(group.StartMediaId, UmbracoObjectTypes.Media)); - } - else if (group.StartMediaId == -1) - { - //create the root node - display.MediaStartNode = RootNode(textService.Localize("media/mediaRoot")); - } - - if (group.StartContentId > 0) - { - display.ContentStartNode = Mapper.Map( - entityService.Get(group.StartContentId, UmbracoObjectTypes.Document)); - } - else if (group.StartContentId == -1) - { - //create the root node - display.ContentStartNode = RootNode(textService.Localize("content/contentRoot")); - } - - if (display.Icon.IsNullOrWhiteSpace()) - { - display.Icon = "icon-users"; - } - } - - private EntityBasic RootNode(string name) - { - return new EntityBasic - { - Name = name, - Path = "-1", - Icon = "icon-folder", - Id = -1, - Trashed = false, - ParentId = -1 - }; - } - - private static int GetIntId(object id) - { - var result = id.TryConvertTo(); - if (result.Success == false) - { - throw new InvalidOperationException( - "Cannot convert the profile to a " + typeof(UserDetail).Name + " object since the id is not an integer"); - } - return result.Result; - } - } -} diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs index 7ab4a64f31..331ec37248 100644 --- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs @@ -503,6 +503,7 @@ namespace Umbraco.Web.PublishedCache.NuCache } } + // IMPORTANT kits must be sorted out by LEVEL public void SetAll(IEnumerable kits) { var lockInfo = new WriteLockInfo(); @@ -533,6 +534,7 @@ namespace Umbraco.Web.PublishedCache.NuCache } } + // IMPORTANT kits must be sorted out by LEVEL public void SetBranch(int rootContentId, IEnumerable kits) { var lockInfo = new WriteLockInfo(); diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.cs index 1b17e0c124..910c0ca737 100644 --- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.cs @@ -1,4 +1,5 @@ -using CSharpTest.Net.Collections; +using System.Configuration; +using CSharpTest.Net.Collections; using CSharpTest.Net.Serialization; namespace Umbraco.Web.PublishedCache.NuCache.DataSource @@ -14,6 +15,12 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource CreateFile = exists ? CreatePolicy.IfNeeded : CreatePolicy.Always, FileName = filepath, + // read or write but do *not* keep in memory + CachePolicy = CachePolicy.None, + + // default is 4096, min 2^9 = 512, max 2^16 = 64K + FileBlockSize = GetBlockSize(), + // other options? }; @@ -25,6 +32,28 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource return tree; } + private static int GetBlockSize() + { + var blockSize = 4096; + + var appSetting = ConfigurationManager.AppSettings["Umbraco.Web.PublishedCache.NuCache.BTree.BlockSize"]; + if (appSetting == null) + return blockSize; + + if (!int.TryParse(appSetting, out blockSize)) + throw new ConfigurationErrorsException($"Invalid block size value \"{appSetting}\": not a number."); + + var bit = 0; + for (var i = blockSize; i != 1; i >>= 1) + bit++; + if (1 << bit != blockSize) + throw new ConfigurationErrorsException($"Invalid block size value \"{blockSize}\": must be a power of two."); + if (blockSize < 512 || blockSize > 65536) + throw new ConfigurationErrorsException($"Invalid block size value \"{blockSize}\": must be >= 512 and <= 65536."); + + return blockSize; + } + /* class ListOfIntSerializer : ISerializer> { diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs index d34a789581..bf16074040 100755 --- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs @@ -356,6 +356,7 @@ namespace Umbraco.Web.PublishedCache.NuCache _logger.Debug("Loading content from database..."); var sw = Stopwatch.StartNew(); + // IMPORTANT GetAllContentSources sorts kits by level var kits = _dataSource.GetAllContentSources(scope); _contentStore.SetAll(kits); sw.Stop(); @@ -370,7 +371,8 @@ namespace Umbraco.Web.PublishedCache.NuCache _logger.Debug("Loading content from local db..."); var sw = Stopwatch.StartNew(); - var kits = _localContentDb.Select(x => x.Value).OrderBy(x => x.Node.Level); + var kits = _localContentDb.Select(x => x.Value) + .OrderBy(x => x.Node.Level); // IMPORTANT sort by level _contentStore.SetAll(kits); sw.Stop(); _logger.Debug("Loaded content from local db ({Duration}ms)", sw.ElapsedMilliseconds); @@ -422,6 +424,7 @@ namespace Umbraco.Web.PublishedCache.NuCache _logger.Debug("Loading media from database..."); var sw = Stopwatch.StartNew(); + // IMPORTANT GetAllMediaSources sorts kits by level var kits = _dataSource.GetAllMediaSources(scope); _mediaStore.SetAll(kits); sw.Stop(); @@ -436,7 +439,8 @@ namespace Umbraco.Web.PublishedCache.NuCache _logger.Debug("Loading media from local db..."); var sw = Stopwatch.StartNew(); - var kits = _localMediaDb.Select(x => x.Value); + var kits = _localMediaDb.Select(x => x.Value) + .OrderBy(x => x.Node.Level); // IMPORTANT sort by level _mediaStore.SetAll(kits); sw.Stop(); _logger.Debug("Loaded media from local db ({Duration}ms)", sw.ElapsedMilliseconds); @@ -647,6 +651,7 @@ namespace Umbraco.Web.PublishedCache.NuCache if (capture.ChangeTypes.HasType(TreeChangeTypes.RefreshBranch)) { // ?? should we do some RV check here? + // IMPORTANT GetbranchContentSources sorts kits by level var kits = _dataSource.GetBranchContentSources(scope, capture.Id); _contentStore.SetBranch(capture.Id, kits); } @@ -738,6 +743,7 @@ namespace Umbraco.Web.PublishedCache.NuCache if (capture.ChangeTypes.HasType(TreeChangeTypes.RefreshBranch)) { // ?? should we do some RV check here? + // IMPORTANT GetbranchContentSources sorts kits by level var kits = _dataSource.GetBranchMediaSources(scope, capture.Id); _mediaStore.SetBranch(capture.Id, kits); } diff --git a/src/Umbraco.Web/PublishedContentExtensions.cs b/src/Umbraco.Web/PublishedContentExtensions.cs index bba58dfae5..54afb7abbd 100644 --- a/src/Umbraco.Web/PublishedContentExtensions.cs +++ b/src/Umbraco.Web/PublishedContentExtensions.cs @@ -298,23 +298,6 @@ namespace Umbraco.Web #region IsSomething: misc. - /// - /// Gets a value indicating whether the content is visible. - /// - /// The content. - /// A value indicating whether the content is visible. - /// A content is not visible if it has an umbracoNaviHide property with a value of "1". Otherwise, - /// the content is visible. - public static bool IsVisible(this IPublishedContent content) - { - // note: would be better to ensure we have an IPropertyEditorValueConverter for booleans - // and then treat the umbracoNaviHide property as a boolean - vs. the hard-coded "1". - - // rely on the property converter - will return default bool value, ie false, if property - // is not defined, or has no value, else will return its value. - return content.Value(Constants.Conventions.Content.NaviHide) == false; - } - /// /// Determines whether the specified content is a specified content type. /// diff --git a/src/Umbraco.Web/PublishedElementExtensions.cs b/src/Umbraco.Web/PublishedElementExtensions.cs index f2a49f7f60..de7c72d21a 100644 --- a/src/Umbraco.Web/PublishedElementExtensions.cs +++ b/src/Umbraco.Web/PublishedElementExtensions.cs @@ -170,5 +170,23 @@ namespace Umbraco.Web } #endregion + + #region IsSomething + + /// + /// Gets a value indicating whether the content is visible. + /// + /// The content. + /// A value indicating whether the content is visible. + /// A content is not visible if it has an umbracoNaviHide property with a value of "1". Otherwise, + /// the content is visible. + public static bool IsVisible(this IPublishedElement content) + { + // rely on the property converter - will return default bool value, ie false, if property + // is not defined, or has no value, else will return its value. + return content.Value(Constants.Conventions.Content.NaviHide) == false; + } + + #endregion } } diff --git a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs index 5e9beeff29..43db9ff0ba 100644 --- a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs +++ b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs @@ -1,19 +1,16 @@ using System; using System.Collections.Generic; -using System.Globalization; using System.Linq; using System.Text; using System.Text.RegularExpressions; -using AutoMapper; using Examine; using Umbraco.Core; -using Umbraco.Core.Composing; +using Umbraco.Core.Mapping; using Umbraco.Core.Models; using Umbraco.Core.Services; using Umbraco.Examine; using Umbraco.Web.Models.ContentEditing; using Umbraco.Web.Trees; -using SearchResult = Examine.SearchResult; namespace Umbraco.Web.Search { @@ -24,21 +21,21 @@ namespace Umbraco.Web.Search { private readonly IExamineManager _examineManager; private readonly UmbracoContext _umbracoContext; - private readonly UmbracoHelper _umbracoHelper; private readonly ILocalizationService _languageService; private readonly IEntityService _entityService; + private readonly UmbracoMapper _mapper; public UmbracoTreeSearcher(IExamineManager examineManager, UmbracoContext umbracoContext, - UmbracoHelper umbracoHelper, ILocalizationService languageService, - IEntityService entityService) + IEntityService entityService, + UmbracoMapper mapper) { _examineManager = examineManager ?? throw new ArgumentNullException(nameof(examineManager)); _umbracoContext = umbracoContext; - _umbracoHelper = umbracoHelper ?? throw new ArgumentNullException(nameof(umbracoHelper)); _languageService = languageService; _entityService = entityService; + _mapper = mapper; } /// @@ -64,9 +61,9 @@ namespace Umbraco.Web.Search string type; var indexName = Constants.UmbracoIndexes.InternalIndexName; var fields = new[] { "id", "__NodeId" }; - + // TODO: WE should try to allow passing in a lucene raw query, however we will still need to do some manual string - // manipulation for things like start paths, member types, etc... + // manipulation for things like start paths, member types, etc... //if (Examine.ExamineExtensions.TryParseLuceneQuery(query)) //{ @@ -201,7 +198,7 @@ namespace Umbraco.Web.Search AppendNodeNameExactWithBoost(sb, query, allLangs); AppendNodeNameWithWildcards(sb, querywords, allLangs); - + foreach (var f in fields) { //additional fields normally @@ -356,14 +353,14 @@ namespace Umbraco.Web.Search //add additional data foreach (var result in results) { - var m = Mapper.Map(result); + var m = _mapper.Map(result); //if no icon could be mapped, it will be set to document, so change it to picture if (m.Icon == "icon-document") { m.Icon = "icon-user"; } - + if (result.Values.ContainsKey("email") && result.Values["email"] != null) { m.AdditionalData["Email"] = result.Values["email"]; @@ -390,7 +387,7 @@ namespace Umbraco.Web.Search //add additional data foreach (var result in results) { - var m = Mapper.Map(result); + var m = _mapper.Map(result); //if no icon could be mapped, it will be set to document, so change it to picture if (m.Icon == "icon-document") { @@ -411,7 +408,7 @@ namespace Umbraco.Web.Search foreach (var result in results) { - var entity = Mapper.Map(result); + var entity = _mapper.Map(result); var intId = entity.Id.TryConvertTo(); if (intId.Success) diff --git a/src/Umbraco.Web/Security/AppBuilderExtensions.cs b/src/Umbraco.Web/Security/AppBuilderExtensions.cs index 22d87bdc14..0a3e57c4fd 100644 --- a/src/Umbraco.Web/Security/AppBuilderExtensions.cs +++ b/src/Umbraco.Web/Security/AppBuilderExtensions.cs @@ -13,6 +13,7 @@ using Owin; using Umbraco.Core; using Umbraco.Core.Configuration; using Umbraco.Core.Configuration.UmbracoSettings; +using Umbraco.Core.Mapping; using Umbraco.Core.Models.Identity; using Umbraco.Core.Security; using Umbraco.Core.Services; @@ -36,6 +37,7 @@ namespace Umbraco.Web.Security /// public static void ConfigureUserManagerForUmbracoBackOffice(this IAppBuilder app, ServiceContext services, + UmbracoMapper mapper, IContentSection contentSettings, IGlobalSettings globalSettings, MembershipProviderBase userMembershipProvider) @@ -52,6 +54,7 @@ namespace Umbraco.Web.Security services.EntityService, services.ExternalLoginService, userMembershipProvider, + mapper, contentSettings, globalSettings)); diff --git a/src/Umbraco.Web/Security/BackOfficeUserManager.cs b/src/Umbraco.Web/Security/BackOfficeUserManager.cs index 83cf06c6d9..6205c1705c 100644 --- a/src/Umbraco.Web/Security/BackOfficeUserManager.cs +++ b/src/Umbraco.Web/Security/BackOfficeUserManager.cs @@ -10,6 +10,7 @@ using Microsoft.Owin.Security.DataProtection; using Umbraco.Core; using Umbraco.Core.Configuration; using Umbraco.Core.Configuration.UmbracoSettings; +using Umbraco.Core.Mapping; using Umbraco.Core.Models.Identity; using Umbraco.Core.Security; using Umbraco.Core.Services; @@ -60,6 +61,7 @@ namespace Umbraco.Web.Security IEntityService entityService, IExternalLoginService externalLoginService, MembershipProviderBase membershipProvider, + UmbracoMapper mapper, IContentSection contentSectionConfig, IGlobalSettings globalSettings) { @@ -69,7 +71,7 @@ namespace Umbraco.Web.Security if (externalLoginService == null) throw new ArgumentNullException("externalLoginService"); var manager = new BackOfficeUserManager( - new BackOfficeUserStore(userService, memberTypeService, entityService, externalLoginService, globalSettings, membershipProvider)); + new BackOfficeUserStore(userService, memberTypeService, entityService, externalLoginService, globalSettings, membershipProvider, mapper)); manager.InitUserManager(manager, membershipProvider, contentSectionConfig, options); return manager; } diff --git a/src/Umbraco.Web/Security/WebAuthExtensions.cs b/src/Umbraco.Web/Security/WebAuthExtensions.cs index aa06616d90..f008dc8ba7 100644 --- a/src/Umbraco.Web/Security/WebAuthExtensions.cs +++ b/src/Umbraco.Web/Security/WebAuthExtensions.cs @@ -1,12 +1,8 @@ using System.Net.Http; -using System.Security.Claims; using System.Security.Principal; using System.ServiceModel.Channels; using System.Threading; using System.Web; -using AutoMapper; -using Umbraco.Core.Models.Membership; -using Umbraco.Core.Security; using Umbraco.Web.WebApi; namespace Umbraco.Web.Security diff --git a/src/Umbraco.Web/TagQuery.cs b/src/Umbraco.Web/TagQuery.cs index e79640bb4d..4a7ee8e7eb 100644 --- a/src/Umbraco.Web/TagQuery.cs +++ b/src/Umbraco.Web/TagQuery.cs @@ -1,7 +1,8 @@ using System; using System.Collections.Generic; using System.Linq; -using AutoMapper; +using Umbraco.Core.Mapping; +using Umbraco.Core.Models; using Umbraco.Core.Models.PublishedContent; using Umbraco.Core.Services; using Umbraco.Web.Models; @@ -15,14 +16,16 @@ namespace Umbraco.Web { private readonly ITagService _tagService; private readonly IPublishedContentQuery _contentQuery; + private readonly UmbracoMapper _mapper; /// /// Initializes a new instance of the class. /// - public TagQuery(ITagService tagService, IPublishedContentQuery contentQuery) + public TagQuery(ITagService tagService, IPublishedContentQuery contentQuery, UmbracoMapper mapper) { _tagService = tagService ?? throw new ArgumentNullException(nameof(tagService)); _contentQuery = contentQuery ?? throw new ArgumentNullException(nameof(contentQuery)); + _mapper = mapper; } /// @@ -64,37 +67,37 @@ namespace Umbraco.Web /// public IEnumerable GetAllTags(string group = null, string culture = null) { - return Mapper.Map>(_tagService.GetAllTags(group, culture)); + return _mapper.MapEnumerable(_tagService.GetAllTags(group, culture)); } /// public IEnumerable GetAllContentTags(string group = null, string culture = null) { - return Mapper.Map>(_tagService.GetAllContentTags(group, culture)); + return _mapper.MapEnumerable(_tagService.GetAllContentTags(group, culture)); } /// public IEnumerable GetAllMediaTags(string group = null, string culture = null) { - return Mapper.Map>(_tagService.GetAllMediaTags(group, culture)); + return _mapper.MapEnumerable(_tagService.GetAllMediaTags(group, culture)); } /// public IEnumerable GetAllMemberTags(string group = null, string culture = null) { - return Mapper.Map>(_tagService.GetAllMemberTags(group, culture)); + return _mapper.MapEnumerable(_tagService.GetAllMemberTags(group, culture)); } /// public IEnumerable GetTagsForProperty(int contentId, string propertyTypeAlias, string group = null, string culture = null) { - return Mapper.Map>(_tagService.GetTagsForProperty(contentId, propertyTypeAlias, group, culture)); + return _mapper.MapEnumerable(_tagService.GetTagsForProperty(contentId, propertyTypeAlias, group, culture)); } /// public IEnumerable GetTagsForEntity(int contentId, string group = null, string culture = null) { - return Mapper.Map>(_tagService.GetTagsForEntity(contentId, group, culture)); + return _mapper.MapEnumerable(_tagService.GetTagsForEntity(contentId, group, culture)); } } } diff --git a/src/Umbraco.Web/Trees/ContentTypeTreeController.cs b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs index b8374f9d94..4a8cfba9a5 100644 --- a/src/Umbraco.Web/Trees/ContentTypeTreeController.cs +++ b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs @@ -1,10 +1,8 @@ -using AutoMapper; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Net.Http.Formatting; using Umbraco.Core; -using Umbraco.Core.Composing; using Umbraco.Core.Models; using Umbraco.Core.Models.Entities; using Umbraco.Web.Actions; @@ -140,7 +138,7 @@ namespace Umbraco.Web.Trees { var results = Services.EntityService.GetPagedDescendants(UmbracoObjectTypes.DocumentType, pageIndex, pageSize, out totalFound, filter: SqlContext.Query().Where(x => x.Name.Contains(query))); - return Mapper.Map>(results); + return Mapper.MapEnumerable(results); } } } diff --git a/src/Umbraco.Web/Trees/DataTypeTreeController.cs b/src/Umbraco.Web/Trees/DataTypeTreeController.cs index a9e29697fc..75260b586d 100644 --- a/src/Umbraco.Web/Trees/DataTypeTreeController.cs +++ b/src/Umbraco.Web/Trees/DataTypeTreeController.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using System.Net.Http.Formatting; -using AutoMapper; using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Models.Entities; @@ -144,7 +143,7 @@ namespace Umbraco.Web.Trees { var results = Services.EntityService.GetPagedDescendants(UmbracoObjectTypes.DataType, pageIndex, pageSize, out totalFound, filter: SqlContext.Query().Where(x => x.Name.Contains(query))); - return Mapper.Map>(results); + return Mapper.MapEnumerable(results); } } } diff --git a/src/Umbraco.Web/Trees/MediaTypeTreeController.cs b/src/Umbraco.Web/Trees/MediaTypeTreeController.cs index bb6b867751..5798c546fc 100644 --- a/src/Umbraco.Web/Trees/MediaTypeTreeController.cs +++ b/src/Umbraco.Web/Trees/MediaTypeTreeController.cs @@ -2,9 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Net.Http.Formatting; -using AutoMapper; using Umbraco.Core; -using Umbraco.Core.Composing; using Umbraco.Core.Models; using Umbraco.Core.Models.Entities; using Umbraco.Web.Models.Trees; @@ -122,7 +120,7 @@ namespace Umbraco.Web.Trees { var results = Services.EntityService.GetPagedDescendants(UmbracoObjectTypes.MediaType, pageIndex, pageSize, out totalFound, filter: SqlContext.Query().Where(x => x.Name.Contains(query))); - return Mapper.Map>(results); + return Mapper.MapEnumerable(results); } } } diff --git a/src/Umbraco.Web/Trees/TemplatesTreeController.cs b/src/Umbraco.Web/Trees/TemplatesTreeController.cs index 601964c30d..8c37718c9b 100644 --- a/src/Umbraco.Web/Trees/TemplatesTreeController.cs +++ b/src/Umbraco.Web/Trees/TemplatesTreeController.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; using System.Net.Http.Formatting; -using AutoMapper; using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Models.Entities; @@ -123,7 +122,7 @@ namespace Umbraco.Web.Trees { var results = Services.EntityService.GetPagedDescendants(UmbracoObjectTypes.Template, pageIndex, pageSize, out totalFound, filter: SqlContext.Query().Where(x => x.Name.Contains(query))); - return Mapper.Map>(results); + return Mapper.MapEnumerable(results); } } } diff --git a/src/Umbraco.Web/Trees/TreeControllerBase.cs b/src/Umbraco.Web/Trees/TreeControllerBase.cs index daa8300b4f..4acf807b77 100644 --- a/src/Umbraco.Web/Trees/TreeControllerBase.cs +++ b/src/Umbraco.Web/Trees/TreeControllerBase.cs @@ -366,7 +366,7 @@ namespace Umbraco.Web.Trees /// protected bool IsDialog(FormDataCollection queryStrings) { - return queryStrings.GetValue(TreeQueryStringParameters.IsDialog); + return queryStrings.GetValue(TreeQueryStringParameters.Use) == "dialog"; } /// diff --git a/src/Umbraco.Web/Trees/TreeQueryStringParameters.cs b/src/Umbraco.Web/Trees/TreeQueryStringParameters.cs index 205871ca20..466aff5a1f 100644 --- a/src/Umbraco.Web/Trees/TreeQueryStringParameters.cs +++ b/src/Umbraco.Web/Trees/TreeQueryStringParameters.cs @@ -5,7 +5,7 @@ /// internal struct TreeQueryStringParameters { - public const string IsDialog = "isDialog"; + public const string Use = "use"; public const string Application = "application"; public const string StartNodeId = "startNodeId"; //public const string OnNodeClick = "OnNodeClick"; diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 4fe10f65b0..b3cab3b2cb 100755 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -60,7 +60,6 @@ - @@ -86,6 +85,9 @@ + + 1.0.5 + @@ -204,6 +206,8 @@ + + @@ -248,12 +252,10 @@ - - @@ -285,7 +287,7 @@ - + @@ -424,34 +426,14 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + @@ -658,9 +640,6 @@ - - - @@ -690,7 +669,7 @@ - + @@ -704,7 +683,7 @@ - + @@ -831,9 +810,9 @@ - - - + + + @@ -861,11 +840,8 @@ - - - - - + + @@ -973,18 +949,16 @@ - - - - - - - - - - - - + + + + + + + + + + diff --git a/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs b/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs index 2651167a6b..0633cca3a0 100644 --- a/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs +++ b/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs @@ -4,6 +4,7 @@ using Owin; using Umbraco.Core; using Umbraco.Core.Configuration; using Umbraco.Core.Configuration.UmbracoSettings; +using Umbraco.Core.Mapping; using Umbraco.Core.Security; using Umbraco.Core.Services; using Umbraco.Web; @@ -28,6 +29,7 @@ namespace Umbraco.Web protected IUmbracoSettingsSection UmbracoSettings => Current.Configs.Settings(); protected IRuntimeState RuntimeState => Core.Composing.Current.RuntimeState; protected ServiceContext Services => Current.Services; + protected UmbracoMapper Mapper => Current.Mapper; /// /// Main startup method @@ -80,6 +82,7 @@ namespace Umbraco.Web // (EXPERT: an overload accepts a custom BackOfficeUserStore implementation) app.ConfigureUserManagerForUmbracoBackOffice( Services, + Mapper, UmbracoSettings.Content, GlobalSettings, Core.Security.MembershipProviderExtensions.GetUsersMembershipProvider().AsUmbracoMembershipProvider()); diff --git a/src/Umbraco.Web/WebApi/Filters/CheckIfUserTicketDataIsStaleAttribute.cs b/src/Umbraco.Web/WebApi/Filters/CheckIfUserTicketDataIsStaleAttribute.cs index 84481868e4..2a57ec10b2 100644 --- a/src/Umbraco.Web/WebApi/Filters/CheckIfUserTicketDataIsStaleAttribute.cs +++ b/src/Umbraco.Web/WebApi/Filters/CheckIfUserTicketDataIsStaleAttribute.cs @@ -4,14 +4,13 @@ using System.Threading; using System.Threading.Tasks; using System.Web.Http.Controllers; using System.Web.Http.Filters; -using AutoMapper; using Umbraco.Core; using Umbraco.Core.Composing; -using Umbraco.Core.Configuration; using Umbraco.Core.Models.Identity; using Umbraco.Core.Models.Membership; using Umbraco.Core.Security; using Umbraco.Web.Security; +using Umbraco.Core.Mapping; using UserExtensions = Umbraco.Core.Models.UserExtensions; namespace Umbraco.Web.WebApi.Filters @@ -26,6 +25,9 @@ namespace Umbraco.Web.WebApi.Filters /// public sealed class CheckIfUserTicketDataIsStaleAttribute : ActionFilterAttribute { + // this is an attribute - no choice + private UmbracoMapper Mapper => Current.Mapper; + public override async Task OnActionExecutingAsync(HttpActionContext actionContext, CancellationToken cancellationToken) { await CheckStaleData(actionContext); diff --git a/src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs b/src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs index 16ca2e5642..89a630fb5d 100644 --- a/src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs +++ b/src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs @@ -7,6 +7,7 @@ using Umbraco.Core.Cache; using Umbraco.Core.Composing; using Umbraco.Core.Configuration; using Umbraco.Core.Logging; +using Umbraco.Core.Mapping; using Umbraco.Core.Persistence; using Umbraco.Core.Services; using Umbraco.Web.Security; @@ -56,6 +57,9 @@ namespace Umbraco.Web.WebApi Logger = logger; RuntimeState = runtimeState; Umbraco = umbracoHelper; + + // fixme - can we break all ctors? + Mapper = Current.Mapper; } /// @@ -120,6 +124,11 @@ namespace Umbraco.Web.WebApi /// public UmbracoHelper Umbraco { get; } + /// + /// Gets the mapper. + /// + public UmbracoMapper Mapper { get; } + /// /// Gets the web security helper. ///