Clean up computed property by inverting early return

hashicorp · May 5, 2018 · 4f260e2 · 4f260e2
1 parent e5ba6eb
commit 4f260e2
Showing 1 changed file with 27 additions and 21 deletions.
diff --git a/ui/app/mixins/searchable.js b/ui/app/mixins/searchable.js
@@ -64,28 +64,34 @@ export default Mixin.create({
     'regexSearchProps.[]',
     function() {
       const searchTerm = this.get('searchTerm').trim();
-      if (searchTerm && searchTerm.length) {
-        const results = [];
-        if (this.get('exactMatchEnabled')) {
-          results.push(
-            ...exactMatchSearch(
-              searchTerm,
-              this.get('listToSearch'),
-              this.get('exactMatchSearchProps')
-            )
-          );
-        }
-        if (this.get('fuzzySearchEnabled')) {
-          results.push(...this.get('fuse').search(searchTerm));
-        }
-        if (this.get('regexEnabled')) {
-          results.push(
-            ...regexSearch(searchTerm, this.get('listToSearch'), this.get('regexSearchProps'))
-          );
-        }
-        return results.uniq();
+
+      if (!searchTerm || !searchTerm.length) {
+        return this.get('listToSearch');
       }
-      return this.get('listToSearch');
+
+      const results = [];
+
+      if (this.get('exactMatchEnabled')) {
+        results.push(
+          ...exactMatchSearch(
+            searchTerm,
+            this.get('listToSearch'),
+            this.get('exactMatchSearchProps')
+          )
+        );
+      }
+
+      if (this.get('fuzzySearchEnabled')) {
+        results.push(...this.get('fuse').search(searchTerm));
+      }
+
+      if (this.get('regexEnabled')) {
+        results.push(
+          ...regexSearch(searchTerm, this.get('listToSearch'), this.get('regexSearchProps'))
+        );
+      }
+
+      return results.uniq();
     }
   ),
 });