Add latest changes from gitlab-org/gitlab@master

4 files changed, 38 insertions, 46 deletions

diff --git a/app/assets/javascripts/boards/components/board_card_move_to_position.vue b/app/assets/javascripts/boards/components/board_card_move_to_position.vue
index 352e891d5ea..706b453e868 100644
--- a/app/assets/javascripts/boards/components/board_card_move_to_position.vue
+++ b/app/assets/javascripts/boards/components/board_card_move_to_position.vue
@@ -1,14 +1,19 @@
 <script>
-import { GlCollapsibleListbox } from '@gitlab/ui';
+import { GlDropdown, GlDropdownItem } from '@gitlab/ui';
 import { mapActions, mapState } from 'vuex';
+import { s__ } from '~/locale';
+
 import Tracking from '~/tracking';
-import { BOARD_CARD_MOVE_TO_POSITION_OPTIONS, MOVE_TO_START } from '../constants';
 
 export default {
-  BOARD_CARD_MOVE_TO_POSITION_OPTIONS,
+  i18n: {
+    moveToStartText: s__('Boards|Move to start of list'),
+    moveToEndText: s__('Boards|Move to end of list'),
+  },
   name: 'BoardCardMoveToPosition',
   components: {
-    GlCollapsibleListbox,
+    GlDropdown,
+    GlDropdownItem,
   },
   mixins: [Tracking.mixin()],
   props: {
@@ -91,30 +96,30 @@ export default {
         allItemsLoadedInList: !this.listHasNextPage,
       });
     },
-    selectMoveAction(action) {
-      if (action === MOVE_TO_START) {
-        this.moveToStart();
-      } else {
-        this.moveToEnd();
-      }
-    },
   },
 };
 </script>
 
 <template>
-  <gl-collapsible-listbox
+  <gl-dropdown
     ref="dropdown"
     :key="itemIdentifier"
-    category="tertiary"
-    class="move-to-position gl-display-block gl-mb-2 gl-ml-2 gl-mt-n3 gl-mr-n3 js-no-trigger"
     icon="ellipsis_v"
-    :items="$options.BOARD_CARD_MOVE_TO_POSITION_OPTIONS"
-    no-caret
-    :tabindex="index"
+    :text="s__('Boards|Move card')"
     :text-sr-only="true"
-    :toggle-text="s__('Boards|Move card')"
+    class="move-to-position gl-display-block gl-mb-2 gl-ml-2 gl-mt-n3 gl-mr-n3"
+    category="tertiary"
+    :tabindex="index"
+    no-caret
     @keydown.esc.native="$emit('hide')"
-    @select="selectMoveAction"
-  />
+  >
+    <div>
+      <gl-dropdown-item @click.stop="moveToStart">
+        {{ $options.i18n.moveToStartText }}
+      </gl-dropdown-item>
+      <gl-dropdown-item @click.stop="moveToEnd">
+        {{ $options.i18n.moveToEndText }}
+      </gl-dropdown-item>
+    </div>
+  </gl-dropdown>
 </template>
diff --git a/app/assets/javascripts/boards/components/issue_board_filtered_search.vue b/app/assets/javascripts/boards/components/issue_board_filtered_search.vue
index e2055325b7a..bc68c2e0e99 100644
--- a/app/assets/javascripts/boards/components/issue_board_filtered_search.vue
+++ b/app/assets/javascripts/boards/components/issue_board_filtered_search.vue
@@ -31,7 +31,7 @@ import {
   TOKEN_TYPE_RELEASE,
   TOKEN_TYPE_TYPE,
 } from '~/vue_shared/components/filtered_search_bar/constants';
-import AuthorToken from '~/vue_shared/components/filtered_search_bar/tokens/author_token.vue';
+import UserToken from '~/vue_shared/components/filtered_search_bar/tokens/user_token.vue';
 import EmojiToken from '~/vue_shared/components/filtered_search_bar/tokens/emoji_token.vue';
 import LabelToken from '~/vue_shared/components/filtered_search_bar/tokens/label_token.vue';
 import MilestoneToken from '~/vue_shared/components/filtered_search_bar/tokens/milestone_token.vue';
@@ -60,7 +60,7 @@ export default {
     tokensCE() {
       const { issue, incident } = this.$options.i18n;
       const { types } = this.$options;
-      const { fetchAuthors, fetchLabels } = issueBoardFilters(
+      const { fetchUsers, fetchLabels } = issueBoardFilters(
         this.$apollo,
         this.fullPath,
         this.boardType,
@@ -72,10 +72,10 @@ export default {
           title: TOKEN_TITLE_ASSIGNEE,
           type: TOKEN_TYPE_ASSIGNEE,
           operators: OPERATORS_IS_NOT,
-          token: AuthorToken,
+          token: UserToken,
           unique: true,
-          fetchAuthors,
-          preloadedAuthors: this.preloadedAuthors(),
+          fetchUsers,
+          preloadedUsers: this.preloadedUsers(),
         },
         {
           icon: 'pencil',
@@ -83,10 +83,10 @@ export default {
           type: TOKEN_TYPE_AUTHOR,
           operators: OPERATORS_IS_NOT,
           symbol: '@',
-          token: AuthorToken,
+          token: UserToken,
           unique: true,
-          fetchAuthors,
-          preloadedAuthors: this.preloadedAuthors(),
+          fetchUsers,
+          preloadedUsers: this.preloadedUsers(),
         },
         {
           icon: 'labels',
@@ -186,7 +186,7 @@ export default {
   },
   methods: {
     ...mapActions(['fetchMilestones']),
-    preloadedAuthors() {
+    preloadedUsers() {
       return gon?.current_user_id
         ? [
             {
diff --git a/app/assets/javascripts/boards/constants.js b/app/assets/javascripts/boards/constants.js
index 696a4a93900..91b7f5004ad 100644
--- a/app/assets/javascripts/boards/constants.js
+++ b/app/assets/javascripts/boards/constants.js
@@ -1,5 +1,5 @@
 import boardListsQuery from 'ee_else_ce/boards/graphql/board_lists.query.graphql';
-import { s__, __ } from '~/locale';
+import { __ } from '~/locale';
 import updateEpicSubscriptionMutation from '~/sidebar/queries/update_epic_subscription.mutation.graphql';
 import updateEpicTitleMutation from '~/sidebar/queries/update_epic_title.mutation.graphql';
 import destroyBoardListMutation from './graphql/board_list_destroy.mutation.graphql';
@@ -141,16 +141,3 @@ export default {
 };
 
 export const DEFAULT_BOARD_LIST_ITEMS_SIZE = 10;
-
-export const MOVE_TO_START = 'moveToStart';
-export const MOVE_TO_END = 'moveToEnd';
-export const BOARD_CARD_MOVE_TO_POSITION_OPTIONS = [
-  {
-    text: s__('Boards|Move to start of list'),
-    value: MOVE_TO_START,
-  },
-  {
-    text: s__('Boards|Move to end of list'),
-    value: MOVE_TO_END,
-  },
-];
diff --git a/app/assets/javascripts/boards/issue_board_filters.js b/app/assets/javascripts/boards/issue_board_filters.js
index 699d7e12de4..4bfd92fb748 100644
--- a/app/assets/javascripts/boards/issue_board_filters.js
+++ b/app/assets/javascripts/boards/issue_board_filters.js
@@ -14,13 +14,13 @@ export default function issueBoardFilters(apollo, fullPath, boardType) {
     return isGroupBoard ? groupBoardMembers : projectBoardMembers;
   };
 
-  const fetchAuthors = (authorsSearchTerm) => {
+  const fetchUsers = (usersSearchTerm) => {
     return apollo
       .query({
         query: boardAssigneesQuery(),
         variables: {
           fullPath,
-          search: authorsSearchTerm,
+          search: usersSearchTerm,
         },
       })
       .then(({ data }) => data.workspace?.assignees.nodes.map(({ user }) => user));
@@ -42,6 +42,6 @@ export default function issueBoardFilters(apollo, fullPath, boardType) {
 
   return {
     fetchLabels,
-    fetchAuthors,
+    fetchUsers,
   };
 }