Commit 0cd70234 authored by Miguel Rincon's avatar Miguel Rincon

Merge branch 'pb-resolve-tech-debt-artifacts-block' into 'master'

Utilize gitlab-ui components more accurately in artifacts_block.vue

See merge request gitlab-org/gitlab!52526
parents 7f00da29 117ce36d
<script> <script>
import { GlIcon, GlLink } from '@gitlab/ui'; import { GlButton, GlButtonGroup, GlIcon, GlLink } from '@gitlab/ui';
import TimeagoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import TimeagoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
import timeagoMixin from '~/vue_shared/mixins/timeago'; import timeagoMixin from '~/vue_shared/mixins/timeago';
export default { export default {
components: { components: {
TimeagoTooltip, GlButton,
GlButtonGroup,
GlIcon, GlIcon,
GlLink, GlLink,
TimeagoTooltip,
}, },
mixins: [timeagoMixin], mixins: [timeagoMixin],
props: { props: {
...@@ -36,7 +38,7 @@ export default { ...@@ -36,7 +38,7 @@ export default {
</script> </script>
<template> <template>
<div class="block"> <div class="block">
<div class="title font-weight-bold">{{ s__('Job|Job artifacts') }}</div> <div class="title gl-font-weight-bold">{{ s__('Job|Job artifacts') }}</div>
<p <p
v-if="isExpired || willExpire" v-if="isExpired || willExpire"
class="build-detail-row" class="build-detail-row"
...@@ -61,32 +63,29 @@ export default { ...@@ -61,32 +63,29 @@ export default {
) )
}}</span> }}</span>
</p> </p>
<div class="btn-group d-flex gl-mt-3" role="group"> <gl-button-group class="gl-display-flex gl-mt-3">
<gl-link <gl-button
v-if="artifact.keep_path" v-if="artifact.keep_path"
:href="artifact.keep_path" :href="artifact.keep_path"
class="btn btn-sm btn-default"
data-method="post" data-method="post"
data-testid="keep-artifacts" data-testid="keep-artifacts"
>{{ s__('Job|Keep') }}</gl-link >{{ s__('Job|Keep') }}</gl-button
> >
<gl-link <gl-button
v-if="artifact.download_path" v-if="artifact.download_path"
:href="artifact.download_path" :href="artifact.download_path"
class="btn btn-sm btn-default"
download
rel="nofollow" rel="nofollow"
data-testid="download-artifacts" data-testid="download-artifacts"
>{{ s__('Job|Download') }}</gl-link download
>{{ s__('Job|Download') }}</gl-button
> >
<gl-link <gl-button
v-if="artifact.browse_path" v-if="artifact.browse_path"
:href="artifact.browse_path" :href="artifact.browse_path"
class="btn btn-sm btn-default"
data-testid="browse-artifacts" data-testid="browse-artifacts"
data-qa-selector="browse_artifacts_button" data-qa-selector="browse_artifacts_button"
>{{ s__('Job|Browse') }}</gl-link >{{ s__('Job|Browse') }}</gl-button
> >
</div> </gl-button-group>
</div> </div>
</template> </template>
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