diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2016-10-26 18:17:00 +0100 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2016-11-16 11:58:06 +0000 |
commit | b1ec3cb8d2776070c80cba21d08774e563b42f84 (patch) | |
tree | 8eeb63579e371e091611ec92e932d98808ec345f /app/assets/javascripts/environments/stores | |
parent | dcafd476dbc11eb6f2e7327d96868bf2c2d165a9 (diff) | |
download | gitlab-ce-b1ec3cb8d2776070c80cba21d08774e563b42f84.tar.gz |
Adds tests for environment store.
Diffstat (limited to 'app/assets/javascripts/environments/stores')
-rw-r--r-- | app/assets/javascripts/environments/stores/environmnets_store.js.es6 | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/app/assets/javascripts/environments/stores/environmnets_store.js.es6 b/app/assets/javascripts/environments/stores/environmnets_store.js.es6 index c0e97413636..11c481c22e3 100644 --- a/app/assets/javascripts/environments/stores/environmnets_store.js.es6 +++ b/app/assets/javascripts/environments/stores/environmnets_store.js.es6 @@ -54,7 +54,7 @@ //humanizes actions names if there are any actions if (environment.last_deployment.manual_actions) { - environment.last_deployment.manual_actions = environment.last_deployment.manual_actions.map((action) => Object.assign({}, action, {name: gl.text.humanize(action.name)})); + environment.last_deployment.manual_actions = environment.last_deployment.manual_actions.map((action) => action.name = gl.text.humanize(action.name)); } //transforms created date for deployment in a human readable format @@ -64,21 +64,19 @@ } if (environment.environment_type !== null) { - const occurs = acc.find((element, index, array) => { + const occurs = acc.filter((element, index, array) => { return element.children && element.name === environment.environment_type; }); environment["vue-isChildren"] = true; - if (occurs !== undefined) { - acc[acc.indexOf(occurs)].children.push(environment); - acc[acc.indexOf(occurs)].children.sort(this.sortByName) + if (occurs.length) { + acc[acc.indexOf(occurs[0])].children.push(environment); + acc[acc.indexOf(occurs[0])].children.sort(this.sortByName) } else { acc.push({ name: environment.environment_type, - children: [ - Object.assign(environment) - ] + children: [environment] }); } } else { |