Skip to content
Snippets Groups Projects
Commit bb9e7a3f authored by Filipa Lacerda's avatar Filipa Lacerda
Browse files

CE port of changes made to the pipeline bundle in EE - Fixes typos and adds i18n

Backport common class name for the tab content

Backport more changes
parent dc835fcc
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -52,7 +52,7 @@
</script>
<template>
<div class="build-content middle-block js-pipeline-graph">
<div class="pipeline-visualization pipeline-graph">
<div class="pipeline-visualization pipeline-graph pipeline-tab-content">
<div class="text-center">
<loading-icon
v-if="isLoading"
Loading
Loading
import Vue from 'vue';
import Flash from '../flash';
import PipelinesMediator from './pipeline_details_mediatior';
import Flash from '~/flash';
import Translate from '~/vue_shared/translate';
import { __ } from '~/locale';
import PipelinesMediator from './pipeline_details_mediator';
import pipelineGraph from './components/graph/graph_component.vue';
import pipelineHeader from './components/header_component.vue';
import eventHub from './event_hub';
 
Vue.use(Translate);
document.addEventListener('DOMContentLoaded', () => {
const dataset = document.querySelector('.js-pipeline-details-vue').dataset;
 
Loading
Loading
@@ -54,7 +58,7 @@ document.addEventListener('DOMContentLoaded', () => {
postAction(action) {
this.mediator.service.postAction(action.path)
.then(() => this.mediator.refreshPipeline())
.catch(() => new Flash('An error occurred while making the request.'));
.catch(() => Flash(__('An error occurred while making the request.')));
},
},
render(createElement) {
Loading
Loading
import Visibility from 'visibilityjs';
import Flash from '../flash';
import Poll from '../lib/utils/poll';
import { __ } from '../locale';
import PipelineStore from './stores/pipeline_store';
import PipelineService from './services/pipeline_service';
 
Loading
Loading
@@ -47,7 +48,7 @@ export default class pipelinesMediator {
 
errorCallback() {
this.state.isLoading = false;
return new Flash('An error occurred while fetching the pipeline.');
Flash(__('An error occurred while fetching the pipeline.'));
}
 
refreshPipeline() {
Loading
Loading
Loading
Loading
@@ -320,14 +320,17 @@
}
}
 
// Pipeline graph
.pipeline-graph {
.pipeline-tab-content {
width: 100%;
background-color: $gray-light;
padding: $gl-padding;
overflow: auto;
}
// Pipeline graph
.pipeline-graph {
white-space: nowrap;
transition: max-height 0.3s, padding 0.3s;
overflow: auto;
 
.stage-column-list,
.builds-container > ul {
Loading
Loading
Loading
Loading
@@ -3,16 +3,16 @@
.tabs-holder
%ul.pipelines-tabs.nav-links.no-top.no-bottom.mobile-separator
%li.js-pipeline-tab-link
= link_to project_pipeline_path(@project, @pipeline), data: { target: 'div#js-tab-pipeline', action: 'pipelines', toggle: 'tab' }, class: 'pipeline-tab' do
Pipeline
= link_to project_pipeline_path(@project, @pipeline), data: { target: '#js-tab-pipeline', action: 'pipelines', toggle: 'tab' }, class: 'pipeline-tab' do
= _("Pipeline")
%li.js-builds-tab-link
= link_to builds_project_pipeline_path(@project, @pipeline), data: {target: 'div#js-tab-builds', action: 'builds', toggle: 'tab' }, class: 'builds-tab' do
Jobs
= link_to builds_project_pipeline_path(@project, @pipeline), data: { target: '#js-tab-builds', action: 'builds', toggle: 'tab' }, class: 'builds-tab' do
= _("Jobs")
%span.badge.js-builds-counter= pipeline.total_size
- if failed_builds.present?
%li.js-failures-tab-link
= link_to failures_project_pipeline_path(@project, @pipeline), data: {target: 'div#js-tab-failures', action: 'failures', toggle: 'tab' }, class: 'failures-tab' do
Failed Jobs
= link_to failures_project_pipeline_path(@project, @pipeline), data: { target: '#js-tab-failures', action: 'failures', toggle: 'tab' }, class: 'failures-tab' do
= _("Failed Jobs")
%span.badge.js-failures-counter= failed_builds.count
 
.tab-content
Loading
Loading
import _ from 'underscore';
import Vue from 'vue';
import PipelineMediator from '~/pipelines/pipeline_details_mediatior';
import PipelineMediator from '~/pipelines/pipeline_details_mediator';
 
describe('PipelineMdediator', () => {
let mediator;
Loading
Loading
Loading
Loading
@@ -8,7 +8,6 @@ describe('Pipeline Store', () => {
});
 
it('should set defaults', () => {
expect(store.state).toEqual({ pipeline: {} });
expect(store.state.pipeline).toEqual({});
});
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment