kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Changes after review

Browse source
This commit is contained in:
Filipa Lacerda 2017-02-16 11:29:45 +00:00
parent 8ca90a68c4
commit ba53ee78fa
3 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/environments/components/environment.js.es6
View file

@ -5,7 +5,7 @@ const Vue = require('vue');
Vue.use(require('vue-resource')); Vue.use(require('vue-resource'));
const EnvironmentsService = require('../services/environments_service'); const EnvironmentsService = require('../services/environments_service');
const EnvironmentTable = require('./environments_table'); const EnvironmentTable = require('./environments_table');
const Store = require('../stores/environments_store'); const EnvironmentsStore = require('../stores/environments_store');
require('../../vue_shared/components/table_pagination'); require('../../vue_shared/components/table_pagination');
require('../../lib/utils/common_utils'); require('../../lib/utils/common_utils');
@ -18,7 +18,7 @@ module.exports = Vue.component('environment-component', {
data() { data() {
const environmentsData = document.querySelector('#environments-list-view').dataset; const environmentsData = document.querySelector('#environments-list-view').dataset;
const store = new Store(); const store = new EnvironmentsStore();
return { return {
store, store,

11
app/assets/javascripts/environments/folder/environments_folder_view.js.es6
View file

@ -5,7 +5,7 @@ const Vue = require('vue');
Vue.use(require('vue-resource')); Vue.use(require('vue-resource'));
const EnvironmentsService = require('../services/environments_service'); const EnvironmentsService = require('../services/environments_service');
const EnvironmentTable = require('../components/environments_table'); const EnvironmentTable = require('../components/environments_table');
const Store = require('../stores/environments_store'); const EnvironmentsStore = require('../stores/environments_store');
require('../../vue_shared/components/table_pagination'); require('../../vue_shared/components/table_pagination');
require('../../lib/utils/common_utils'); require('../../lib/utils/common_utils');
@ -18,9 +18,10 @@ module.exports = Vue.component('environment-folder-view', {
data() { data() {
const environmentsData = document.querySelector('#environments-folder-list-view').dataset; const environmentsData = document.querySelector('#environments-folder-list-view').dataset;
const store = new Store(); const store = new EnvironmentsStore();
const endpoint = `${window.location.pathname}.json`; const pathname = window.location.pathname;
const folderName = window.location.pathname.substr(window.location.pathname.lastIndexOf('/') + 1); const endpoint = `${pathname}.json`;
const folderName = pathname.substr(pathname.lastIndexOf('/') + 1);
return { return {
store, store,
@ -99,7 +100,7 @@ module.exports = Vue.component('environment-folder-view', {
this.store.storeAvailableCount(response.body.available_count); this.store.storeAvailableCount(response.body.available_count);
this.store.storeStoppedCount(response.body.stopped_count); this.store.storeStoppedCount(response.body.stopped_count);
this.store.storeEnvironments(response.body.environments); this.store.storeEnvironments(response.body.environments);
this.store.storePagination(response.headers); this.store.setPagination(response.headers);
}) })
.then(() => { .then(() => {
this.isLoading = false; this.isLoading = false;

12
app/assets/javascripts/lib/utils/common_utils.js.es6
View file

@ -256,19 +256,19 @@
*/ */
w.gl.utils.setParamInURL = (param, value) => { w.gl.utils.setParamInURL = (param, value) => {
let search; let search;
const locationSearch = window.location.search;
if (window.location.search.length === 0) { if (locationSearch.length === 0) {
search = `?${param}=${value}`; search = `?${param}=${value}`;
} }
if (window.location.search.indexOf(param) !== -1) { if (locationSearch.indexOf(param) !== -1) {
const regex = new RegExp(param + '=\\d'); const regex = new RegExp(param + '=\\d');
search = window.location.search.replace(regex, `${param}=${value}`); search = locationSearch.replace(regex, `${param}=${value}`);
} }
if (window.location.search.length && if (locationSearch.length && locationSearch.indexOf(param) === -1) {
window.location.search.indexOf(param) === -1) { search = `${locationSearch}&${param}=${value}`;
search = `${window.location.search}&${param}=${value}`;
} }
return search; return search;