kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Moves EE diferences to CE for mr_widget_pipeline

Browse source
This commit is contained in:
Filipa Lacerda 2019-03-01 14:55:03 +00:00
parent 31353188f8
commit e24cd0b7db
2 changed files with 36 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
View file

@ -5,6 +5,7 @@ import PipelineStage from '~/pipelines/components/stage.vue';
import CiIcon from '~/vue_shared/components/ci_icon.vue'; import CiIcon from '~/vue_shared/components/ci_icon.vue';
import Icon from '~/vue_shared/components/icon.vue'; import Icon from '~/vue_shared/components/icon.vue';
import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue'; import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue';
import mrWidgetPipelineMixin from 'ee_else_ce/vue_merge_request_widget/mixins/mr_widget_pipeline';
export default { export default {
name: 'MRWidgetPipeline', name: 'MRWidgetPipeline',
@ -13,7 +14,10 @@ export default {
CiIcon, CiIcon,
Icon, Icon,
TooltipOnTruncate, TooltipOnTruncate,
LinkedPipelinesMiniList: () =>
import('ee_component/vue_shared/components/linked_pipelines_mini_list.vue'),
}, },
mixins: [mrWidgetPipelineMixin],
props: { props: {
pipeline: { pipeline: {
type: Object, type: Object,
@ -82,8 +86,7 @@ export default {
<div v-if="hasPipeline || hasCIError" class="ci-widget media"> <div v-if="hasPipeline || hasCIError" class="ci-widget media">
<template v-if="hasCIError"> <template v-if="hasCIError">
<div <div
class="add-border ci-status-icon ci-status-icon-failed ci-error class="add-border ci-status-icon ci-status-icon-failed ci-error js-ci-error append-right-default"
js-ci-error append-right-default"
> >
<icon :size="32" name="status_failed_borderless" /> <icon :size="32" name="status_failed_borderless" />
</div> </div>
@ -101,16 +104,13 @@ export default {
<a :href="pipeline.path" class="pipeline-id font-weight-normal pipeline-number" <a :href="pipeline.path" class="pipeline-id font-weight-normal pipeline-number"
>#{{ pipeline.id }}</a >#{{ pipeline.id }}</a
> >
{{ pipeline.details.status.label }} {{ pipeline.details.status.label }}
<template v-if="hasCommitInfo"> <template v-if="hasCommitInfo">
for for
<a <a
:href="pipeline.commit.commit_path" :href="pipeline.commit.commit_path"
class="commit-sha js-commit-link font-weight-normal" class="commit-sha js-commit-link font-weight-normal"
> >{{ pipeline.commit.short_id }}</a
{{ pipeline.commit.short_id }}</a
> >
on on
<tooltip-on-truncate <tooltip-on-truncate
@ -126,15 +126,22 @@ export default {
</div> </div>
<div> <div>
<span class="mr-widget-pipeline-graph"> <span class="mr-widget-pipeline-graph">
<span v-if="hasStages" class="stage-cell"> <span class="stage-cell">
<linked-pipelines-mini-list v-if="triggeredBy.length" :triggered-by="triggeredBy" />
<template v-if="hasStages">
<div <div
v-for="(stage, i) in pipeline.details.stages" v-for="(stage, i) in pipeline.details.stages"
:key="i" :key="i"
:class="{
'has-downstream': hasDownstream(i),
}"
class="stage-container dropdown js-mini-pipeline-graph mr-widget-pipeline-stages" class="stage-container dropdown js-mini-pipeline-graph mr-widget-pipeline-stages"
> >
<pipeline-stage :stage="stage" /> <pipeline-stage :stage="stage" />
</div> </div>
</template>
</span> </span>
<linked-pipelines-mini-list v-if="triggered.length" :triggered="triggered" />
</span> </span>
</div> </div>
</div> </div>

15
app/assets/javascripts/vue_merge_request_widget/mixins/mr_widget_pipeline.js Normal file
View file

@ -0,0 +1,15 @@
export default {
computed: {
triggered() {
return [];
},
triggeredBy() {
return [];
},
},
methods: {
hasDownstream() {
return false;
},
},
};