From a6788c1add38981405843ab3c977792c26ae486b Mon Sep 17 00:00:00 2001
From: Kushal Pandya <kushal@gitlab.com>
Date: Wed, 24 Oct 2018 17:00:39 +0530
Subject: Run through Prettier and remove ESLint disables

Formats the file to match Prettier rules
Removes all blacklisted ESLint rules
---
 app/assets/javascripts/issuable_form.js            |  32 ++--
 .../javascripts/lib/utils/datetime_utility.js      |  85 ++++-----
 .../components/time_tracking/collapsed_state.vue   | 192 ++++++++++-----------
 spec/javascripts/datetime_utility_spec.js          |   2 +-
 4 files changed, 160 insertions(+), 151 deletions(-)

diff --git a/app/assets/javascripts/issuable_form.js b/app/assets/javascripts/issuable_form.js
index 1786876dd0c..c81a2230310 100644
--- a/app/assets/javascripts/issuable_form.js
+++ b/app/assets/javascripts/issuable_form.js
@@ -1,6 +1,3 @@
-/* eslint-disable no-new, no-unused-vars, consistent-return, no-else-return */
-/* global GitLab */
-
 import $ from 'jquery';
 import Pikaday from 'pikaday';
 import Autosave from './autosave';
@@ -19,9 +16,11 @@ export default class IssuableForm {
     this.handleSubmit = this.handleSubmit.bind(this);
     this.wipRegex = /^\s*(\[WIP\]\s*|WIP:\s*|WIP\s+)+\s*/i;
 
-    new GfmAutoComplete(gl.GfmAutoComplete && gl.GfmAutoComplete.dataSources).setup();
-    new UsersSelect();
-    new ZenMode();
+    this.gfmAutoComplete = new GfmAutoComplete(
+      gl.GfmAutoComplete && gl.GfmAutoComplete.dataSources,
+    ).setup();
+    this.usersSelect = new UsersSelect();
+    this.zenMode = new ZenMode();
 
     this.titleField = this.form.find('input[name*="[title]"]');
     this.descriptionField = this.form.find('textarea[name*="[description]"]');
@@ -57,8 +56,16 @@ export default class IssuableForm {
   }
 
   initAutosave() {
-    new Autosave(this.titleField, [document.location.pathname, document.location.search, 'title']);
-    return new Autosave(this.descriptionField, [document.location.pathname, document.location.search, 'description']);
+    this.autosave = new Autosave(this.titleField, [
+      document.location.pathname,
+      document.location.search,
+      'title',
+    ]);
+    return new Autosave(this.descriptionField, [
+      document.location.pathname,
+      document.location.search,
+      'description',
+    ]);
   }
 
   handleSubmit() {
@@ -74,7 +81,7 @@ export default class IssuableForm {
     this.$wipExplanation = this.form.find('.js-wip-explanation');
     this.$noWipExplanation = this.form.find('.js-no-wip-explanation');
     if (!(this.$wipExplanation.length && this.$noWipExplanation.length)) {
-      return;
+      return undefined;
     }
     this.form.on('click', '.js-toggle-wip', this.toggleWip);
     this.titleField.on('keyup blur', this.renderWipExplanation);
@@ -89,10 +96,9 @@ export default class IssuableForm {
     if (this.workInProgress()) {
       this.$wipExplanation.show();
       return this.$noWipExplanation.hide();
-    } else {
-      this.$wipExplanation.hide();
-      return this.$noWipExplanation.show();
     }
+    this.$wipExplanation.hide();
+    return this.$noWipExplanation.show();
   }
 
   toggleWip(event) {
@@ -110,7 +116,7 @@ export default class IssuableForm {
   }
 
   addWip() {
-    this.titleField.val(`WIP: ${(this.titleField.val())}`);
+    this.titleField.val(`WIP: ${this.titleField.val()}`);
   }
 
   initTargetBranchDropdown() {
diff --git a/app/assets/javascripts/lib/utils/datetime_utility.js b/app/assets/javascripts/lib/utils/datetime_utility.js
index 13332875b05..1bdf98d0c97 100644
--- a/app/assets/javascripts/lib/utils/datetime_utility.js
+++ b/app/assets/javascripts/lib/utils/datetime_utility.js
@@ -79,39 +79,41 @@ let timeagoInstance;
  */
 export const getTimeago = () => {
   if (!timeagoInstance) {
-    const localeRemaining = (number, index) => [
-      [s__('Timeago|just now'), s__('Timeago|right now')],
-      [s__('Timeago|%s seconds ago'), s__('Timeago|%s seconds remaining')],
-      [s__('Timeago|1 minute ago'), s__('Timeago|1 minute remaining')],
-      [s__('Timeago|%s minutes ago'), s__('Timeago|%s minutes remaining')],
-      [s__('Timeago|1 hour ago'), s__('Timeago|1 hour remaining')],
-      [s__('Timeago|%s hours ago'), s__('Timeago|%s hours remaining')],
-      [s__('Timeago|1 day ago'), s__('Timeago|1 day remaining')],
-      [s__('Timeago|%s days ago'), s__('Timeago|%s days remaining')],
-      [s__('Timeago|1 week ago'), s__('Timeago|1 week remaining')],
-      [s__('Timeago|%s weeks ago'), s__('Timeago|%s weeks remaining')],
-      [s__('Timeago|1 month ago'), s__('Timeago|1 month remaining')],
-      [s__('Timeago|%s months ago'), s__('Timeago|%s months remaining')],
-      [s__('Timeago|1 year ago'), s__('Timeago|1 year remaining')],
-      [s__('Timeago|%s years ago'), s__('Timeago|%s years remaining')],
-    ][index];
-
-    const locale = (number, index) => [
-      [s__('Timeago|just now'), s__('Timeago|right now')],
-      [s__('Timeago|%s seconds ago'), s__('Timeago|in %s seconds')],
-      [s__('Timeago|1 minute ago'), s__('Timeago|in 1 minute')],
-      [s__('Timeago|%s minutes ago'), s__('Timeago|in %s minutes')],
-      [s__('Timeago|1 hour ago'), s__('Timeago|in 1 hour')],
-      [s__('Timeago|%s hours ago'), s__('Timeago|in %s hours')],
-      [s__('Timeago|1 day ago'), s__('Timeago|in 1 day')],
-      [s__('Timeago|%s days ago'), s__('Timeago|in %s days')],
-      [s__('Timeago|1 week ago'), s__('Timeago|in 1 week')],
-      [s__('Timeago|%s weeks ago'), s__('Timeago|in %s weeks')],
-      [s__('Timeago|1 month ago'), s__('Timeago|in 1 month')],
-      [s__('Timeago|%s months ago'), s__('Timeago|in %s months')],
-      [s__('Timeago|1 year ago'), s__('Timeago|in 1 year')],
-      [s__('Timeago|%s years ago'), s__('Timeago|in %s years')],
-    ][index];
+    const localeRemaining = (number, index) =>
+      [
+        [s__('Timeago|just now'), s__('Timeago|right now')],
+        [s__('Timeago|%s seconds ago'), s__('Timeago|%s seconds remaining')],
+        [s__('Timeago|1 minute ago'), s__('Timeago|1 minute remaining')],
+        [s__('Timeago|%s minutes ago'), s__('Timeago|%s minutes remaining')],
+        [s__('Timeago|1 hour ago'), s__('Timeago|1 hour remaining')],
+        [s__('Timeago|%s hours ago'), s__('Timeago|%s hours remaining')],
+        [s__('Timeago|1 day ago'), s__('Timeago|1 day remaining')],
+        [s__('Timeago|%s days ago'), s__('Timeago|%s days remaining')],
+        [s__('Timeago|1 week ago'), s__('Timeago|1 week remaining')],
+        [s__('Timeago|%s weeks ago'), s__('Timeago|%s weeks remaining')],
+        [s__('Timeago|1 month ago'), s__('Timeago|1 month remaining')],
+        [s__('Timeago|%s months ago'), s__('Timeago|%s months remaining')],
+        [s__('Timeago|1 year ago'), s__('Timeago|1 year remaining')],
+        [s__('Timeago|%s years ago'), s__('Timeago|%s years remaining')],
+      ][index];
+
+    const locale = (number, index) =>
+      [
+        [s__('Timeago|just now'), s__('Timeago|right now')],
+        [s__('Timeago|%s seconds ago'), s__('Timeago|in %s seconds')],
+        [s__('Timeago|1 minute ago'), s__('Timeago|in 1 minute')],
+        [s__('Timeago|%s minutes ago'), s__('Timeago|in %s minutes')],
+        [s__('Timeago|1 hour ago'), s__('Timeago|in 1 hour')],
+        [s__('Timeago|%s hours ago'), s__('Timeago|in %s hours')],
+        [s__('Timeago|1 day ago'), s__('Timeago|in 1 day')],
+        [s__('Timeago|%s days ago'), s__('Timeago|in %s days')],
+        [s__('Timeago|1 week ago'), s__('Timeago|in 1 week')],
+        [s__('Timeago|%s weeks ago'), s__('Timeago|in %s weeks')],
+        [s__('Timeago|1 month ago'), s__('Timeago|in 1 month')],
+        [s__('Timeago|%s months ago'), s__('Timeago|in %s months')],
+        [s__('Timeago|1 year ago'), s__('Timeago|in 1 year')],
+        [s__('Timeago|%s years ago'), s__('Timeago|in %s years')],
+      ][index];
 
     timeago.register(timeagoLanguageCode, locale);
     timeago.register(`${timeagoLanguageCode}-remaining`, localeRemaining);
@@ -119,7 +121,7 @@ export const getTimeago = () => {
   }
 
   return timeagoInstance;
-}
+};
 
 /**
  * For the given element, renders a timeago instance.
@@ -184,7 +186,7 @@ export const getDayDifference = (a, b) => {
  * @param  {Number} seconds
  * @return {String}
  */
-export const timeIntervalInWords = (intervalInSeconds) => {
+export const timeIntervalInWords = intervalInSeconds => {
   const secondsInteger = parseInt(intervalInSeconds, 10);
   const minutes = Math.floor(secondsInteger / 60);
   const seconds = secondsInteger - minutes * 60;
@@ -196,7 +198,7 @@ export const timeIntervalInWords = (intervalInSeconds) => {
     text = `${seconds} ${pluralize('second', seconds)}`;
   }
   return text;
-}
+};
 
 export const dateInWords = (date, abbreviated = false, hideYear = false) => {
   if (!date) return date;
@@ -240,7 +242,7 @@ export const dateInWords = (date, abbreviated = false, hideYear = false) => {
   }
 
   return `${monthName} ${date.getDate()}, ${year}`;
-}
+};
 
 /**
  * Returns month name based on provided date.
@@ -447,13 +449,13 @@ export const parseSeconds = (seconds, { daysPerWeek = 5, hoursPerDay = 8 } = {})
 
     return periodCount;
   });
-}
+};
 
 /**
  * Accepts a timeObject (see parseSeconds) and returns a condensed string representation of it
  * (e.g. '1w 2d 3h 1m' or '1h 30m'). Zero value units are not included.
  */
-export const stringifyTime = (timeObject) => {
+export const stringifyTime = timeObject => {
   const reducedTime = _.reduce(
     timeObject,
     (memo, unitValue, unitName) => {
@@ -463,10 +465,11 @@ export const stringifyTime = (timeObject) => {
     '',
   ).trim();
   return reducedTime.length ? reducedTime : '0m';
-}
+};
 
 /**
  * Accepts a time string of any size (e.g. '1w 2d 3h 5m' or '1w 2d') and returns
  *  the first non-zero unit/value pair.
  */
-export const abbreviateTime = (timeStr) => timeStr.split(' ').filter(unitStr => unitStr.charAt(0) !== '0')[0];
+export const abbreviateTime = timeStr =>
+  timeStr.split(' ').filter(unitStr => unitStr.charAt(0) !== '0')[0];
diff --git a/app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue b/app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue
index c66564edc00..259858e4b46 100644
--- a/app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue
+++ b/app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue
@@ -1,111 +1,111 @@
 <script>
-  import { __, sprintf } from '~/locale';
-  import { abbreviateTime } from '~/lib/utils/datetime_utility';
-  import icon from '~/vue_shared/components/icon.vue';
-  import tooltip from '~/vue_shared/directives/tooltip';
+import { __, sprintf } from '~/locale';
+import { abbreviateTime } from '~/lib/utils/datetime_utility';
+import icon from '~/vue_shared/components/icon.vue';
+import tooltip from '~/vue_shared/directives/tooltip';
 
-  export default {
-    name: 'TimeTrackingCollapsedState',
-    components: {
-      icon,
+export default {
+  name: 'TimeTrackingCollapsedState',
+  components: {
+    icon,
+  },
+  directives: {
+    tooltip,
+  },
+  props: {
+    showComparisonState: {
+      type: Boolean,
+      required: true,
     },
-    directives: {
-      tooltip,
+    showSpentOnlyState: {
+      type: Boolean,
+      required: true,
     },
-    props: {
-      showComparisonState: {
-        type: Boolean,
-        required: true,
-      },
-      showSpentOnlyState: {
-        type: Boolean,
-        required: true,
-      },
-      showEstimateOnlyState: {
-        type: Boolean,
-        required: true,
-      },
-      showNoTimeTrackingState: {
-        type: Boolean,
-        required: true,
-      },
-      timeSpentHumanReadable: {
-        type: String,
-        required: false,
-        default: '',
-      },
-      timeEstimateHumanReadable: {
-        type: String,
-        required: false,
-        default: '',
-      },
+    showEstimateOnlyState: {
+      type: Boolean,
+      required: true,
     },
-    computed: {
-      timeSpent() {
-        return this.abbreviateTime(this.timeSpentHumanReadable);
-      },
-      timeEstimate() {
-        return this.abbreviateTime(this.timeEstimateHumanReadable);
-      },
-      divClass() {
-        if (this.showComparisonState) {
-          return 'compare';
-        } else if (this.showEstimateOnlyState) {
-          return 'estimate-only';
-        } else if (this.showSpentOnlyState) {
-          return 'spend-only';
-        } else if (this.showNoTimeTrackingState) {
-          return 'no-tracking';
-        }
+    showNoTimeTrackingState: {
+      type: Boolean,
+      required: true,
+    },
+    timeSpentHumanReadable: {
+      type: String,
+      required: false,
+      default: '',
+    },
+    timeEstimateHumanReadable: {
+      type: String,
+      required: false,
+      default: '',
+    },
+  },
+  computed: {
+    timeSpent() {
+      return this.abbreviateTime(this.timeSpentHumanReadable);
+    },
+    timeEstimate() {
+      return this.abbreviateTime(this.timeEstimateHumanReadable);
+    },
+    divClass() {
+      if (this.showComparisonState) {
+        return 'compare';
+      } else if (this.showEstimateOnlyState) {
+        return 'estimate-only';
+      } else if (this.showSpentOnlyState) {
+        return 'spend-only';
+      } else if (this.showNoTimeTrackingState) {
+        return 'no-tracking';
+      }
 
+      return '';
+    },
+    spanClass() {
+      if (this.showComparisonState) {
         return '';
-      },
-      spanClass() {
-        if (this.showComparisonState) {
-          return '';
-        } else if (this.showEstimateOnlyState || this.showSpentOnlyState) {
-          return 'bold';
-        } else if (this.showNoTimeTrackingState) {
-          return 'no-value';
-        }
+      } else if (this.showEstimateOnlyState || this.showSpentOnlyState) {
+        return 'bold';
+      } else if (this.showNoTimeTrackingState) {
+        return 'no-value';
+      }
 
-        return '';
-      },
-      text() {
-        if (this.showComparisonState) {
-          return `${this.timeSpent} / ${this.timeEstimate}`;
-        } else if (this.showEstimateOnlyState) {
-          return `-- / ${this.timeEstimate}`;
-        } else if (this.showSpentOnlyState) {
-          return `${this.timeSpent} / --`;
-        } else if (this.showNoTimeTrackingState) {
-          return 'None';
-        }
+      return '';
+    },
+    text() {
+      if (this.showComparisonState) {
+        return `${this.timeSpent} / ${this.timeEstimate}`;
+      } else if (this.showEstimateOnlyState) {
+        return `-- / ${this.timeEstimate}`;
+      } else if (this.showSpentOnlyState) {
+        return `${this.timeSpent} / --`;
+      } else if (this.showNoTimeTrackingState) {
+        return 'None';
+      }
 
-        return '';
-      },
-      timeTrackedTooltipText() {
-        let title;
-        if (this.showComparisonState) {
-          title = __('Time remaining');
-        } else if (this.showEstimateOnlyState) {
-          title = __('Estimated');
-        } else if (this.showSpentOnlyState) {
-          title = __('Time spent');
-        }
+      return '';
+    },
+    timeTrackedTooltipText() {
+      let title;
+      if (this.showComparisonState) {
+        title = __('Time remaining');
+      } else if (this.showEstimateOnlyState) {
+        title = __('Estimated');
+      } else if (this.showSpentOnlyState) {
+        title = __('Time spent');
+      }
 
-        return sprintf('%{title}: %{text}', ({ title, text: this.text }));
-      },
-      tooltipText() {
-        return this.showNoTimeTrackingState ? __('Time tracking') : this.timeTrackedTooltipText;
-      },
+      return sprintf('%{title}: %{text}', { title, text: this.text });
+    },
+    tooltipText() {
+      return this.showNoTimeTrackingState ? __('Time tracking') : this.timeTrackedTooltipText;
     },
-    methods: {
-      abbreviateTime(timeStr) {
-        return abbreviateTime(timeStr);
-      },
+  },
+  methods: {
+    abbreviateTime(timeStr) {
+      return abbreviateTime(timeStr);
     },
-  };
+  },
+};
 </script>
 
 <template>
diff --git a/spec/javascripts/datetime_utility_spec.js b/spec/javascripts/datetime_utility_spec.js
index 2e33cbe47c5..2821f4d6793 100644
--- a/spec/javascripts/datetime_utility_spec.js
+++ b/spec/javascripts/datetime_utility_spec.js
@@ -225,7 +225,7 @@ describe('prettyTime methods', () => {
     expect(obj.hours).toBe(hours);
     expect(obj.days).toBe(days);
     expect(obj.weeks).toBe(weeks);
-  }
+  };
 
   describe('parseSeconds', () => {
     it('should correctly parse a negative value', () => {
-- 
cgit v1.2.1