From d87da627d9c4e9b3d7e7de1693f769277a437811 Mon Sep 17 00:00:00 2001
From: Fabien 'egg' O'Carroll <fabien@allou.is>
Date: Tue, 2 May 2023 19:38:31 -0400
Subject: [PATCH] Added author image to revision history list (#16724)

refs https://github.com/TryGhost/Team/issues/3129

This has copied the same pattern from the gh-user-list-item component.

Co-authored-by: Sanne de Vries <sannedv@protonmail.com>
---
 ghost/admin/app/components/modal-post-history.hbs |  7 ++++++-
 ghost/admin/app/components/modal-post-history.js  |  4 +++-
 ghost/admin/app/styles/layouts/post-history.css   | 14 +++++++++++++-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/ghost/admin/app/components/modal-post-history.hbs b/ghost/admin/app/components/modal-post-history.hbs
index 540dd49e1e..1feddf93f6 100644
--- a/ghost/admin/app/components/modal-post-history.hbs
+++ b/ghost/admin/app/components/modal-post-history.hbs
@@ -71,7 +71,12 @@
                                 {{/if}}
                                 
                             </div>
-                            <span class="gh-post-history-version-meta {{if (eq revision.author.name "Deleted staff user") "deleted-user"}}">{{revision.author.name}}</span>
+                            <div class="flex items-center mt2">
+                                <span class="user-list-item-figure" style={{background-image-style revision.author.profile_image_url}}>
+                                    <span class="hidden">Photo of {{revisions.author.name}}</span>
+                                </span>
+                                <span class="gh-post-history-version-meta {{if (eq revision.author.name "Deleted staff user") "deleted-user"}}">{{revision.author.name}}</span>
+                            </div>
                         </button>
                         {{#if (and revision.selected (not revision.latest))}}
                             <button
diff --git a/ghost/admin/app/components/modal-post-history.js b/ghost/admin/app/components/modal-post-history.js
index a7b99d9f4a..a70c38a740 100644
--- a/ghost/admin/app/components/modal-post-history.js
+++ b/ghost/admin/app/components/modal-post-history.js
@@ -24,6 +24,7 @@ export default class ModalPostHistory extends Component {
     @service notifications;
     @service modals;
     @service feature;
+    @service ghostPaths;
     @tracked selectedHTML = null;
     @tracked diffHtml = null;
     @tracked showDifferences = this.feature.get('postDiffing'); // should default to true in future
@@ -65,7 +66,8 @@ export default class ModalPostHistory extends Component {
                 feature_image_alt: revision.get('featureImageAlt'),
                 feature_image_caption: revision.get('featureImageCaption'),
                 author: {
-                    name: revision.get('author.name') || 'Deleted staff user'
+                    name: revision.get('author.name') || 'Deleted staff user',
+                    profile_image_url: revision.get('author.profileImage') || this.ghostPaths.assetRoot.replace(/\/$/, '') + '/img/user-image.png'
                 },
                 postStatus: revision.get('postStatus'),
                 reason: revision.get('reason'),
diff --git a/ghost/admin/app/styles/layouts/post-history.css b/ghost/admin/app/styles/layouts/post-history.css
index 2f362f57ab..f3242bf5a0 100644
--- a/ghost/admin/app/styles/layouts/post-history.css
+++ b/ghost/admin/app/styles/layouts/post-history.css
@@ -29,6 +29,13 @@
     background: var(--whitegrey-l2);
 }
 
+.gh-post-history .user-list-item-figure {
+    width: 2.8rem;
+    height: 2.8rem;
+    margin: 0 8px 0 0;
+    border: 1px solid var(--whitegrey-d1);
+}
+
 .nav-list-item .gh-post-history-version-meta {
     margin-top: 4px;
     color: var(--midgrey);
@@ -77,7 +84,12 @@
 .nav-list-item .gh-post-history-version-restore span {
     color: var(--midgrey);
     font-size: 1.35rem;
-    font-weight: 500;
+    font-weight: 600;
+    transition: all .2s ease;
+}
+
+.nav-list-item .gh-post-history-version-restore:hover span {
+    color: var(--midgrey-d2);
 }
 
 .gh-post-history-footer {