Merge branch '413642-redirect-if-envs-page-empty' into 'master'

Redirect is current environment page empty empty

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/143847



Merged-by: Andrew Fontaine <afontaine@gitlab.com>
Approved-by: Anna Vovchenko <avovchenko@gitlab.com>
Approved-by: Emily Bauman <ebauman@gitlab.com>
Approved-by: Andrew Fontaine <afontaine@gitlab.com>
Reviewed-by: Anna Vovchenko <avovchenko@gitlab.com>
Co-authored-by: Ivan Shtyrliaiev <ee923925@gmail.com>
Co-authored-by: Anna Vovchenko <avovchenko@gitlab.com>

ee/app/assets/javascripts/protected_environments/store/edit/actions.js

@@ -154,12 +154,16 @@ export const updateApproverInheritance = ({ commit }, { rule, value }) => {
 
 export const editRule = ({ commit }, rule) => commit(types.EDIT_RULE, rule);
 
-export const unprotectEnvironment = ({ state, commit }, environment) => {
+export const unprotectEnvironment = ({ state, commit, dispatch }, environment) => {
   commit(types.REQUEST_UPDATE_PROTECTED_ENVIRONMENT);
 
   return Api.deleteProtectedEnvironment(state.projectId, environment)
     .then(() => {
       commit(types.DELETE_PROTECTED_ENVIRONMENT_SUCCESS, environment);
+
+      if (!state.protectedEnvironments.length && state.pageInfo.page > 1) {
+        dispatch('setPage', state.pageInfo.page - 1);
+      }
     })
     .catch((error) => {
       commit(types.RECEIVE_UPDATE_PROTECTED_ENVIRONMENT_ERROR, error);

ee/spec/frontend/protected_environments/store/edit/actions_spec.js

@@ -426,5 +426,38 @@ describe('ee/protected_environments/store/edit/actions', () => {
         [],
       );
     });
+
+    it('redirects to previous page after deleting if current page is empty', () => {
+      const environment = {
+        name: 'staging',
+      };
+
+      mockedState.pageInfo = {
+        page: 2,
+        nextPage: null,
+        previousPage: 1,
+        perPage: 10,
+        total: 11,
+        totalPages: 2,
+      };
+
+      mock.onDelete(url, environment).replyOnce(HTTP_STATUS_OK);
+
+      return testAction({
+        action: unprotectEnvironment,
+        payload: environment,
+        state: mockedState,
+        expectedMutations: [
+          { type: types.REQUEST_UPDATE_PROTECTED_ENVIRONMENT },
+          { type: types.DELETE_PROTECTED_ENVIRONMENT_SUCCESS, payload: environment },
+        ],
+        expectedActions: [
+          {
+            type: 'setPage',
+            payload: 1,
+          },
+        ],
+      });
+    });
   });
 });