summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRegis <boudinot.regis@yahoo.com>2016-10-27 13:23:56 -0600
committerRegis <boudinot.regis@yahoo.com>2016-10-27 13:23:56 -0600
commit59389b311e40ef3a091809a41341a4dbdd93c413 (patch)
tree1dc79705badf7b323c59255bbaf38c26bde6aca6
parent53e17c497d59b9c67b07d01ab7ddba858a2cad99 (diff)
downloadgitlab-ce-59389b311e40ef3a091809a41341a4dbdd93c413.tar.gz
add global runner status object - more mock data for realtime testing
-rw-r--r--app/assets/javascripts/polling-pipelines.js.es612
-rw-r--r--app/assets/javascripts/runner_statuses.js.es659
2 files changed, 68 insertions, 3 deletions
diff --git a/app/assets/javascripts/polling-pipelines.js.es6 b/app/assets/javascripts/polling-pipelines.js.es6
index 6483aab457f..ba2db9de7a4 100644
--- a/app/assets/javascripts/polling-pipelines.js.es6
+++ b/app/assets/javascripts/polling-pipelines.js.es6
@@ -14,6 +14,7 @@
this.storePipelineStatuses();
this.checkStatusChanges();
setTimeout(() => this.applyNewStatusChanges(), 3000);
+ this.runnerStatuses = new gl.RunnerStatuses();
}
storePipelineStatuses() {
@@ -44,6 +45,10 @@
// using 'mock' data
const apiPipelines = this.pipelines;
apiPipelines[0].status = 'failed';
+ apiPipelines[1].status = 'passed';
+ apiPipelines[2].status = 'created';
+ apiPipelines[3].status = 'skipped';
+ apiPipelines[4].status = 'pending';
// end of 'mock' data
this.pipelines = apiPipelines;
return apiPipelines;
@@ -51,10 +56,11 @@
applyNewStatusChanges() {
this.pipelinesOnDOM.forEach((e, i) => {
- const newStatus = `ci-status ci-${this.pipelines[i].status}`;
- // needs to be explicitly called
- // cannot ask `currentDomStatus` to change
+ const updatedStatus = this.pipelines[i].status;
+ const newStatus = `ci-status ci-${updatedStatus}`;
e.children[0].childNodes[0].className = newStatus;
+ e.children[0].childNodes[0].innerHTML = this.runnerStatuses[updatedStatus];
+ // debugger
});
}
};
diff --git a/app/assets/javascripts/runner_statuses.js.es6 b/app/assets/javascripts/runner_statuses.js.es6
new file mode 100644
index 00000000000..b86e69ace34
--- /dev/null
+++ b/app/assets/javascripts/runner_statuses.js.es6
@@ -0,0 +1,59 @@
+/* eslint-disable no-param-reassign */
+
+((gl) => {
+ gl.RunnerStatuses = class {
+ constructor() {
+ return {
+ running: `
+ <svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14">
+ <g fill="#2D9FD8" fill-rule="evenodd">
+ <path d="M12.5,7 C12.5,3.96243388 10.0375661,1.5 7,1.5 C3.96243388,1.5 1.5,3.96243388 1.5,7 C1.5,10.0375661 3.96243388,12.5 7,12.5 C10.0375661,12.5 12.5,10.0375661 12.5,7 Z M0,7 C0,3.13400675 3.13400675,0 7,0 C10.8659932,0 14,3.13400675 14,7 C14,10.8659932 10.8659932,14 7,14 C3.13400675,14 0,10.8659932 0,7 Z"></path>
+ <path d="M7,3 C9.209139,3 11,4.790861 11,7 C11,9.209139 9.209139,11 7,11 C5.65802855,11 4.47040669,10.3391508 3.74481446,9.32513253 L7,7 L7,3 L7,3 Z"></path>
+ </g>
+ </svg>
+ &nbsp;running
+ `,
+ passed: `
+ <svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14">
+ <g fill="#31AF64" fill-rule="evenodd">
+ <path d="M12.5,7 C12.5,3.96243388 10.0375661,1.5 7,1.5 C3.96243388,1.5 1.5,3.96243388 1.5,7 C1.5,10.0375661 3.96243388,12.5 7,12.5 C10.0375661,12.5 12.5,10.0375661 12.5,7 Z M0,7 C0,3.13400675 3.13400675,0 7,0 C10.8659932,0 14,3.13400675 14,7 C14,10.8659932 10.8659932,14 7,14 C3.13400675,14 0,10.8659932 0,7 Z"></path>
+ <path d="M7.29166667,7.875 L5.54840803,7.875 C5.38293028,7.875 5.25,8.00712771 5.25,8.17011551 L5.25,9.03821782 C5.25,9.19875081 5.38360183,9.33333333 5.54840803,9.33333333 L8.24853534,9.33333333 C8.52035522,9.33333333 8.75,9.11228506 8.75,8.83960819 L8.75,8.46475969 L8.75,4.07392947 C8.75,3.92144267 8.61787229,3.79166667 8.45488449,3.79166667 L7.58678218,3.79166667 C7.42624919,3.79166667 7.29166667,3.91804003 7.29166667,4.07392947 L7.29166667,7.875 Z" transform="rotate(45 7 6.563)"></path>
+ </g>
+ </svg>
+
+ passed
+ `,
+ failed: `
+ <svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14">
+ <g fill="#D22852" fill-rule="evenodd">
+ <path d="M12.5,7 C12.5,3.96243388 10.0375661,1.5 7,1.5 C3.96243388,1.5 1.5,3.96243388 1.5,7 C1.5,10.0375661 3.96243388,12.5 7,12.5 C10.0375661,12.5 12.5,10.0375661 12.5,7 Z M0,7 C0,3.13400675 3.13400675,0 7,0 C10.8659932,0 14,3.13400675 14,7 C14,10.8659932 10.8659932,14 7,14 C3.13400675,14 0,10.8659932 0,7 Z"></path>
+ <path d="M7.72916667,6.27083333 L7.72916667,4.28939247 C7.72916667,4.12531853 7.59703895,4 7.43405116,4 L6.56594884,4 C6.40541585,4 6.27083333,4.12956542 6.27083333,4.28939247 L6.27083333,6.27083333 L4.28939247,6.27083333 C4.12531853,6.27083333 4,6.40296105 4,6.56594884 L4,7.43405116 C4,7.59458415 4.12956542,7.72916667 4.28939247,7.72916667 L6.27083333,7.72916667 L6.27083333,9.71060753 C6.27083333,9.87468147 6.40296105,10 6.56594884,10 L7.43405116,10 C7.59458415,10 7.72916667,9.87043458 7.72916667,9.71060753 L7.72916667,7.72916667 L9.71060753,7.72916667 C9.87468147,7.72916667 10,7.59703895 10,7.43405116 L10,6.56594884 C10,6.40541585 9.87043458,6.27083333 9.71060753,6.27083333 L7.72916667,6.27083333 Z" transform="rotate(-45 7 7)"></path>
+ </g>
+ </svg>
+ &nbsp;failed
+ `,
+ created: `
+ <svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14" enable-background="new 0 0 14 14"><path d="M12.5,7 C12.5,4 10,1.5 7,1.5 C4,1.5 1.5,4 1.5,7 C1.5,10 4,12.5 7,12.5 C10,12.5 12.5,10 12.5,7 L12.5,7 Z M0,7 C0,3.1 3.1,0 7,0 C10.9,0 14,3.1 14,7 C14,10.9 10.9,14 7,14 C3.1,14 0,10.9 0,7 L0,7 Z"></path><circle cx="7" cy="7" r="3.25"></circle></svg>&nbsp;created
+ `,
+ skipped: `
+ <svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14">
+ <g fill="#5C5C5C" fill-rule="evenodd">
+ <path d="M12.5,7 C12.5,3.96243388 10.0375661,1.5 7,1.5 C3.96243388,1.5 1.5,3.96243388 1.5,7 C1.5,10.0375661 3.96243388,12.5 7,12.5 C10.0375661,12.5 12.5,10.0375661 12.5,7 Z M0,7 C0,3.13400675 3.13400675,0 7,0 C10.8659932,0 14,3.13400675 14,7 C14,10.8659932 10.8659932,14 7,14 C3.13400675,14 0,10.8659932 0,7 Z"></path>
+ <rect width="8" height="2" x="3" y="6" transform="rotate(45 7 7)" rx=".5"></rect>
+ </g>
+ </svg>
+ &nbsp;skipped
+ `,
+ pending: `
+ <svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14">
+ <g fill="#E75E40" fill-rule="evenodd">
+ <path d="M12.5,7 C12.5,3.96243388 10.0375661,1.5 7,1.5 C3.96243388,1.5 1.5,3.96243388 1.5,7 C1.5,10.0375661 3.96243388,12.5 7,12.5 C10.0375661,12.5 12.5,10.0375661 12.5,7 Z M0,7 C0,3.13400675 3.13400675,0 7,0 C10.8659932,0 14,3.13400675 14,7 C14,10.8659932 10.8659932,14 7,14 C3.13400675,14 0,10.8659932 0,7 Z"></path>
+ <path d="M4.69999981,5.30065012 C4.69999981,5.13460564 4.83842754,5 5.00354719,5 L5.89645243,5 C6.06409702,5 6.19999981,5.13308716 6.19999981,5.30065012 L6.19999981,8.69934988 C6.19999981,8.86539436 6.06157207,9 5.89645243,9 L5.00354719,9 C4.8359026,9 4.69999981,8.86691284 4.69999981,8.69934988 L4.69999981,5.30065012 Z M7.69999981,5.30065012 C7.69999981,5.13460564 7.83842754,5 8.00354719,5 L8.89645243,5 C9.06409702,5 9.19999981,5.13308716 9.19999981,5.30065012 L9.19999981,8.69934988 C9.19999981,8.86539436 9.06157207,9 8.89645243,9 L8.00354719,9 C7.8359026,9 7.69999981,8.86691284 7.69999981,8.69934988 L7.69999981,5.30065012 Z"></path>
+ </g>
+ </svg>
+ &nbsp;pending
+ `,
+ };
+ }
+ };
+})(window.gl || (window.gl = {}));