Commit 76980df6 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '230582-remove-ff' into 'master'

Remove multi_select_board feature flag

See merge request gitlab-org/gitlab!46430
parents 65e57ef3 82ce6d17
...@@ -44,9 +44,6 @@ export default { ...@@ -44,9 +44,6 @@ export default {
multiSelectVisible() { multiSelectVisible() {
return this.multiSelect.list.findIndex(issue => issue.id === this.issue.id) > -1; return this.multiSelect.list.findIndex(issue => issue.id === this.issue.id) > -1;
}, },
canMultiSelect() {
return gon.features && gon.features.multiSelectBoard;
},
}, },
methods: { methods: {
mouseDown() { mouseDown() {
...@@ -59,7 +56,7 @@ export default { ...@@ -59,7 +56,7 @@ export default {
// Don't do anything if this happened on a no trigger element // Don't do anything if this happened on a no trigger element
if (e.target.classList.contains('js-no-trigger')) return; if (e.target.classList.contains('js-no-trigger')) return;
const isMultiSelect = this.canMultiSelect && (e.ctrlKey || e.metaKey); const isMultiSelect = e.ctrlKey || e.metaKey;
if (this.showDetail || isMultiSelect) { if (this.showDetail || isMultiSelect) {
this.showDetail = false; this.showDetail = false;
......
...@@ -16,9 +16,7 @@ import { ...@@ -16,9 +16,7 @@ import {
// This component is being replaced in favor of './board_list_new.vue' for GraphQL boards // This component is being replaced in favor of './board_list_new.vue' for GraphQL boards
if (gon.features && gon.features.multiSelectBoard) { Sortable.mount(new MultiDrag());
Sortable.mount(new MultiDrag());
}
export default { export default {
name: 'BoardList', name: 'BoardList',
...@@ -100,12 +98,11 @@ export default { ...@@ -100,12 +98,11 @@ export default {
mounted() { mounted() {
// TODO: Use Draggable in ./board_list_new.vue to drag & drop issue // TODO: Use Draggable in ./board_list_new.vue to drag & drop issue
// https://gitlab.com/gitlab-org/gitlab/-/issues/218164 // https://gitlab.com/gitlab-org/gitlab/-/issues/218164
const multiSelectOpts = {}; const multiSelectOpts = {
if (gon.features && gon.features.multiSelectBoard) { multiDrag: true,
multiSelectOpts.multiDrag = true; selectedClass: 'js-multi-select',
multiSelectOpts.selectedClass = 'js-multi-select'; animation: 500,
multiSelectOpts.animation = 500; };
}
const options = getBoardSortableDefaultOptions({ const options = getBoardSortableDefaultOptions({
scroll: true, scroll: true,
......
...@@ -7,7 +7,6 @@ class Groups::BoardsController < Groups::ApplicationController ...@@ -7,7 +7,6 @@ class Groups::BoardsController < Groups::ApplicationController
before_action :authorize_read_board!, only: [:index, :show] before_action :authorize_read_board!, only: [:index, :show]
before_action :assign_endpoint_vars before_action :assign_endpoint_vars
before_action do before_action do
push_frontend_feature_flag(:multi_select_board, default_enabled: true)
push_frontend_feature_flag(:graphql_board_lists, group, default_enabled: false) push_frontend_feature_flag(:graphql_board_lists, group, default_enabled: false)
push_frontend_feature_flag(:boards_with_swimlanes, group, default_enabled: false) push_frontend_feature_flag(:boards_with_swimlanes, group, default_enabled: false)
end end
......
...@@ -8,7 +8,6 @@ class Projects::BoardsController < Projects::ApplicationController ...@@ -8,7 +8,6 @@ class Projects::BoardsController < Projects::ApplicationController
before_action :authorize_read_board!, only: [:index, :show] before_action :authorize_read_board!, only: [:index, :show]
before_action :assign_endpoint_vars before_action :assign_endpoint_vars
before_action do before_action do
push_frontend_feature_flag(:multi_select_board, default_enabled: true)
push_frontend_feature_flag(:boards_with_swimlanes, project, default_enabled: false) push_frontend_feature_flag(:boards_with_swimlanes, project, default_enabled: false)
end end
......
---
name: multi_select_board
introduced_by_url:
rollout_issue_url:
group: group::project management
type: development
default_enabled: true
...@@ -175,7 +175,7 @@ describe('BoardCard', () => { ...@@ -175,7 +175,7 @@ describe('BoardCard', () => {
wrapper.trigger('mousedown'); wrapper.trigger('mousedown');
wrapper.trigger('mouseup'); wrapper.trigger('mouseup');
expect(eventHub.$emit).toHaveBeenCalledWith('newDetailIssue', wrapper.vm.issue, undefined); expect(eventHub.$emit).toHaveBeenCalledWith('newDetailIssue', wrapper.vm.issue, false);
expect(boardsStore.detail.list).toEqual(wrapper.vm.list); expect(boardsStore.detail.list).toEqual(wrapper.vm.list);
}); });
...@@ -188,7 +188,7 @@ describe('BoardCard', () => { ...@@ -188,7 +188,7 @@ describe('BoardCard', () => {
wrapper.trigger('mousedown'); wrapper.trigger('mousedown');
wrapper.trigger('mouseup'); wrapper.trigger('mouseup');
expect(eventHub.$emit).toHaveBeenCalledWith('clearDetailIssue', undefined); expect(eventHub.$emit).toHaveBeenCalledWith('clearDetailIssue', false);
}); });
}); });
......
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