mirror of
https://github.com/muerwre/vault-frontend.git
synced 2025-04-24 20:36:40 +07:00
fixed offseting in lab by number
This commit is contained in:
parent
26a6d2d919
commit
2f8ce82325
3 changed files with 8 additions and 10 deletions
|
@ -7,9 +7,9 @@ import {
|
|||
} from '~/types/lab';
|
||||
import { api, cleanResult } from '~/utils/api';
|
||||
|
||||
export const getLabNodes = ({ after, sort }: GetLabNodesRequest) =>
|
||||
export const getLabNodes = ({ offset, limit, sort }: GetLabNodesRequest) =>
|
||||
api
|
||||
.get<GetLabNodesResult>(API.LAB.NODES, { params: { after, sort } })
|
||||
.get<GetLabNodesResult>(API.LAB.NODES, { params: { offset, limit, sort } })
|
||||
.then(cleanResult);
|
||||
|
||||
export const getLabStats = () => api.get<GetLabStatsResult>(API.LAB.STATS).then(cleanResult);
|
||||
|
|
|
@ -7,22 +7,18 @@ import { useAuth } from '~/hooks/auth/useAuth';
|
|||
import { useLabStore } from '~/store/lab/useLabStore';
|
||||
import { INode } from '~/types';
|
||||
import { GetLabNodesRequest, ILabNode, LabNodesSort } from '~/types/lab';
|
||||
import { flatten, last, uniqBy } from '~/utils/ramda';
|
||||
import { flatten, uniqBy } from '~/utils/ramda';
|
||||
|
||||
const getKey: (isUser: boolean, sort?: LabNodesSort) => SWRInfiniteKeyLoader = (isUser, sort) => (
|
||||
index,
|
||||
prev: ILabNode[]
|
||||
) => {
|
||||
if (!isUser) return null;
|
||||
if (index > 0 && !prev?.length) return null;
|
||||
|
||||
const lastNode = last(prev || []);
|
||||
if (!lastNode && index > 0) {
|
||||
return null;
|
||||
}
|
||||
if (index > 0 && (!prev?.length || prev.length < 20)) return null;
|
||||
|
||||
const props: GetLabNodesRequest = {
|
||||
after: lastNode?.node.commented_at || lastNode?.node.created_at,
|
||||
limit: 20,
|
||||
offset: index * 20,
|
||||
sort: sort || LabNodesSort.New,
|
||||
};
|
||||
|
||||
|
|
|
@ -25,6 +25,8 @@ export enum LabNodesSort {
|
|||
}
|
||||
|
||||
export type GetLabNodesRequest = {
|
||||
limit?: number;
|
||||
offset?: number;
|
||||
after?: string;
|
||||
sort?: LabNodesSort;
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue