Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
d34d2718
Commit
d34d2718
authored
Mar 21, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improvements after review
parent
f4b4a34b
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
21 additions
and
28 deletions
+21
-28
app/assets/javascripts/commit/pipelines/pipelines_table.js
app/assets/javascripts/commit/pipelines/pipelines_table.js
+3
-1
app/assets/javascripts/vue_pipelines_index/components/empty_state.js
...javascripts/vue_pipelines_index/components/empty_state.js
+3
-9
app/assets/javascripts/vue_pipelines_index/components/error_state.js
...javascripts/vue_pipelines_index/components/error_state.js
+2
-8
app/assets/javascripts/vue_pipelines_index/pipelines.js
app/assets/javascripts/vue_pipelines_index/pipelines.js
+7
-8
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+4
-0
spec/javascripts/commit/pipelines/pipelines_spec.js
spec/javascripts/commit/pipelines/pipelines_spec.js
+1
-1
spec/javascripts/vue_pipelines_index/pipelines_spec.js
spec/javascripts/vue_pipelines_index/pipelines_spec.js
+1
-1
No files found.
app/assets/javascripts/commit/pipelines/pipelines_table.js
View file @
d34d2718
...
@@ -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" />
...
...
app/assets/javascripts/vue_pipelines_index/components/empty_state.js
View file @
d34d2718
...
@@ -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>
...
...
app/assets/javascripts/vue_pipelines_index/components/error_state.js
View file @
d34d2718
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>
...
...
app/assets/javascripts/vue_pipelines_index/pipelines.js
View file @
d34d2718
/* 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" />
...
...
app/assets/stylesheets/pages/pipelines.scss
View file @
d34d2718
...
@@ -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
;
...
...
spec/javascripts/commit/pipelines/pipelines_spec.js
View file @
d34d2718
...
@@ -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
);
});
});
...
...
spec/javascripts/vue_pipelines_index/pipelines_spec.js
View file @
d34d2718
...
@@ -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
();
});
});
});
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment