Commit d34d2718 authored by Filipa Lacerda's avatar Filipa Lacerda

Improvements after review

parent f4b4a34b
...@@ -109,7 +109,9 @@ export default Vue.component('pipelines-table', { ...@@ -109,7 +109,9 @@ export default Vue.component('pipelines-table', {
<i class="fa fa-spinner fa-spin"></i> <i class="fa fa-spinner fa-spin"></i>
</div> </div>
<empty-state v-if="shouldRenderEmptyState" :helpPagePath="helpPagePath" /> <empty-state
v-if="shouldRenderEmptyState"
:help-page-path="helpPagePath" />
<error-state v-if="shouldRenderErrorState" /> <error-state v-if="shouldRenderErrorState" />
......
...@@ -8,21 +8,15 @@ export default { ...@@ -8,21 +8,15 @@ export default {
}, },
}, },
data() {
return {
pipelinesEmptyStateSVG,
};
},
template: ` template: `
<div class="row empty-state js-pipelines-empty-state"> <div class="row empty-state">
<div class="col-xs-12 pull-right"> <div class="col-xs-12">
<div class="svg-content"> <div class="svg-content">
${pipelinesEmptyStateSVG} ${pipelinesEmptyStateSVG}
</div> </div>
</div> </div>
<div class="col-xs-12 center"> <div class="col-xs-12 text-center">
<div class="text-content"> <div class="text-content">
<h4>Build with confidence</h4> <h4>Build with confidence</h4>
<p> <p>
......
import pipelinesErrorStateSVG from 'empty_states/icons/_pipelines_failed.svg'; import pipelinesErrorStateSVG from 'empty_states/icons/_pipelines_failed.svg';
export default { export default {
data() {
return {
pipelinesErrorStateSVG,
};
},
template: ` template: `
<div class="row empty-state js-pipelines-error-state"> <div class="row empty-state js-pipelines-error-state">
<div class="col-xs-12 pull-right"> <div class="col-xs-12">
<div class="svg-content"> <div class="svg-content">
${pipelinesErrorStateSVG} ${pipelinesErrorStateSVG}
</div> </div>
</div> </div>
<div class="col-xs-12 center"> <div class="col-xs-12 text-center">
<div class="text-content"> <div class="text-content">
<h4>The API failed to fetch the pipelines.</h4> <h4>The API failed to fetch the pipelines.</h4>
</div> </div>
......
/* global Flash */
/* eslint-disable no-new */
import Vue from 'vue'; import Vue from 'vue';
import '~/flash';
import PipelinesService from './services/pipelines_service'; import PipelinesService from './services/pipelines_service';
import eventHub from './event_hub'; import eventHub from './event_hub';
import PipelinesTableComponent from '../vue_shared/components/pipelines_table'; import PipelinesTableComponent from '../vue_shared/components/pipelines_table';
...@@ -177,14 +174,12 @@ export default { ...@@ -177,14 +174,12 @@ export default {
.catch(() => { .catch(() => {
this.hasError = true; this.hasError = true;
this.pageRequest = false; this.pageRequest = false;
new Flash('An error occurred while fetching the pipelines, please reload the page again.');
}); });
}, },
}, },
template: ` template: `
<div <div :class="cssClass">
:class="cssClass">
<div <div
class="top-area" class="top-area"
...@@ -207,10 +202,14 @@ export default { ...@@ -207,10 +202,14 @@ export default {
<div <div
class="realtime-loading" class="realtime-loading"
v-if="pageRequest"> v-if="pageRequest">
<i class="fa fa-spinner fa-spin" aria-hidden="true"></i> <i
class="fa fa-spinner fa-spin"
aria-hidden="true" />
</div> </div>
<empty-state v-if="shouldRenderEmptyState" :helpPagePath="helpPagePath" /> <empty-state
v-if="shouldRenderEmptyState"
:help-page-path="helpPagePath" />
<error-state v-if="shouldRenderErrorState" /> <error-state v-if="shouldRenderErrorState" />
......
...@@ -14,6 +14,10 @@ ...@@ -14,6 +14,10 @@
white-space: nowrap; white-space: nowrap;
} }
.empty-state {
margin: 5% auto 0;
}
.table-holder { .table-holder {
width: 100%; width: 100%;
overflow: auto; overflow: auto;
......
...@@ -33,7 +33,7 @@ describe('Pipelines table in Commits and Merge requests', () => { ...@@ -33,7 +33,7 @@ describe('Pipelines table in Commits and Merge requests', () => {
}); });
setTimeout(() => { setTimeout(() => {
expect(component.$el.querySelector('.js-pipelines-empty-state')).toBeDefined(); expect(component.$el.querySelector('.empty-state')).toBeDefined();
done(); done();
}, 1); }, 1);
}); });
......
...@@ -71,7 +71,7 @@ describe('Pipelines', () => { ...@@ -71,7 +71,7 @@ describe('Pipelines', () => {
}).$mount(); }).$mount();
setTimeout(() => { setTimeout(() => {
expect(component.$el.querySelector('.js-pipelines-empty-state')).toBeDefined(); expect(component.$el.querySelector('.empty-state')).toBeDefined();
done(); done();
}); });
}); });
......
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