From 895126475768682c0b42ba66fa9b003b30cd42ac Mon Sep 17 00:00:00 2001 From: Antonella Sgarlatta Date: Wed, 23 Jun 2021 17:51:43 -0300 Subject: [PATCH] feat: show date on revision preview --- app/assets/javascripts/directives/views/historyMenu.ts | 10 ++++++---- .../directives/views/revisionPreviewModal.ts | 2 ++ app/assets/javascripts/ui_models/application.ts | 5 +++-- .../templates/directives/revision-preview-modal.pug | 6 +++++- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/directives/views/historyMenu.ts b/app/assets/javascripts/directives/views/historyMenu.ts index 2fcfad95f..54141eda8 100644 --- a/app/assets/javascripts/directives/views/historyMenu.ts +++ b/app/assets/javascripts/directives/views/historyMenu.ts @@ -61,10 +61,11 @@ class HistoryMenuCtrl extends PureViewCtrl { } } - 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 { } this.application.presentRevisionPreviewModal( remoteRevision.payload.uuid, - remoteRevision.payload.content + remoteRevision.payload.content, + this.previewRemoteHistoryTitle(revision) ); } @@ -154,7 +156,7 @@ class HistoryMenuCtrl extends PureViewCtrl { this.reloadState(); } - previewRemoteHistoryTitle(revision: SingleRevision) { + previewRemoteHistoryTitle(revision: RevisionListEntry) { return new Date(revision.created_at).toLocaleString(); } } diff --git a/app/assets/javascripts/directives/views/revisionPreviewModal.ts b/app/assets/javascripts/directives/views/revisionPreviewModal.ts index a67755eb1..3332fbada 100644 --- a/app/assets/javascripts/directives/views/revisionPreviewModal.ts +++ b/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: '=' }; } diff --git a/app/assets/javascripts/ui_models/application.ts b/app/assets/javascripts/ui_models/application.ts index 3577b4703..80080ccd2 100644 --- a/app/assets/javascripts/ui_models/application.ts +++ b/app/assets/javascripts/ui_models/application.ts @@ -189,13 +189,14 @@ export class WebApplication extends SNApplication { this.applicationElement.append(el); } - presentRevisionPreviewModal(uuid: string, content: any) { + presentRevisionPreviewModal(uuid: string, content: any, title?: string) { const scope: any = this.scope!.$new(true); scope.uuid = uuid; scope.content = content; + scope.title = title; scope.application = this; const el = this.$compile!( - `` )(scope); this.applicationElement.append(el); diff --git a/app/assets/templates/directives/revision-preview-modal.pug b/app/assets/templates/directives/revision-preview-modal.pug index 339d4a2ba..ee0895408 100644 --- a/app/assets/templates/directives/revision-preview-modal.pug +++ b/app/assets/templates/directives/revision-preview-modal.pug @@ -5,7 +5,11 @@ .sn-component .sk-panel .sk-panel-header - .sk-panel-header-title Preview + div + .sk-panel-header-title Preview + .sk-subtitle.neutral.mt-1( + ng-if="ctrl.title" + ) {{ctrl.title}} .sk-horizontal-group a.sk-a.info.close-button( ng-click="ctrl.restore(false)"