LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

off by 1 again

Browse source
This commit is contained in:
jessop 2019-09-25 17:17:23 -04:00 • committed by Sean Yesmunt
parent 88e39ed14e
commit 53402c4759
4 changed files with 6 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ui/page/fileListDownloaded/index.js
View file

@ -6,7 +6,7 @@ import { withRouter } from 'react-router';
const select = (state, props) => {
const { search } = props.location;
const urlParams = new URLSearchParams(search);
const page = Number(urlParams.get('page')) || 0;
const page = Number(urlParams.get('page')) || 1;
return {
page,
downloadedUris: makeSelectDownloadUrisForPage(page)(state),

12
src/ui/page/fileListDownloaded/view.jsx
View file

@ -14,7 +14,7 @@ type Props = {
};
function FileListDownloaded(props: Props) {
const { fetching, downloadedUris, downloadedUrisCount, history, page } = props;
const { fetching, downloadedUris, downloadedUrisCount } = props;
const hasDownloads = !!downloadedUris.length;
return (
// Removed the <Page> wapper to try combining this page with UserHistory
@ -29,15 +29,7 @@ function FileListDownloaded(props: Props) {
uris={downloadedUris}
loading={fetching}
/>
<Paginate
onPageChange={p => {
if (page !== p) {
history.replace(`#/$/published?page=${p}`);
}
}}
totalPages={Math.floor(Number(downloadedUrisCount) / Number(PAGE_SIZE))}
loading={fetching}
/>
<Paginate totalPages={Math.ceil(Number(downloadedUrisCount) / Number(PAGE_SIZE))} loading={fetching} />
</div>
) : (
<div className="main--empty">

2
src/ui/page/fileListPublished/index.js
View file

@ -7,7 +7,7 @@ import { withRouter } from 'react-router';
const select = (state, props) => {
const { search } = props.location;
const urlParams = new URLSearchParams(search);
const page = Number(urlParams.get('page')) || 0;
const page = Number(urlParams.get('page')) || 1;
return {
page,
uris: makeSelectMyStreamUrisForPage(page)(state),

12
src/ui/page/fileListPublished/view.jsx
View file

@ -16,7 +16,7 @@ type Props = {
};
function FileListPublished(props: Props) {
const { checkPendingPublishes, fetching, uris, uriTotal, history, page } = props;
const { checkPendingPublishes, fetching, uris, uriTotal } = props;
useEffect(() => {
checkPendingPublishes();
}, [checkPendingPublishes]);
@ -33,15 +33,7 @@ function FileListPublished(props: Props) {
defaultSort
headerAltControls={<Button button="link" label={__('New Publish')} navigate="/$/publish" />}
/>
<Paginate
onPageChange={p => {
if (page !== p) {
history.replace(`#/$/published?page=${p + 1}`);
}
}}
totalPages={Math.floor(Number(uriTotal) / Number(PAGE_SIZE))}
loading={fetching}
/>
<Paginate totalPages={Math.ceil(Number(uriTotal) / Number(PAGE_SIZE))} loading={fetching} />
</div>
) : (
<div className="main--empty">