Add latest changes from gitlab-org/gitlab@master

8 files changed, 27 insertions, 29 deletions

diff --git a/app/assets/javascripts/boards/components/board_card_inner.vue b/app/assets/javascripts/boards/components/board_card_inner.vue
index 1c67a2d9f7f..05c786ca61d 100644
--- a/app/assets/javascripts/boards/components/board_card_inner.vue
+++ b/app/assets/javascripts/boards/components/board_card_inner.vue
@@ -43,7 +43,7 @@ export default {
     GlTooltip: GlTooltipDirective,
   },
   mixins: [boardCardInner],
-  inject: ['rootPath', 'scopedLabelsAvailable'],
+  inject: ['rootPath', 'scopedLabelsAvailable', 'isEpicBoard'],
   props: {
     item: {
       type: Object,
@@ -78,7 +78,7 @@ export default {
   },
   computed: {
     ...mapState(['isShowingLabels', 'issuableType', 'allowSubEpics']),
-    ...mapGetters(['isEpicBoard', 'isProjectBoard']),
+    ...mapGetters(['isProjectBoard']),
     cappedAssignees() {
       // e.g. maxRender is 4,
       // Render up to all 4 assignees if there are only 4 assigness
diff --git a/app/assets/javascripts/boards/components/board_content.vue b/app/assets/javascripts/boards/components/board_content.vue
index 9230513ff93..150378f7a7d 100644
--- a/app/assets/javascripts/boards/components/board_content.vue
+++ b/app/assets/javascripts/boards/components/board_content.vue
@@ -7,12 +7,7 @@ import { s__ } from '~/locale';
 import { formatBoardLists } from 'ee_else_ce/boards/boards_util';
 import BoardAddNewColumn from 'ee_else_ce/boards/components/board_add_new_column.vue';
 import { defaultSortableOptions } from '~/sortable/constants';
-import {
-  DraggableItemTypes,
-  issuableTypes,
-  BoardType,
-  listsQuery,
-} from 'ee_else_ce/boards/constants';
+import { DraggableItemTypes, BoardType, listsQuery } from 'ee_else_ce/boards/constants';
 import BoardColumn from './board_column.vue';
 
 export default {
@@ -31,7 +26,15 @@ export default {
     EpicsSwimlanes: () => import('ee_component/boards/components/epics_swimlanes.vue'),
     GlAlert,
   },
-  inject: ['canAdminList', 'boardType', 'fullPath', 'issuableType', 'isApolloBoard'],
+  inject: [
+    'canAdminList',
+    'boardType',
+    'fullPath',
+    'issuableType',
+    'isIssueBoard',
+    'isEpicBoard',
+    'isApolloBoard',
+  ],
   props: {
     disabled: {
       type: Boolean,
@@ -78,12 +81,6 @@ export default {
   computed: {
     ...mapState(['boardLists', 'error', 'addColumnForm']),
     ...mapGetters(['isSwimlanesOn']),
-    isIssueBoard() {
-      return this.issuableType === issuableTypes.issue;
-    },
-    isEpicBoard() {
-      return this.issuableType === issuableTypes.epic;
-    },
     addColumnFormVisible() {
       return this.addColumnForm?.visible;
     },
diff --git a/app/assets/javascripts/boards/components/board_form.vue b/app/assets/javascripts/boards/components/board_form.vue
index eb889344c1e..fcf026bbe00 100644
--- a/app/assets/javascripts/boards/components/board_form.vue
+++ b/app/assets/javascripts/boards/components/board_form.vue
@@ -84,7 +84,7 @@ export default {
   },
   computed: {
     ...mapState(['error']),
-    ...mapGetters(['isIssueBoard', 'isGroupBoard', 'isProjectBoard']),
+    ...mapGetters(['isGroupBoard', 'isProjectBoard']),
     isNewForm() {
       return this.currentPage === formType.new;
     },
diff --git a/app/assets/javascripts/boards/components/board_list.vue b/app/assets/javascripts/boards/components/board_list.vue
index ebf19c32e5e..6a5e2801de5 100644
--- a/app/assets/javascripts/boards/components/board_list.vue
+++ b/app/assets/javascripts/boards/components/board_list.vue
@@ -1,7 +1,7 @@
 <script>
 import { GlLoadingIcon, GlIntersectionObserver } from '@gitlab/ui';
 import Draggable from 'vuedraggable';
-import { mapActions, mapGetters, mapState } from 'vuex';
+import { mapActions, mapState } from 'vuex';
 import { sprintf, __ } from '~/locale';
 import { defaultSortableOptions } from '~/sortable/constants';
 import { sortableStart, sortableEnd } from '~/sortable/utils';
@@ -31,6 +31,7 @@ export default {
     BoardCardMoveToPosition,
   },
   mixins: [Tracking.mixin()],
+  inject: ['isEpicBoard'],
   props: {
     disabled: {
       type: Boolean,
@@ -69,7 +70,6 @@ export default {
   },
   computed: {
     ...mapState(['pageInfoByListId', 'listsFlags', 'filterParams', 'isUpdateIssueOrderInProgress']),
-    ...mapGetters(['isEpicBoard']),
     listItemsCount() {
       return this.isEpicBoard ? this.list.epicsCount : this.boardList?.issuesCount;
     },
diff --git a/app/assets/javascripts/boards/components/board_list_header.vue b/app/assets/javascripts/boards/components/board_list_header.vue
index 230fa4e1e0f..cb2f68df0d1 100644
--- a/app/assets/javascripts/boards/components/board_list_header.vue
+++ b/app/assets/javascripts/boards/components/board_list_header.vue
@@ -57,6 +57,9 @@ export default {
     canCreateEpic: {
       default: false,
     },
+    isEpicBoard: {
+      default: false,
+    },
   },
   props: {
     list: {
@@ -76,7 +79,7 @@ export default {
   },
   computed: {
     ...mapState(['activeId', 'filterParams', 'boardId']),
-    ...mapGetters(['isEpicBoard', 'isSwimlanesOn']),
+    ...mapGetters(['isSwimlanesOn']),
     isLoggedIn() {
       return Boolean(this.currentUserId);
     },
diff --git a/app/assets/javascripts/boards/components/board_settings_sidebar.vue b/app/assets/javascripts/boards/components/board_settings_sidebar.vue
index e93edad675c..c0c2699b63d 100644
--- a/app/assets/javascripts/boards/components/board_settings_sidebar.vue
+++ b/app/assets/javascripts/boards/components/board_settings_sidebar.vue
@@ -31,7 +31,7 @@ export default {
     GlModal: GlModalDirective,
   },
   mixins: [glFeatureFlagMixin(), Tracking.mixin()],
-  inject: ['canAdminList', 'scopedLabelsAvailable'],
+  inject: ['canAdminList', 'scopedLabelsAvailable', 'isIssueBoard'],
   inheritAttrs: false,
   data() {
     return {
@@ -40,10 +40,10 @@ export default {
   },
   modalId: 'board-settings-sidebar-modal',
   computed: {
-    ...mapGetters(['isSidebarOpen', 'isEpicBoard']),
+    ...mapGetters(['isSidebarOpen']),
     ...mapState(['activeId', 'sidebarType', 'boardLists']),
     isWipLimitsOn() {
-      return this.glFeatures.wipLimits && !this.isEpicBoard;
+      return this.glFeatures.wipLimits && this.isIssueBoard;
     },
     activeList() {
       return this.boardLists[this.activeId] || {};
diff --git a/app/assets/javascripts/boards/components/board_top_bar.vue b/app/assets/javascripts/boards/components/board_top_bar.vue
index 54a6e3000a4..368feba9a44 100644
--- a/app/assets/javascripts/boards/components/board_top_bar.vue
+++ b/app/assets/javascripts/boards/components/board_top_bar.vue
@@ -1,5 +1,4 @@
 <script>
-import { mapGetters } from 'vuex';
 import BoardAddNewColumnTrigger from '~/boards/components/board_add_new_column_trigger.vue';
 import BoardsSelector from 'ee_else_ce/boards/components/boards_selector.vue';
 import IssueBoardFilteredSearch from 'ee_else_ce/boards/components/issue_board_filtered_search.vue';
@@ -20,10 +19,7 @@ export default {
     EpicBoardFilteredSearch: () =>
       import('ee_component/boards/components/epic_filtered_search.vue'),
   },
-  inject: ['swimlanesFeatureAvailable', 'canAdminList', 'isSignedIn'],
-  computed: {
-    ...mapGetters(['isEpicBoard']),
-  },
+  inject: ['swimlanesFeatureAvailable', 'canAdminList', 'isSignedIn', 'isIssueBoard'],
 };
 </script>
 
@@ -37,8 +33,8 @@ export default {
       >
         <boards-selector />
         <new-board-button />
-        <epic-board-filtered-search v-if="isEpicBoard" />
-        <issue-board-filtered-search v-else />
+        <issue-board-filtered-search v-if="isIssueBoard" />
+        <epic-board-filtered-search v-else />
       </div>
       <div
         class="filter-dropdown-container gl-md-display-flex gl-flex-direction-column gl-md-flex-direction-row gl-align-items-flex-start"
diff --git a/app/assets/javascripts/boards/index.js b/app/assets/javascripts/boards/index.js
index 9590a3f963e..f8bd81e6b98 100644
--- a/app/assets/javascripts/boards/index.js
+++ b/app/assets/javascripts/boards/index.js
@@ -72,6 +72,8 @@ function mountBoardApp(el) {
       emailsDisabled: parseBoolean(el.dataset.emailsDisabled),
       hasMissingBoards: parseBoolean(el.dataset.hasMissingBoards),
       weights: el.dataset.weights ? JSON.parse(el.dataset.weights) : [],
+      isIssueBoard: true,
+      isEpicBoard: false,
       // Permissions
       canUpdate: parseBoolean(el.dataset.canUpdate),
       canAdminList: parseBoolean(el.dataset.canAdminList),