From 9af59bddfebc230916e078d9b8147761400069f8 Mon Sep 17 00:00:00 2001
From: Qstick <qstick@gmail.com>
Date: Tue, 10 Sep 2019 21:43:46 -0400
Subject: [PATCH] Fixed: Cleanup InteractiveSearch.js logic

Co-Authored-By: Mark McDowall <markus101@users.noreply.github.com>
---
 .../InteractiveSearch/InteractiveSearch.js    | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/frontend/src/InteractiveSearch/InteractiveSearch.js b/frontend/src/InteractiveSearch/InteractiveSearch.js
index bc47e4e96..1581f2b69 100644
--- a/frontend/src/InteractiveSearch/InteractiveSearch.js
+++ b/frontend/src/InteractiveSearch/InteractiveSearch.js
@@ -119,33 +119,35 @@ function InteractiveSearch(props) {
       </div>
 
       {
-        isFetching &&
-          <LoadingIndicator />
+        isFetching ? <LoadingIndicator /> : null
       }
 
       {
-        !isFetching && !!error &&
+        !isFetching && error ?
           <div>
             Unable to load results for this album search. Try again later
-          </div>
+          </div> :
+          null
       }
 
       {
-        !isFetching && isPopulated && !totalReleasesCount &&
+        !isFetching && isPopulated && !totalReleasesCount ?
           <div>
             No results found
-          </div>
+          </div> :
+          null
       }
 
       {
-        !!totalReleasesCount && isPopulated && !items.length &&
+        !!totalReleasesCount && isPopulated && !items.length ?
           <div>
             All results are hidden by the applied filter
-          </div>
+          </div> :
+          null
       }
 
       {
-        isPopulated && !!items.length &&
+        isPopulated && !!items.length ?
           <Table
             columns={columns}
             sortKey={sortKey}
@@ -168,14 +170,16 @@ function InteractiveSearch(props) {
                 })
               }
             </TableBody>
-          </Table>
+          </Table> :
+          null
       }
 
       {
-        totalReleasesCount !== items.length && !!items.length &&
+        totalReleasesCount !== items.length && !!items.length ?
           <div className={styles.filteredMessage}>
                 Some results are hidden by the applied filter
-          </div>
+          </div> :
+          null
       }
     </div>
   );