Commit 16f9857b authored by Florie Guibert's avatar Florie Guibert

Remove boards_with_swimlanes feature flag

Review feedback
parent 7a7dd923
import FilteredSearchBoards from '../../filtered_search_boards'; import FilteredSearchBoards from '../../filtered_search_boards';
import FilteredSearchContainer from '../../../filtered_search/container'; import FilteredSearchContainer from '../../../filtered_search/container';
import vuexstore from '~/boards/stores';
export default { export default {
name: 'modal-filters', name: 'modal-filters',
...@@ -12,7 +13,7 @@ export default { ...@@ -12,7 +13,7 @@ export default {
mounted() { mounted() {
FilteredSearchContainer.container = this.$el; FilteredSearchContainer.container = this.$el;
this.filteredSearch = new FilteredSearchBoards(this.store); this.filteredSearch = new FilteredSearchBoards(this.store, vuexstore);
this.filteredSearch.setup(); this.filteredSearch.setup();
this.filteredSearch.removeTokens(); this.filteredSearch.removeTokens();
this.filteredSearch.handleInputPlaceholder(); this.filteredSearch.handleInputPlaceholder();
......
...@@ -4,7 +4,7 @@ import FilteredSearchContainer from '../filtered_search/container'; ...@@ -4,7 +4,7 @@ import FilteredSearchContainer from '../filtered_search/container';
import boardsStore from './stores/boards_store'; import boardsStore from './stores/boards_store';
export default class FilteredSearchBoards extends FilteredSearchManager { export default class FilteredSearchBoards extends FilteredSearchManager {
constructor(store, updateUrl = false, cantEdit = [], vuexstore = {}) { constructor(store, vuexstore, updateUrl = false, cantEdit = []) {
super({ super({
page: 'boards', page: 'boards',
isGroupDecendent: true, isGroupDecendent: true,
......
...@@ -154,9 +154,9 @@ export default () => { ...@@ -154,9 +154,9 @@ export default () => {
mounted() { mounted() {
this.filterManager = new FilteredSearchBoards( this.filterManager = new FilteredSearchBoards(
boardsStore.filter, boardsStore.filter,
store,
true, true,
boardsStore.cantEdit, boardsStore.cantEdit,
store,
); );
this.filterManager.setup(); this.filterManager.setup();
...@@ -200,7 +200,7 @@ export default () => { ...@@ -200,7 +200,7 @@ export default () => {
this.resetEpics(); this.resetEpics();
this.resetIssues(); this.resetIssues();
this.fetchEpicsSwimlanes({}); this.fetchEpicsSwimlanes({});
} else if (gon.features.graphqlBoardLists && !this.isSwimlanesOn) { } else if (gon.features.graphqlBoardLists) {
this.fetchLists(); this.fetchLists();
this.resetIssues(); this.resetIssues();
} }
......
...@@ -4,9 +4,7 @@ import { inactiveId } from '../constants'; ...@@ -4,9 +4,7 @@ import { inactiveId } from '../constants';
export default { export default {
labelToggleState: state => (state.isShowingLabels ? 'on' : 'off'), labelToggleState: state => (state.isShowingLabels ? 'on' : 'off'),
isSidebarOpen: state => state.activeId !== inactiveId, isSidebarOpen: state => state.activeId !== inactiveId,
isSwimlanesOn: () => { isSwimlanesOn: () => false,
return false;
},
getIssueById: state => id => { getIssueById: state => id => {
return state.issues[id] || {}; return state.issues[id] || {};
}, },
......
...@@ -4,11 +4,7 @@ export default { ...@@ -4,11 +4,7 @@ export default {
...gettersCE, ...gettersCE,
isSwimlanesOn: state => { isSwimlanesOn: state => {
if (!gon?.features?.swimlanes) { return Boolean(gon?.features?.swimlanes && state.isShowingEpicsSwimlanes);
return false;
}
return state.isShowingEpicsSwimlanes;
}, },
getIssuesByEpic: (state, getters) => (listId, epicId) => { getIssuesByEpic: (state, getters) => (listId, epicId) => {
return getters.getIssuesByList(listId).filter(issue => issue.epic && issue.epic.id === epicId); return getters.getIssuesByList(listId).filter(issue => issue.epic && issue.epic.id === epicId);
......
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