Merge branch 'nested-env' into 'master'

Show nested environments when change tab, page

See merge request gitlab-org/gitlab!55167

app/assets/javascripts/environments/mixins/environments_pagination_api_mixin.js

@@ -16,6 +16,7 @@ export default {
       let params = {
         scope,
         page: '1',
+        nested: true,
       };
 
       params = this.onChangeWithFilter(params);
@@ -27,6 +28,7 @@ export default {
       /* URLS parameters are strings, we need to parse to match types */
       let params = {
         page: Number(page).toString(),
+        nested: true,
       };
 
       if (this.scope) {

changelogs/unreleased/show-nested-env.yml

+---
+title: Show nested environments when change tab, page
+merge_request: 55167
+author:
+type: changed

spec/frontend/environments/environments_app_spec.js

@@ -97,13 +97,21 @@ describe('Environment', () => {
           jest.spyOn(wrapper.vm, 'updateContent').mockImplementation(() => {});
 
           wrapper.find('.gl-pagination li:nth-child(3) .page-link').trigger('click');
-          expect(wrapper.vm.updateContent).toHaveBeenCalledWith({ scope: 'available', page: '2' });
+          expect(wrapper.vm.updateContent).toHaveBeenCalledWith({
+            scope: 'available',
+            page: '2',
+            nested: true,
+          });
         });
 
         it('should make an API request when using tabs', () => {
           jest.spyOn(wrapper.vm, 'updateContent').mockImplementation(() => {});
           findEnvironmentsTabStopped().trigger('click');
-          expect(wrapper.vm.updateContent).toHaveBeenCalledWith({ scope: 'stopped', page: '1' });
+          expect(wrapper.vm.updateContent).toHaveBeenCalledWith({
+            scope: 'stopped',
+            page: '1',
+            nested: true,
+          });
         });
 
         it('should not make the same API request when clicking on the current scope tab', () => {

spec/frontend/environments/folder/environments_folder_view_spec.js

@@ -103,13 +103,18 @@ describe('Environments Folder View', () => {
         expect(wrapper.vm.updateContent).toHaveBeenCalledWith({
           scope: wrapper.vm.scope,
           page: '10',
+          nested: true,
         });
       });
 
       it('should make an API request when using tabs', () => {
         jest.spyOn(wrapper.vm, 'updateContent').mockImplementation(() => {});
         findEnvironmentsTabStopped().trigger('click');
-        expect(wrapper.vm.updateContent).toHaveBeenCalledWith({ scope: 'stopped', page: '1' });
+        expect(wrapper.vm.updateContent).toHaveBeenCalledWith({
+          scope: 'stopped',
+          page: '1',
+          nested: true,
+        });
       });
     });
   });
@@ -161,7 +166,11 @@ describe('Environments Folder View', () => {
       it('should set page to 1', () => {
         jest.spyOn(wrapper.vm, 'updateContent').mockImplementation(() => {});
         wrapper.vm.onChangeTab('stopped');
-        expect(wrapper.vm.updateContent).toHaveBeenCalledWith({ scope: 'stopped', page: '1' });
+        expect(wrapper.vm.updateContent).toHaveBeenCalledWith({
+          scope: 'stopped',
+          page: '1',
+          nested: true,
+        });
       });
     });
 
@@ -172,6 +181,7 @@ describe('Environments Folder View', () => {
         expect(wrapper.vm.updateContent).toHaveBeenCalledWith({
           scope: wrapper.vm.scope,
           page: '4',
+          nested: true,
         });
       });
     });