Merge branch 'bugfix/swimlanes-encode-label-with-space' into 'master'

Swimlanes - Fix url encoding when adding group_by param

See merge request gitlab-org/gitlab!45853

ee/app/assets/javascripts/boards/stores/actions.js

@@ -4,7 +4,7 @@ import axios from '~/lib/utils/axios_utils';
 import boardsStore from '~/boards/stores/boards_store';
 import { __ } from '~/locale';
 import { historyPushState, parseBoolean } from '~/lib/utils/common_utils';
-import { setUrlParams, removeParams } from '~/lib/utils/url_utility';
+import { mergeUrlParams, removeParams } from '~/lib/utils/url_utility';
 import actionsCE from '~/boards/stores/actions';
 import { BoardType, ListType } from '~/boards/constants';
 import { EpicFilterType, GroupByParamType } from '../constants';
@@ -307,7 +307,7 @@ export default {
     commit(types.TOGGLE_EPICS_SWIMLANES);
 
     if (state.isShowingEpicsSwimlanes) {
-      historyPushState(setUrlParams({ group_by: GroupByParamType.epic }, window.location.href));
+      historyPushState(mergeUrlParams({ group_by: GroupByParamType.epic }, window.location.href));
       dispatch('fetchEpicsSwimlanes', {});
     } else if (!gon.features.graphqlBoardLists) {
       historyPushState(removeParams(['group_by']));

ee/spec/frontend/boards/stores/actions_spec.js

 import axios from 'axios';
 import MockAdapter from 'axios-mock-adapter';
+import { TEST_HOST } from 'helpers/test_constants';
 import boardsStoreEE from 'ee/boards/stores/boards_store_ee';
 import actions, { gqlClient } from 'ee/boards/stores/actions';
 import * as types from 'ee/boards/stores/mutation_types';
@@ -7,7 +8,7 @@ import { GroupByParamType } from 'ee/boards/constants';
 import testAction from 'helpers/vuex_action_helper';
 import * as typesCE from '~/boards/stores/mutation_types';
 import * as commonUtils from '~/lib/utils/common_utils';
-import { setUrlParams, removeParams } from '~/lib/utils/url_utility';
+import { mergeUrlParams, removeParams } from '~/lib/utils/url_utility';
 import { ListType } from '~/boards/constants';
 import { formatListIssues } from '~/boards/boards_util';
 import {
@@ -448,6 +449,10 @@ describe('fetchIssuesForEpic', () => {
 
 describe('toggleEpicSwimlanes', () => {
   it('should commit mutation TOGGLE_EPICS_SWIMLANES', () => {
+    global.jsdom.reconfigure({
+      url: `${TEST_HOST}/groups/gitlab-org/-/boards/1?group_by=epic`,
+    });
+
     const state = {
       isShowingEpicsSwimlanes: false,
       endpoints: {
@@ -464,11 +469,16 @@ describe('toggleEpicSwimlanes', () => {
       [],
       () => {
         expect(commonUtils.historyPushState).toHaveBeenCalledWith(removeParams(['group_by']));
+        expect(global.window.location.href).toBe(`${TEST_HOST}/groups/gitlab-org/-/boards/1`);
       },
     );
   });
 
   it('should dispatch fetchEpicsSwimlanes action when isShowingEpicsSwimlanes is true', () => {
+    global.jsdom.reconfigure({
+      url: `${TEST_HOST}/groups/gitlab-org/-/boards/1`,
+    });
+
     jest.spyOn(gqlClient, 'query').mockResolvedValue({});
 
     const state = {
@@ -487,7 +497,10 @@ describe('toggleEpicSwimlanes', () => {
       [{ type: 'fetchEpicsSwimlanes', payload: {} }],
       () => {
         expect(commonUtils.historyPushState).toHaveBeenCalledWith(
-          setUrlParams({ group_by: GroupByParamType.epic }, window.location.href),
+          mergeUrlParams({ group_by: GroupByParamType.epic }, window.location.href),
+        );
+        expect(global.window.location.href).toBe(
+          `${TEST_HOST}/groups/gitlab-org/-/boards/1?group_by=epic`,
         );
       },
     );