Merge branch '28-stop-circular-progress' into 'master'

Stops CircularProgress when there are no more assets to load

Closes #28

See merge request !20

ui/frontend/src/pages/AssetListPage.tsx

@@ -20,7 +20,7 @@ export const AssetListPage: React.FunctionComponent = () => {
   const { instId } = useParams()
   const nameLookup = useLookupInstName();
   const {
-    setDepartment, isLoading, setOrdering, nextPage, assets, assetIds, query, deleteAsset, dumpAssets
+    setDepartment, isLoading, setOrdering, nextPage, assets, assetIds, query, deleteAsset, dumpAssets, next
   } = useAssets()
 
   // Whether to confirm deletion (by id)
@@ -61,7 +61,7 @@ export const AssetListPage: React.FunctionComponent = () => {
           />
           <AssetTableBody summaries={summaries} isLoading={isLoading} onDelete={(id: string) => { setIdToDelete(id); }} />
         </Table>
-        { (assetIds.length > 0) && <GetMoreAssets onNextPage={nextPage} isLoading={isLoading} /> }
+        { (assetIds.length > 0 ) && (next !== null) && <GetMoreAssets onNextPage={nextPage} isLoading={isLoading} /> }
       </Box>
       <DeleteConfirmation
         open={idToDelete!==null}