1
0
Fork 0
mirror of https://github.com/muerwre/vault-frontend.git synced 2025-04-25 21:06:42 +07:00

search load more

This commit is contained in:
Fedor Katurov 2020-04-18 18:07:39 +07:00
parent 94ac596b92
commit 9498c7b7a0
12 changed files with 199 additions and 26 deletions

View file

@ -46,3 +46,7 @@ export const flowChangeSearch = (search: Partial<IFlowState['search']>) => ({
type: FLOW_ACTIONS.CHANGE_SEARCH,
search,
});
export const flowLoadMoreSearch = () => ({
type: FLOW_ACTIONS.LOAD_MORE_SEARCH,
});

View file

@ -2,6 +2,7 @@ import { api, configWithToken, resultMiddleware, errorMiddleware } from '~/utils
import { INode, IResultWithStatus } from '../types';
import { API } from '~/constants/api';
import { flowSetCellView } from '~/redux/flow/actions';
import { IFlowState } from './reducer';
export const postNode = ({
access,
@ -30,11 +31,12 @@ export const postCellView = ({
export const getSearchResults = ({
access,
text,
}: {
skip = 0,
}: IFlowState['search'] & {
access: string;
text: string;
skip: number;
}): Promise<IResultWithStatus<{ nodes: INode[]; total: number }>> =>
api
.get(API.SEARCH, configWithToken(access, { params: { text } }))
.get(API.SEARCH.NODES, configWithToken(access, { params: { text, skip } }))
.then(resultMiddleware)
.catch(errorMiddleware);

View file

@ -13,4 +13,5 @@ export const FLOW_ACTIONS = {
SET_SEARCH: `${prefix}SET_SEARCH`,
CHANGE_SEARCH: `${prefix}CHANGE_SEARCH`,
LOAD_MORE_SEARCH: `${prefix}LOAD_MORE_SEARCH`,
};

View file

@ -10,8 +10,10 @@ export type IFlowState = Readonly<{
updated: Partial<INode>[];
search: {
text: string;
is_loading: boolean;
results: INode[];
total: number;
is_loading: boolean;
is_loading_more: boolean;
};
error: IError;
}>;
@ -23,8 +25,10 @@ const INITIAL_STATE: IFlowState = {
updated: [],
search: {
text: '',
is_loading: false,
results: [],
total: 0,
is_loading: false,
is_loading_more: false,
},
is_loading: false,
error: null,

View file

@ -1,4 +1,4 @@
import { takeLatest, call, put, select, takeLeading, delay } from 'redux-saga/effects';
import { takeLatest, call, put, select, takeLeading, delay, race, take } from 'redux-saga/effects';
import { REHYDRATE } from 'redux-persist';
import { FLOW_ACTIONS } from './constants';
import { getNodeDiff } from '../node/api';
@ -13,7 +13,7 @@ import {
flowSetSearch,
} from './actions';
import { IResultWithStatus, INode, Unwrap } from '../types';
import { selectFlowNodes } from './selectors';
import { selectFlowNodes, selectFlow } from './selectors';
import { reqWrapper } from '../auth/sagas';
import { postCellView, getSearchResults } from './api';
import { IFlowState } from './reducer';
@ -124,11 +124,59 @@ function* changeSearch({ search }: ReturnType<typeof flowChangeSearch>) {
yield delay(500);
const res: Unwrap<typeof getSearchResults> = yield call(reqWrapper, getSearchResults, {
...search,
const { data, error }: Unwrap<ReturnType<typeof getSearchResults>> = yield call(
reqWrapper,
getSearchResults,
{
...search,
}
);
if (error) {
yield put(flowSetSearch({ is_loading: false, results: [], total: 0 }));
return;
}
yield put(
flowSetSearch({
is_loading: false,
results: data.nodes,
total: data.total,
})
);
}
function* loadMoreSearch() {
yield put(
flowSetSearch({
is_loading_more: true,
})
);
const { search }: ReturnType<typeof selectFlow> = yield select(selectFlow);
const {
result,
delay,
}: { result: Unwrap<ReturnType<typeof getSearchResults>>; delay: any } = yield race({
result: call(reqWrapper, getSearchResults, {
...search,
skip: search.results.length,
}),
delay: take(FLOW_ACTIONS.CHANGE_SEARCH),
});
console.log(res);
if (delay || result.error) {
return put(flowSetSearch({ is_loading_more: false }));
}
yield put(
flowSetSearch({
results: [...search.results, ...result.data.nodes],
total: result.data.total,
is_loading_more: false,
})
);
}
export default function* nodeSaga() {
@ -136,4 +184,5 @@ export default function* nodeSaga() {
yield takeLatest(FLOW_ACTIONS.SET_CELL_VIEW, onSetCellView);
yield takeLeading(FLOW_ACTIONS.GET_MORE, getMore);
yield takeLatest(FLOW_ACTIONS.CHANGE_SEARCH, changeSearch);
yield takeLatest(FLOW_ACTIONS.LOAD_MORE_SEARCH, loadMoreSearch);
}