Merge branch 'winh-multiple-issueboards-core-ee' into 'master'

Move multiple issue boards frontend to core

See merge request gitlab-org/gitlab-ee!14514

ee/app/assets/javascripts/boards/components/board_form.vue → app/assets/javascripts/boards/components/board_form.vue

 <script>
 import Flash from '~/flash';
 import DeprecatedModal from '~/vue_shared/components/deprecated_modal.vue';
-import BoardScope from './board_scope.vue';
 import { visitUrl } from '~/lib/utils/url_utility';
 import boardsStore from '~/boards/stores/boards_store';
 
@@ -17,7 +16,7 @@ const boardDefaults = {
 
 export default {
   components: {
-    BoardScope,
+    BoardScope: () => import('ee_component/boards/components/board_scope.vue'),
     DeprecatedModal,
   },
   props: {

ee/app/assets/javascripts/boards/components/boards_selector.vue → app/assets/javascripts/boards/components/boards_selector.vue

@@ -10,9 +10,9 @@ import {
 } from '@gitlab/ui';
 
 import Icon from '~/vue_shared/components/icon.vue';
-import boardsStore from '~/boards/stores/boards_store';
-import BoardForm from './board_form.vue';
 import httpStatusCodes from '~/lib/utils/http_status';
+import boardsStore from '../stores/boards_store';
+import BoardForm from './board_form.vue';
 
 const MIN_BOARDS_TO_VIEW_RECENT = 10;
 

app/assets/javascripts/boards/index.js

 import $ from 'jquery';
 import Vue from 'vue';
 
-import mountMultipleBoardsSwitcher from 'ee_else_ce/boards/mount_multiple_boards_switcher';
 import Flash from '~/flash';
 import { __ } from '~/locale';
 import './models/label';
@@ -31,6 +30,7 @@ import {
 } from '~/lib/utils/common_utils';
 import boardConfigToggle from 'ee_else_ce/boards/config_toggle';
 import toggleFocusMode from 'ee_else_ce/boards/toggle_focus';
+import mountMultipleBoardsSwitcher from './mount_multiple_boards_switcher';
 
 let issueBoardsApp;
 

app/assets/javascripts/boards/mount_multiple_boards_switcher.js

-// this will be moved from EE to CE as part of https://gitlab.com/gitlab-org/gitlab-ce/issues/53811
-export default () => {};
+import Vue from 'vue';
+import { parseBoolean } from '~/lib/utils/common_utils';
+import BoardsSelector from '~/boards/components/boards_selector.vue';
+
+export default () => {
+  const boardsSwitcherElement = document.getElementById('js-multiple-boards-switcher');
+  return new Vue({
+    el: boardsSwitcherElement,
+    components: {
+      BoardsSelector,
+    },
+    data() {
+      const { dataset } = boardsSwitcherElement;
+
+      const boardsSelectorProps = {
+        ...dataset,
+        currentBoard: JSON.parse(dataset.currentBoard),
+        hasMissingBoards: parseBoolean(dataset.hasMissingBoards),
+        canAdminBoard: parseBoolean(dataset.canAdminBoard),
+        multipleIssueBoardsAvailable: parseBoolean(dataset.multipleIssueBoardsAvailable),
+        projectId: Number(dataset.projectId),
+        groupId: Number(dataset.groupId),
+        scopedIssueBoardFeatureEnabled: parseBoolean(dataset.scopedIssueBoardFeatureEnabled),
+        weights: JSON.parse(dataset.weights),
+      };
+
+      return { boardsSelectorProps };
+    },
+    render(createElement) {
+      return createElement(BoardsSelector, {
+        props: this.boardsSelectorProps,
+      });
+    },
+  });
+};

ee/app/views/shared/boards/_switcher.html.haml → app/views/shared/boards/_switcher.html.haml

 - parent = board.parent
 - milestone_filter_opts = { format: :json }
 - milestone_filter_opts = milestone_filter_opts.merge(only_group_milestones: true) if board.group_board?
+- weights = Gitlab.ee? ? ([Issue::WEIGHT_ANY] + Issue.weight_options) : []
 
 #js-multiple-boards-switcher.inline.boards-switcher{ data: { current_board: current_board_json.to_json,
     milestone_path: milestones_filter_path(milestone_filter_opts),
@@ -11,5 +12,5 @@
     labels_path: labels_filter_path_with_defaults(only_group_labels: true, include_descendant_groups: true),
     project_id: @project&.id,
     group_id: @group&.id,
-    scoped_issue_board_feature_enabled: parent.feature_available?(:scoped_issue_board) ? 'true' : 'false',
-    weights: ([Issue::WEIGHT_ANY] + Issue.weight_options).to_json } }
+    scoped_issue_board_feature_enabled: Gitlab.ee? && parent.feature_available?(:scoped_issue_board) ? 'true' : 'false',
+    weights: weights.to_json } }

app/views/shared/issuable/_search_bar.html.haml

@@ -6,7 +6,7 @@
 .issues-filters{ class: ("w-100" if type == :boards_modal) }
   .issues-details-filters.filtered-search-block.d-flex.flex-column.flex-md-row{ class: block_css_class, "v-pre" => type == :boards_modal }
     - if type == :boards
-      = render_if_exists "shared/boards/switcher", board: board
+      = render "shared/boards/switcher", board: board
     = form_tag page_filter_path, method: :get, class: 'filter-form js-filter-form w-100' do
       - if params[:search].present?
         = hidden_field_tag :search, params[:search]

changelogs/unreleased/winh-multiple-issueboards-core.yml

+---
+title: Move multiple issue boards to core
+merge_request: 30503
+author:
+type: changed

ee/app/assets/javascripts/boards/components/assignee_select.vue

@@ -48,7 +48,8 @@ export default {
     },
     selected: {
       type: Object,
-      required: true,
+      required: false,
+      default: () => null,
     },
     wrapperClass: {
       type: String,
@@ -58,7 +59,7 @@ export default {
   },
   computed: {
     hasValue() {
-      return this.selected.id > 0;
+      return this.selected && this.selected.id > 0;
     },
     selectedId() {
       return this.selected ? this.selected.id : null;

ee/app/assets/javascripts/boards/mount_multiple_boards_switcher.js

-import Vue from 'vue';
-import { parseBoolean } from '~/lib/utils/common_utils';
-import BoardsSelector from 'ee/boards/components/boards_selector.vue';
-
-export default () => {
-  const boardsSwitcherElement = document.getElementById('js-multiple-boards-switcher');
-  return new Vue({
-    el: boardsSwitcherElement,
-    components: {
-      BoardsSelector,
-    },
-    data() {
-      const { dataset } = boardsSwitcherElement;
-
-      const boardsSelectorProps = {
-        ...dataset,
-        currentBoard: JSON.parse(dataset.currentBoard),
-        hasMissingBoards: parseBoolean(dataset.hasMissingBoards),
-        canAdminBoard: parseBoolean(dataset.canAdminBoard),
-        multipleIssueBoardsAvailable: parseBoolean(dataset.multipleIssueBoardsAvailable),
-        projectId: Number(dataset.projectId),
-        groupId: Number(dataset.groupId),
-        scopedIssueBoardFeatureEnabled: parseBoolean(dataset.scopedIssueBoardFeatureEnabled),
-        weights: JSON.parse(dataset.weights),
-      };
-
-      return { boardsSelectorProps };
-    },
-    render(createElement) {
-      return createElement(BoardsSelector, {
-        props: this.boardsSelectorProps,
-      });
-    },
-  });
-};

ee/spec/javascripts/boards/components/board_form_spec.js → spec/javascripts/boards/components/board_form_spec.js

 import $ from 'jquery';
 import Vue from 'vue';
 import boardsStore from '~/boards/stores/boards_store';
-import boardForm from 'ee/boards/components/board_form.vue';
+import boardForm from '~/boards/components/board_form.vue';
 import mountComponent from 'spec/helpers/vue_mount_component_helper';
 
 describe('board_form.vue', () => {

ee/spec/javascripts/boards/components/boards_selector_spec.js → spec/javascripts/boards/components/boards_selector_spec.js

 import Vue from 'vue';
-import BoardService from 'ee/boards/services/board_service';
-import BoardsSelector from 'ee/boards/components/boards_selector.vue';
+import BoardService from '~/boards/services/board_service';
+import BoardsSelector from '~/boards/components/boards_selector.vue';
 import mountComponent from 'spec/helpers/vue_mount_component_helper';
 import { TEST_HOST } from 'spec/test_constants';
 import boardsStore from '~/boards/stores/boards_store';