Commit 633d417c authored by Martin Wortschack's avatar Martin Wortschack

Merge branch 'psi-responsive-error-tracking' into 'master'

Fix error tracking table layout on small screens

See merge request gitlab-org/gitlab!18325
parents 3d8b0ab7 1eeea981
...@@ -7,10 +7,10 @@ import { __ } from '~/locale'; ...@@ -7,10 +7,10 @@ import { __ } from '~/locale';
export default { export default {
fields: [ fields: [
{ key: 'error', label: __('Open errors') }, { key: 'error', label: __('Open errors'), thClass: 'w-70p' },
{ key: 'events', label: __('Events') }, { key: 'events', label: __('Events') },
{ key: 'users', label: __('Users') }, { key: 'users', label: __('Users') },
{ key: 'lastSeen', label: __('Last seen') }, { key: 'lastSeen', label: __('Last seen'), thClass: 'w-15p' },
], ],
components: { components: {
GlEmptyState, GlEmptyState,
...@@ -67,40 +67,39 @@ export default { ...@@ -67,40 +67,39 @@ export default {
<div class="d-flex justify-content-end"> <div class="d-flex justify-content-end">
<gl-button class="my-3 ml-auto" variant="primary" :href="externalUrl" target="_blank"> <gl-button class="my-3 ml-auto" variant="primary" :href="externalUrl" target="_blank">
{{ __('View in Sentry') }} {{ __('View in Sentry') }}
<icon name="external-link" /> <icon name="external-link" class="flex-shrink-0" />
</gl-button> </gl-button>
</div> </div>
<gl-table :items="errors" :fields="$options.fields" :show-empty="true">
<gl-table :items="errors" :fields="$options.fields" :show-empty="true" fixed stacked="sm">
<template slot="HEAD_events" slot-scope="data"> <template slot="HEAD_events" slot-scope="data">
<div class="text-right">{{ data.label }}</div> <div class="text-md-right">{{ data.label }}</div>
</template> </template>
<template slot="HEAD_users" slot-scope="data"> <template slot="HEAD_users" slot-scope="data">
<div class="text-right">{{ data.label }}</div> <div class="text-md-right">{{ data.label }}</div>
</template> </template>
<template slot="error" slot-scope="errors"> <template slot="error" slot-scope="errors">
<div class="d-flex flex-column"> <div class="d-flex flex-column">
<div class="d-flex"> <gl-link :href="errors.item.externalUrl" class="d-flex text-dark" target="_blank">
<gl-link :href="errors.item.externalUrl" class="d-flex text-dark" target="_blank"> <strong class="text-truncate">{{ errors.item.title.trim() }}</strong>
<strong>{{ errors.item.title.trim() }}</strong> <icon name="external-link" class="ml-1 flex-shrink-0" />
<icon name="external-link" class="ml-1" /> </gl-link>
</gl-link> <span class="text-secondary text-truncate">
<span class="text-secondary ml-2">{{ errors.item.culprit }}</span> {{ errors.item.culprit }}
</div> </span>
{{ errors.item.message || __('No details available') }}
</div> </div>
</template> </template>
<template slot="events" slot-scope="errors"> <template slot="events" slot-scope="errors">
<div class="text-right">{{ errors.item.count }}</div> <div class="text-md-right">{{ errors.item.count }}</div>
</template> </template>
<template slot="users" slot-scope="errors"> <template slot="users" slot-scope="errors">
<div class="text-right">{{ errors.item.userCount }}</div> <div class="text-md-right">{{ errors.item.userCount }}</div>
</template> </template>
<template slot="lastSeen" slot-scope="errors"> <template slot="lastSeen" slot-scope="errors">
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<icon name="calendar" class="text-secondary mr-1" />
<time-ago :time="errors.item.lastSeen" class="text-secondary" /> <time-ago :time="errors.item.lastSeen" class="text-secondary" />
</div> </div>
</template> </template>
......
...@@ -452,6 +452,8 @@ img.emoji { ...@@ -452,6 +452,8 @@ img.emoji {
.w-0 { width: 0; } .w-0 { width: 0; }
.w-8em { width: 8em; } .w-8em { width: 8em; }
.w-3rem { width: 3rem; } .w-3rem { width: 3rem; }
.w-15p { width: 15%; }
.w-70p { width: 70%; }
.h-12em { height: 12em; } .h-12em { height: 12em; }
.h-32-px { height: 32px;} .h-32-px { height: 32px;}
......
---
title: Fix error tracking table layout on small screens
merge_request: 18325
author:
type: fixed
...@@ -10758,9 +10758,6 @@ msgstr "" ...@@ -10758,9 +10758,6 @@ msgstr ""
msgid "No deployments found" msgid "No deployments found"
msgstr "" msgstr ""
msgid "No details available"
msgstr ""
msgid "No due date" msgid "No due date"
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment