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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
ace33c55
Commit
ace33c55
authored
Feb 15, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Only run timeago loops after rendering timeago components
parent
1b6a671e
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
34 additions
and
43 deletions
+34
-43
app/assets/javascripts/commit/pipelines/pipelines_store.js.es6
...ssets/javascripts/commit/pipelines/pipelines_store.js.es6
+1
-1
app/assets/javascripts/commit/pipelines/pipelines_table.js.es6
...ssets/javascripts/commit/pipelines/pipelines_table.js.es6
+6
-1
app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
+10
-0
app/assets/javascripts/vue_pipelines_index/store.js.es6
app/assets/javascripts/vue_pipelines_index/store.js.es6
+13
-41
changelogs/unreleased/28247-timeloops-bug.yml
changelogs/unreleased/28247-timeloops-bug.yml
+4
-0
No files found.
app/assets/javascripts/commit/pipelines/pipelines_store.js.es6
View file @
ace33c55
...
@@ -24,7 +24,7 @@ class PipelinesStore {
...
@@ -24,7 +24,7 @@ class PipelinesStore {
* update the time to show how long as passed.
* update the time to show how long as passed.
*
*
*/
*/
startTimeAgoLoops() {
sta
tic sta
rtTimeAgoLoops() {
const startTimeLoops = () => {
const startTimeLoops = () => {
this.timeLoopInterval = setInterval(() => {
this.timeLoopInterval = setInterval(() => {
this.$children[0].$children.reduce((acc, component) => {
this.$children[0].$children.reduce((acc, component) => {
...
...
app/assets/javascripts/commit/pipelines/pipelines_table.js.es6
View file @
ace33c55
...
@@ -71,7 +71,6 @@ require('./pipelines_store');
...
@@ -71,7 +71,6 @@ require('./pipelines_store');
.then(response => response.json())
.then(response => response.json())
.then((json) => {
.then((json) => {
this.store.storePipelines(json);
this.store.storePipelines(json);
this.store.startTimeAgoLoops.call(this, Vue);
this.isLoading = false;
this.isLoading = false;
})
})
.catch(() => {
.catch(() => {
...
@@ -80,6 +79,12 @@ require('./pipelines_store');
...
@@ -80,6 +79,12 @@ require('./pipelines_store');
});
});
},
},
beforeUpdate() {
if (this.state.pipelines.length && this.$children) {
this.store.startTimeAgoLoops.call(this, Vue);
}
},
template: `
template: `
<div class="pipelines">
<div class="pipelines">
<div class="realtime-loading" v-if="isLoading">
<div class="realtime-loading" v-if="isLoading">
...
...
app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
View file @
ace33c55
...
@@ -5,6 +5,7 @@ window.Vue = require('vue');
...
@@ -5,6 +5,7 @@ window.Vue = require('vue');
require('../vue_shared/components/table_pagination');
require('../vue_shared/components/table_pagination');
require('./store');
require('./store');
require('../vue_shared/components/pipelines_table');
require('../vue_shared/components/pipelines_table');
const CommitPipelinesStoreWithTimeAgo = require('../commit/pipelines/pipelines_store');
((gl) => {
((gl) => {
gl.VuePipelines = Vue.extend({
gl.VuePipelines = Vue.extend({
...
@@ -32,8 +33,17 @@ require('../vue_shared/components/pipelines_table');
...
@@ -32,8 +33,17 @@ require('../vue_shared/components/pipelines_table');
const scope = gl.utils.getParameterByName('scope');
const scope = gl.utils.getParameterByName('scope');
if (pagenum) this.pagenum = pagenum;
if (pagenum) this.pagenum = pagenum;
if (scope) this.apiScope = scope;
if (scope) this.apiScope = scope;
this.store.fetchDataLoop.call(this, Vue, this.pagenum, this.scope, this.apiScope);
this.store.fetchDataLoop.call(this, Vue, this.pagenum, this.scope, this.apiScope);
},
},
beforeUpdate() {
if (this.pipelines.length && this.$children) {
debugger;
CommitPipelinesStoreWithTimeAgo.startTimeAgoLoops.call(this, Vue);
}
},
methods: {
methods: {
change(pagenum, apiScope) {
change(pagenum, apiScope) {
gl.utils.visitUrl(`?scope=${apiScope}&p=${pagenum}`);
gl.utils.visitUrl(`?scope=${apiScope}&p=${pagenum}`);
...
...
app/assets/javascripts/vue_pipelines_index/store.js.es6
View file @
ace33c55
/* global gl, Flash */
/* global gl, Flash */
/* eslint-disable no-param-reassign, no-underscore-dangle */
/* eslint-disable no-param-reassign */
require('../vue_realtime_listener');
((gl) => {
((gl) => {
const pageValues = (headers) => {
const pageValues = (headers) => {
...
@@ -21,15 +20,8 @@ require('../vue_realtime_listener');
...
@@ -21,15 +20,8 @@ require('../vue_realtime_listener');
gl.PipelineStore = class {
gl.PipelineStore = class {
fetchDataLoop(Vue, pageNum, url, apiScope) {
fetchDataLoop(Vue, pageNum, url, apiScope) {
this.pageRequest = true;
this.pageRequest = true;
const updatePipelineNums = (count) => {
const { all } = count;
const running = count.running_or_pending;
document.querySelector('.js-totalbuilds-count').innerHTML = all;
document.querySelector('.js-running-count').innerHTML = running;
};
const goFetch = () =>
return this.$http.get(`${url}?scope=${apiScope}&page=${pageNum}`)
this.$http.get(`${url}?scope=${apiScope}&page=${pageNum}`)
.then((response) => {
.then((response) => {
const pageInfo = pageValues(response.headers);
const pageInfo = pageValues(response.headers);
this.pageInfo = Object.assign({}, this.pageInfo, pageInfo);
this.pageInfo = Object.assign({}, this.pageInfo, pageInfo);
...
@@ -38,31 +30,11 @@ require('../vue_realtime_listener');
...
@@ -38,31 +30,11 @@ require('../vue_realtime_listener');
this.count = Object.assign({}, this.count, res.count);
this.count = Object.assign({}, this.count, res.count);
this.pipelines = Object.assign([], this.pipelines, res.pipelines);
this.pipelines = Object.assign([], this.pipelines, res.pipelines);
updatePipelineNums(this.count);
this.pageRequest = false;
this.pageRequest = false;
}, () => {
}, () => {
this.pageRequest = false;
this.pageRequest = false;
return new Flash('An error occurred while fetching the pipelines, please reload the page again.');
return new Flash('An error occurred while fetching the pipelines, please reload the page again.');
});
});
goFetch();
const startTimeLoops = () => {
this.timeLoopInterval = setInterval(() => {
this.$children[0].$children.reduce((acc, component) => {
const timeAgoComponent = component.$children.filter(el => el.$options._componentTag === 'time-ago')[0];
acc.push(timeAgoComponent);
return acc;
}, []).forEach(e => e.changeTime());
}, 10000);
};
startTimeLoops();
const removeIntervals = () => clearInterval(this.timeLoopInterval);
const startIntervals = () => startTimeLoops();
gl.VueRealtimeListener(removeIntervals, startIntervals);
}
}
};
};
})(window.gl || (window.gl = {}));
})(window.gl || (window.gl = {}));
changelogs/unreleased/28247-timeloops-bug.yml
0 → 100644
View file @
ace33c55
---
title
:
Only run timeago loops after rendering timeago components
merge_request
:
author
:
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