BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
df1b15e3
Commit
df1b15e3
authored
Nov 10, 2016
by
Regis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
loading icon - rename component keys
parent
a1f281e9
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
11 deletions
+19
-11
pipelines.js.es6
app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
+18
-10
store.js.es6
app/assets/javascripts/vue_pipelines_index/store.js.es6
+1
-1
No files found.
app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
View file @
df1b15e3
...
...
@@ -4,15 +4,15 @@
((gl) => {
gl.VuePipeLines = Vue.extend({
components: {
'running-pipeline'
: gl.VueRunningPipeline,
'stages': gl.VueStage
s,
'pipeline-actions': gl.VuePipelineAction
s,
'branch-commit'
: gl.VueBranchCommit,
'pipeline-url'
: gl.VuePipelineUrl,
'pipeline-head'
: gl.VuePipelineHead,
'gl-pagination'
: gl.VueGlPagination,
'status-scope'
: gl.VueStatusScope,
'time-ago'
: gl.VueTimeAgo,
runningPipeline
: gl.VueRunningPipeline,
pipelineActions: gl.VuePipelineAction
s,
stages: gl.VueStage
s,
branchCommit
: gl.VueBranchCommit,
pipelineUrl
: gl.VuePipelineUrl,
pipelineHead
: gl.VuePipelineHead,
glPagination
: gl.VueGlPagination,
statusScope
: gl.VueStatusScope,
timeAgo
: gl.VueTimeAgo,
},
data() {
return {
...
...
@@ -24,6 +24,7 @@
all: 0,
running_or_pending: 0,
},
pageRequest: false,
};
},
props: [
...
...
@@ -47,12 +48,16 @@
window.history.pushState({}, null, `?p=${this.pagenum}`);
clearInterval(this.intervalId);
this.pageRequest = true;
this.store.fetchDataLoop.call(this, Vue, this.pagenum, this.scope);
},
},
template: `
<div>
<div class="table-holder">
<div class="pipeline-loading-status" v-if='pipelines.length < 1'>
<i class="fa fa-spinner fa-spin"></i>
</div>
<div class="table-holder" v-if='pipelines.length > 0'>
<table class="table ci-table">
<pipeline-head></pipeline-head>
<tbody>
...
...
@@ -67,6 +72,9 @@
</tbody>
</table>
</div>
<div class="pipeline-loading-status" v-if='pageRequest'>
<i class="fa fa-spinner fa-spin"></i>
</div>
<gl-pagination
v-if='count.all > 0'
:pagenum='pagenum'
...
...
app/assets/javascripts/vue_pipelines_index/store.js.es6
View file @
df1b15e3
...
...
@@ -32,10 +32,10 @@
this.$http.get(`${url}?page=${pageNum}`)
.then((response) => {
const res = JSON.parse(response.body);
debugger
Vue.set(this, 'updatedAt', res.updated_at);
Vue.set(this, 'pipelines', res.pipelines);
Vue.set(this, 'count', res.count);
this.pageRequest = false;
}, () => new Flash(
'Something went wrong on our end.'
));
...
...
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