summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget/stores
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-09-29 10:31:10 +0100
committerPhil Hughes <me@iamphill.com>2017-09-29 10:31:10 +0100
commite178eb782a1a5ac24c18ed4e4a1c1d55bee8251f (patch)
tree589d299a94d3fbcf3836146892c8d25b4a8594d6 /app/assets/javascripts/vue_merge_request_widget/stores
parenta481337b6a1b30750a16fffe0e83521b7909b851 (diff)
downloadgitlab-ce-e178eb782a1a5ac24c18ed4e4a1c1d55bee8251f.tar.gz
Fixes merge request widget date tooltip inconsistencies
Previously the merge request widget would use the `updated_at` date as the tooltip text for both closed & merged states. This is incorrect as the `updated_at` date is actually changed when a user updates merge request through commenting, description changes or anything else. The widget states for merged & closed events now use their own event object which holds their own `updated_at` date string. Also this text has been correctly formatted through our date utilities to correctly display the right timezone data in a user friendly way. Closes #38545
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/stores')
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js16
1 files changed, 12 insertions, 4 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
index 29464662578..5bd3af3bd8d 100644
--- a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
+++ b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
@@ -37,10 +37,8 @@ export default class MergeRequestStore {
}
this.updatedAt = data.updated_at;
- this.mergedAt = MergeRequestStore.getEventDate(data.merge_event);
- this.closedAt = MergeRequestStore.getEventDate(data.closed_event);
- this.mergedBy = MergeRequestStore.getAuthorObject(data.merge_event);
- this.closedBy = MergeRequestStore.getAuthorObject(data.closed_event);
+ this.mergedEvent = MergeRequestStore.getEventObject(data.merge_event);
+ this.closedEvent = MergeRequestStore.getEventObject(data.closed_event);
this.setToMWPSBy = MergeRequestStore.getAuthorObject({ author: data.merge_user || {} });
this.mergeUserId = data.merge_user_id;
this.currentUserId = gon.current_user_id;
@@ -118,6 +116,16 @@ export default class MergeRequestStore {
}
}
+ static getEventObject(event) {
+ if (!event) return null;
+
+ return {
+ author: MergeRequestStore.getAuthorObject(event),
+ updatedAt: gl.utils.formatDate(event.updated_at),
+ formattedUpdatedAt: MergeRequestStore.getEventDate(event),
+ };
+ }
+
static getAuthorObject(event) {
if (!event) {
return {};