Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 3 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 053dbb62b2e..a0cc3756fc4 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,8 +1,7 @@
 <script>
 import { GlDropdown, GlDropdownItem } from '@gitlab/ui';
-import { mapActions, mapGetters } from 'vuex';
+import { mapActions, mapGetters, mapState } from 'vuex';
 import { s__ } from '~/locale';
-import { DEFAULT_BOARD_LIST_ITEMS_SIZE } from 'ee_else_ce/boards/constants';
 
 import Tracking from '~/tracking';
 
@@ -34,6 +33,7 @@ export default {
     },
   },
   computed: {
+    ...mapState(['pageInfoByListId']),
     ...mapGetters(['getBoardItemsByList']),
     tracking() {
       return {
@@ -45,6 +45,9 @@ export default {
     listItems() {
       return this.getBoardItemsByList(this.list.id);
     },
+    listHasNextPage() {
+      return this.pageInfoByListId[this.list.id]?.hasNextPage;
+    },
     firstItemInListId() {
       return this.listItems[0]?.id;
     },
@@ -58,7 +61,7 @@ export default {
       return `${this.item.id}-${this.item.iid}-${this.index}`;
     },
     showMoveToEndOfList() {
-      return this.lengthOfListItemsInBoard <= DEFAULT_BOARD_LIST_ITEMS_SIZE;
+      return !this.listHasNextPage;
     },
     isFirstItemInList() {
       return this.index === 0;