FAQ | This is a LIVE service | Changelog

Skip to content
Snippets Groups Projects
Commit 8be3e1e5 authored by Blake Dust's avatar Blake Dust
Browse files

Stops CircularProgress when there are no more assets to load

parent a859d04d
No related branches found
No related tags found
1 merge request!20Stops CircularProgress when there are no more assets to load
Pipeline #26967 passed with warnings
......@@ -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}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment