Merge branch '7262-placeholder-when-entering-weight-value' into 'master'

Resolve "Placeholder when entering weight value"

Closes #7262

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

ee/app/assets/javascripts/sidebar/components/weight/weight.vue

@@ -114,7 +114,7 @@ export default {
     },
     onSubmit(e) {
       const { value } = e.target;
-      const validatedValue = Number(value);
+      const validatedValue = parseInt(value, 10);
       const isNewValue = validatedValue !== this.weight;
 
       this.hasValidInput = validatedValue >= 0 || value === '';
@@ -188,7 +188,9 @@ export default {
         ref="editableField"
         :value="weight"
         class="form-control"
-        type="text"
+        type="number"
+        min="0"
+        placeholder="Enter a number"
         @blur="onSubmit"
         @keydown.enter="onSubmit"
       />

ee/changelogs/unreleased/7262-placeholder-when-entering-weight-value.yml

+---
+title: Added placeholder to weight input for issue sidebar
+merge_request: 7346
+author:
+type: changed

ee/spec/javascripts/sidebar/weight_spec.js

@@ -154,27 +154,6 @@ describe('Weight', function() {
     });
   });
 
-  it('triggers error on invalid string value', done => {
-    vm = mountComponent(Weight, {
-      ...DEFAULT_PROPS,
-      editable: true,
-    });
-
-    vm.$el.querySelector('.js-weight-edit-link').click();
-
-    vm.$nextTick(() => {
-      const event = new CustomEvent('keydown');
-      event.keyCode = ENTER_KEY_CODE;
-
-      vm.$refs.editableField.click();
-      vm.$refs.editableField.value = 'potato';
-      vm.$refs.editableField.dispatchEvent(event);
-
-      expect(vm.hasValidInput).toBe(false);
-      done();
-    });
-  });
-
   it('triggers error on invalid negative integer value', done => {
     vm = mountComponent(Weight, {
       ...DEFAULT_PROPS,