U4-6837 New content type editor: availableCompositeContentTypes could be moved to service.

Allows for assigning compositions to doc types that are being created.
Removes unused getAssignedListViewDataType from contentTypeResource.
Removes unused getPropertyTypeScaffold from memberTypeResource.
Removes unused performContainerDelete from memberTypeResource - since member types don't support folders.
Ensures correct security for the ContentTypeController.GetAllPropertyTypeAliases and ContentTypeController.GetAvailableCompositeContentTypes.
Removes unused ContentTypeControllerBase.GetAssignedListViewDataType, this is no longer used because the list view is configured using the DataTypeController.

src/Umbraco.Web/Models/ContentEditing/ContentTypeCompositionDisplay.cs

@@ -18,8 +18,7 @@ namespace Umbraco.Web.Models.ContentEditing
             //initialize collections so at least their never null
             Groups = new List<PropertyGroupDisplay>();
             AllowedContentTypes = new List<int>();
-            CompositeContentTypes = new List<string>();
-            AvailableCompositeContentTypes = new List<EntityBasic>();
+            CompositeContentTypes = new List<string>();
             Notifications = new List<Notification>();
         }
 
@@ -44,11 +43,7 @@ namespace Umbraco.Web.Models.ContentEditing
         //Compositions
         [DataMember(Name = "compositeContentTypes")]
         public IEnumerable<string> CompositeContentTypes { get; set; }
-
-        [DataMember(Name = "availableCompositeContentTypes")]
-        [ReadOnly(true)]
-        public IEnumerable<EntityBasic> AvailableCompositeContentTypes { get; set; }
-
+        
         [DataMember(Name = "allowAsRoot")]
         public bool AllowAsRoot { get; set; }
 

src/Umbraco.Web/Models/Mapping/AvailableCompositeContentTypesResolver.cs

@@ -1,118 +0,0 @@
-using AutoMapper;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Umbraco.Core;
-using Umbraco.Core.Models;
-using Umbraco.Web.Models.ContentEditing;
-
-namespace Umbraco.Web.Models.Mapping
-{
-    internal class AvailableCompositeContentTypesResolver : ValueResolver<IContentTypeComposition, IEnumerable<EntityBasic>>
-    {
-        private readonly ApplicationContext _context;
-
-        internal AvailableCompositeContentTypesResolver(ApplicationContext context)
-        {
-            _context = context;
-        }
-
-        protected override IEnumerable<EntityBasic> ResolveCore(IContentTypeComposition source)
-        {
-
-            //below is all ported from the old doc type editor and comes with the same weaknesses /insanity / magic
-
-            var s = source;
-            var type = _context.Services.EntityService.GetObjectType(source.Id);
-            var allContentTypes = new IContentTypeComposition[0];
-
-            switch (type)
-            {
-                case UmbracoObjectTypes.DocumentType:
-                    allContentTypes = _context.Services.ContentTypeService.GetAllContentTypes().Cast<IContentTypeComposition>().ToArray();
-                    break;
-
-                case UmbracoObjectTypes.MediaType:
-                    allContentTypes = _context.Services.ContentTypeService.GetAllMediaTypes().Cast<IContentTypeComposition>().ToArray();
-                    break;
-
-                case UmbracoObjectTypes.MemberType:
-                    allContentTypes = _context.Services.MemberTypeService.GetAll().Cast<IContentTypeComposition>().ToArray();
-                    break;
-            }
-
-            // note: there are many sanity checks missing here and there ;-((
-            // make sure once and for all
-            //if (allContentTypes.Any(x => x.ParentId > 0 && x.ContentTypeComposition.Any(y => y.Id == x.ParentId) == false))
-            //    throw new Exception("A parent does not belong to a composition.");
-
-            // find out if any content type uses this content type
-            var isUsing = allContentTypes.Where(x => x.ContentTypeComposition.Any(y => y.Id == source.Id)).ToArray();
-            if (isUsing.Length > 0)
-            {
-                //if already in use a composition, do not allow any composited types
-                return new List<EntityBasic>();
-            }
-
-            // if it is not used then composition is possible
-            // hashset guarantees unicity on Id
-            var list = new HashSet<IContentTypeComposition>(new DelegateEqualityComparer<IContentTypeComposition>(
-                (x, y) => x.Id == y.Id,
-                x => x.Id));
-
-            // usable types are those that are top-level
-            var usableContentTypes = allContentTypes
-                .Where(x => x.ContentTypeComposition.Any() == false).ToArray();
-            foreach (var x in usableContentTypes)
-                list.Add(x);
-
-            // indirect types are those that we use, directly or indirectly
-            var indirectContentTypes = GetIndirect(source).ToArray();
-            foreach (var x in indirectContentTypes)
-                list.Add(x);
-
-            //// directContentTypes are those we use directly
-            //// they are already in indirectContentTypes, no need to add to the list
-            //var directContentTypes = source.ContentTypeComposition.ToArray();
-
-            //var enabled = usableContentTypes.Select(x => x.Id) // those we can use
-            //    .Except(indirectContentTypes.Select(x => x.Id)) // except those that are indirectly used
-            //    .Union(directContentTypes.Select(x => x.Id)) // but those that are directly used
-            //    .Where(x => x != source.ParentId) // but not the parent
-            //    .Distinct()
-            //    .ToArray();
-
-            return list
-                .Where(x => x.Id != source.Id)
-                .OrderBy(x => x.Name)
-                .Select(Mapper.Map<IContentTypeComposition, EntityBasic>)
-                .ToList();
-        }
-
-
-        private IEnumerable<IContentTypeComposition> GetIndirect(IContentTypeComposition ctype)
-        {
-            // hashset guarantees unicity on Id
-            var all = new HashSet<IContentTypeComposition>(new DelegateEqualityComparer<IContentTypeComposition>(
-                (x, y) => x.Id == y.Id,
-                x => x.Id));
-
-            var stack = new Stack<IContentTypeComposition>();
-
-            foreach (var x in ctype.ContentTypeComposition)
-                stack.Push(x);
-
-            while (stack.Count > 0)
-            {
-                var x = stack.Pop();
-                all.Add(x);
-                foreach (var y in x.ContentTypeComposition)
-                    stack.Push(y);
-            }
-
-            return all;
-        }
-    }
-}

src/Umbraco.Web/Models/Mapping/ContentTypeModelMapperExtensions.cs

@@ -56,7 +56,6 @@ namespace Umbraco.Web.Models.Mapping
                 .ForMember(dto => dto.CreateDate, expression => expression.Ignore())
                 .ForMember(dto => dto.UpdateDate, expression => expression.Ignore())                
                 .ForMember(dto => dto.ListViewEditorName, expression => expression.Ignore())
-                .ForMember(dto => dto.AvailableCompositeContentTypes, expression => expression.Ignore())
                 .ForMember(dto => dto.Notifications, expression => expression.Ignore())
                 .ForMember(dto => dto.Errors, expression => expression.Ignore());
         }
@@ -77,11 +76,7 @@ namespace Umbraco.Web.Models.Mapping
                 .ForMember(
                     dto => dto.AllowedContentTypes,
                     expression => expression.MapFrom(dto => dto.AllowedContentTypes.Select(x => x.Id.Value)))
-
-                .ForMember(
-                    dto => dto.AvailableCompositeContentTypes,
-                    expression => expression.ResolveUsing(new AvailableCompositeContentTypesResolver(applicationContext)))
-
+                    
                 .ForMember(
                     dto => dto.CompositeContentTypes,
                     expression => expression.MapFrom(dto => dto.ContentTypeComposition))