Add latest changes from gitlab-org/gitlab@master

3 files changed, 14 insertions, 2 deletions

diff --git a/app/assets/javascripts/boards/components/board_card_inner.vue b/app/assets/javascripts/boards/components/board_card_inner.vue
index 6830c96a6a9..ecac208b1e0 100644
--- a/app/assets/javascripts/boards/components/board_card_inner.vue
+++ b/app/assets/javascripts/boards/components/board_card_inner.vue
@@ -9,7 +9,7 @@ import {
 } from '@gitlab/ui';
 import { sortBy } from 'lodash';
 // eslint-disable-next-line no-restricted-imports
-import { mapActions, mapState } from 'vuex';
+import { mapActions } from 'vuex';
 import boardCardInner from 'ee_else_ce/boards/mixins/board_card_inner';
 import { isScopedLabel } from '~/lib/utils/common_utils';
 import { updateHistory } from '~/lib/utils/url_utility';
@@ -21,6 +21,7 @@ import IssuableBlockedIcon from '~/vue_shared/components/issuable_blocked_icon/i
 import { ListType } from '../constants';
 import eventHub from '../eventhub';
 import { setError } from '../graphql/cache_updates';
+import isShowingLabelsQuery from '../graphql/client/is_showing_labels.query.graphql';
 import IssueDueDate from './issue_due_date.vue';
 import IssueTimeEstimate from './issue_time_estimate.vue';
 
@@ -86,8 +87,13 @@ export default {
       maxCounter: 99,
     };
   },
+  apollo: {
+    isShowingLabels: {
+      query: isShowingLabelsQuery,
+      update: (data) => data.isShowingLabels,
+    },
+  },
   computed: {
-    ...mapState(['isShowingLabels']),
     isLoading() {
       return this.item.isLoading || this.item.iid === '-1';
     },
diff --git a/app/assets/javascripts/boards/graphql/client/is_showing_labels.query.graphql b/app/assets/javascripts/boards/graphql/client/is_showing_labels.query.graphql
new file mode 100644
index 00000000000..dc16f7ad313
--- /dev/null
+++ b/app/assets/javascripts/boards/graphql/client/is_showing_labels.query.graphql
@@ -0,0 +1,3 @@
+query isShowingLabels {
+  isShowingLabels @client
+}
diff --git a/app/assets/javascripts/boards/graphql/client/set_is_showing_labels.mutation.graphql b/app/assets/javascripts/boards/graphql/client/set_is_showing_labels.mutation.graphql
new file mode 100644
index 00000000000..2f115291977
--- /dev/null
+++ b/app/assets/javascripts/boards/graphql/client/set_is_showing_labels.mutation.graphql
@@ -0,0 +1,3 @@
+mutation setIsShowingLabels($isShowingLabels: Boolean!) {
+  setIsShowingLabels(isShowingLabels: $isShowingLabels) @client
+}