diff options
author | Simon Knox <psimyn@gmail.com> | 2018-12-18 22:39:07 +1100 |
---|---|---|
committer | Peter Leitzen <pleitzen@gitlab.com> | 2019-01-02 19:43:11 +0100 |
commit | b771191fc9e013b0f8bc657be82c4020a618d039 (patch) | |
tree | 276771235cd8bb8a522244b6f87105393651882d | |
parent | eec8b6eadb170d4af5a8366dc7a092c640205683 (diff) | |
download | gitlab-ce-b771191fc9e013b0f8bc657be82c4020a618d039.tar.gz |
Use timeago for last seen, fix markup for title
-rw-r--r-- | app/assets/javascripts/error_tracking/components/error_tracking_list.vue | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/app/assets/javascripts/error_tracking/components/error_tracking_list.vue b/app/assets/javascripts/error_tracking/components/error_tracking_list.vue index 11dbb030d42..1bdfe5fc441 100644 --- a/app/assets/javascripts/error_tracking/components/error_tracking_list.vue +++ b/app/assets/javascripts/error_tracking/components/error_tracking_list.vue @@ -1,26 +1,25 @@ <script> import { mapActions, mapState } from 'vuex'; -import { GlEmptyState, GlButton, GlLoadingIcon, GlTable } from '@gitlab/ui'; +import { GlEmptyState, GlButton, GlLink, GlLoadingIcon, GlTable } from '@gitlab/ui'; import Icon from '~/vue_shared/components/icon.vue'; -import timeagoMixin from '~/vue_shared/mixins/timeago'; +import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue'; export default { fields: [ 'error', 'count', 'user_count', - { key: 'last_seen', formatter: 'timeFormated' }, + 'lastSeen', ], components: { GlEmptyState, GlButton, + GlLink, GlLoadingIcon, GlTable, Icon, + TimeAgo, }, - mixins: [ - timeagoMixin, - ], props: { indexPath: { type: String, @@ -75,7 +74,20 @@ export default { :fields="$options.fields" > <template slot="error" slot-scope="errors"> - {{ errors.item.title }} {{ errors.item.culprit }} {{ errors.item.external_url }} + <div class="d-flex flex-column"> + <div class="d-flex"> + <gl-link :href="errors.item.external_url" class="d-flex text-dark"> + <strong>{{ errors.item.title.trim() }}</strong> + <icon name="external-link" class="ml-1" /> + </gl-link> + <span class="text-secondary ml-2">{{ errors.item.culprit }}</span> + </div> + {{ errors.item.message }} + </div> + </template> + <template slot="lastSeen" slot-scope="errors"> + <icon name="calendar" /> + <time-ago :time="errors.item.last_seen" /> </template> </gl-table> </div> |