Add latest changes from gitlab-org/gitlab@master

6 files changed, 38 insertions, 37 deletions

diff --git a/app/assets/javascripts/work_items/components/work_item_detail.vue b/app/assets/javascripts/work_items/components/work_item_detail.vue
index ad90fe88947..f49d8eab9f0 100644
--- a/app/assets/javascripts/work_items/components/work_item_detail.vue
+++ b/app/assets/javascripts/work_items/components/work_item_detail.vue
@@ -114,7 +114,7 @@ export default {
       return this.workItem?.mockWidgets?.find((widget) => widget.type === WIDGET_TYPE_LABELS);
     },
     workItemWeight() {
-      return this.workItem?.mockWidgets?.find((widget) => widget.type === WIDGET_TYPE_WEIGHT);
+      return this.workItem?.widgets?.find((widget) => widget.type === WIDGET_TYPE_WEIGHT);
     },
     workItemHierarchy() {
       return this.workItem?.widgets?.find((widget) => widget.type === WIDGET_TYPE_HIERARCHY);
@@ -142,7 +142,7 @@ export default {
 
 <template>
   <section class="gl-pt-5">
-    <gl-alert v-if="error" variant="danger" @dismiss="error = undefined">
+    <gl-alert v-if="error" class="gl-mb-3" variant="danger" @dismiss="error = undefined">
       {{ error }}
     </gl-alert>
 
@@ -236,6 +236,7 @@ export default {
           :weight="workItemWeight.weight"
           :work-item-id="workItem.id"
           :work-item-type="workItemType"
+          @error="error = $event"
         />
       </template>
       <work-item-description
diff --git a/app/assets/javascripts/work_items/components/work_item_weight.vue b/app/assets/javascripts/work_items/components/work_item_weight.vue
index 30e2c1e56b8..db97f16a010 100644
--- a/app/assets/javascripts/work_items/components/work_item_weight.vue
+++ b/app/assets/javascripts/work_items/components/work_item_weight.vue
@@ -1,9 +1,10 @@
 <script>
 import { GlForm, GlFormGroup, GlFormInput } from '@gitlab/ui';
+import * as Sentry from '@sentry/browser';
 import { __ } from '~/locale';
 import Tracking from '~/tracking';
-import { TRACKING_CATEGORY_SHOW } from '../constants';
-import localUpdateWorkItemMutation from '../graphql/local_update_work_item.mutation.graphql';
+import { i18n, TRACKING_CATEGORY_SHOW } from '../constants';
+import updateWorkItemMutation from '../graphql/update_work_item.mutation.graphql';
 
 /* eslint-disable @gitlab/require-i18n-strings */
 const allowedKeys = [
@@ -98,16 +99,34 @@ export default {
     },
     updateWeight(event) {
       this.isEditing = false;
+
+      const weight = Number(event.target.value);
+      if (this.weight === weight) {
+        return;
+      }
+
       this.track('updated_weight');
-      this.$apollo.mutate({
-        mutation: localUpdateWorkItemMutation,
-        variables: {
-          input: {
-            id: this.workItemId,
-            weight: event.target.value === '' ? null : Number(event.target.value),
+      this.$apollo
+        .mutate({
+          mutation: updateWorkItemMutation,
+          variables: {
+            input: {
+              id: this.workItemId,
+              weightWidget: {
+                weight: event.target.value === '' ? null : weight,
+              },
+            },
           },
-        },
-      });
+        })
+        .then(({ data }) => {
+          if (data.workItemUpdate.errors.length) {
+            throw new Error(data.workItemUpdate.errors.join('\n'));
+          }
+        })
+        .catch((error) => {
+          this.$emit('error', i18n.updateError);
+          Sentry.captureException(error);
+        });
     },
   },
 };
diff --git a/app/assets/javascripts/work_items/graphql/provider.js b/app/assets/javascripts/work_items/graphql/provider.js
index 8788ad21e7b..1feef8bcaf8 100644
--- a/app/assets/javascripts/work_items/graphql/provider.js
+++ b/app/assets/javascripts/work_items/graphql/provider.js
@@ -2,7 +2,7 @@ import produce from 'immer';
 import Vue from 'vue';
 import VueApollo from 'vue-apollo';
 import createDefaultClient from '~/lib/graphql';
-import { WIDGET_TYPE_ASSIGNEES, WIDGET_TYPE_LABELS, WIDGET_TYPE_WEIGHT } from '../constants';
+import { WIDGET_TYPE_ASSIGNEES, WIDGET_TYPE_LABELS } from '../constants';
 import typeDefs from './typedefs.graphql';
 import workItemQuery from './work_item.query.graphql';
 
@@ -10,7 +10,7 @@ export const temporaryConfig = {
   typeDefs,
   cacheConfig: {
     possibleTypes: {
-      LocalWorkItemWidget: ['LocalWorkItemLabels', 'LocalWorkItemWeight'],
+      LocalWorkItemWidget: ['LocalWorkItemLabels'],
     },
     typePolicies: {
       WorkItem: {
@@ -25,11 +25,6 @@ export const temporaryConfig = {
                     allowScopedLabels: true,
                     nodes: [],
                   },
-                  {
-                    __typename: 'LocalWorkItemWeight',
-                    type: 'WEIGHT',
-                    weight: null,
-                  },
                 ]
               );
             },
@@ -56,13 +51,6 @@ export const resolvers = {
           assigneesWidget.assignees.nodes = [...input.assignees];
         }
 
-        if (input.weight != null) {
-          const weightWidget = draftData.workItem.mockWidgets.find(
-            (widget) => widget.type === WIDGET_TYPE_WEIGHT,
-          );
-          weightWidget.weight = input.weight;
-        }
-
         if (input.labels) {
           const labelsWidget = draftData.workItem.mockWidgets.find(
             (widget) => widget.type === WIDGET_TYPE_LABELS,
diff --git a/app/assets/javascripts/work_items/graphql/typedefs.graphql b/app/assets/javascripts/work_items/graphql/typedefs.graphql
index 48228b15a53..44a2999a72e 100644
--- a/app/assets/javascripts/work_items/graphql/typedefs.graphql
+++ b/app/assets/javascripts/work_items/graphql/typedefs.graphql
@@ -1,7 +1,6 @@
 enum LocalWidgetType {
   ASSIGNEES
   LABELS
-  WEIGHT
 }
 
 interface LocalWorkItemWidget {
@@ -19,11 +18,6 @@ type LocalWorkItemLabels implements LocalWorkItemWidget {
   nodes: [Label!]
 }
 
-type LocalWorkItemWeight implements LocalWorkItemWidget {
-  type: LocalWidgetType!
-  weight: Int
-}
-
 extend type WorkItem {
   mockWidgets: [LocalWorkItemWidget]
 }
@@ -32,7 +26,6 @@ input LocalUpdateWorkItemInput {
   id: WorkItemID!
   assignees: [UserCore!]
   labels: [Label]
-  weight: Int
 }
 
 type LocalWorkItemPayload {
diff --git a/app/assets/javascripts/work_items/graphql/work_item.fragment.graphql b/app/assets/javascripts/work_items/graphql/work_item.fragment.graphql
index 5f64eda96aa..abed1cb134e 100644
--- a/app/assets/javascripts/work_items/graphql/work_item.fragment.graphql
+++ b/app/assets/javascripts/work_items/graphql/work_item.fragment.graphql
@@ -28,6 +28,10 @@ fragment WorkItem on WorkItem {
         }
       }
     }
+    ... on WorkItemWidgetWeight {
+      type
+      weight
+    }
     ... on WorkItemWidgetHierarchy {
       type
       parent {
diff --git a/app/assets/javascripts/work_items/graphql/work_item.query.graphql b/app/assets/javascripts/work_items/graphql/work_item.query.graphql
index 61cb8802187..276061af193 100644
--- a/app/assets/javascripts/work_items/graphql/work_item.query.graphql
+++ b/app/assets/javascripts/work_items/graphql/work_item.query.graphql
@@ -12,10 +12,6 @@ query workItem($id: WorkItemID!) {
           ...Label
         }
       }
-      ... on LocalWorkItemWeight {
-        type
-        weight
-      }
     }
   }
 }