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
Jérome Perrin
gitlab-ce
Commits
595afed2
Commit
595afed2
authored
Feb 09, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Integrates pagination component with API
Adds pagination tests Remove misplaced comment Fix broken store test
parent
fb359808
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
100 additions
and
34 deletions
+100
-34
app/assets/javascripts/environments/components/environment.js.es6
...ts/javascripts/environments/components/environment.js.es6
+22
-15
app/assets/javascripts/environments/components/environment_item.js.es6
...vascripts/environments/components/environment_item.js.es6
+15
-1
app/assets/javascripts/environments/stores/environments_store.js.es6
...javascripts/environments/stores/environments_store.js.es6
+8
-4
app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
+1
-0
app/assets/javascripts/vue_shared/components/table_pagination.js.es6
...javascripts/vue_shared/components/table_pagination.js.es6
+1
-3
spec/javascripts/environments/environment_spec.js.es6
spec/javascripts/environments/environment_spec.js.es6
+23
-5
spec/javascripts/environments/environments_store_spec.js.es6
spec/javascripts/environments/environments_store_spec.js.es6
+30
-6
No files found.
app/assets/javascripts/environments/components/environment.js.es6
View file @
595afed2
...
@@ -59,6 +59,7 @@ module.exports = Vue.component('environment-component', {
...
@@ -59,6 +59,7 @@ module.exports = Vue.component('environment-component', {
canCreateEnvironmentParsed() {
canCreateEnvironmentParsed() {
return this.$options.convertPermissionToBoolean(this.canCreateEnvironment);
return this.$options.convertPermissionToBoolean(this.canCreateEnvironment);
},
},
},
},
/**
/**
...
@@ -68,6 +69,7 @@ module.exports = Vue.component('environment-component', {
...
@@ -68,6 +69,7 @@ module.exports = Vue.component('environment-component', {
created() {
created() {
const scope = this.$options.getQueryParameter('scope') || this.visibility;
const scope = this.$options.getQueryParameter('scope') || this.visibility;
const pageNumber = this.$options.getQueryParameter('page') || this.pageNumber;
const pageNumber = this.$options.getQueryParameter('page') || this.pageNumber;
const endpoint = `${this.endpoint}?scope=${scope}&page=${pageNumber}`;
const endpoint = `${this.endpoint}?scope=${scope}&page=${pageNumber}`;
const service = new EnvironmentsService(endpoint);
const service = new EnvironmentsService(endpoint);
...
@@ -75,14 +77,15 @@ module.exports = Vue.component('environment-component', {
...
@@ -75,14 +77,15 @@ module.exports = Vue.component('environment-component', {
this.isLoading = true;
this.isLoading = true;
return service.all()
return service.all()
.then((resp) => {
.then(resp => ({
debugger;
headers: resp.headers,
return resp.json();
body: resp.json(),
})
}))
.then((json) => {
.then((response) => {
this.store.storeAvailableCount(json.available_count);
this.store.storeAvailableCount(response.body.available_count);
this.store.storeStoppedCount(json.stopped_count);
this.store.storeStoppedCount(response.body.stopped_count);
this.store.storeEnvironments(json.environments);
this.store.storeEnvironments(response.body.environments);
this.store.storePagination(response.headers);
})
})
.then(() => {
.then(() => {
this.isLoading = false;
this.isLoading = false;
...
@@ -122,8 +125,14 @@ module.exports = Vue.component('environment-component', {
...
@@ -122,8 +125,14 @@ module.exports = Vue.component('environment-component', {
return this.store.toggleFolder(model.name);
return this.store.toggleFolder(model.name);
},
},
changePage(pageNumber, scope) {
/**
gl.utils.visitUrl(`?scope=${scope}&p=${pageNumber}`);
* Will change the page number and update the URL.
*
* @param {Number} pageNumber desired page to go to.
*/
changePage(pageNumber) {
const param = window.location.search.replace(/page=\d/g, `page=${pageNumber}`);
gl.utils.visitUrl(param);
},
},
},
},
...
@@ -131,7 +140,7 @@ module.exports = Vue.component('environment-component', {
...
@@ -131,7 +140,7 @@ module.exports = Vue.component('environment-component', {
<div :class="cssContainerClass">
<div :class="cssContainerClass">
<div class="top-area">
<div class="top-area">
<ul v-if="!isLoading" class="nav-links">
<ul v-if="!isLoading" class="nav-links">
<li v-bind:class="{ 'active': scope === undefined }">
<li v-bind:class="{ 'active': scope === undefined
|| scope === 'available'
}">
<a :href="projectEnvironmentsPath">
<a :href="projectEnvironmentsPath">
Available
Available
<span class="badge js-available-environments-count">
<span class="badge js-available-environments-count">
...
@@ -207,11 +216,9 @@ module.exports = Vue.component('environment-component', {
...
@@ -207,11 +216,9 @@ module.exports = Vue.component('environment-component', {
</tbody>
</tbody>
</table>
</table>
<table-pagination v-if="!isLoading && state.environments.length"
<table-pagination v-if="state.paginationInformation && state.paginationInformation.totalPages > 1"
:pagenum="1"
:count="2"
:change="changePage"
:change="changePage"
:pageInfo="paginationInformation">
:pageInfo="
state.
paginationInformation">
</table-pagination>
</table-pagination>
</div>
</div>
</div>
</div>
...
...
app/assets/javascripts/environments/components/environment_item.js.es6
View file @
595afed2
...
@@ -355,6 +355,11 @@ module.exports = Vue.component('environment-item', {
...
@@ -355,6 +355,11 @@ module.exports = Vue.component('environment-item', {
!this.$options.isObjectEmpty(this.model.latest.last_deployment.deployable);
!this.$options.isObjectEmpty(this.model.latest.last_deployment.deployable);
},
},
/**
* Verifies the presence of all the keys needed to render the buil_path.
*
* @return {String}
*/
buildPath(){
buildPath(){
return this.model.latest &&
return this.model.latest &&
this.model.latest.last_deployment &&
this.model.latest.last_deployment &&
...
@@ -363,8 +368,17 @@ module.exports = Vue.component('environment-item', {
...
@@ -363,8 +368,17 @@ module.exports = Vue.component('environment-item', {
'';
'';
},
},
/**
* Verifies the presence of all the keys needed to render the external_url.
*
* @return {String}
*/
externalURL() {
externalURL() {
return this.model.latest && this.model.latest.external_url || '';
if (this.model.latest && this.model.latest.external_url) {
return this.model.latest.external_url;
}
return '';
},
},
/**
/**
...
...
app/assets/javascripts/environments/stores/environments_store.js.es6
View file @
595afed2
...
@@ -44,13 +44,17 @@ class EnvironmentsStore {
...
@@ -44,13 +44,17 @@ class EnvironmentsStore {
}
}
storePagination(pagination = {}) {
storePagination(pagination = {}) {
const normalizedHeaders = gl.utils.normalizedHeaders(pagination);
const normalizedHeaders = gl.utils.normalizeHeaders(pagination);
const paginationInformation = {
const paginationInformation = {
perPage: parseInt(normalizedHeaders['X-PER-PAGE'], 10),
page: parseInt(normalizedHeaders['X-PAGE'], 10),
total: parseInt(normalizedHeaders['X-TOTAL'], 10),
totalPages: parseInt(normalizedHeaders['X-TOTAL-PAGES'], 10),
nextPage: parseInt(normalizedHeaders['X-NEXT-PAGE'], 10),
previousPage: parseInt(normalizedHeaders['X-PREV-PAGE'], 10),
};
};
this.paginationInformation = paginationInformation;
this.
state.
paginationInformation = paginationInformation;
return paginationInformation;
return paginationInformation;
}
}
...
...
app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
View file @
595afed2
...
@@ -36,6 +36,7 @@ require('../vue_shared/components/pipelines_table');
...
@@ -36,6 +36,7 @@ require('../vue_shared/components/pipelines_table');
},
},
methods: {
methods: {
change(pagenum, apiScope) {
change(pagenum, apiScope) {
if (!apiScope) apiScope = 'all';
gl.utils.visitUrl(`?scope=${apiScope}&p=${pagenum}`);
gl.utils.visitUrl(`?scope=${apiScope}&p=${pagenum}`);
},
},
},
},
...
...
app/assets/javascripts/vue_shared/components/table_pagination.js.es6
View file @
595afed2
...
@@ -57,9 +57,7 @@ window.Vue = require('vue');
...
@@ -57,9 +57,7 @@ window.Vue = require('vue');
},
},
methods: {
methods: {
changePage(e) {
changePage(e) {
let apiScope = gl.utils.getParameterByName('scope');
const apiScope = gl.utils.getParameterByName('scope');
if (!apiScope) apiScope = 'all';
const text = e.target.innerText;
const text = e.target.innerText;
const { totalPages, nextPage, previousPage } = this.pageInfo;
const { totalPages, nextPage, previousPage } = this.pageInfo;
...
...
spec/javascripts/environments/environment_spec.js.es6
View file @
595afed2
...
@@ -49,7 +49,7 @@ describe('Environment', () => {
...
@@ -49,7 +49,7 @@ describe('Environment', () => {
});
});
});
});
describe('with environments', () => {
describe('with
paginated
environments', () => {
const environmentsResponseInterceptor = (request, next) => {
const environmentsResponseInterceptor = (request, next) => {
next(request.respondWith(JSON.stringify({
next(request.respondWith(JSON.stringify({
environments: [environment],
environments: [environment],
...
@@ -57,11 +57,22 @@ describe('Environment', () => {
...
@@ -57,11 +57,22 @@ describe('Environment', () => {
available_count: 0,
available_count: 0,
}), {
}), {
status: 200,
status: 200,
headers: {
'X-Next-Page': '2',
'X-Page': '1',
'X-Per-Page': '1',
'X-Prev-Page': '',
'X-Total': '37',
'X-Total-Pages': '2',
},
}));
}));
};
};
beforeEach(() => {
beforeEach(() => {
Vue.http.interceptors.push(environmentsResponseInterceptor);
Vue.http.interceptors.push(environmentsResponseInterceptor);
component = new EnvironmentsComponent({
el: document.querySelector('#environments-list-view'),
});
});
});
afterEach(() => {
afterEach(() => {
...
@@ -71,10 +82,6 @@ describe('Environment', () => {
...
@@ -71,10 +82,6 @@ describe('Environment', () => {
});
});
it('should render a table with environments', (done) => {
it('should render a table with environments', (done) => {
component = new EnvironmentsComponent({
el: document.querySelector('#environments-list-view'),
});
setTimeout(() => {
setTimeout(() => {
expect(
expect(
component.$el.querySelectorAll('table tbody tr').length,
component.$el.querySelectorAll('table tbody tr').length,
...
@@ -82,6 +89,17 @@ describe('Environment', () => {
...
@@ -82,6 +89,17 @@ describe('Environment', () => {
done();
done();
}, 0);
}, 0);
});
});
describe('pagination', () => {
it('should render pagination', (done) => {
setTimeout(() => {
expect(
component.$el.querySelectorAll('.gl-pagination li').length,
).toEqual(5);
done();
}, 0);
});
});
});
});
});
});
...
...
spec/javascripts/environments/environments_store_spec.js.es6
View file @
595afed2
...
@@ -10,24 +10,48 @@ const { environmentsList } = require('./mock_data');
...
@@ -10,24 +10,48 @@ const { environmentsList } = require('./mock_data');
});
});
it('should start with a blank state', () => {
it('should start with a blank state', () => {
expect(store.state.environments.length).toBe(0);
expect(store.state.environments.length).toEqual(0);
expect(store.state.stoppedCounter).toBe(0);
expect(store.state.stoppedCounter).toEqual(0);
expect(store.state.availableCounter).toBe(0);
expect(store.state.availableCounter).toEqual(0);
expect(store.state.paginationInformation).toEqual({});
});
});
it('should store environments', () => {
it('should store environments', () => {
store.storeEnvironments(environmentsList);
store.storeEnvironments(environmentsList);
expect(store.state.environments.length).to
Be
(environmentsList.length);
expect(store.state.environments.length).to
Equal
(environmentsList.length);
});
});
it('should store available count', () => {
it('should store available count', () => {
store.storeAvailableCount(2);
store.storeAvailableCount(2);
expect(store.state.availableCounter).to
Be
(2);
expect(store.state.availableCounter).to
Equal
(2);
});
});
it('should store stopped count', () => {
it('should store stopped count', () => {
store.storeStoppedCount(2);
store.storeStoppedCount(2);
expect(store.state.stoppedCounter).toBe(2);
expect(store.state.stoppedCounter).toEqual(2);
});
it('should store pagination information', () => {
const pagination = {
'X-nExt-pAge': '2',
'X-page': '1',
'X-Per-Page': '1',
'X-Prev-Page': '2',
'X-TOTAL': '37',
'X-Total-Pages': '2',
};
const expectedResult = {
perPage: 1,
page: 1,
total: 37,
totalPages: 2,
nextPage: 2,
previousPage: 2,
};
store.storePagination(pagination);
expect(store.state.paginationInformation).toEqual(expectedResult);
});
});
});
});
})();
})();
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