Bug 1505758 - Fix/enable ESLint 'no-else-return'

https://eslint.org/docs/rules/no-else-return

.eslintrc.js

@@ -31,7 +31,6 @@ module.exports = {
     'max-len': 'off',
     'no-alert': 'off',
     'no-continue': 'off',
-    'no-else-return': 'off',
     'no-mixed-operators': 'off',
     'no-nested-ternary': 'off',
     'no-param-reassign': 'off',

ui/job-view/details/PinBoard.jsx

@@ -171,7 +171,9 @@ class PinBoard extends React.Component {
   cancelAllPinnedJobsTitle() {
     if (!this.props.isLoggedIn) {
       return 'Not logged in';
-    } else if (!this.canCancelAllPinnedJobs()) {
+    }
+
+    if (!this.canCancelAllPinnedJobs()) {
       return 'No pending / running jobs in pinBoard';
     }
 

ui/job-view/details/tabs/autoclassify/ErrorLine.jsx

@@ -114,16 +114,24 @@ class ErrorLine extends React.Component {
     if (!selectedOption) {
       return;
     }
+
     if (!this.canClassify) {
       return 'classification-disabled';
-    } else if (this.props.errorLine.verified) {
+    }
+
+    if (this.props.errorLine.verified) {
       return 'verified';
-    } else if (selectedOption.type === 'ignore') {
+    }
+
+    if (selectedOption.type === 'ignore') {
       return 'unverified-ignore';
-    } else if (selectedOption.type === 'manual' &&
+    }
+
+    if (selectedOption.type === 'manual' &&
       !selectedOption.manualBugNumber) {
       return 'unverified-no-bug';
     }
+
     return 'unverified';
   }
 

ui/js/controllers/perf/compare.js

@@ -29,7 +29,9 @@ perf.controller('CompareChooserCtrl', [
             const getParameter = function (paramName, defaultValue) {
                 if ($stateParams[paramName]) {
                     return $stateParams[paramName];
-                } else if (localStorageService.get(paramName)) {
+                }
+
+                if (localStorageService.get(paramName)) {
                     return localStorageService.get(paramName);
                 }
                 return defaultValue;

ui/models/filter.js

@@ -246,7 +246,9 @@ export default class FilterModel {
   _getJobFieldValue(job, field) {
     if (field === 'platform') {
       return `${thPlatformMap[job.platform] || job.platform} ${job.platform_option}`;
-    } else if (field === 'searchStr') {
+    }
+
+    if (field === 'searchStr') {
       // lazily get this to avoid storing redundant information
       return job.getSearchStr();
     }

ui/models/treeStatus.js

@@ -14,7 +14,9 @@ export default class TreeStatusModel {
       .then(async (resp) => {
         if (resp.ok) {
           return resp.json();
-        } else if (resp.status === 404) {
+        }
+
+        if (resp.status === 404) {
           return Promise.resolve({
             result: {
               status: 'unsupported',