Merge pull request #11561 from umbraco/v8/feature/version-history-cleanup-ui

V8: Added UI to configure history cleanup per doc type

Author: bergmania

src/Umbraco.Core/Composing/CompositionExtensions/Services.cs

@@ -34,7 +34,7 @@ public static Composition ComposeServices(this Composition composition)
 
             composition.RegisterUnique<ContentService>();
             composition.RegisterUnique<IContentService>(factory => factory.GetInstance<ContentService>());
-            composition.RegisterUnique<IContentVersionCleanupService>(factory => factory.GetInstance<ContentService>());
+            composition.RegisterUnique<IContentVersionService>(factory => factory.GetInstance<ContentService>());
             composition.RegisterUnique<IContentVersionCleanupPolicy, DefaultContentVersionCleanupPolicy>();
 
             composition.RegisterUnique<IUserService, UserService>();

src/Umbraco.Core/Models/ContentEditing/HistoryCleanup.cs

@@ -0,0 +1,18 @@
+using System.Runtime.Serialization;
+
+namespace Umbraco.Core.Models.ContentEditing
+{
+    [DataContract(Name = "historyCleanup", Namespace = "")]
+    public class HistoryCleanup
+    {
+        [DataMember(Name = "preventCleanup")]
+        public bool PreventCleanup { get; set; }
+
+        [DataMember(Name = "keepAllVersionsNewerThanDays")]
+        public int? KeepAllVersionsNewerThanDays { get;set; }
+
+        [DataMember(Name = "keepLatestVersionPerDayForDays")]
+        public int? KeepLatestVersionPerDayForDays { get;set; }
+    }
+}
+

src/Umbraco.Core/Models/ContentType.cs

@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Runtime.Serialization;
+using Umbraco.Core.Models.ContentEditing;
 
 namespace Umbraco.Core.Models
 {
@@ -26,6 +27,7 @@ public class ContentType : ContentTypeCompositionBase, IContentType
         public ContentType(int parentId) : base(parentId)
         {
             _allowedTemplates = new List<ITemplate>();
+            HistoryCleanup = new HistoryCleanup();
         }
 
 
@@ -39,6 +41,7 @@ public ContentType(IContentType parent, string alias)
             : base(parent, alias)
         {
             _allowedTemplates = new List<ITemplate>();
+            HistoryCleanup = new HistoryCleanup();
         }
 
         /// <inheritdoc />
@@ -47,6 +50,8 @@ public ContentType(IContentType parent, string alias)
         /// <inheritdoc />
         public override bool SupportsPublishing => SupportsPublishingConst;
 
+
+
         //Custom comparer for enumerable
         private static readonly DelegateEqualityComparer<IEnumerable<ITemplate>> TemplateComparer = new DelegateEqualityComparer<IEnumerable<ITemplate>>(
             (templates, enumerable) => templates.UnsortedSequenceEqual(enumerable),
@@ -93,6 +98,8 @@ public IEnumerable<ITemplate> AllowedTemplates
             }
         }
 
+        public HistoryCleanup HistoryCleanup { get; set; }
+
         /// <summary>
         /// Determines if AllowedTemplates contains templateId
         /// </summary>

src/Umbraco.Core/Models/IContentType.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Umbraco.Core.Models.ContentEditing;
 
 namespace Umbraco.Core.Models
 {
@@ -17,6 +18,10 @@ public interface IContentType : IContentTypeComposition
         /// </summary>
         IEnumerable<ITemplate> AllowedTemplates { get; set; }
 
+        /// <summary>
+        /// Gets or Sets the history cleanup configuration
+        /// </summary>
+        HistoryCleanup HistoryCleanup { get; set; }
         /// <summary>
         /// Determines if AllowedTemplates contains templateId
         /// </summary>

src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs

@@ -5,6 +5,7 @@
 using Umbraco.Core.Cache;
 using Umbraco.Core.Exceptions;
 using Umbraco.Core.Models;
+using Umbraco.Core.Models.ContentEditing;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Factories;
 using Umbraco.Core.Scoping;
@@ -109,6 +110,7 @@ private IEnumerable<IContentTypeComposition> GetAllTypesInternal()
             MapTemplates(contentTypes);
             MapComposition(contentTypes);
             MapGroupsAndProperties(contentTypes);
+            MapHistoryCleanup(contentTypes);
 
             // finalize
             foreach (var contentType in contentTypes.Values)
@@ -119,6 +121,35 @@ private IEnumerable<IContentTypeComposition> GetAllTypesInternal()
             return contentTypes.Values;
         }
 
+        private void MapHistoryCleanup(Dictionary<int, IContentTypeComposition> contentTypes)
+        {
+            // get templates
+            var sql1 = Sql()
+                .Select<ContentVersionCleanupPolicyDto>()
+                .From<ContentVersionCleanupPolicyDto>()
+                .OrderBy<ContentVersionCleanupPolicyDto>(x => x.ContentTypeId);
+
+            var contentVersionCleanupPolicyDtos = Database.Fetch<ContentVersionCleanupPolicyDto>(sql1);
+
+            var contentVersionCleanupPolicyDictionary =
+                contentVersionCleanupPolicyDtos.ToDictionary(x => x.ContentTypeId);
+            foreach (var c in contentTypes.Values)
+            {
+                if (!(c is ContentType contentType)) continue;
+
+                var historyCleanup = new HistoryCleanup();
+
+                if (contentVersionCleanupPolicyDictionary.TryGetValue(contentType.Id, out var versionCleanup))
+                {
+                    historyCleanup.PreventCleanup = versionCleanup.PreventCleanup;
+                    historyCleanup.KeepAllVersionsNewerThanDays = versionCleanup.KeepAllVersionsNewerThanDays;
+                    historyCleanup.KeepLatestVersionPerDayForDays = versionCleanup.KeepLatestVersionPerDayForDays;
+                }
+
+                contentType.HistoryCleanup = historyCleanup;
+            }
+        }
+
         private void MapTemplates(Dictionary<int, IContentTypeComposition> contentTypes)
         {
             // get templates
@@ -145,7 +176,7 @@ private void MapTemplates(Dictionary<int, IContentTypeComposition> contentTypes)
                     templateDtoIx++;
                     if (!templates.TryGetValue(allowedDto.TemplateNodeId, out var template)) continue;
                     allowedTemplates.Add(template);
-                    
+
                     if (allowedDto.IsDefault)
                         defaultTemplateId = template.Id;
                 }

src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepository.cs

@@ -236,6 +236,7 @@ protected override void PersistNewItem(IContentType entity)
 
             PersistNewBaseContentType(entity);
             PersistTemplates(entity, false);
+            PersistHistoryCleanup(entity);
 
             entity.ResetDirtyProperties();
         }
@@ -289,8 +290,22 @@ protected override void PersistUpdatedItem(IContentType entity)
 
             PersistUpdatedBaseContentType(entity);
             PersistTemplates(entity, true);
+            PersistHistoryCleanup(entity);
 
             entity.ResetDirtyProperties();
         }
+
+        private void PersistHistoryCleanup(IContentType entity)
+        {
+            ContentVersionCleanupPolicyDto dto = new ContentVersionCleanupPolicyDto()
+            {
+                ContentTypeId = entity.Id,
+                Updated = DateTime.Now,
+                PreventCleanup = entity.HistoryCleanup.PreventCleanup,
+                KeepAllVersionsNewerThanDays = entity.HistoryCleanup.KeepAllVersionsNewerThanDays,
+                KeepLatestVersionPerDayForDays = entity.HistoryCleanup.KeepLatestVersionPerDayForDays,
+            };
+            Database.InsertOrUpdate(dto);
+        }
     }
 }

src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs

@@ -266,9 +266,11 @@ public override IEnumerable<IContent> GetAllVersionsSlim(int nodeId, int skip, i
                 .OrderByDescending<ContentVersionDto>(x => x.Current)
                 .AndByDescending<ContentVersionDto>(x => x.VersionDate);
 
-            return MapDtosToContent(Database.Fetch<DocumentDto>(sql), true,
+            var pageIndex = skip / take;
+
+            return MapDtosToContent(Database.Page<DocumentDto>(pageIndex+1, take, sql).Items, true,
                 // load bare minimum, need variants though since this is used to rollback with variants
-                false, false, false, true).Skip(skip).Take(take);
+                false, false, false, true);
         }
 
         public override IContent GetVersion(int versionId)

src/Umbraco.Core/Services/IContentVersionCleanupService.cs renamed to src/Umbraco.Core/Services/IContentVersionService.cs

@@ -4,7 +4,7 @@
 
 namespace Umbraco.Core.Services
 {
-    public interface IContentVersionCleanupService
+    public interface IContentVersionService
     {
         /// <summary>
         /// Removes historic content versions according to a policy.

src/Umbraco.Core/Services/Implement/ContentService.cs

@@ -19,7 +19,7 @@ namespace Umbraco.Core.Services.Implement
     /// <summary>
     /// Implements the content service.
     /// </summary>
-    public class ContentService : RepositoryService, IContentService, IContentVersionCleanupService
+    public class ContentService : RepositoryService, IContentService, IContentVersionService
     {
         private readonly IDocumentRepository _documentRepository;
         private readonly IEntityRepository _entityRepository;

src/Umbraco.Core/Umbraco.Core.csproj

@@ -163,6 +163,7 @@
     <Compile Include="Models\ContentDataIntegrityReport.cs" />
     <Compile Include="Models\ContentDataIntegrityReportEntry.cs" />
     <Compile Include="Models\ContentDataIntegrityReportOptions.cs" />
+    <Compile Include="Models\ContentEditing\HistoryCleanup.cs" />
     <Compile Include="Models\ContentVersionCleanupPolicySettings.cs" />
     <Compile Include="Models\Identity\ExternalLogin.cs" />
     <Compile Include="Models\Identity\IExternalLogin.cs" />
@@ -198,7 +199,7 @@
     <Compile Include="PropertyEditors\EyeDropperColorPickerConfiguration.cs" />
     <Compile Include="PropertyEditors\ComplexPropertyEditorContentEventHandler.cs" />
     <Compile Include="Services\IContentVersionCleanupPolicy.cs" />
-    <Compile Include="Services\IContentVersionCleanupService.cs" />
+    <Compile Include="Services\IContentVersionService.cs" />
     <Compile Include="Services\IIconService.cs" />
     <Compile Include="Services\Implement\DefaultContentVersionCleanupPolicy.cs" />
     <Compile Include="Services\Implement\InstallationService.cs" />