Merge branch 'v8/8.17' into v8/dev

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/services/contenttypehelper.service.js

Author: nul800sebastiaan

src/SolutionInfo.cs

@@ -18,5 +18,5 @@
 [assembly: AssemblyVersion("8.0.0")]
 
 // these are FYI and changed automatically
-[assembly: AssemblyFileVersion("8.17.0")]
-[assembly: AssemblyInformationalVersion("8.17.0")]
+[assembly: AssemblyFileVersion("8.17.1")]
+[assembly: AssemblyInformationalVersion("8.17.1")]

src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using Moq;
@@ -10,6 +11,7 @@
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Changes;
+using Umbraco.Tests.TestHelpers.Entities;
 using Umbraco.Tests.Testing;
 using Umbraco.Tests.Testing.Objects.Accessors;
 using Umbraco.Web;
@@ -168,17 +170,73 @@ public void CanHandleEvent()
         }
 
         [Test]
-        public void OnlyHandlesOnContentTypeEvent()
+        public void GroupsContentTypeEvents()
         {
-            var definitions = new IEventDefinition[]
+            var num = 30;
+            var contentTypes = Enumerable.Repeat(MockedContentTypes.CreateBasicContentType(), num);
+            var mediaTypes = Enumerable.Repeat(MockedContentTypes.CreateImageMediaType(), num);
+            var memberTypes = Enumerable.Repeat(MockedContentTypes.CreateSimpleMemberType(), num);
+            var definitionsContent = contentTypes.SelectMany(x => new IEventDefinition[]
             {
-                new EventDefinition<IContentTypeService, ContentTypeChange<IContentType>.EventArgs>(null, Current.Services.ContentTypeService, new ContentTypeChange<IContentType>.EventArgs(Enumerable.Empty<ContentTypeChange<IContentType>>()), "Changed"),
-                new EventDefinition<IContentTypeService, SaveEventArgs<IContentType>>(null, Current.Services.ContentTypeService, new SaveEventArgs<IContentType>(Enumerable.Empty<IContentType>()), "Saved"),
-                new EventDefinition<IContentTypeService, ContentTypeChange<IContentType>.EventArgs>(null, Current.Services.ContentTypeService, new ContentTypeChange<IContentType>.EventArgs(Enumerable.Empty<ContentTypeChange<IContentType>>()), "Changed"),
-                new EventDefinition<IContentTypeService, SaveEventArgs<IContentType>>(null, Current.Services.ContentTypeService, new SaveEventArgs<IContentType>(Enumerable.Empty<IContentType>()), "Saved"),
-            };
-            var result = DistributedCacheBinder.GetReducedEventList(definitions);
-            Assert.AreEqual(1, result.Count());
+                new EventDefinition<IContentTypeService, ContentTypeChange<IContentType>.EventArgs>(null, Current.Services.ContentTypeService, new ContentTypeChange<IContentType>.EventArgs(new ContentTypeChange<IContentType>(x, ContentTypeChangeTypes.Create)), "Changed"),
+                new EventDefinition<IContentTypeService, SaveEventArgs<IContentType>>(null, Current.Services.ContentTypeService, new SaveEventArgs<IContentType>(x), "Saved"),
+            });
+
+            var definitionsMedia = mediaTypes.SelectMany(x => new IEventDefinition[]
+            {
+                new EventDefinition<IMediaTypeService, ContentTypeChange<IMediaType>.EventArgs>(null, Current.Services.MediaTypeService, new ContentTypeChange<IMediaType>.EventArgs(new ContentTypeChange<IMediaType>(x, ContentTypeChangeTypes.Create)), "Changed"),
+                new EventDefinition<IMediaTypeService, SaveEventArgs<IMediaType>>(null, Current.Services.MediaTypeService, new SaveEventArgs<IMediaType>(x), "Saved"),
+            });
+            var definitionsMember = memberTypes.SelectMany(x => new IEventDefinition[]
+            {
+                new EventDefinition<IMemberTypeService, ContentTypeChange<IMemberType>.EventArgs>(null, Current.Services.MemberTypeService, new ContentTypeChange<IMemberType>.EventArgs(new ContentTypeChange<IMemberType>(x, ContentTypeChangeTypes.Create)), "Changed"),
+                new EventDefinition<IMemberTypeService, SaveEventArgs<IMemberType>>(null, Current.Services.MemberTypeService, new SaveEventArgs<IMemberType>(x), "Saved"),
+            });
+
+            var definitions = new List<IEventDefinition>();
+            definitions.AddRange(definitionsContent);
+            definitions.AddRange(definitionsMedia);
+            definitions.AddRange(definitionsMember);
+
+            var result = DistributedCacheBinder.GetGroupedEventList(definitions);
+
+            Assert.Multiple(() =>
+            {
+                Assert.AreEqual(num * 6, definitions.Count(), "Precondition is we have many definitions");
+                Assert.AreEqual(6, result.Count(), "Unexpected number of reduced definitions");
+                foreach (var eventDefinition in result)
+                {
+                    if (eventDefinition.Args is SaveEventArgs<IContentType> saveContentEventArgs)
+                    {
+                        Assert.AreEqual(num, saveContentEventArgs.SavedEntities.Count());
+                    }
+
+                    if (eventDefinition.Args is ContentTypeChange<IContentType>.EventArgs changeContentEventArgs)
+                    {
+                        Assert.AreEqual(num, changeContentEventArgs.Changes.Count());
+                    }
+
+                    if (eventDefinition.Args is SaveEventArgs<IMediaType> saveMediaEventArgs)
+                    {
+                        Assert.AreEqual(num, saveMediaEventArgs.SavedEntities.Count());
+                    }
+
+                    if (eventDefinition.Args is ContentTypeChange<IMediaType>.EventArgs changeMediaEventArgs)
+                    {
+                        Assert.AreEqual(num, changeMediaEventArgs.Changes.Count());
+                    }
+
+                    if (eventDefinition.Args is SaveEventArgs<IMemberType> saveMemberEventArgs)
+                    {
+                        Assert.AreEqual(num, saveMemberEventArgs.SavedEntities.Count());
+                    }
+
+                    if (eventDefinition.Args is ContentTypeChange<IMemberType>.EventArgs changeMemberEventArgs)
+                    {
+                        Assert.AreEqual(num, changeMemberEventArgs.Changes.Count());
+                    }
+                }
+            });
         }
     }
 }

src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

@@ -348,9 +348,9 @@
         <WebProjectProperties>
           <UseIIS>False</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>8170</DevelopmentServerPort>
+          <DevelopmentServerPort>8171</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:8170</IISUrl>
+          <IISUrl>http://localhost:8171</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>