Merge remote-tracking branch 'upstream/develop' into account-menu-split-fix

app/assets/javascripts/directives/views/historyMenu.ts

@@ -61,10 +61,11 @@ class HistoryMenuCtrl extends PureViewCtrl<unknown, HistoryState> {
     }
   }
 
-  async openSessionRevision(revision: HistoryEntry) {
+  async openSessionRevision(revision: HistoryEntry & { previewTitle: () => string }) {
     this.application.presentRevisionPreviewModal(
       revision.payload.uuid,
-      revision.payload.content
+      revision.payload.content,
+      revision.previewTitle()
     );
   }
 
@@ -84,7 +85,8 @@ class HistoryMenuCtrl extends PureViewCtrl<unknown, HistoryState> {
     }
     this.application.presentRevisionPreviewModal(
       remoteRevision.payload.uuid,
-      remoteRevision.payload.content
+      remoteRevision.payload.content,
+      this.previewRemoteHistoryTitle(revision)
     );
   }
 
@@ -154,7 +156,7 @@ class HistoryMenuCtrl extends PureViewCtrl<unknown, HistoryState> {
     this.reloadState();
   }
 
-  previewRemoteHistoryTitle(revision: SingleRevision) {
+  previewRemoteHistoryTitle(revision: RevisionListEntry) {
     return new Date(revision.created_at).toLocaleString();
   }
 }

app/assets/javascripts/directives/views/revisionPreviewModal.ts

@@ -24,6 +24,7 @@ class RevisionPreviewModalCtrl extends PureViewCtrl implements RevisionPreviewSc
   $timeout: ng.ITimeoutService
   uuid!: string
   content!: PayloadContent
+  title?: string
   application!: WebApplication
   unregisterComponent?: any
   note!: SNNote
@@ -139,6 +140,7 @@ export class RevisionPreviewModal extends WebDirective {
     this.scope = {
       uuid: '=',
       content: '=',
+      title: '=',
       application: '='
     };
   }