Merge branch 'winh-sidebar-weight-0-ee' into 'master'

Support 0 weight in issue sidebar

See merge request gitlab-org/gitlab-ee!14683

ee/app/assets/javascripts/sidebar/stores/sidebar_store.js

@@ -13,9 +13,9 @@ export default class SidebarStore extends CESidebarStore {
     this.epic = {};
   }
 
-  setWeightData(data) {
+  setWeightData({ weight }) {
     this.isFetching.weight = false;
-    this.weight = data.weight || null;
+    this.weight = typeof weight === 'number' ? Number(weight) : null;
   }
 
   setWeight(newWeight) {

ee/changelogs/unreleased/winh-sidebar-weight-0-ee.yml

+---
+title: Support 0 weight in issue sidebar
+merge_request: 14683
+author:
+type: fixed

ee/spec/frontend/sidebar/ee_sidebar_store_spec.js

@@ -17,16 +17,28 @@ describe('EE Sidebar store', () => {
     CESidebarStore.singleton = null;
   });
 
-  it('sets weight data', () => {
-    expect(store.weight).toEqual(null);
+  describe('setWeightData', () => {
+    beforeEach(() => {
+      expect(store.weight).toEqual(null);
+    });
+
+    it('sets weight data', () => {
+      const weight = 3;
+      store.setWeightData({
+        weight,
+      });
 
-    const weight = 3;
-    store.setWeightData({
-      weight,
+      expect(store.isFetching.weight).toEqual(false);
+      expect(store.weight).toEqual(weight);
     });
 
-    expect(store.isFetching.weight).toEqual(false);
-    expect(store.weight).toEqual(weight);
+    it('supports 0 weight', () => {
+      store.setWeightData({
+        weight: 0,
+      });
+
+      expect(store.weight).toBe(0);
+    });
   });
 
   it('set weight', () => {