From 2fac50ba3eedb1b31064062f6166dafca1fc868a Mon Sep 17 00:00:00 2001
From: Infinite <infinitekittens@protonmail.com>
Date: Sun, 1 Mar 2020 21:30:40 +0100
Subject: [PATCH] Formatting and list hook fix

---
 ui/v2.5/src/components/List/AddFilter.tsx     |  2 +-
 .../src/components/Scenes/SceneListTable.tsx  |  5 +--
 ui/v2.5/src/hooks/ListHook.tsx                | 32 +++++++++++++------
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/ui/v2.5/src/components/List/AddFilter.tsx b/ui/v2.5/src/components/List/AddFilter.tsx
index 1366b4b8d..874227d01 100644
--- a/ui/v2.5/src/components/List/AddFilter.tsx
+++ b/ui/v2.5/src/components/List/AddFilter.tsx
@@ -190,7 +190,7 @@ export const AddFilter: React.FC<IAddFilterProps> = (
           type={criterion.inputType}
           onChange={onChangedInput}
           onBlur={onBlurInput}
-          defaultValue={criterion.value ? criterion.value.toString() : ''}
+          defaultValue={criterion.value ? criterion.value.toString() : ""}
         />
       );
     }
diff --git a/ui/v2.5/src/components/Scenes/SceneListTable.tsx b/ui/v2.5/src/components/Scenes/SceneListTable.tsx
index 437d668eb..8dc3e66cc 100644
--- a/ui/v2.5/src/components/Scenes/SceneListTable.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneListTable.tsx
@@ -21,10 +21,7 @@ export const SceneListTable: React.FC<ISceneListTableProps> = (
 
   const renderPerformers = (performers: Partial<GQL.Performer>[]) =>
     performers.map(performer => (
-      <Link
-        key={performer.id}
-        to={NavUtils.makePerformerScenesUrl(performer)}
-      >
+      <Link key={performer.id} to={NavUtils.makePerformerScenesUrl(performer)}>
         <h6>{performer.name}</h6>
       </Link>
     ));
diff --git a/ui/v2.5/src/hooks/ListHook.tsx b/ui/v2.5/src/hooks/ListHook.tsx
index a2bbbc4f5..13da370e2 100644
--- a/ui/v2.5/src/hooks/ListHook.tsx
+++ b/ui/v2.5/src/hooks/ListHook.tsx
@@ -342,6 +342,25 @@ const useList = <QueryResult extends IQueryResult, QueryData extends IDataItem>(
       })
     : undefined;
 
+  function maybeRenderContent() {
+    if (!result.loading && !result.error) {
+      return options.renderContent(result, filter, selectedIds, zoomIndex);
+    }
+  }
+
+  function maybeRenderPagination() {
+    if (!result.loading && !result.error) {
+      return (
+        <Pagination
+          itemsPerPage={filter.itemsPerPage}
+          currentPage={filter.currentPage}
+          totalItems={totalCount}
+          onChangePage={onChangePage}
+        />
+      );
+    }
+  }
+
   const template = (
     <div>
       <ListFilter
@@ -362,15 +381,10 @@ const useList = <QueryResult extends IQueryResult, QueryData extends IDataItem>(
       {options.renderSelectedOptions && selectedIds.size > 0
         ? options.renderSelectedOptions(result, selectedIds)
         : undefined}
-      {options.renderContent(result, filter, selectedIds, zoomIndex)}
-      { (result.loading || !forageInitialised) && <LoadingIndicator /> }
-      { result.error && <h1>{result.error.message}</h1> }
-      <Pagination
-        itemsPerPage={filter.itemsPerPage}
-        currentPage={filter.currentPage}
-        totalItems={totalCount}
-        onChangePage={onChangePage}
-      />
+      {(result.loading || !forageInitialised) && <LoadingIndicator />}
+      {result.error && <h1>{result.error.message}</h1>}
+      {maybeRenderContent()}
+      {maybeRenderPagination()}
     </div>
   );