Add latest changes from gitlab-org/gitlab@master

4 files changed, 5 insertions, 45 deletions

diff --git a/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_form.vue b/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_form.vue
index 336c291d4f1..c44ce8b0057 100644
--- a/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_form.vue
+++ b/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_form.vue
@@ -88,10 +88,7 @@ export default {
         .then(
           ({
             data: {
-              issuableSetConfidential: {
-                issuable: { confidential },
-                errors,
-              },
+              issuableSetConfidential: { errors },
             },
           }) => {
             if (errors.length) {
@@ -99,7 +96,7 @@ export default {
                 message: errors[0],
               });
             } else {
-              this.$emit('closeForm', { confidential });
+              this.$emit('closeForm');
             }
           },
         )
diff --git a/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_widget.vue b/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_widget.vue
index eec083f23f3..f234c5ea3c9 100644
--- a/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_widget.vue
+++ b/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_widget.vue
@@ -95,10 +95,10 @@ export default {
     confidentialWidget.setConfidentiality = null;
   },
   methods: {
-    closeForm({ confidential } = {}) {
+    closeForm() {
       this.$refs.editable.collapse();
       this.$el.dispatchEvent(hideDropdownEvent);
-      this.$emit('closeForm', { confidential });
+      this.$emit('closeForm');
     },
     // synchronizing the quick action with the sidebar widget
     // this is a temporary solution until we have confidentiality real-time updates
diff --git a/app/assets/javascripts/sidebar/graphql.js b/app/assets/javascripts/sidebar/graphql.js
deleted file mode 100644
index 127e3a3c610..00000000000
--- a/app/assets/javascripts/sidebar/graphql.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import produce from 'immer';
-import VueApollo from 'vue-apollo';
-import getIssueStateQuery from '~/issues/show/queries/get_issue_state.query.graphql';
-import createDefaultClient from '~/lib/graphql';
-import { temporaryConfig, resolvers as workItemResolvers } from '~/work_items/graphql/provider';
-
-const resolvers = {
-  Mutation: {
-    updateIssueState: (_, { issueType = undefined, isDirty = false }, { cache }) => {
-      const sourceData = cache.readQuery({ query: getIssueStateQuery });
-      const data = produce(sourceData, (draftData) => {
-        draftData.issueState = { issueType, isDirty };
-      });
-      cache.writeQuery({ query: getIssueStateQuery, data });
-    },
-    ...workItemResolvers.Mutation,
-  },
-};
-
-export const defaultClient = createDefaultClient(
-  resolvers,
-  // should be removed with the rollout of work item assignees FF
-  // https://gitlab.com/gitlab-org/gitlab/-/issues/363030
-  temporaryConfig,
-);
-
-export const apolloProvider = new VueApollo({
-  defaultClient,
-});
diff --git a/app/assets/javascripts/sidebar/mount_sidebar.js b/app/assets/javascripts/sidebar/mount_sidebar.js
index fec4d0e346d..62032359d95 100644
--- a/app/assets/javascripts/sidebar/mount_sidebar.js
+++ b/app/assets/javascripts/sidebar/mount_sidebar.js
@@ -22,7 +22,7 @@ import SidebarParticipantsWidget from '~/sidebar/components/participants/sidebar
 import SidebarReferenceWidget from '~/sidebar/components/reference/sidebar_reference_widget.vue';
 import SidebarDropdownWidget from '~/sidebar/components/sidebar_dropdown_widget.vue';
 import SidebarTodoWidget from '~/sidebar/components/todo_toggle/sidebar_todo_widget.vue';
-import { apolloProvider } from '~/sidebar/graphql';
+import { apolloProvider } from '~/graphql_shared/issuable_client';
 import trackShowInviteMemberLink from '~/sidebar/track_invite_members';
 import { DropdownVariant } from '~/vue_shared/components/sidebar/labels_select_vue/constants';
 import LabelsSelectWidget from '~/vue_shared/components/sidebar/labels_select_widget/labels_select_root.vue';
@@ -39,7 +39,6 @@ import SidebarTimeTracking from './components/time_tracking/sidebar_time_trackin
 import { IssuableAttributeType } from './constants';
 import SidebarMoveIssue from './lib/sidebar_move_issue';
 import CrmContacts from './components/crm_contacts/crm_contacts.vue';
-import SidebarEventHub from './event_hub';
 
 Vue.use(Translate);
 Vue.use(VueApollo);
@@ -360,13 +359,6 @@ function mountConfidentialComponent() {
               ? IssuableType.Issue
               : IssuableType.MergeRequest,
         },
-        on: {
-          closeForm({ confidential }) {
-            if (confidential !== undefined) {
-              SidebarEventHub.$emit('confidentialityUpdated', confidential);
-            }
-          },
-        },
       }),
   });
 }