From f0e7f815cf9681922ccb5f2c17d0f9c3b1dd3a33 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Tue, 2 Nov 2021 13:51:39 +0100
Subject: [PATCH 01/24] init rollback ui prototype

---
 .../src/common/services/editor.service.js     |   2 +-
 src/Umbraco.Web.UI.Client/src/less/belle.less |   2 +
 .../rollback/rollback.controller.js           |  22 +-
 .../infiniteeditors/rollback/rollback.html    | 192 +++++++++++-------
 .../infiniteeditors/rollback/rollback.less    |  18 ++
 5 files changed, 162 insertions(+), 74 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.less

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
index a68f68fbb35f..7b2b49d8f73c 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
@@ -527,7 +527,7 @@ When building a custom infinite editor view you can use the same components as a
          */
         function rollback(editor) {
             editor.view = "views/common/infiniteeditors/rollback/rollback.html";
-            if (!editor.size) editor.size = "medium";
+            if (!editor.size) editor.size = "";
             open(editor);
         }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less
index 6f95608d7a8d..ba4df33aa0b3 100644
--- a/src/Umbraco.Web.UI.Client/src/less/belle.less
+++ b/src/Umbraco.Web.UI.Client/src/less/belle.less
@@ -203,6 +203,8 @@
 
 @import "components/umbemailmarketing.less";
 
+// Editors
+@import "../views/common/infiniteeditors/rollback/rollback.less";
 
 // Property Editors
 @import "../views/components/blockcard/umb-block-card-grid.less";
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
index 4b0dfcb8b47a..07247fcdac92 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
@@ -10,6 +10,8 @@
         vm.changeVersion = changeVersion;
         vm.submit = submit;
         vm.close = close;
+        vm.pinVersion = pinVersion;
+        vm.goToPage = goToPage;
 
         //////////
 
@@ -22,6 +24,10 @@
             vm.rollbackButtonDisabled = true;
             vm.labels = {};
 
+            // TODO: implement
+            vm.totalPages = 25;
+            vm.currentPage = 1;
+
             // find the current version for invariant nodes
             if($scope.model.node.variants.length === 1) {
                 vm.currentVersion = $scope.model.node.variants[0];
@@ -68,7 +74,7 @@
 
             if(version && version.versionId) {
 
-                vm.loading = true;
+                vm.loadingDiff = true;
 
                 const culture = $scope.model.node.variants.length > 1 ? vm.currentVersion.language.culture : null;
 
@@ -78,10 +84,10 @@
                         vm.previousVersion.versionId = version.versionId;
                         createDiff(vm.currentVersion, vm.previousVersion);
 
-                        vm.loading = false;
+                        vm.loadingDiff = false;
                         vm.rollbackButtonDisabled = false;
                     }, function () {
-                        vm.loading = false;
+                        vm.loadingDiff = false;
                     });
 
             } else {
@@ -200,6 +206,16 @@
             }
         }
 
+        // TODO: implement
+        function pinVersion (version) {
+            console.log('PIN VERSION', version);
+        }
+
+        // TODO: implement
+        function goToPage (pageNumber) {
+            console.log('PAGE NUMBER', pageNumber);
+        }
+
         onInit();
 
     }
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
index e48b5991f602..e91ec55df197 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
@@ -1,4 +1,4 @@
-<div ng-controller="Umbraco.Editors.RollbackController as vm">
+<div class="editor-rollback" ng-controller="Umbraco.Editors.RollbackController as vm">
 
     <umb-editor-view>
 
@@ -16,75 +16,127 @@
                 ng-if="vm.loading">
             </umb-load-indicator>
 
-            <umb-box>
-                <umb-box-content>
-
-                    <div ng-if="model.node.variants.length > 1">
-                        <h5><localize key="general_language">Language</localize></h5>
-                        <select
-                            class="input-block-level"
-                            ng-model="vm.selectedLanguage"
-                            ng-options="variant as variant.displayName for variant in model.node.variants track by variant.language.culture"
-                            ng-change="vm.changeLanguage(vm.selectedLanguage)">
-                        </select>
-                    </div>
-
-                    <div>
-
-                        <h5><localize key="rollback_currentVersion">Current version</localize></h5>
-                        <p>{{vm.currentVersion.name}} (<localize key="rollback_created">Created</localize>: {{vm.currentVersion.createDate}})</p>
-
-                        <h5><localize key="rollback_rollbackTo">Rollback to</localize></h5>
-                        <select
-                            class="input-block-level"
-                            ng-model="vm.selectedVersion"
-                            ng-options="version.displayValue for version in vm.previousVersions track by version.versionId"
-                            ng-change="vm.changeVersion(vm.selectedVersion)">
-                            <option value="">{{vm.labels.choose}}...</option>
-                        </select>
-                    </div>
-
-                    <div ng-if="vm.diff && !vm.loading" class="diff" style="border-top: 1px solid #e9e9eb; margin-top: 30px;">
-
-                        <h5><localize key="rollback_changes">Changes</localize></h5>
-                        <small style="margin-bottom: 15px; display: block;">
-                            <localize key="rollback_diffHelp">
-                                This shows the differences between the current version and the selected version<br /><del>Red text</del> will be
-                                removed in the selected version, <ins>green text</ins> will be added
-                            </localize>
-                        </small>
-
-                        <table class="table table-condensed table-bordered">
-                            <tbody>
-                                <tr>
-                                    <td class="bold">
-                                        <localize key="general_name">Name</localize>
-                                    </td>
-                                    <td>
-                                        <span ng-repeat="part in vm.diff.name track by $id(part)">
-                                            <ins ng-if="part.added">{{part.value}}</ins>
-                                            <del ng-if="part.removed">{{part.value}}</del>
-                                            <span ng-if="!part.added && !part.removed">{{part.value}}</span>
-                                        </span>
-                                    </td>
-                                </tr>
-                                <tr ng-repeat="property in vm.diff.properties track by property.alias">
-                                    <td class="bold">{{property.label}}</td>
-                                    <td ng-class="{'pre-line': property.isObject, 'word-wrap': !property.isObject}">
-                                        <span ng-repeat="part in property.diff track by $id(part)">
-                                            <ins ng-if="part.added">{{part.value}}</ins>
-                                            <del ng-if="part.removed">{{part.value}}</del>
-                                            <span ng-if="!part.added && !part.removed">{{part.value}}</span>
-                                        </span>
-                                    </td>
-                                </tr>
-                            </tbody>
-                        </table>
-
-                    </div>
-
-                </umb-box-content>
-            </umb-box>
+            <div class="main-content">
+
+                <umb-box class="side-panel">
+                    <umb-box-content>
+
+                        <div ng-if="model.node.variants.length > 1">
+                            <h5><localize key="general_language">Language</localize></h5>
+                            <select
+                                class="input-block-level"
+                                ng-model="vm.selectedLanguage"
+                                ng-options="variant as variant.displayName for variant in model.node.variants track by variant.language.culture"
+                                ng-change="vm.changeLanguage(vm.selectedLanguage)">
+                            </select>
+                        </div>
+
+                        <div>
+
+                            <h5><localize key="rollback_currentVersion">Current version</localize></h5>
+                            <p>{{vm.currentVersion.name}} (<localize key="rollback_created">Created</localize>: {{vm.currentVersion.createDate}})</p>
+
+                            <!--
+                            <h5><localize key="rollback_rollbackTo">Rollback to</localize></h5>
+                            -->
+
+                            <div class="umb-table umb-table--condensed">
+
+                                <div class="umb-table-head">
+                                    <div class="umb-table-row">
+                                        <div class="umb-table-cell dn"></div>
+                                        <div class="umb-table-cell umb-table-cell-padding">Version</div>
+                                        <div class="umb-table-cell umb-table-cell-padding umb-table-cell--auto-width"></div>
+                                    </div>
+                                </div>
+
+                                <div class="umb-table-body">
+                                    <div class="umb-table-row cursor-pointer umb-outline -selectable"
+                                        ng-repeat="version in vm.previousVersions track by version.versionId"
+                                        ng-class="{'-selected': version.versionId === vm.previousVersion.versionId }"
+                                        ng-click="vm.changeVersion(version)">
+                                        <div class="umb-table-cell dn"></div>
+                                        <div class="umb-table-cell black">{{ version.displayValue }}</div>
+                                        <div class="umb-table-cell umb-table-cell--auto-width">
+                                            <umb-button 
+                                                style="margin-left: auto;"
+                                                button-style="outline"
+                                                type="button"
+                                                size="xxs"
+                                                action="vm.pinVersion(version)"
+                                                label="Pin">
+                                            </umb-button>
+                                        </div>
+                                    </div>
+                                </div>
+
+                            </div>
+                        </div>
+
+                        <umb-pagination
+                            ng-if="vm.totalPages > 0 && !vm.loading"
+                            page-number="vm.currentPage"
+                            total-pages="vm.totalPages"
+                            on-change="vm.goToPage(pageNumber)">
+                        </umb-pagination>
+
+                    </umb-box-content>
+                </umb-box>
+
+                <umb-box class="compare-panel">
+
+                    <umb-box-content>
+
+                        <umb-load-indicator ng-if="vm.loadingDiff"></umb-load-indicator>
+
+                        <umb-empty-state
+                            ng-if="!vm.diff"
+                            position="center">
+                            Select version to compare
+                        </umb-empty-state>
+
+                        <div ng-if="vm.diff && !vm.loadingDiff" class="diff">
+
+                            <small class="db" style="margin-bottom: 15px;">
+                                <localize key="rollback_diffHelp">
+                                    This shows the differences between the current version and the selected version<br /><del>Red text</del> will be
+                                    removed in the selected version, <ins>green text</ins> will be added
+                                </localize>
+                            </small>
+
+                            <table class="table table-condensed table-bordered">
+                                <tbody>
+                                    <tr>
+                                        <td class="bold">
+                                            <localize key="general_name">Name</localize>
+                                        </td>
+                                        <td>
+                                            <span ng-repeat="part in vm.diff.name track by $id(part)">
+                                                <ins ng-if="part.added">{{part.value}}</ins>
+                                                <del ng-if="part.removed">{{part.value}}</del>
+                                                <span ng-if="!part.added && !part.removed">{{part.value}}</span>
+                                            </span>
+                                        </td>
+                                    </tr>
+                                    <tr ng-repeat="property in vm.diff.properties track by property.alias">
+                                        <td class="bold">{{property.label}}</td>
+                                        <td ng-class="{'pre-line': property.isObject, 'word-wrap': !property.isObject}">
+                                            <span ng-repeat="part in property.diff track by $id(part)">
+                                                <ins ng-if="part.added">{{part.value}}</ins>
+                                                <del ng-if="part.removed">{{part.value}}</del>
+                                                <span ng-if="!part.added && !part.removed">{{part.value}}</span>
+                                            </span>
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+
+                        </div>
+
+                    </umb-box-content>
+                </umb-box>
+
+            </div>
         </umb-editor-container>
 
         <umb-editor-footer>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.less b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.less
new file mode 100644
index 000000000000..347ba456cc7b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.less
@@ -0,0 +1,18 @@
+.editor-rollback {
+
+  .main-content {
+    display: flex;
+    gap: 20px;
+  }
+
+  .side-panel {
+    flex: 0 0 30%;
+
+  }
+
+  .compare-panel {
+    flex: 1 1 auto;
+    position: relative;
+  }
+
+}
\ No newline at end of file

From 896dcf673cdf5cd3cef391c2579ec995b89e9501 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Tue, 2 Nov 2021 15:45:12 +0100
Subject: [PATCH 02/24] add busy state to button, deselect version, add
 pagination status

---
 .../rollback/rollback.controller.js           | 21 +++++++++----
 .../infiniteeditors/rollback/rollback.html    | 30 ++++++++-----------
 .../views/components/buttons/umb-button.html  |  6 ++--
 3 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
index 07247fcdac92..42b6072c45db 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
@@ -1,7 +1,7 @@
 (function () {
     "use strict";
 
-    function RollbackController($scope, contentResource, localizationService, assetsService, dateHelper, userService) {
+    function RollbackController($scope, $timeout, contentResource, localizationService, assetsService, dateHelper, userService) {
 
         var vm = this;
 
@@ -25,7 +25,8 @@
             vm.labels = {};
 
             // TODO: implement
-            vm.totalPages = 25;
+            vm.itemsPerPage = 10;
+            vm.totalPages = 10;
             vm.currentPage = 1;
 
             // find the current version for invariant nodes
@@ -72,16 +73,21 @@
 
         function changeVersion(version) {
 
-            if(version && version.versionId) {
+            if (vm.previousVersion && version && vm.previousVersion.versionId === version.versionId) {
+                vm.previousVersion = null;
+                vm.diff = null;
+                return;
+            }
 
+            if (version && version.versionId) {
                 vm.loadingDiff = true;
-
                 const culture = $scope.model.node.variants.length > 1 ? vm.currentVersion.language.culture : null;
 
                 contentResource.getRollbackVersion(version.versionId, culture)
                     .then(function(data) {
                         vm.previousVersion = data;
                         vm.previousVersion.versionId = version.versionId;
+                        vm.previousVersion.displayValue = version.displayValue;
                         createDiff(vm.currentVersion, vm.previousVersion);
 
                         vm.loadingDiff = false;
@@ -208,7 +214,12 @@
 
         // TODO: implement
         function pinVersion (version) {
-            console.log('PIN VERSION', version);
+            version.pinningState = 'busy';
+
+            $timeout(() => {
+                version.pinningState = 'init';
+                version.isPinned = !version.isPinned;
+            }, 2000);
         }
 
         // TODO: implement
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
index e91ec55df197..8f57c19ab907 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
@@ -19,6 +19,10 @@
             <div class="main-content">
 
                 <umb-box class="side-panel">
+                    <umb-box-header title="Versions">
+                        <small>Showing version {{ (vm.currentPage * vm.itemsPerPage - vm.itemsPerPage) + 1 }} to {{ vm.currentPage * vm.itemsPerPage }} of {{ vm.itemsPerPage * vm.totalPages }} versions</small>
+                    </umb-box-header>
+
                     <umb-box-content>
 
                         <div ng-if="model.node.variants.length > 1">
@@ -32,24 +36,13 @@ <h5><localize key="general_language">Language</localize></h5>
                         </div>
 
                         <div>
-
-                            <h5><localize key="rollback_currentVersion">Current version</localize></h5>
-                            <p>{{vm.currentVersion.name}} (<localize key="rollback_created">Created</localize>: {{vm.currentVersion.createDate}})</p>
-
-                            <!--
-                            <h5><localize key="rollback_rollbackTo">Rollback to</localize></h5>
-                            -->
+                            <div class="mb3">
+                                <span class="bold"><localize key="rollback_currentVersion">Current version</localize>: </span>
+                                <span>{{vm.currentVersion.name}} (<localize key="rollback_created">Created</localize>: {{vm.currentVersion.createDate}})</span>
+                            </div>
 
                             <div class="umb-table umb-table--condensed">
 
-                                <div class="umb-table-head">
-                                    <div class="umb-table-row">
-                                        <div class="umb-table-cell dn"></div>
-                                        <div class="umb-table-cell umb-table-cell-padding">Version</div>
-                                        <div class="umb-table-cell umb-table-cell-padding umb-table-cell--auto-width"></div>
-                                    </div>
-                                </div>
-
                                 <div class="umb-table-body">
                                     <div class="umb-table-row cursor-pointer umb-outline -selectable"
                                         ng-repeat="version in vm.previousVersions track by version.versionId"
@@ -63,8 +56,9 @@ <h5><localize key="rollback_rollbackTo">Rollback to</localize></h5>
                                                 button-style="outline"
                                                 type="button"
                                                 size="xxs"
+                                                state="version.pinningState"
                                                 action="vm.pinVersion(version)"
-                                                label="Pin">
+                                                label="{{ version.isPinned ? 'Unpin' : 'Pin' }}">
                                             </umb-button>
                                         </div>
                                     </div>
@@ -85,6 +79,8 @@ <h5><localize key="rollback_rollbackTo">Rollback to</localize></h5>
 
                 <umb-box class="compare-panel">
 
+                    <umb-box-header ng-if="vm.previousVersion" title="{{vm.previousVersion.displayValue}}"></umb-box-header>
+
                     <umb-box-content>
 
                         <umb-load-indicator ng-if="vm.loadingDiff"></umb-load-indicator>
@@ -96,7 +92,7 @@ <h5><localize key="rollback_rollbackTo">Rollback to</localize></h5>
                         </umb-empty-state>
 
                         <div ng-if="vm.diff && !vm.loadingDiff" class="diff">
-
+                            
                             <small class="db" style="margin-bottom: 15px;">
                                 <localize key="rollback_diffHelp">
                                     This shows the differences between the current version and the selected version<br /><del>Red text</del> will be
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button.html b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button.html
index 552d0ffdb578..365aad38171a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button.html
@@ -1,9 +1,9 @@
 <div class="umb-button" ng-class="{'ml0': vm.generalActions, 'umb-button--block': vm.blockElement}" data-element="{{ vm.alias ? 'button-' + vm.alias : '' }}">
 
     <div ng-if="vm.innerState">
-        <umb-icon icon="icon-check" class="umb-button__success" ng-class="{'-hidden': vm.innerState !== 'success', '-white': vm.isPrimaryButtonStyle}"></umb-icon>
-        <umb-icon icon="icon-delete" class="umb-button__error" ng-class="{'-hidden': vm.innerState !== 'error', '-white': vm.isPrimaryButtonStyle}"></umb-icon>
-        <div class="umb-button__progress" ng-class="{'-hidden': vm.innerState !== 'busy', '-white': vm.isPrimaryButtonStyle}"></div>
+        <umb-icon icon="icon-check" class="umb-button__success" ng-class="{'-hidden': vm.innerState !== 'success', '-white': vm.isPrimaryButtonStyle, '-black': vm.buttonStyle === 'outline'}"></umb-icon>
+        <umb-icon icon="icon-delete" class="umb-button__error" ng-class="{'-hidden': vm.innerState !== 'error', '-white': vm.isPrimaryButtonStyle, '-black': vm.buttonStyle === 'outline'}"></umb-icon>
+        <div class="umb-button__progress" ng-class="{'-hidden': vm.innerState !== 'busy', '-white': vm.isPrimaryButtonStyle, '-black': vm.buttonStyle === 'outline'}"></div>
         <div ng-if="vm.innerState !== 'init'" class="umb-button__overlay"></div>
     </div>
 

From 77185c73955ed2fc2f3db4b8a082c088f495a9e2 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Tue, 2 Nov 2021 21:18:30 +0100
Subject: [PATCH 03/24] add localisation

---
 .../common/infiniteeditors/rollback/rollback.html      | 10 ++++++++--
 src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml       |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
index 8f57c19ab907..79e761d39bf0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
@@ -20,7 +20,13 @@
 
                 <umb-box class="side-panel">
                     <umb-box-header title="Versions">
-                        <small>Showing version {{ (vm.currentPage * vm.itemsPerPage - vm.itemsPerPage) + 1 }} to {{ vm.currentPage * vm.itemsPerPage }} of {{ vm.itemsPerPage * vm.totalPages }} versions</small>
+                        <small>
+                            <localize 
+                                key="rollback_pagination"
+                                tokens="[(vm.currentPage * vm.itemsPerPage - vm.itemsPerPage) + 1, vm.currentPage * vm.itemsPerPage, vm.itemsPerPage * vm.totalPages]"
+                                watch-tokens="true">
+                            </localize>
+                        </small>
                     </umb-box-header>
 
                     <umb-box-content>
@@ -88,7 +94,7 @@ <h5><localize key="general_language">Language</localize></h5>
                         <umb-empty-state
                             ng-if="!vm.diff"
                             position="center">
-                            Select version to compare
+                            <localize key="rollback_headline"></localize>
                         </umb-empty-state>
 
                         <div ng-if="vm.diff && !vm.loadingDiff" class="diff">
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 b16765c66a65..d53df40079e9 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -1396,6 +1396,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
     <key alias="rollbackTo">Rollback to</key>
     <key alias="selectVersion">Select version</key>
     <key alias="view">View</key>
+    <key alias="pagination"><![CDATA[Showing version %0% to %1% of %2% versions]]></key>
   </area>
   <area alias="scripts">
     <key alias="editscript">Edit script file</key>

From a0a0ea107f83e4a8148aa033374c96e7eef29e43 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Tue, 2 Nov 2021 21:33:09 +0100
Subject: [PATCH 04/24] style current version

---
 .../common/infiniteeditors/rollback/rollback.html     |  6 +++---
 .../common/infiniteeditors/rollback/rollback.less     | 11 ++++++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
index 79e761d39bf0..a7db7f1ff353 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
@@ -32,9 +32,9 @@
                     <umb-box-content>
 
                         <div ng-if="model.node.variants.length > 1">
-                            <h5><localize key="general_language">Language</localize></h5>
+                            <h5 class="mt0"><localize key="general_language">Language</localize></h5>
                             <select
-                                class="input-block-level"
+                                class="culture-select input-block-level"
                                 ng-model="vm.selectedLanguage"
                                 ng-options="variant as variant.displayName for variant in model.node.variants track by variant.language.culture"
                                 ng-change="vm.changeLanguage(vm.selectedLanguage)">
@@ -42,7 +42,7 @@ <h5><localize key="general_language">Language</localize></h5>
                         </div>
 
                         <div>
-                            <div class="mb3">
+                            <div class="current-version">
                                 <span class="bold"><localize key="rollback_currentVersion">Current version</localize>: </span>
                                 <span>{{vm.currentVersion.name}} (<localize key="rollback_created">Created</localize>: {{vm.currentVersion.createDate}})</span>
                             </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.less b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.less
index 347ba456cc7b..5f6e7362c270 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.less
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.less
@@ -7,7 +7,6 @@
 
   .side-panel {
     flex: 0 0 30%;
-
   }
 
   .compare-panel {
@@ -15,4 +14,14 @@
     position: relative;
   }
 
+  .current-version {
+    background: @gray-10;
+    padding: 15px;
+    margin-bottom: 12px;
+  }
+
+  .culture-select {
+    margin-bottom: 12px;
+  }
+
 }
\ No newline at end of file

From 1d874f3a1fc6372b57a0862196b68c27d4b4893d Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Tue, 2 Nov 2021 21:41:11 +0100
Subject: [PATCH 05/24] disable rollback button when nothing is selected

---
 .../views/common/infiniteeditors/rollback/rollback.controller.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
index 42b6072c45db..abefd38c31e7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
@@ -76,6 +76,7 @@
             if (vm.previousVersion && version && vm.previousVersion.versionId === version.versionId) {
                 vm.previousVersion = null;
                 vm.diff = null;
+                vm.rollbackButtonDisabled = true;
                 return;
             }
 

From df27ea4e87453fd9526e84fc7bc5213ee769a2af Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Tue, 2 Nov 2021 21:45:55 +0100
Subject: [PATCH 06/24] stop click event

---
 .../common/infiniteeditors/rollback/rollback.controller.js    | 4 +++-
 .../src/views/common/infiniteeditors/rollback/rollback.html   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
index abefd38c31e7..52cb28960d5a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
@@ -214,13 +214,15 @@
         }
 
         // TODO: implement
-        function pinVersion (version) {
+        function pinVersion (version, event) {
             version.pinningState = 'busy';
 
             $timeout(() => {
                 version.pinningState = 'init';
                 version.isPinned = !version.isPinned;
             }, 2000);
+
+            event.stopPropagation();
         }
 
         // TODO: implement
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
index a7db7f1ff353..a183410d8cc9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
@@ -63,7 +63,7 @@ <h5 class="mt0"><localize key="general_language">Language</localize></h5>
                                                 type="button"
                                                 size="xxs"
                                                 state="version.pinningState"
-                                                action="vm.pinVersion(version)"
+                                                action="vm.pinVersion(version, $event)"
                                                 label="{{ version.isPinned ? 'Unpin' : 'Pin' }}">
                                             </umb-button>
                                         </div>

From 71fcb390e76669e50aa8baca107aa5509295afe6 Mon Sep 17 00:00:00 2001
From: Paul Johnson <pmj@umbraco.com>
Date: Thu, 11 Nov 2021 16:05:05 +0000
Subject: [PATCH 07/24] Endpoints for paginated content versions. Light on
 tests, tight on time.

---
 src/Umbraco.Core/Models/ContentVersionMeta.cs | 45 +++++++++++
 .../Models/HistoricContentVersionMeta.cs      | 24 ------
 .../IDocumentVersionRepository.cs             |  7 +-
 .../Implement/DocumentVersionRepository.cs    | 54 +++++++++++++-
 .../Services/IContentVersionCleanupPolicy.cs  |  2 +-
 .../Services/IContentVersionService.cs        |  8 +-
 .../Services/Implement/ContentService.cs      | 27 +++++--
 .../DefaultContentVersionCleanupPolicy.cs     |  6 +-
 src/Umbraco.Core/Umbraco.Core.csproj          |  2 +-
 ...mentVersionRepository_Tests_Integration.cs | 68 +++++++++++++++++
 ...ntVersionCleanupService_Tests_UnitTests.cs | 49 ++++++++----
 ...entVersionCleanupPolicy_Tests_UnitTests.cs | 74 +++++++++----------
 src/Umbraco.Web/Editors/ContentController.cs  | 26 +++++++
 13 files changed, 302 insertions(+), 90 deletions(-)
 create mode 100644 src/Umbraco.Core/Models/ContentVersionMeta.cs
 delete mode 100644 src/Umbraco.Core/Models/HistoricContentVersionMeta.cs

diff --git a/src/Umbraco.Core/Models/ContentVersionMeta.cs b/src/Umbraco.Core/Models/ContentVersionMeta.cs
new file mode 100644
index 000000000000..e1b4934141ec
--- /dev/null
+++ b/src/Umbraco.Core/Models/ContentVersionMeta.cs
@@ -0,0 +1,45 @@
+using System;
+
+namespace Umbraco.Core.Models
+{
+    public class ContentVersionMeta
+    {
+        public int ContentId { get; }
+        public int ContentTypeId { get; }
+        public int VersionId { get; }
+        public int UserId { get; }
+
+        public DateTime VersionDate { get; }
+        public bool CurrentPublishedVersion { get; }
+        public bool CurrentDraftVersion { get; }
+        public bool PreventCleanup { get; }
+        public string Username { get; }
+
+        public ContentVersionMeta() { }
+
+        public ContentVersionMeta(
+            int versionId,
+            int contentId,
+            int contentTypeId,
+            int userId,
+            DateTime versionDate,
+            bool currentPublishedVersion,
+            bool currentDraftVersion,
+            bool preventCleanup,
+            string username)
+        {
+            VersionId = versionId;
+            ContentId = contentId;
+            ContentTypeId = contentTypeId;
+         
+            UserId = userId;
+            VersionDate = versionDate;
+            CurrentPublishedVersion = currentPublishedVersion;
+            CurrentDraftVersion = currentDraftVersion;
+            PreventCleanup = preventCleanup;
+            Username = username;
+        }
+
+        public override string ToString() => $"HistoricContentVersionMeta(versionId: {VersionId}, versionDate: {VersionDate:s}";
+    }
+}
diff --git a/src/Umbraco.Core/Models/HistoricContentVersionMeta.cs b/src/Umbraco.Core/Models/HistoricContentVersionMeta.cs
deleted file mode 100644
index 7eb329371136..000000000000
--- a/src/Umbraco.Core/Models/HistoricContentVersionMeta.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Models
-{
-    public class HistoricContentVersionMeta
-    {
-        public int ContentId { get; }
-        public int ContentTypeId { get; }
-        public int VersionId { get; }
-        public DateTime VersionDate { get; }
-
-        public HistoricContentVersionMeta() { }
-
-        public HistoricContentVersionMeta(int contentId, int contentTypeId, int versionId, DateTime versionDate)
-        {
-            ContentId = contentId;
-            ContentTypeId = contentTypeId;
-            VersionId = versionId;
-            VersionDate = versionDate;
-        }
-
-        public override string ToString() => $"HistoricContentVersionMeta(versionId: {VersionId}, versionDate: {VersionDate:s}";
-    }
-}
diff --git a/src/Umbraco.Core/Persistence/Repositories/IDocumentVersionRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IDocumentVersionRepository.cs
index a299713985ff..1e50327dd78a 100644
--- a/src/Umbraco.Core/Persistence/Repositories/IDocumentVersionRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IDocumentVersionRepository.cs
@@ -8,13 +8,18 @@ public interface IDocumentVersionRepository : IRepository
         /// <summary>
         /// Gets a list of all historic content versions.
         /// </summary>
-        public IReadOnlyCollection<HistoricContentVersionMeta> GetDocumentVersionsEligibleForCleanup();
+        public IReadOnlyCollection<ContentVersionMeta> GetDocumentVersionsEligibleForCleanup();
 
         /// <summary>
         /// Gets cleanup policy override settings per content type.
         /// </summary>
         public IReadOnlyCollection<ContentVersionCleanupPolicySettings> GetCleanupPolicies();
 
+        /// <summary>
+        /// Gets paginated content versions for given content id paginated.
+        /// </summary>
+        public IEnumerable<ContentVersionMeta> GetPagedItemsByContentId(int contentId, long pageIndex, int pageSize, out long totalRecords, int? languageId = null);
+
         /// <summary>
         /// Deletes multiple content versions by ID.
         /// </summary>
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentVersionRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentVersionRepository.cs
index 761b83924f8a..b95bf114c3bd 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentVersionRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentVersionRepository.cs
@@ -22,14 +22,19 @@ public DocumentVersionRepository(IScopeAccessor scopeAccessor)
         /// Never includes current published version.<br/>
         /// Never includes versions marked as "preventCleanup".<br/>
         /// </remarks>
-        public IReadOnlyCollection<HistoricContentVersionMeta> GetDocumentVersionsEligibleForCleanup()
+        public IReadOnlyCollection<ContentVersionMeta> GetDocumentVersionsEligibleForCleanup()
         {
             var query = _scopeAccessor.AmbientScope.SqlContext.Sql();
 
             query.Select(@"umbracoDocument.nodeId as contentId,
                            umbracoContent.contentTypeId as contentTypeId,
                            umbracoContentVersion.id as versionId,
-                           umbracoContentVersion.versionDate as versionDate")
+                           umbracoContentVersion.userId as userId,
+                           umbracoContentVersion.versionDate as versionDate,
+                           umbracoDocumentVersion.published as currentPublishedVersion,
+                           umbracoContentVersion.[current] as currentDraftVersion,
+                           umbracoContentVersion.preventCleanup as preventCleanup,
+                           umbracoUser.userName as username")
                 .From<DocumentDto>()
                 .InnerJoin<ContentDto>()
                     .On<DocumentDto, ContentDto>(left => left.NodeId, right => right.NodeId)
@@ -37,11 +42,13 @@ public IReadOnlyCollection<HistoricContentVersionMeta> GetDocumentVersionsEligib
                     .On<ContentDto, ContentVersionDto>(left => left.NodeId, right => right.NodeId)
                 .InnerJoin<DocumentVersionDto>()
                     .On<ContentVersionDto, DocumentVersionDto>(left => left.Id, right => right.Id)
+                .LeftJoin<UserDto>()
+                    .On<UserDto, ContentVersionDto>(left => left.Id, right => right.UserId)
                 .Where<ContentVersionDto>(x => !x.Current) // Never delete current draft version
                 .Where<ContentVersionDto>(x => !x.PreventCleanup) // Never delete "pinned" versions
                 .Where<DocumentVersionDto>(x => !x.Published); // Never delete published version
 
-            return _scopeAccessor.AmbientScope.Database.Fetch<HistoricContentVersionMeta>(query);
+            return _scopeAccessor.AmbientScope.Database.Fetch<ContentVersionMeta>(query);
         }
 
         /// <inheritdoc />
@@ -55,6 +62,47 @@ public IReadOnlyCollection<ContentVersionCleanupPolicySettings> GetCleanupPolici
             return _scopeAccessor.AmbientScope.Database.Fetch<ContentVersionCleanupPolicySettings>(query);
         }
 
+        /// <inheritdoc />
+        public IEnumerable<ContentVersionMeta> GetPagedItemsByContentId(int contentId, long pageIndex, int pageSize, out long totalRecords, int? languageId = null)
+        {
+            var query = _scopeAccessor.AmbientScope.SqlContext.Sql();
+
+            query.Select(@"umbracoDocument.nodeId as contentId,
+                           umbracoContent.contentTypeId as contentTypeId,
+                           umbracoContentVersion.id as versionId,
+                           umbracoContentVersion.userId as userId,
+                           umbracoContentVersion.versionDate as versionDate,
+                           umbracoDocumentVersion.published as currentPublishedVersion,
+                           umbracoContentVersion.[current] as currentDraftVersion,
+                           umbracoContentVersion.preventCleanup as preventCleanup,
+                           umbracoUser.userName as username")
+                .From<DocumentDto>()
+                .InnerJoin<ContentDto>()
+                    .On<DocumentDto, ContentDto>(left => left.NodeId, right => right.NodeId)
+                .InnerJoin<ContentVersionDto>()
+                    .On<ContentDto, ContentVersionDto>(left => left.NodeId, right => right.NodeId)
+                .InnerJoin<DocumentVersionDto>()
+                    .On<ContentVersionDto, DocumentVersionDto>(left => left.Id, right => right.Id)
+                .LeftJoin<UserDto>()
+                    .On<UserDto, ContentVersionDto>(left => left.Id, right => right.UserId)
+                .LeftJoin<ContentVersionCultureVariationDto>()
+                    .On<ContentVersionCultureVariationDto, ContentVersionDto>(left => left.VersionId, right => right.Id)
+                .Where<ContentVersionDto>(x => x.NodeId == contentId);
+
+            // TODO: If there's not a better way to write this then we need a better way to write this.
+            query = languageId.HasValue
+                ? query.Where<ContentVersionCultureVariationDto>(x => x.LanguageId == languageId.Value)
+                : query.Where("umbracoContentVersionCultureVariation.languageId is null");
+
+            query = query.OrderByDescending<ContentVersionDto>(x => x.Id);
+
+            var page = _scopeAccessor.AmbientScope.Database.Page<ContentVersionMeta>(pageIndex + 1, pageSize, query);
+
+            totalRecords = page.TotalItems;
+
+            return page.Items;
+        }
+
         /// <inheritdoc />
         /// <remarks>
         /// Deletes in batches of <see cref="Constants.Sql.MaxParameterCount"/>
diff --git a/src/Umbraco.Core/Services/IContentVersionCleanupPolicy.cs b/src/Umbraco.Core/Services/IContentVersionCleanupPolicy.cs
index 924148181626..e8872d23d13d 100644
--- a/src/Umbraco.Core/Services/IContentVersionCleanupPolicy.cs
+++ b/src/Umbraco.Core/Services/IContentVersionCleanupPolicy.cs
@@ -12,6 +12,6 @@ public interface IContentVersionCleanupPolicy
         /// <summary>
         /// Filters a set of candidates historic content versions for cleanup according to policy settings.
         /// </summary>
-        IEnumerable<HistoricContentVersionMeta> Apply(DateTime asAtDate, IEnumerable<HistoricContentVersionMeta> items);
+        IEnumerable<ContentVersionMeta> Apply(DateTime asAtDate, IEnumerable<ContentVersionMeta> items);
     }
 }
diff --git a/src/Umbraco.Core/Services/IContentVersionService.cs b/src/Umbraco.Core/Services/IContentVersionService.cs
index 8c6cf0bd914d..99bcda1114e5 100644
--- a/src/Umbraco.Core/Services/IContentVersionService.cs
+++ b/src/Umbraco.Core/Services/IContentVersionService.cs
@@ -9,6 +9,12 @@ public interface IContentVersionService
         /// <summary>
         /// Removes historic content versions according to a policy.
         /// </summary>
-        IReadOnlyCollection<HistoricContentVersionMeta> PerformContentVersionCleanup(DateTime asAtDate);
+        IReadOnlyCollection<ContentVersionMeta> PerformContentVersionCleanup(DateTime asAtDate);
+
+        /// <summary>
+        /// Gets paginated content versions for given content id paginated.
+        /// </summary>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="culture"/> is invalid.</exception>
+        IEnumerable<ContentVersionMeta> GetPagedContentVersions(int contentId, long pageIndex, int pageSize, out long totalRecords, string culture = null);
     }
 }
diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index ec381923a557..06d4d6fba9c7 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -3227,17 +3227,34 @@ public OperationResult Rollback(int id, int versionId, string culture = "*", int
         /// In v9 this can live in another class as we publish the notifications via IEventAggregator.
         /// But for v8 must be here for access to the static events.
         /// </remarks>
-        public IReadOnlyCollection<HistoricContentVersionMeta> PerformContentVersionCleanup(DateTime asAtDate)
+        public IReadOnlyCollection<ContentVersionMeta> PerformContentVersionCleanup(DateTime asAtDate)
         {
             return CleanupDocumentVersions(asAtDate);
             // Media - ignored
             // Members - ignored
         }
 
+        /// <inheritdoc />
+        public IEnumerable<ContentVersionMeta> GetPagedContentVersions(int contentId, long pageIndex, int pageSize, out long totalRecords, string culture = null)
+        {
+            if (pageIndex < 0) throw new ArgumentOutOfRangeException(nameof(pageIndex));
+            if (pageSize <= 0) throw new ArgumentOutOfRangeException(nameof(pageSize));
+
+            // NOTE: v9 - don't service locate
+            var documentVersionRepository = Composing.Current.Factory.GetInstance<IDocumentVersionRepository>();
+
+            using (var scope = ScopeProvider.CreateScope(autoComplete: true))
+            {
+                var languageId = _languageRepository.GetIdByIsoCode(culture, throwOnNotFound: true);
+                scope.ReadLock(Constants.Locks.ContentTree);
+                return documentVersionRepository.GetPagedItemsByContentId(contentId, pageIndex, pageSize, out totalRecords, languageId);
+            }
+        }
+
         /// <remarks>
         /// v9 - move to another class
         /// </remarks>
-        private IReadOnlyCollection<HistoricContentVersionMeta> CleanupDocumentVersions(DateTime asAtDate)
+        private IReadOnlyCollection<ContentVersionMeta> CleanupDocumentVersions(DateTime asAtDate)
         {
             // NOTE: v9 - don't service locate
             var documentVersionRepository = Composing.Current.Factory.GetInstance<IDocumentVersionRepository>();
@@ -3245,7 +3262,7 @@ private IReadOnlyCollection<HistoricContentVersionMeta> CleanupDocumentVersions(
             // NOTE: v9 - don't service locate
             var cleanupPolicy = Composing.Current.Factory.GetInstance<IContentVersionCleanupPolicy>();
 
-            List<HistoricContentVersionMeta> versionsToDelete;
+            List<ContentVersionMeta> versionsToDelete;
 
             /* Why so many scopes?
              *
@@ -3278,7 +3295,7 @@ private IReadOnlyCollection<HistoricContentVersionMeta> CleanupDocumentVersions(
                 var allHistoricVersions = documentVersionRepository.GetDocumentVersionsEligibleForCleanup();
 
                 Logger.Debug<ContentService>("Discovered {count} candidate(s) for ContentVersion cleanup.", allHistoricVersions.Count);
-                versionsToDelete = new List<HistoricContentVersionMeta>(allHistoricVersions.Count);
+                versionsToDelete = new List<ContentVersionMeta>(allHistoricVersions.Count);
 
                 var filteredContentVersions = cleanupPolicy.Apply(asAtDate, allHistoricVersions);
 
@@ -3299,7 +3316,7 @@ private IReadOnlyCollection<HistoricContentVersionMeta> CleanupDocumentVersions(
             if (!versionsToDelete.Any())
             {
                 Logger.Debug<ContentService>("No remaining ContentVersions for cleanup.", versionsToDelete.Count);
-                return Array.Empty<HistoricContentVersionMeta>();
+                return Array.Empty<ContentVersionMeta>();
             }
 
             Logger.Debug<ContentService>("Removing {count} ContentVersion(s).", versionsToDelete.Count);
diff --git a/src/Umbraco.Core/Services/Implement/DefaultContentVersionCleanupPolicy.cs b/src/Umbraco.Core/Services/Implement/DefaultContentVersionCleanupPolicy.cs
index 014c6ff1133e..eacedad905dc 100644
--- a/src/Umbraco.Core/Services/Implement/DefaultContentVersionCleanupPolicy.cs
+++ b/src/Umbraco.Core/Services/Implement/DefaultContentVersionCleanupPolicy.cs
@@ -21,14 +21,14 @@ public DefaultContentVersionCleanupPolicy(IContentSection contentSection, IScope
             _documentVersionRepository = documentVersionRepository ?? throw new ArgumentNullException(nameof(documentVersionRepository));
         }
 
-        public IEnumerable<HistoricContentVersionMeta> Apply(DateTime asAtDate, IEnumerable<HistoricContentVersionMeta> items)
+        public IEnumerable<ContentVersionMeta> Apply(DateTime asAtDate, IEnumerable<ContentVersionMeta> items)
         {
             // Note: Not checking global enable flag, that's handled in the scheduled job.
             // If this method is called and policy is globally disabled someone has chosen to run in code.
 
             var globalPolicy = _contentSection.ContentVersionCleanupPolicyGlobalSettings;
 
-            var theRest = new List<HistoricContentVersionMeta>();
+            var theRest = new List<ContentVersionMeta>();
 
             using(_scopeProvider.CreateScope(autoComplete: true))
             {
@@ -79,7 +79,7 @@ public IEnumerable<HistoricContentVersionMeta> Apply(DateTime asAtDate, IEnumera
         }
 
         private ContentVersionCleanupPolicySettings GetOverridePolicy(
-            HistoricContentVersionMeta version,
+            ContentVersionMeta version,
             IDictionary<int, ContentVersionCleanupPolicySettings> overrides)
         {
             _ = overrides.TryGetValue(version.ContentTypeId, out var value);
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index cf5ffc9d0ca7..632031a2e61e 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -181,7 +181,7 @@
     <Compile Include="Persistence\Dtos\ConstraintPerTableDto.cs" />
     <Compile Include="Persistence\Dtos\ContentVersionCleanupPolicyDto.cs" />
     <Compile Include="Persistence\Dtos\DefaultConstraintPerColumnDto.cs" />
-    <Compile Include="Models\HistoricContentVersionMeta.cs" />
+    <Compile Include="Models\ContentVersionMeta.cs" />
     <Compile Include="Persistence\Dtos\UserNotificationDto.cs" />
     <Compile Include="Persistence\Repositories\IDocumentVersionRepository.cs" />
     <Compile Include="Persistence\Repositories\IInstallationRepository.cs" />
diff --git a/src/Umbraco.Tests/Persistence/Repositories/DocumentVersionRepository_Tests_Integration.cs b/src/Umbraco.Tests/Persistence/Repositories/DocumentVersionRepository_Tests_Integration.cs
index 9c012bf083d9..58fc4546b7f1 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/DocumentVersionRepository_Tests_Integration.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/DocumentVersionRepository_Tests_Integration.cs
@@ -1,6 +1,8 @@
 using System.Diagnostics;
 using System.Linq;
 using NUnit.Framework;
+using Umbraco.Core;
+using Umbraco.Core.Models;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Repositories.Implement;
@@ -121,5 +123,71 @@ public void DeleteVersions_Always_DeletesSpecifiedVersions()
                 });
             }
         }
+
+        [Test]
+        public void GetPagedItemsByContentId_WithInvariantCultureContent_ReturnsPaginatedResults()
+        {
+            var contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage", "Textpage");
+            ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate);
+            ServiceContext.ContentTypeService.Save(contentType);
+
+            var content = MockedContent.CreateSimpleContent(contentType);
+
+            ServiceContext.ContentService.SaveAndPublish(content); // Draft + Published 
+            ServiceContext.ContentService.SaveAndPublish(content); // New Draft
+
+            var scopeProvider = TestObjects.GetScopeProvider(Logger);
+            using (scopeProvider.CreateScope())
+            {
+                var sut = new DocumentVersionRepository((IScopeAccessor)scopeProvider);
+                var page1 = sut.GetPagedItemsByContentId(content.Id, 0, 2, out var page1Total);
+                var page2 = sut.GetPagedItemsByContentId(content.Id, 1, 2, out var page2Total);
+
+                Assert.Multiple(() =>
+                {
+                    Assert.AreEqual(2, page1.Count());
+                    Assert.AreEqual(3, page1Total);
+
+                    Assert.AreEqual(1, page2.Count());
+                    Assert.AreEqual(3, page2Total);
+                });
+            }
+        }
+
+        [Test]
+        public void GetPagedItemsByContentId_WithVariantCultureContent_ReturnsPaginatedResults()
+        {
+            var contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage", "Textpage");
+            contentType.Variations = ContentVariation.Culture;
+            foreach (var propertyType in contentType.PropertyTypes)
+            {
+                propertyType.Variations = ContentVariation.Culture;
+            }
+            ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate);
+            ServiceContext.ContentTypeService.Save(contentType);
+
+            var content = MockedContent.CreateSimpleContent(contentType, "foo", culture:"en-US");
+            content.SetCultureName("foo", "en-US");
+
+            ServiceContext.ContentService.SaveAndPublish(content, "en-US"); // Draft + Published 
+            ServiceContext.ContentService.SaveAndPublish(content, "en-US"); // New Draft
+
+            var scopeProvider = TestObjects.GetScopeProvider(Logger);
+            using (scopeProvider.CreateScope())
+            {
+                var sut = new DocumentVersionRepository((IScopeAccessor)scopeProvider);
+                var page1 = sut.GetPagedItemsByContentId(content.Id, 0, 2, out var page1Total, 1);
+                var page2 = sut.GetPagedItemsByContentId(content.Id, 1, 2, out var page2Total, 1);
+
+                Assert.Multiple(() =>
+                {
+                    Assert.AreEqual(2, page1.Count());
+                    Assert.AreEqual(3, page1Total);
+
+                    Assert.AreEqual(1, page2.Count());
+                    Assert.AreEqual(3, page2Total);
+                });
+            }
+        }
     }
 }
diff --git a/src/Umbraco.Tests/Services/ContentVersionCleanupService_Tests_UnitTests.cs b/src/Umbraco.Tests/Services/ContentVersionCleanupService_Tests_UnitTests.cs
index f72b61b4ce21..4eab0972ade2 100644
--- a/src/Umbraco.Tests/Services/ContentVersionCleanupService_Tests_UnitTests.cs
+++ b/src/Umbraco.Tests/Services/ContentVersionCleanupService_Tests_UnitTests.cs
@@ -37,7 +37,7 @@ public void PerformContentVersionCleanup_Always_RespectsDeleteRevisionsCancellat
             [Frozen] Mock<IFactory> factory,
             [Frozen] Mock<IScope> scope,
             Mock<IDocumentVersionRepository> documentVersionRepository,
-            List<TestHistoricContentVersionMeta> someHistoricVersions,
+            List<TestContentVersionMeta> someHistoricVersions,
             DateTime aDateTime,
             ContentService sut)
         {
@@ -75,7 +75,7 @@ public void PerformContentVersionCleanup_Always_FiresDeletedVersionsForEachDelet
             [Frozen] Mock<IFactory> factory,
             [Frozen] Mock<IScope> scope,
             Mock<IDocumentVersionRepository> documentVersionRepository,
-            List<TestHistoricContentVersionMeta> someHistoricVersions,
+            List<TestContentVersionMeta> someHistoricVersions,
             DateTime aDateTime,
             ContentService sut)
         {
@@ -119,7 +119,7 @@ public void PerformContentVersionCleanup_Always_ReturnsReportOfDeletedItems(
             [Frozen] Mock<IFactory> factory,
             [Frozen] Mock<IScope> scope,
             Mock<IDocumentVersionRepository> documentVersionRepository,
-            List<TestHistoricContentVersionMeta> someHistoricVersions,
+            List<TestContentVersionMeta> someHistoricVersions,
             DateTime aDateTime,
             ContentService sut)
         {
@@ -156,7 +156,7 @@ public void PerformContentVersionCleanup_Always_AdheresToCleanupPolicy(
             [Frozen] Mock<IScope> scope,
             Mock<IDocumentVersionRepository> documentVersionRepository,
             Mock<IContentVersionCleanupPolicy> cleanupPolicy,
-            List<TestHistoricContentVersionMeta> someHistoricVersions,
+            List<TestContentVersionMeta> someHistoricVersions,
             DateTime aDateTime,
             ContentService sut)
         {
@@ -171,8 +171,8 @@ public void PerformContentVersionCleanup_Always_AdheresToCleanupPolicy(
 
             scope.Setup(x => x.Events).Returns(new PassThroughEventDispatcher());
 
-            cleanupPolicy.Setup(x => x.Apply(It.IsAny<DateTime>(), It.IsAny<IEnumerable<TestHistoricContentVersionMeta>>()))
-                .Returns<DateTime, IEnumerable<TestHistoricContentVersionMeta>>((_, items) => items.Take(1));
+            cleanupPolicy.Setup(x => x.Apply(It.IsAny<DateTime>(), It.IsAny<IEnumerable<TestContentVersionMeta>>()))
+                .Returns<DateTime, IEnumerable<TestContentVersionMeta>>((_, items) => items.Take(1));
 
             // Wire up service locator
             Current.Factory = factory.Object;
@@ -198,7 +198,7 @@ public void PerformContentVersionCleanup_HasVersionsToDelete_CallsDeleteOnReposi
             [Frozen] Mock<IScope> scope,
             Mock<IDocumentVersionRepository> documentVersionRepository,
             Mock<IContentVersionCleanupPolicy> cleanupPolicy,
-            List<TestHistoricContentVersionMeta> someHistoricVersions,
+            List<TestContentVersionMeta> someHistoricVersions,
             DateTime aDateTime,
             ContentService sut)
         {
@@ -215,8 +215,8 @@ public void PerformContentVersionCleanup_HasVersionsToDelete_CallsDeleteOnReposi
 
             var filteredSet = someHistoricVersions.Take(1);
 
-            cleanupPolicy.Setup(x => x.Apply(It.IsAny<DateTime>(), It.IsAny<IEnumerable<TestHistoricContentVersionMeta>>()))
-                .Returns<DateTime, IEnumerable<TestHistoricContentVersionMeta>>((_, items) => filteredSet);
+            cleanupPolicy.Setup(x => x.Apply(It.IsAny<DateTime>(), It.IsAny<IEnumerable<TestContentVersionMeta>>()))
+                .Returns<DateTime, IEnumerable<TestContentVersionMeta>>((_, items) => filteredSet);
 
             // Wire up service locator
             Current.Factory = factory.Object;
@@ -243,9 +243,9 @@ public EchoingCleanupPolicyStub() { }
              * cleanupPolicy.Setup(x => x.Apply(It.IsAny<DateTime>(), It.IsAny<IEnumerable<TestHistoricContentVersionMeta>>()))
              *    .Returns<DateTime, IEnumerable<TestHistoricContentVersionMeta>>((date, items) => items);
              */
-            public IEnumerable<HistoricContentVersionMeta> Apply(
+            public IEnumerable<ContentVersionMeta> Apply(
                 DateTime asAtDate,
-                IEnumerable<HistoricContentVersionMeta> items
+                IEnumerable<ContentVersionMeta> items
             ) => items;
         }
 
@@ -255,10 +255,31 @@ IEnumerable<HistoricContentVersionMeta> items
         ///
         /// <para>Inheritance solves this so that we get values for test data without a specimen builder</para>
         /// </remarks>
-        public class TestHistoricContentVersionMeta : HistoricContentVersionMeta
+        public class TestContentVersionMeta : ContentVersionMeta
         {
-            public TestHistoricContentVersionMeta(int contentId, int contentTypeId, int versionId, DateTime versionDate)
-                : base(contentId, contentTypeId, versionId, versionDate) { }
+            public TestContentVersionMeta(
+                int contentId,
+                int contentTypeId,
+                int versionId,
+                int userId,
+                DateTime versionDate,
+                bool currentPublishedVersion,
+                bool currentDraftVersion,
+                bool preventCleanup,
+                string username)
+            : base(
+                contentId,
+                contentTypeId,
+                versionId,
+                userId,
+                versionDate,
+                currentPublishedVersion,
+                currentDraftVersion,
+                preventCleanup,
+                username
+            )
+            {
+            }
         }
     }
 }
diff --git a/src/Umbraco.Tests/Services/DefaultContentVersionCleanupPolicy_Tests_UnitTests.cs b/src/Umbraco.Tests/Services/DefaultContentVersionCleanupPolicy_Tests_UnitTests.cs
index c20bcc72ef5e..2beb47530ea8 100644
--- a/src/Umbraco.Tests/Services/DefaultContentVersionCleanupPolicy_Tests_UnitTests.cs
+++ b/src/Umbraco.Tests/Services/DefaultContentVersionCleanupPolicy_Tests_UnitTests.cs
@@ -23,10 +23,10 @@ public void Apply_AllOlderThanKeepSettings_AllVersionsReturned(
         {
             var versionId = 0;
 
-            var historicItems = new List<HistoricContentVersionMeta>
+            var historicItems = new List<ContentVersionMeta>
             {
-                new HistoricContentVersionMeta(versionId: ++versionId, contentId: 1, contentTypeId: 1, versionDate: DateTime.Today.AddHours(-1)),
-                new HistoricContentVersionMeta(versionId: ++versionId, contentId: 1, contentTypeId: 1, versionDate: DateTime.Today.AddHours(-1)),
+                new ContentVersionMeta(versionId: ++versionId, contentId: 1, contentTypeId: 1, -1, versionDate: DateTime.Today.AddHours(-1), false, false, false, null),
+                new ContentVersionMeta(versionId: ++versionId, contentId: 1, contentTypeId: 1, -1, versionDate: DateTime.Today.AddHours(-1), false, false, false, null),
             };
 
             globalSettings.Setup(x => x.ContentVersionCleanupPolicyGlobalSettings)
@@ -51,10 +51,10 @@ public void Apply_OverlappingKeepSettings_KeepAllVersionsNewerThanDaysTakesPrior
         {
             var versionId = 0;
 
-            var historicItems = new List<HistoricContentVersionMeta>
+            var historicItems = new List<ContentVersionMeta>
             {
-                new HistoricContentVersionMeta(versionId: ++versionId, contentId: 1, contentTypeId: 1, versionDate: DateTime.Today.AddHours(-1)),
-                new HistoricContentVersionMeta(versionId: ++versionId, contentId: 1, contentTypeId: 1, versionDate: DateTime.Today.AddHours(-1)),
+                new ContentVersionMeta(versionId: ++versionId, contentId: 1, contentTypeId: 1, -1, versionDate: DateTime.Today.AddHours(-1), false, false, false, null),
+                new ContentVersionMeta(versionId: ++versionId, contentId: 1, contentTypeId: 1, -1, versionDate: DateTime.Today.AddHours(-1), false, false, false, null),
             };
 
             globalSettings.Setup(x => x.ContentVersionCleanupPolicyGlobalSettings)
@@ -77,19 +77,19 @@ public void Apply_WithinInKeepLatestPerDay_ReturnsSinglePerContentPerDay(
             [Frozen] Mock<IContentSection> globalSettings,
             DefaultContentVersionCleanupPolicy sut)
         {
-            var historicItems = new List<HistoricContentVersionMeta>
+            var historicItems = new List<ContentVersionMeta>
             {
-                new HistoricContentVersionMeta(versionId: 1, contentId: 1, contentTypeId: 1, versionDate: DateTime.Today.AddHours(-3)),
-                new HistoricContentVersionMeta(versionId: 2, contentId: 1, contentTypeId: 1, versionDate: DateTime.Today.AddHours(-2)),
-                new HistoricContentVersionMeta(versionId: 3, contentId: 1, contentTypeId: 1, versionDate: DateTime.Today.AddHours(-1)),
+                new ContentVersionMeta(versionId: 1, contentId: 1, contentTypeId: 1, -1, versionDate: DateTime.Today.AddHours(-3), false, false, false, null),
+                new ContentVersionMeta(versionId: 2, contentId: 1, contentTypeId: 1, -1, versionDate: DateTime.Today.AddHours(-2), false, false, false, null),
+                new ContentVersionMeta(versionId: 3, contentId: 1, contentTypeId: 1, -1, versionDate: DateTime.Today.AddHours(-1), false, false, false, null),
 
-                new HistoricContentVersionMeta(versionId: 4, contentId: 1, contentTypeId: 1, versionDate: DateTime.Today.AddDays(-1).AddHours(-3)),
-                new HistoricContentVersionMeta(versionId: 5, contentId: 1, contentTypeId: 1, versionDate: DateTime.Today.AddDays(-1).AddHours(-2)),
-                new HistoricContentVersionMeta(versionId: 6, contentId: 1, contentTypeId: 1, versionDate: DateTime.Today.AddDays(-1).AddHours(-1)),
+                new ContentVersionMeta(versionId: 4, contentId: 1, contentTypeId: 1, -1, versionDate: DateTime.Today.AddDays(-1).AddHours(-3), false, false, false, null),
+                new ContentVersionMeta(versionId: 5, contentId: 1, contentTypeId: 1, -1, versionDate: DateTime.Today.AddDays(-1).AddHours(-2), false, false, false, null),
+                new ContentVersionMeta(versionId: 6, contentId: 1, contentTypeId: 1, -1, versionDate: DateTime.Today.AddDays(-1).AddHours(-1), false, false, false, null),
                 // another content
-                new HistoricContentVersionMeta(versionId: 7, contentId: 2, contentTypeId: 1, versionDate: DateTime.Today.AddHours(-3)),
-                new HistoricContentVersionMeta(versionId: 8, contentId: 2, contentTypeId: 1, versionDate: DateTime.Today.AddHours(-2)),
-                new HistoricContentVersionMeta(versionId: 9, contentId: 2, contentTypeId: 1, versionDate: DateTime.Today.AddHours(-1)),
+                new ContentVersionMeta(versionId: 7, contentId: 2, contentTypeId: 1, -1, versionDate: DateTime.Today.AddHours(-3), false, false, false, null),
+                new ContentVersionMeta(versionId: 8, contentId: 2, contentTypeId: 1, -1, versionDate: DateTime.Today.AddHours(-2), false, false, false, null),
+                new ContentVersionMeta(versionId: 9, contentId: 2, contentTypeId: 1, -1, versionDate: DateTime.Today.AddHours(-1), false, false, false, null),
             };
 
             globalSettings.Setup(x => x.ContentVersionCleanupPolicyGlobalSettings)
@@ -118,15 +118,15 @@ public void Apply_HasOverridePolicy_RespectsPreventCleanup(
             [Frozen] Mock<IContentSection> globalSettings,
             DefaultContentVersionCleanupPolicy sut)
         {
-            var historicItems = new List<HistoricContentVersionMeta>
+            var historicItems = new List<ContentVersionMeta>
             {
-                new HistoricContentVersionMeta(versionId: 1, contentId: 1, contentTypeId: 1, versionDate: DateTime.Today.AddHours(-3)),
-                new HistoricContentVersionMeta(versionId: 2, contentId: 1, contentTypeId: 1, versionDate: DateTime.Today.AddHours(-2)),
-                new HistoricContentVersionMeta(versionId: 3, contentId: 1, contentTypeId: 1, versionDate: DateTime.Today.AddHours(-1)),
+                new ContentVersionMeta(versionId: 1, contentId: 1, contentTypeId: 1, -1, versionDate: DateTime.Today.AddHours(-3), false, false, false, null),
+                new ContentVersionMeta(versionId: 2, contentId: 1, contentTypeId: 1, -1, versionDate: DateTime.Today.AddHours(-2), false, false, false, null),
+                new ContentVersionMeta(versionId: 3, contentId: 1, contentTypeId: 1, -1, versionDate: DateTime.Today.AddHours(-1), false, false, false, null),
                 // another content & type
-                new HistoricContentVersionMeta(versionId: 4, contentId: 2, contentTypeId: 2, versionDate: DateTime.Today.AddHours(-3)),
-                new HistoricContentVersionMeta(versionId: 5, contentId: 2, contentTypeId: 2, versionDate: DateTime.Today.AddHours(-2)),
-                new HistoricContentVersionMeta(versionId: 6, contentId: 2, contentTypeId: 2, versionDate: DateTime.Today.AddHours(-1)),
+                new ContentVersionMeta(versionId: 4, contentId: 2, contentTypeId: 2, -1, versionDate: DateTime.Today.AddHours(-3), false, false, false, null),
+                new ContentVersionMeta(versionId: 5, contentId: 2, contentTypeId: 2, -1, versionDate: DateTime.Today.AddHours(-2), false, false, false, null),
+                new ContentVersionMeta(versionId: 6, contentId: 2, contentTypeId: 2, -1, versionDate: DateTime.Today.AddHours(-1), false, false, false, null),
             };
 
             globalSettings.Setup(x => x.ContentVersionCleanupPolicyGlobalSettings)
@@ -152,15 +152,15 @@ public void Apply_HasOverridePolicy_RespectsKeepAll(
             [Frozen] Mock<IContentSection> globalSettings,
             DefaultContentVersionCleanupPolicy sut)
         {
-            var historicItems = new List<HistoricContentVersionMeta>
+            var historicItems = new List<ContentVersionMeta>
             {
-                new HistoricContentVersionMeta(versionId: 1, contentId: 1, contentTypeId: 1, versionDate: DateTime.Today.AddHours(-3)),
-                new HistoricContentVersionMeta(versionId: 2, contentId: 1, contentTypeId: 1, versionDate: DateTime.Today.AddHours(-2)),
-                new HistoricContentVersionMeta(versionId: 3, contentId: 1, contentTypeId: 1, versionDate: DateTime.Today.AddHours(-1)),
+                new ContentVersionMeta(versionId: 1, contentId: 1, contentTypeId: 1, -1, versionDate: DateTime.Today.AddHours(-3), false, false, false, null),
+                new ContentVersionMeta(versionId: 2, contentId: 1, contentTypeId: 1, -1, versionDate: DateTime.Today.AddHours(-2), false, false, false, null),
+                new ContentVersionMeta(versionId: 3, contentId: 1, contentTypeId: 1, -1, versionDate: DateTime.Today.AddHours(-1), false, false, false, null),
                 // another content & type
-                new HistoricContentVersionMeta(versionId: 4, contentId: 2, contentTypeId: 2, versionDate: DateTime.Today.AddHours(-3)),
-                new HistoricContentVersionMeta(versionId: 5, contentId: 2, contentTypeId: 2, versionDate: DateTime.Today.AddHours(-2)),
-                new HistoricContentVersionMeta(versionId: 6, contentId: 2, contentTypeId: 2, versionDate: DateTime.Today.AddHours(-1)),
+                new ContentVersionMeta(versionId: 4, contentId: 2, contentTypeId: 2, -1, versionDate: DateTime.Today.AddHours(-3), false, false, false, null),
+                new ContentVersionMeta(versionId: 5, contentId: 2, contentTypeId: 2, -1, versionDate: DateTime.Today.AddHours(-2), false, false, false, null),
+                new ContentVersionMeta(versionId: 6, contentId: 2, contentTypeId: 2, -1, versionDate: DateTime.Today.AddHours(-1), false, false, false, null),
             };
 
             globalSettings.Setup(x => x.ContentVersionCleanupPolicyGlobalSettings)
@@ -186,15 +186,15 @@ public void Apply_HasOverridePolicy_RespectsKeepLatest(
             [Frozen] Mock<IContentSection> globalSettings,
             DefaultContentVersionCleanupPolicy sut)
         {
-            var historicItems = new List<HistoricContentVersionMeta>
+            var historicItems = new List<ContentVersionMeta>
             {
-                new HistoricContentVersionMeta(versionId: 1, contentId: 1, contentTypeId: 1, versionDate: DateTime.Today.AddHours(-3)),
-                new HistoricContentVersionMeta(versionId: 2, contentId: 1, contentTypeId: 1, versionDate: DateTime.Today.AddHours(-2)),
-                new HistoricContentVersionMeta(versionId: 3, contentId: 1, contentTypeId: 1, versionDate: DateTime.Today.AddHours(-1)),
+                new ContentVersionMeta(versionId: 1, contentId: 1, contentTypeId: 1, -1, versionDate: DateTime.Today.AddHours(-3), false, false, false, null),
+                new ContentVersionMeta(versionId: 2, contentId: 1, contentTypeId: 1, -1, versionDate: DateTime.Today.AddHours(-2), false, false, false, null),
+                new ContentVersionMeta(versionId: 3, contentId: 1, contentTypeId: 1, -1, versionDate: DateTime.Today.AddHours(-1), false, false, false, null),
                 // another content & type
-                new HistoricContentVersionMeta(versionId: 4, contentId: 2, contentTypeId: 2, versionDate: DateTime.Today.AddHours(-3)),
-                new HistoricContentVersionMeta(versionId: 5, contentId: 2, contentTypeId: 2, versionDate: DateTime.Today.AddHours(-2)),
-                new HistoricContentVersionMeta(versionId: 6, contentId: 2, contentTypeId: 2, versionDate: DateTime.Today.AddHours(-1)),
+                new ContentVersionMeta(versionId: 4, contentId: 2, contentTypeId: 2, -1, versionDate: DateTime.Today.AddHours(-3), false, false, false, null),
+                new ContentVersionMeta(versionId: 5, contentId: 2, contentTypeId: 2, -1, versionDate: DateTime.Today.AddHours(-2), false, false, false, null),
+                new ContentVersionMeta(versionId: 6, contentId: 2, contentTypeId: 2, -1, versionDate: DateTime.Today.AddHours(-1), false, false, false, null),
             };
 
             globalSettings.Setup(x => x.ContentVersionCleanupPolicyGlobalSettings)
diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs
index d7f1d81c77a9..f5b652363a40 100644
--- a/src/Umbraco.Web/Editors/ContentController.cs
+++ b/src/Umbraco.Web/Editors/ContentController.cs
@@ -2398,6 +2398,32 @@ public void PostNotificationOptions(int contentId, [FromUri] string[] notifyOpti
             Services.NotificationService.SetNotifications(Security.CurrentUser, content, notifyOptions);
         }
 
+        [HttpGet]
+        public PagedResult<ContentVersionMeta> GetPagedContentVersions(
+            int contentId,
+            int pageNumber = 1,
+            int pageSize = 10,
+            string culture = null)
+        {
+            if (!string.IsNullOrEmpty(culture))
+            {
+                if (!_allLangs.Value.TryGetValue(culture, out _))
+                {
+                    throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
+                }
+            }
+
+            // NOTE: v9 - don't service locate
+            var contentVersionService = Current.Factory.GetInstance<IContentVersionService>();
+
+            var results =  contentVersionService.GetPagedContentVersions(contentId, pageNumber - 1, pageSize, out var totalRecords, culture);
+
+            return new PagedResult<ContentVersionMeta>(totalRecords, pageNumber, pageSize)
+            {
+                Items = results
+            };
+        }
+
         [HttpGet]
         public IEnumerable<RollbackVersion> GetRollbackVersions(int contentId, string culture = null)
         {

From 27cf328ffb02b057487969787099f29e4e7dc03f Mon Sep 17 00:00:00 2001
From: Paul Johnson <pmj@umbraco.com>
Date: Mon, 15 Nov 2021 08:35:56 +0000
Subject: [PATCH 08/24] Endpoints to "pin" content versions

---
 .../IDocumentVersionRepository.cs             | 10 +++++
 .../Implement/DocumentVersionRepository.cs    | 40 +++++++++++++++++++
 .../Services/IContentVersionService.cs        |  5 +++
 .../Services/Implement/ContentService.cs      | 16 ++++++++
 src/Umbraco.Web/Editors/ContentController.cs  | 19 +++++++++
 5 files changed, 90 insertions(+)

diff --git a/src/Umbraco.Core/Persistence/Repositories/IDocumentVersionRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IDocumentVersionRepository.cs
index 1e50327dd78a..c1e3c04adc08 100644
--- a/src/Umbraco.Core/Persistence/Repositories/IDocumentVersionRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IDocumentVersionRepository.cs
@@ -24,5 +24,15 @@ public interface IDocumentVersionRepository : IRepository
         /// Deletes multiple content versions by ID.
         /// </summary>
         void DeleteVersions(IEnumerable<int> versionIds);
+
+        /// <summary>
+        /// Updates the prevent cleanup flag on a content version.
+        /// </summary>
+        void SetPreventCleanup(int versionId, bool preventCleanup);
+
+        /// <summary>
+        /// Gets the content version metadata for a specific version.
+        /// </summary>
+        ContentVersionMeta Get(int versionId);
     }
 }
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentVersionRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentVersionRepository.cs
index b95bf114c3bd..c4ec783ae949 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentVersionRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentVersionRepository.cs
@@ -138,5 +138,45 @@ public void DeleteVersions(IEnumerable<int> versionIds)
                 _scopeAccessor.AmbientScope.Database.Execute(query);
             }
         }
+
+        /// <inheritdoc />
+        public void SetPreventCleanup(int versionId, bool preventCleanup)
+        {
+            var query = _scopeAccessor.AmbientScope.SqlContext.Sql()
+                .Update<ContentVersionDto>(x => x.Set(y => y.PreventCleanup, preventCleanup))
+                .Where<ContentVersionDto>(x => x.Id == versionId);
+
+            _scopeAccessor.AmbientScope.Database.Execute(query);
+        }
+
+        /// <inheritdoc />
+        public ContentVersionMeta Get(int versionId)
+        {
+            var query = _scopeAccessor.AmbientScope.SqlContext.Sql();
+
+            query.Select(@"umbracoDocument.nodeId as contentId,
+                           umbracoContent.contentTypeId as contentTypeId,
+                           umbracoContentVersion.id as versionId,
+                           umbracoContentVersion.userId as userId,
+                           umbracoContentVersion.versionDate as versionDate,
+                           umbracoDocumentVersion.published as currentPublishedVersion,
+                           umbracoContentVersion.[current] as currentDraftVersion,
+                           umbracoContentVersion.preventCleanup as preventCleanup,
+                           umbracoUser.userName as username")
+                .From<DocumentDto>()
+                .InnerJoin<ContentDto>()
+                    .On<DocumentDto, ContentDto>(left => left.NodeId, right => right.NodeId)
+                .InnerJoin<ContentVersionDto>()
+                    .On<ContentDto, ContentVersionDto>(left => left.NodeId, right => right.NodeId)
+                .InnerJoin<DocumentVersionDto>()
+                    .On<ContentVersionDto, DocumentVersionDto>(left => left.Id, right => right.Id)
+                .LeftJoin<UserDto>()
+                    .On<UserDto, ContentVersionDto>(left => left.Id, right => right.UserId)
+                .LeftJoin<ContentVersionCultureVariationDto>()
+                    .On<ContentVersionCultureVariationDto, ContentVersionDto>(left => left.VersionId, right => right.Id)
+                .Where<ContentVersionDto>(x => x.Id == versionId);
+
+            return _scopeAccessor.AmbientScope.Database.Single<ContentVersionMeta>(query);
+        }
     }
 }
diff --git a/src/Umbraco.Core/Services/IContentVersionService.cs b/src/Umbraco.Core/Services/IContentVersionService.cs
index 99bcda1114e5..3243576aa8ef 100644
--- a/src/Umbraco.Core/Services/IContentVersionService.cs
+++ b/src/Umbraco.Core/Services/IContentVersionService.cs
@@ -16,5 +16,10 @@ public interface IContentVersionService
         /// </summary>
         /// <exception cref="ArgumentException">Thrown when <paramref name="culture"/> is invalid.</exception>
         IEnumerable<ContentVersionMeta> GetPagedContentVersions(int contentId, long pageIndex, int pageSize, out long totalRecords, string culture = null);
+
+        /// <summary>
+        /// Updates preventCleanup value for given content version.
+        /// </summary>
+        void SetPreventCleanup(int versionId, bool preventCleanup, int userId = -1);
     }
 }
diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index 06d4d6fba9c7..fe8cb99671d9 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -3251,6 +3251,22 @@ public IEnumerable<ContentVersionMeta> GetPagedContentVersions(int contentId, lo
             }
         }
 
+        /// <inheritdoc />
+        public void SetPreventCleanup(int versionId, bool preventCleanup, int userId = -1)
+        {
+            // NOTE: v9 - don't service locate
+            var documentVersionRepository = Composing.Current.Factory.GetInstance<IDocumentVersionRepository>();
+
+            using (ScopeProvider.CreateScope(autoComplete: true))
+            {
+                documentVersionRepository.SetPreventCleanup(versionId, preventCleanup);
+
+                //var version = documentVersionRepository.Get(versionId);
+
+                //TODO: Audit log message(s)
+            }
+        }
+
         /// <remarks>
         /// v9 - move to another class
         /// </remarks>
diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs
index f5b652363a40..16ab66617e52 100644
--- a/src/Umbraco.Web/Editors/ContentController.cs
+++ b/src/Umbraco.Web/Editors/ContentController.cs
@@ -2423,6 +2423,24 @@ public PagedResult<ContentVersionMeta> GetPagedContentVersions(
                 Items = results
             };
         }
+        
+        [HttpPost]
+        [EnsureUserPermissionForContent("contentId", ActionUpdate.ActionLetter)]
+        public HttpResponseMessage PostSetContentVersionPreventCleanup(int contentId, int versionId, bool preventCleanup)
+        {
+            var content = Services.ContentService.GetVersion(versionId);
+            if (content == null || content.Id != contentId)
+            {
+                throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
+            }
+
+            // NOTE: v9 - don't service locate
+            var contentVersionService = Current.Factory.GetInstance<IContentVersionService>();
+
+            contentVersionService.SetPreventCleanup(versionId, preventCleanup, Security.GetUserId().ResultOr(0));
+
+            return Request.CreateResponse(HttpStatusCode.OK);
+        }
 
         [HttpGet]
         public IEnumerable<RollbackVersion> GetRollbackVersions(int contentId, string culture = null)
@@ -2512,6 +2530,7 @@ public HttpResponseMessage PostRollbackContent(int contentId, int versionId, str
             return Request.CreateValidationErrorResponse(notificationModel);
         }
 
+
         [EnsureUserPermissionForContent("contentId", ActionProtect.ActionLetter)]
         [HttpGet]
         public HttpResponseMessage GetPublicAccess(int contentId)

From de5bfe9048ce576fd6ec4bb79dbbcf9747f0b3cd Mon Sep 17 00:00:00 2001
From: Paul Johnson <pmj@umbraco.com>
Date: Mon, 15 Nov 2021 08:47:34 +0000
Subject: [PATCH 09/24] camel case json output. Not sure why json formatter not
 set for controller, bit risky to add it now

---
 src/Umbraco.Core/Models/ContentVersionMeta.cs |  2 +-
 src/Umbraco.Web/Editors/ContentController.cs  |  6 +--
 .../ContentVersionMetaViewModel.cs            | 54 +++++++++++++++++++
 src/Umbraco.Web/Umbraco.Web.csproj            |  1 +
 4 files changed, 59 insertions(+), 4 deletions(-)
 create mode 100644 src/Umbraco.Web/Models/ContentEditing/ContentVersionMetaViewModel.cs

diff --git a/src/Umbraco.Core/Models/ContentVersionMeta.cs b/src/Umbraco.Core/Models/ContentVersionMeta.cs
index e1b4934141ec..3bd37db05b75 100644
--- a/src/Umbraco.Core/Models/ContentVersionMeta.cs
+++ b/src/Umbraco.Core/Models/ContentVersionMeta.cs
@@ -40,6 +40,6 @@ public ContentVersionMeta(
             Username = username;
         }
 
-        public override string ToString() => $"HistoricContentVersionMeta(versionId: {VersionId}, versionDate: {VersionDate:s}";
+        public override string ToString() => $"ContentVersionMeta(versionId: {VersionId}, versionDate: {VersionDate:s}";
     }
 }
diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs
index 16ab66617e52..f535a5078ce8 100644
--- a/src/Umbraco.Web/Editors/ContentController.cs
+++ b/src/Umbraco.Web/Editors/ContentController.cs
@@ -2399,7 +2399,7 @@ public void PostNotificationOptions(int contentId, [FromUri] string[] notifyOpti
         }
 
         [HttpGet]
-        public PagedResult<ContentVersionMeta> GetPagedContentVersions(
+        public PagedResult<ContentVersionMetaViewModel> GetPagedContentVersions(
             int contentId,
             int pageNumber = 1,
             int pageSize = 10,
@@ -2418,9 +2418,9 @@ public PagedResult<ContentVersionMeta> GetPagedContentVersions(
 
             var results =  contentVersionService.GetPagedContentVersions(contentId, pageNumber - 1, pageSize, out var totalRecords, culture);
 
-            return new PagedResult<ContentVersionMeta>(totalRecords, pageNumber, pageSize)
+            return new PagedResult<ContentVersionMetaViewModel>(totalRecords, pageNumber, pageSize)
             {
-                Items = results
+                Items = results.Select(x => new ContentVersionMetaViewModel(x))
             };
         }
         
diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentVersionMetaViewModel.cs b/src/Umbraco.Web/Models/ContentEditing/ContentVersionMetaViewModel.cs
new file mode 100644
index 000000000000..a8e63d2152e5
--- /dev/null
+++ b/src/Umbraco.Web/Models/ContentEditing/ContentVersionMetaViewModel.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Runtime.Serialization;
+using Umbraco.Core.Models;
+
+namespace Umbraco.Web.Models.ContentEditing
+{
+    [DataContract(Name = "contentVersionMeta", Namespace = "")]
+    public class ContentVersionMetaViewModel
+    {
+        [DataMember(Name = "contentId")]
+        public int ContentId { get; set; }
+
+        [DataMember(Name = "contentTypeId")]
+        public int ContentTypeId { get; set; }
+
+        [DataMember(Name = "versionId")]
+        public int VersionId { get; set; }
+
+        [DataMember(Name = "userId")]
+        public int UserId { get; set; }
+
+        [DataMember(Name = "versionDate")]
+        public DateTime VersionDate { get; set; }
+
+        [DataMember(Name = "currentPublishedVersion")]
+        public bool CurrentPublishedVersion { get; set; }
+
+        [DataMember(Name = "currentDraftVersion")]
+        public bool CurrentDraftVersion { get; set; }
+
+        [DataMember(Name = "preventCleanup")]
+        public bool PreventCleanup { get; set; }
+
+        [DataMember(Name = "username")]
+        public string Username { get; set; }
+
+        public ContentVersionMetaViewModel()
+        {
+        }
+
+        public ContentVersionMetaViewModel(ContentVersionMeta dto)
+        {
+            ContentId = dto.ContentId;
+            ContentTypeId = dto.ContentTypeId;
+            VersionId = dto.VersionId;
+            UserId = dto.UserId;
+            VersionDate = dto.VersionDate;
+            CurrentPublishedVersion = dto.CurrentPublishedVersion;
+            CurrentDraftVersion = dto.CurrentDraftVersion;
+            PreventCleanup = dto.PreventCleanup;
+            Username = dto.Username;
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 64d81cff13bd..638be9d05aef 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -255,6 +255,7 @@
     <Compile Include="Models\AnchorsModel.cs" />
     <Compile Include="Models\ContentEditing\ContentTypesByAliases.cs" />
     <Compile Include="Models\ContentEditing\ContentTypesByKeys.cs" />
+    <Compile Include="Models\ContentEditing\ContentVersionMetaViewModel.cs" />
     <Compile Include="Models\ContentEditing\DataTypeReferences.cs" />
     <Compile Include="Models\ContentEditing\HistoryCleanup.cs" />
     <Compile Include="Models\ContentEditing\LinkDisplay.cs" />

From 7c14b10252e24af7828e38aff50198d3cc61a340 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Mon, 15 Nov 2021 10:23:57 +0100
Subject: [PATCH 10/24] wire up paging

---
 .../src/common/resources/content.resource.js  | 37 +++++++++++++++++++
 .../rollback/rollback.controller.js           | 22 ++++++-----
 .../infiniteeditors/rollback/rollback.html    |  4 +-
 3 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
index e996ef41116a..f44b0e975cd0 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
@@ -1137,6 +1137,43 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
             );
         },
 
+        /**
+          * @ngdoc method
+          * @name umbraco.resources.contentResource#getPagedRollbackVersions
+          * @methodOf umbraco.resources.contentResource
+          *
+          * @description
+          * Returns a paged array of previous version id's, given a node id, pageNumber, pageSize and a culture
+          *
+          * ##usage
+          * <pre>
+          * contentResource.getPagedRollbackVersions(id, pageNumber, pageSize, culture)
+          *    .then(function(versions) {
+          *        alert('its here!');
+          *    });
+          * </pre>
+          *
+          * @param {Int} id Id of node
+          * @param {Int} pageNumber page number
+          * @param {Int} pageSize page size 
+          * @param {Int} culture if provided, the results will be for this specific culture/variant
+          * @returns {Promise} resourcePromise object containing the versions
+          *
+          */
+        getPagedRollbackVersions: function (contentId, pageNumber, pageSize, culture) {
+            return umbRequestHelper.resourcePromise(
+                $http.get(
+                    umbRequestHelper.getApiUrl("contentApiBaseUrl", "GetPagedContentVersions", {
+                        contentId: contentId,
+                        pageNumber: pageNumber,
+                        pageSize: pageSize,
+                        culture: culture
+                    })
+                ),
+                "Failed to get rollback versions for content item with id " + contentId
+            );
+        },
+
         /**
           * @ngdoc method
           * @name umbraco.resources.contentResource#getRollbackVersions
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
index 52cb28960d5a..6f77440c7583 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
@@ -24,10 +24,10 @@
             vm.rollbackButtonDisabled = true;
             vm.labels = {};
 
-            // TODO: implement
-            vm.itemsPerPage = 10;
-            vm.totalPages = 10;
-            vm.currentPage = 1;
+            vm.pageSize = 15;
+            vm.pageNumber = 1;
+            vm.totalPages = 1;
+            vm.totalItems = 0;
 
             // find the current version for invariant nodes
             if($scope.model.node.variants.length === 1) {
@@ -68,6 +68,7 @@
 
         function changeLanguage(language) {
             vm.currentVersion = language;
+            vm.pageNumber = 1;
             getVersions();
         }
 
@@ -108,13 +109,16 @@
             const nodeId = $scope.model.node.id;
             const culture = $scope.model.node.variants.length > 1 ? vm.currentVersion.language.culture : null;
 
-            return contentResource.getRollbackVersions(nodeId, culture)
+            return contentResource.getPagedRollbackVersions(nodeId, vm.pageNumber, vm.pageSize, culture)
                 .then(function (data) {
+                    vm.totalPages = data.totalPages;
+                    vm.totalItems = data.totalItems;
+
                     // get current backoffice user and format dates
                     userService.getCurrentUser().then(function (currentUser) {
-                        vm.previousVersions = data.map(version => {
+                        vm.previousVersions = data.items.map(version => {
                             var timestampFormatted = dateHelper.getLocalDate(version.versionDate, currentUser.locale, 'LLL');
-                            version.displayValue = timestampFormatted + ' - ' + version.versionAuthorName;
+                            version.displayValue = timestampFormatted + ' - ' + version.username;
                             return version;
                         });
                     });
@@ -225,9 +229,9 @@
             event.stopPropagation();
         }
 
-        // TODO: implement
         function goToPage (pageNumber) {
-            console.log('PAGE NUMBER', pageNumber);
+            vm.pageNumber = pageNumber;
+            getVersions();
         }
 
         onInit();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
index a183410d8cc9..e6e27d65b84d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
@@ -23,7 +23,7 @@
                         <small>
                             <localize 
                                 key="rollback_pagination"
-                                tokens="[(vm.currentPage * vm.itemsPerPage - vm.itemsPerPage) + 1, vm.currentPage * vm.itemsPerPage, vm.itemsPerPage * vm.totalPages]"
+                                tokens="[(vm.pageNumber * vm.pageSize - vm.pageSize) + 1, vm.pageNumber * vm.pageSize, vm.totalItems]"
                                 watch-tokens="true">
                             </localize>
                         </small>
@@ -75,7 +75,7 @@ <h5 class="mt0"><localize key="general_language">Language</localize></h5>
 
                         <umb-pagination
                             ng-if="vm.totalPages > 0 && !vm.loading"
-                            page-number="vm.currentPage"
+                            page-number="vm.pageNumber"
                             total-pages="vm.totalPages"
                             on-change="vm.goToPage(pageNumber)">
                         </umb-pagination>

From ec3bef82c6dad419e17f97f0460ed61ac5f39739 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Mon, 15 Nov 2021 14:32:35 +0100
Subject: [PATCH 11/24] wire up pin/unpin

---
 .../src/common/resources/content.resource.js  | 34 +++++++++++++++++++
 .../less/components/buttons/umb-button.less   |  5 +++
 .../rollback/rollback.controller.js           | 28 +++++++++++----
 .../infiniteeditors/rollback/rollback.html    |  2 +-
 .../Umbraco/config/lang/en_us.xml             |  3 ++
 5 files changed, 65 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
index f44b0e975cd0..c7e32aa3b344 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
@@ -1380,6 +1380,40 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
                 ),
                 "Failed to remove public access for content item with id " + contentId
             );
+        },
+
+        /**
+          * @ngdoc method
+          * @name umbraco.resources.contentResource#contentVersionPreventCleanup
+          * @methodOf umbraco.resources.contentResource
+          *
+          * @description
+          * Enables or disabled clean up of a version
+          *
+          * ##usage
+          * <pre>
+          * contentResource.contentVersionPreventCleanup(contentId, versionId, preventCleanup)
+          *    .then(function() {
+          *        // do your thing
+          *    });
+          * </pre>
+          *
+          * @param {Int} contentId Id of node
+          * @param {Int} versionId Id of version
+          * @param {Int} preventCleanup Boolean to toggle clean up prevention
+          *
+          */
+        contentVersionPreventCleanup: function (contentId, versionId, preventCleanup) {
+            return umbRequestHelper.resourcePromise(
+                $http.post(
+                    umbRequestHelper.getApiUrl("contentApiBaseUrl", "PostSetContentVersionPreventCleanup", {
+                        contentId: contentId,
+                        versionId: versionId,
+                        preventCleanup: preventCleanup
+                    })
+                ),
+                "Failed to toggle prevent cleanup of version with id " + versionId
+            );
         }
     };
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button.less b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button.less
index b6800aba65fc..88e172db0ced 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button.less
@@ -91,6 +91,11 @@
    color: @white;
 }
 
+.umb-button__success.-black,
+.umb-button__error.-black {
+   color: @black;
+}
+
 .umb-button__overlay {
    position: absolute;
    width: 100%;
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
index 6f77440c7583..7c0596281105 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
@@ -1,7 +1,7 @@
 (function () {
     "use strict";
 
-    function RollbackController($scope, $timeout, contentResource, localizationService, assetsService, dateHelper, userService) {
+    function RollbackController($scope, contentResource, localizationService, assetsService, dateHelper, userService, notificationsService) {
 
         var vm = this;
 
@@ -217,14 +217,30 @@
             }
         }
 
-        // TODO: implement
         function pinVersion (version, event) {
+            if (!version) {
+                return;
+            }
+
             version.pinningState = 'busy';
 
-            $timeout(() => {
-                version.pinningState = 'init';
-                version.isPinned = !version.isPinned;
-            }, 2000);
+            const nodeId = $scope.model.node.id;
+            const versionId = version.versionId;
+            const preventCleanup = !version.preventCleanup;
+
+            contentResource.contentVersionPreventCleanup(nodeId, versionId, preventCleanup)
+                .then(() => {
+                    version.pinningState = 'success';
+                    version.preventCleanup = preventCleanup;
+                }, () => {
+                    version.pinningState = 'error';
+
+                    const localizationKey = preventCleanup ? 'speechBubbles_preventCleanupEnableError' : 'speechBubbles_preventCleanupDisableError';
+
+                    localizationService.localize(localizationKey).then(value => {
+                        notificationsService.error(value);
+                    });
+                });
 
             event.stopPropagation();
         }
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
index e6e27d65b84d..0eda4adceb5e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
@@ -64,7 +64,7 @@ <h5 class="mt0"><localize key="general_language">Language</localize></h5>
                                                 size="xxs"
                                                 state="version.pinningState"
                                                 action="vm.pinVersion(version, $event)"
-                                                label="{{ version.isPinned ? 'Unpin' : 'Pin' }}">
+                                                label="{{ version.preventCleanup ? 'Unpin' : 'Pin' }}">
                                             </umb-button>
                                         </div>
                                     </div>
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 d53df40079e9..c717c0135bbf 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -1533,6 +1533,9 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
     <key alias="scheduleErrReleaseDate3">Cannot schedule the document for publishing since the required '%0%' has a publish date later than a non mandatory language</key>
     <key alias="scheduleErrExpireDate1">The expire date cannot be in the past</key>
     <key alias="scheduleErrExpireDate2">The expire date cannot be before the release date</key>
+    <key alias="preventCleanupEnableError">An error occurred while enabling version cleanup for %0%</key>
+    <key alias="preventCleanupDisableError">An error occurred while disabling version cleanup for %0%</key>
+
   </area>
   <area alias="stylesheet">
     <key alias="addRule">Add style</key>

From eb62dd15425731ffe41fde05febca4d879ac6583 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Mon, 15 Nov 2021 14:41:40 +0100
Subject: [PATCH 12/24] rename getPagedRollbackVersions to
 getPagedContentVersions

---
 .../src/common/resources/content.resource.js  | 74 +++++++++----------
 .../rollback/rollback.controller.js           |  2 +-
 2 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
index c7e32aa3b344..0b8a8ca6408f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
@@ -1137,43 +1137,6 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
             );
         },
 
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#getPagedRollbackVersions
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Returns a paged array of previous version id's, given a node id, pageNumber, pageSize and a culture
-          *
-          * ##usage
-          * <pre>
-          * contentResource.getPagedRollbackVersions(id, pageNumber, pageSize, culture)
-          *    .then(function(versions) {
-          *        alert('its here!');
-          *    });
-          * </pre>
-          *
-          * @param {Int} id Id of node
-          * @param {Int} pageNumber page number
-          * @param {Int} pageSize page size 
-          * @param {Int} culture if provided, the results will be for this specific culture/variant
-          * @returns {Promise} resourcePromise object containing the versions
-          *
-          */
-        getPagedRollbackVersions: function (contentId, pageNumber, pageSize, culture) {
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl("contentApiBaseUrl", "GetPagedContentVersions", {
-                        contentId: contentId,
-                        pageNumber: pageNumber,
-                        pageSize: pageSize,
-                        culture: culture
-                    })
-                ),
-                "Failed to get rollback versions for content item with id " + contentId
-            );
-        },
-
         /**
           * @ngdoc method
           * @name umbraco.resources.contentResource#getRollbackVersions
@@ -1382,6 +1345,43 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
             );
         },
 
+        /**
+          * @ngdoc method
+          * @name umbraco.resources.contentResource#getPagedContentVersions
+          * @methodOf umbraco.resources.contentResource
+          *
+          * @description
+          * Returns a paged array of previous version id's, given a node id, pageNumber, pageSize and a culture
+          *
+          * ##usage
+          * <pre>
+          * contentResource.getPagedContentVersions(id, pageNumber, pageSize, culture)
+          *    .then(function(versions) {
+          *        alert('its here!');
+          *    });
+          * </pre>
+          *
+          * @param {Int} id Id of node
+          * @param {Int} pageNumber page number
+          * @param {Int} pageSize page size 
+          * @param {Int} culture if provided, the results will be for this specific culture/variant
+          * @returns {Promise} resourcePromise object containing the versions
+          *
+          */
+        getPagedContentVersions: function (contentId, pageNumber, pageSize, culture) {
+            return umbRequestHelper.resourcePromise(
+                $http.get(
+                    umbRequestHelper.getApiUrl("contentApiBaseUrl", "GetPagedContentVersions", {
+                        contentId: contentId,
+                        pageNumber: pageNumber,
+                        pageSize: pageSize,
+                        culture: culture
+                    })
+                ),
+                "Failed to get versions for content item with id " + contentId
+            );
+        },
+
         /**
           * @ngdoc method
           * @name umbraco.resources.contentResource#contentVersionPreventCleanup
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
index 7c0596281105..e7e032caeac7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
@@ -109,7 +109,7 @@
             const nodeId = $scope.model.node.id;
             const culture = $scope.model.node.variants.length > 1 ? vm.currentVersion.language.culture : null;
 
-            return contentResource.getPagedRollbackVersions(nodeId, vm.pageNumber, vm.pageSize, culture)
+            return contentResource.getPagedContentVersions(nodeId, vm.pageNumber, vm.pageSize, culture)
                 .then(function (data) {
                     vm.totalPages = data.totalPages;
                     vm.totalItems = data.totalItems;

From 77fea2909502eaae2ee535a62b4c88e4b3620d53 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Mon, 15 Nov 2021 14:55:02 +0100
Subject: [PATCH 13/24] prevent selection of current version and current draft

---
 .../common/infiniteeditors/rollback/rollback.controller.js  | 6 ++++++
 .../src/views/common/infiniteeditors/rollback/rollback.html | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
index e7e032caeac7..09de21057012 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
@@ -74,6 +74,12 @@
 
         function changeVersion(version) {
 
+            const canRollback = !version.currentDraftVersion && !version.currentPublishedVersion;
+
+            if (canRollback === false) {
+                return;
+            }
+
             if (vm.previousVersion && version && vm.previousVersion.versionId === version.versionId) {
                 vm.previousVersion = null;
                 vm.diff = null;
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
index 0eda4adceb5e..ae56cd8ebbc8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
@@ -50,9 +50,9 @@ <h5 class="mt0"><localize key="general_language">Language</localize></h5>
                             <div class="umb-table umb-table--condensed">
 
                                 <div class="umb-table-body">
-                                    <div class="umb-table-row cursor-pointer umb-outline -selectable"
+                                    <div class="umb-table-row cursor-pointer umb-outline"
                                         ng-repeat="version in vm.previousVersions track by version.versionId"
-                                        ng-class="{'-selected': version.versionId === vm.previousVersion.versionId }"
+                                        ng-class="{'-selectable': !version.currentDraftVersion && !version.currentPublishedVersion,'-selected': version.versionId === vm.previousVersion.versionId }"
                                         ng-click="vm.changeVersion(version)">
                                         <div class="umb-table-cell dn"></div>
                                         <div class="umb-table-cell black">{{ version.displayValue }}</div>

From 558d1d1978222754c6edc065f56430ea50a98668 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Mon, 15 Nov 2021 15:19:52 +0100
Subject: [PATCH 14/24] add current draft and current version to UI

---
 .../common/infiniteeditors/rollback/rollback.html    | 12 ++++++++++--
 src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml     |  4 +++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
index ae56cd8ebbc8..188b53e93335 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
@@ -19,7 +19,7 @@
             <div class="main-content">
 
                 <umb-box class="side-panel">
-                    <umb-box-header title="Versions">
+                    <umb-box-header title-key="rollback_versions">
                         <small>
                             <localize 
                                 key="rollback_pagination"
@@ -55,7 +55,15 @@ <h5 class="mt0"><localize key="general_language">Language</localize></h5>
                                         ng-class="{'-selectable': !version.currentDraftVersion && !version.currentPublishedVersion,'-selected': version.versionId === vm.previousVersion.versionId }"
                                         ng-click="vm.changeVersion(version)">
                                         <div class="umb-table-cell dn"></div>
-                                        <div class="umb-table-cell black">{{ version.displayValue }}</div>
+                                        <div class="umb-table-cell black">
+                                            <div class="flex flex-column">
+                                                <div>{{ version.displayValue }}</div>
+                                                <div>
+                                                    <small ng-if="version.currentPublishedVersion"><localize key="rollback_currentPublishedVersion">Current version</localize></small>
+                                                    <small ng-if="version.currentDraftVersion"><localize key="rollback_currentDraftVersion">Current version</localize></small>
+                                                </div>
+                                            </div>
+                                        </div>
                                         <div class="umb-table-cell umb-table-cell--auto-width">
                                             <umb-button 
                                                 style="margin-left: auto;"
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 c717c0135bbf..e13f06f938d3 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -1397,6 +1397,9 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
     <key alias="selectVersion">Select version</key>
     <key alias="view">View</key>
     <key alias="pagination"><![CDATA[Showing version %0% to %1% of %2% versions]]></key>
+    <key alias="versions">Versions</key>
+    <key alias="currentDraftVersion">Current draft version</key>
+    <key alias="currentPublishedVersion">Current published version</key>
   </area>
   <area alias="scripts">
     <key alias="editscript">Edit script file</key>
@@ -1535,7 +1538,6 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
     <key alias="scheduleErrExpireDate2">The expire date cannot be before the release date</key>
     <key alias="preventCleanupEnableError">An error occurred while enabling version cleanup for %0%</key>
     <key alias="preventCleanupDisableError">An error occurred while disabling version cleanup for %0%</key>
-
   </area>
   <area alias="stylesheet">
     <key alias="addRule">Add style</key>

From 1dc27fa856021838a1eff7b01461e2bc8dd00b3b Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Mon, 15 Nov 2021 15:25:20 +0100
Subject: [PATCH 15/24] remove pointer if the row is not selectable

---
 .../src/views/common/infiniteeditors/rollback/rollback.html   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
index 188b53e93335..a9f036c0300f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
@@ -50,9 +50,9 @@ <h5 class="mt0"><localize key="general_language">Language</localize></h5>
                             <div class="umb-table umb-table--condensed">
 
                                 <div class="umb-table-body">
-                                    <div class="umb-table-row cursor-pointer umb-outline"
+                                    <div class="umb-table-row umb-outline"
                                         ng-repeat="version in vm.previousVersions track by version.versionId"
-                                        ng-class="{'-selectable': !version.currentDraftVersion && !version.currentPublishedVersion,'-selected': version.versionId === vm.previousVersion.versionId }"
+                                        ng-class="{'-selectable cursor-pointer': !version.currentDraftVersion && !version.currentPublishedVersion,'-selected': version.versionId === vm.previousVersion.versionId }"
                                         ng-click="vm.changeVersion(version)">
                                         <div class="umb-table-cell dn"></div>
                                         <div class="umb-table-cell black">

From e2b221a06c7f973a798d538447b62ebc890c6682 Mon Sep 17 00:00:00 2001
From: Paul Johnson <pmj@umbraco.com>
Date: Mon, 15 Nov 2021 09:49:33 +0000
Subject: [PATCH 16/24] Improve warning for globally disabled cleanup feature.

---
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml    | 2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index ee8b50a13a86..fcc04e3c7d8b 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -1730,7 +1730,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
     <key alias="historyCleanupKeepAllVersionsNewerThanDays">Keep all versions newer than days</key>
     <key alias="historyCleanupKeepLatestVersionPerDayForDays">Keep latest version per day for days</key>
     <key alias="historyCleanupPreventCleanup">Prevent cleanup</key>
-    <key alias="historyCleanupGloballyDisabled">NOTE! The cleanup of historically content versions are disabled globally. These settings will not take effect before it is enabled.</key>
+    <key alias="historyCleanupGloballyDisabled">NOTE! The content version cleanup feature is disabled globally. These settings will not take effect until it is enabled.</key>
   </area>
   <area alias="languages">
     <key alias="addLanguage">Add language</key>
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 e13f06f938d3..946d3711a29b 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -1769,7 +1769,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
     <key alias="historyCleanupKeepAllVersionsNewerThanDays">Keep all versions newer than days</key>
     <key alias="historyCleanupKeepLatestVersionPerDayForDays">Keep latest version per day for days</key>
     <key alias="historyCleanupPreventCleanup">Prevent cleanup</key>
-    <key alias="historyCleanupGloballyDisabled">NOTE! The cleanup of historically content versions are disabled globally. These settings will not take effect before it is enabled.</key>
+    <key alias="historyCleanupGloballyDisabled">NOTE! The content version cleanup feature is disabled globally. These settings will not take effect until it is enabled.</key>
   </area>
   <area alias="languages">
     <key alias="addLanguage">Add language</key>

From d50adf7e88106e6fa09b4c4212b6fdd3efd57846 Mon Sep 17 00:00:00 2001
From: Paul Johnson <pmj@umbraco.com>
Date: Mon, 15 Nov 2021 10:11:51 +0000
Subject: [PATCH 17/24] Fix current loses prevent cleanup state on publish.

---
 .../Persistence/Repositories/Implement/DocumentRepository.cs    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
index 89b34e3f7c18..9012fa43c396 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
@@ -594,6 +594,7 @@ protected override void PersistUpdatedItem(IContent entity)
                 {
                     documentVersionDto.Published = true; // now published
                     contentVersionDto.Current = false; // no more current
+                    contentVersionDto.PreventCleanup = version.PreventCleanup; // published version retains current drafts prevent cleanup flag
                 }
                 Database.Update(contentVersionDto);
                 Database.Update(documentVersionDto);
@@ -606,6 +607,7 @@ protected override void PersistUpdatedItem(IContent entity)
                     contentVersionDto.Id = 0; // want a new id
                     contentVersionDto.Current = true; // current version
                     contentVersionDto.Text = entity.Name;
+                    contentVersionDto.PreventCleanup = false; // new draft version disregards prevent cleanup flag
                     Database.Insert(contentVersionDto);
                     entity.VersionId = documentVersionDto.Id = contentVersionDto.Id; // get the new id
 

From 5f44f871498ae1b137e5ea0e89980360e6bffa8f Mon Sep 17 00:00:00 2001
From: Paul Johnson <pmj@umbraco.com>
Date: Mon, 15 Nov 2021 11:22:24 +0000
Subject: [PATCH 18/24] Added umbracoLog audit entries for "pin" / "unpin"

---
 src/Umbraco.Core/Models/AuditType.cs                 | 12 +++++++++++-
 .../Services/Implement/ContentService.cs             | 10 ++++++++--
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml        |  4 ++++
 src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml     |  4 ++++
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/Models/AuditType.cs b/src/Umbraco.Core/Models/AuditType.cs
index 8a57948805bb..89ea40f74aba 100644
--- a/src/Umbraco.Core/Models/AuditType.cs
+++ b/src/Umbraco.Core/Models/AuditType.cs
@@ -113,6 +113,16 @@ public enum AuditType
         /// <summary>
         /// Custom audit message.
         /// </summary>
-        Custom
+        Custom,
+
+        /// <summary>
+        /// Content version preventCleanup set to true
+        /// </summary>
+        ContentVersionPreventCleanup,
+
+        /// <summary>
+        /// Content version preventCleanup set to false
+        /// </summary>
+        ContentVersionEnableCleanup
     }
 }
diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index fe8cb99671d9..bd9bcb1d3ca4 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -3261,9 +3261,15 @@ public void SetPreventCleanup(int versionId, bool preventCleanup, int userId = -
             {
                 documentVersionRepository.SetPreventCleanup(versionId, preventCleanup);
 
-                //var version = documentVersionRepository.Get(versionId);
+                var version = documentVersionRepository.Get(versionId);
 
-                //TODO: Audit log message(s)
+                var auditType = preventCleanup
+                    ? AuditType.ContentVersionPreventCleanup
+                    : AuditType.ContentVersionEnableCleanup;
+
+                var message = $"set preventCleanup = '{preventCleanup}' for version '{versionId}'";
+
+                Audit(auditType, userId, version.ContentId, message, $"{version.VersionDate}");
             }
         }
 
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index fcc04e3c7d8b..65c3afc82220 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -174,6 +174,8 @@
     <key alias="sendtopublishvariant">Content sent for publishing for languages: %0%</key>
     <key alias="sort">Sort child items performed by user</key>
     <key alias="custom">%0%</key>
+    <key alias="contentversionpreventcleanup">Cleanup disabled for version: %0%</key>
+    <key alias="contentversionenablecleanup">Cleanup enabled for version: %0%</key>
     <key alias="smallCopy">Copy</key>
     <key alias="smallPublish">Publish</key>
     <key alias="smallPublishVariant">Publish</key>
@@ -187,6 +189,8 @@
     <key alias="smallSendToPublishVariant">Send To Publish</key>
     <key alias="smallSort">Sort</key>
     <key alias="smallCustom">Custom</key>
+    <key alias="smallContentVersionPreventCleanup">Save</key>
+    <key alias="smallContentVersionEnableCleanup">Save</key>
     <key alias="historyIncludingVariants">History (all variants)</key>
   </area>
   <area alias="codefile">
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 946d3711a29b..d4cd20cc5342 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -176,6 +176,8 @@
     <key alias="sendtopublishvariant">Content sent for publishing for languages: %0%</key>
     <key alias="sort">Sort child items performed by user</key>
     <key alias="custom">%0%</key>
+    <key alias="contentversionpreventcleanup">Cleanup disabled for version: %0%</key>
+    <key alias="contentversionenablecleanup">Cleanup enabled for version: %0%</key>
     <key alias="smallCopy">Copy</key>
     <key alias="smallPublish">Publish</key>
     <key alias="smallPublishVariant">Publish</key>
@@ -190,6 +192,8 @@
     <key alias="smallSendToPublishVariant">Send To Publish</key>
     <key alias="smallSort">Sort</key>
     <key alias="smallCustom">Custom</key>
+    <key alias="smallContentVersionPreventCleanup">Save</key>
+    <key alias="smallContentVersionEnableCleanup">Save</key>
     <key alias="historyIncludingVariants">History (all variants)</key>
   </area>
   <area alias="codefile">

From 5944188878bfd8294320980099d4f05bf4126800 Mon Sep 17 00:00:00 2001
From: Paul Johnson <pmj@umbraco.com>
Date: Mon, 15 Nov 2021 13:51:28 +0000
Subject: [PATCH 19/24] Match v9 defaults for keepVersions settings

---
 src/Umbraco.Web.UI/config/umbracoSettings.Release.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
index 0e51c63cfaf3..c7b38d8f361e 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
@@ -191,7 +191,7 @@
     <!-- You can specify your own logo for the login screen here. This path is relative to the ~/umbraco path. The default location is: /umbraco/assets/img/application/umbraco_logo_white.svg -->
     <loginLogoImage>assets/img/application/umbraco_logo_white.svg</loginLogoImage>
 
-    <contentVersionCleanupPolicyGlobalSettings enable="true" keepAllVersionsNewerThanDays="2" keepLatestVersionPerDayForDays="30" />
+    <contentVersionCleanupPolicyGlobalSettings enable="true" keepAllVersionsNewerThanDays="7" keepLatestVersionPerDayForDays="90" />
   </content>
 
   <security>

From 4a335f54ed4302e12d3f03cfe9ca17cb10d88caf Mon Sep 17 00:00:00 2001
From: Paul Johnson <pmj@umbraco.com>
Date: Mon, 15 Nov 2021 15:09:18 +0000
Subject: [PATCH 20/24] Fix - losing preventCleanup on save current with
 content changes

---
 .../Persistence/Repositories/Implement/DocumentRepository.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
index 9012fa43c396..af89cadecccf 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
@@ -594,8 +594,11 @@ protected override void PersistUpdatedItem(IContent entity)
                 {
                     documentVersionDto.Published = true; // now published
                     contentVersionDto.Current = false; // no more current
-                    contentVersionDto.PreventCleanup = version.PreventCleanup; // published version retains current drafts prevent cleanup flag
                 }
+
+                // Ensure existing version retains current preventCleanup flag (both saving and publishing).
+                contentVersionDto.PreventCleanup = version.PreventCleanup; 
+
                 Database.Update(contentVersionDto);
                 Database.Update(documentVersionDto);
 

From 86b3fb6ccba53eb2a6af263c520f9b190f4fa68d Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Mon, 15 Nov 2021 17:07:07 +0100
Subject: [PATCH 21/24] update pin/unpin button labels

---
 .../infiniteeditors/rollback/rollback.controller.js      | 4 ++--
 .../views/common/infiniteeditors/rollback/rollback.html  | 9 +++++----
 .../views/common/infiniteeditors/rollback/rollback.less  | 7 ++++++-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
index 09de21057012..c810604e411f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
@@ -95,7 +95,7 @@
                     .then(function(data) {
                         vm.previousVersion = data;
                         vm.previousVersion.versionId = version.versionId;
-                        vm.previousVersion.displayValue = version.displayValue;
+                        vm.previousVersion.displayValue = version.displayValue + ' - ' + version.username;
                         createDiff(vm.currentVersion, vm.previousVersion);
 
                         vm.loadingDiff = false;
@@ -124,7 +124,7 @@
                     userService.getCurrentUser().then(function (currentUser) {
                         vm.previousVersions = data.items.map(version => {
                             var timestampFormatted = dateHelper.getLocalDate(version.versionDate, currentUser.locale, 'LLL');
-                            version.displayValue = timestampFormatted + ' - ' + version.username;
+                            version.displayValue = timestampFormatted;
                             return version;
                         });
                     });
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
index a9f036c0300f..497fc88e962d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
@@ -58,9 +58,10 @@ <h5 class="mt0"><localize key="general_language">Language</localize></h5>
                                         <div class="umb-table-cell black">
                                             <div class="flex flex-column">
                                                 <div>{{ version.displayValue }}</div>
-                                                <div>
-                                                    <small ng-if="version.currentPublishedVersion"><localize key="rollback_currentPublishedVersion">Current version</localize></small>
-                                                    <small ng-if="version.currentDraftVersion"><localize key="rollback_currentDraftVersion">Current version</localize></small>
+                                                <div class="version-details">{{version.username}}</div>
+                                                <div class="version-details">
+                                                    <localize ng-if="version.currentPublishedVersion" key="rollback_currentPublishedVersion">Current version</localize>
+                                                    <localize ng-if="version.currentDraftVersion key="rollback_currentDraftVersion">Current version</localize>
                                                 </div>
                                             </div>
                                         </div>
@@ -72,7 +73,7 @@ <h5 class="mt0"><localize key="general_language">Language</localize></h5>
                                                 size="xxs"
                                                 state="version.pinningState"
                                                 action="vm.pinVersion(version, $event)"
-                                                label="{{ version.preventCleanup ? 'Unpin' : 'Pin' }}">
+                                                label="{{ version.preventCleanup ? 'Enable cleanup' : 'Prevent cleanup' }}">
                                             </umb-button>
                                         </div>
                                     </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.less b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.less
index 5f6e7362c270..e7953a4feada 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.less
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.less
@@ -6,7 +6,7 @@
   }
 
   .side-panel {
-    flex: 0 0 30%;
+    flex: 0 0 33%;
   }
 
   .compare-panel {
@@ -24,4 +24,9 @@
     margin-bottom: 12px;
   }
 
+  .version-details {
+    color: @gray-5;
+    font-size: 13px;
+  }
+
 }
\ No newline at end of file

From 87c2e5cc3a812a48548689f81835fceddc174576 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Mon, 15 Nov 2021 17:07:25 +0100
Subject: [PATCH 22/24] fix pagination bug

---
 .../infiniteeditors/rollback/rollback.controller.js      | 9 +++++++++
 .../views/common/infiniteeditors/rollback/rollback.html  | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
index c810604e411f..46ea13cef7cb 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
@@ -12,6 +12,7 @@
         vm.close = close;
         vm.pinVersion = pinVersion;
         vm.goToPage = goToPage;
+        vm.paginationCount = { from: 0, to: 0, total: 0 };
 
         //////////
 
@@ -120,6 +121,14 @@
                     vm.totalPages = data.totalPages;
                     vm.totalItems = data.totalItems;
 
+                    const possibleTotalItems = vm.pageNumber * vm.pageSize;
+
+                    vm.paginationCount = {
+                        from: (vm.pageNumber * vm.pageSize - vm.pageSize) + 1,
+                        to: vm.totalItems < possibleTotalItems ? vm.totalItems : possibleTotalItems,
+                        total: vm.totalItems
+                    };
+
                     // get current backoffice user and format dates
                     userService.getCurrentUser().then(function (currentUser) {
                         vm.previousVersions = data.items.map(version => {
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
index 497fc88e962d..2b605cf9efda 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
@@ -23,7 +23,7 @@
                         <small>
                             <localize 
                                 key="rollback_pagination"
-                                tokens="[(vm.pageNumber * vm.pageSize - vm.pageSize) + 1, vm.pageNumber * vm.pageSize, vm.totalItems]"
+                                tokens="[vm.paginationCount.from, vm.paginationCount.to, vm.paginationCount.total]"
                                 watch-tokens="true">
                             </localize>
                         </small>

From 63467627accad83093fec2c510cf0eee1d49530b Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Mon, 15 Nov 2021 17:09:10 +0100
Subject: [PATCH 23/24] add missing "

---
 .../src/views/common/infiniteeditors/rollback/rollback.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
index 2b605cf9efda..a5ac2ea6cb4c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
@@ -61,7 +61,7 @@ <h5 class="mt0"><localize key="general_language">Language</localize></h5>
                                                 <div class="version-details">{{version.username}}</div>
                                                 <div class="version-details">
                                                     <localize ng-if="version.currentPublishedVersion" key="rollback_currentPublishedVersion">Current version</localize>
-                                                    <localize ng-if="version.currentDraftVersion key="rollback_currentDraftVersion">Current version</localize>
+                                                    <localize ng-if="version.currentDraftVersion" key="rollback_currentDraftVersion">Current version</localize>
                                                 </div>
                                             </div>
                                         </div>

From 669ecbb69762e14bbc8b87ed4e74cb59d69b5728 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Mon, 15 Nov 2021 20:57:30 +0100
Subject: [PATCH 24/24] always send culture when a doc type can vary

---
 .../common/infiniteeditors/rollback/rollback.controller.js      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
index 46ea13cef7cb..7f1dbad69153 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
@@ -114,7 +114,7 @@
         function getVersions() {
 
             const nodeId = $scope.model.node.id;
-            const culture = $scope.model.node.variants.length > 1 ? vm.currentVersion.language.culture : null;
+            const culture = vm.currentVersion.language ? vm.currentVersion.language.culture : null;
 
             return contentResource.getPagedContentVersions(nodeId, vm.pageNumber, vm.pageSize, culture)
                 .then(function (data) {