Commit d58a6c69 authored by Enrique Alcántara's avatar Enrique Alcántara

Merge branch 'afontaine/environments-reset-page-when-tab-change' into 'master'

Reset the page to 1 when changing tabs

See merge request gitlab-org/gitlab!78127
parents 96453ede 49b39610
...@@ -145,7 +145,7 @@ export default { ...@@ -145,7 +145,7 @@ export default {
}, },
setScope(scope) { setScope(scope) {
this.scope = scope; this.scope = scope;
this.resetPolling(); this.moveToPage(1);
}, },
movePage(direction) { movePage(direction) {
this.moveToPage(this.pageInfo[`${direction}Page`]); this.moveToPage(this.pageInfo[`${direction}Page`]);
......
...@@ -187,7 +187,7 @@ describe('~/environments/components/new_environments_app.vue', () => { ...@@ -187,7 +187,7 @@ describe('~/environments/components/new_environments_app.vue', () => {
expect(environmentAppMock).toHaveBeenCalledWith( expect(environmentAppMock).toHaveBeenCalledWith(
expect.anything(), expect.anything(),
expect.objectContaining({ scope: 'stopped' }), expect.objectContaining({ scope: 'stopped', page: 1 }),
expect.anything(), expect.anything(),
expect.anything(), expect.anything(),
); );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment