mirrors/shlink-web-client
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink-web-client.git synced 2025-01-10 02:07:26 +03:00
Code Issues Projects Releases Packages Wiki Activity

Ensured state is properly reset when starting, finisihing or failing to load visits

Browse source
This commit is contained in:
Alejandro Celaya 2020-05-11 18:55:35 +02:00
parent 02a4380f7c
commit 9bdbe90716
3 changed files with 9 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/visits/reducers/shortUrlDetail.js
View file

@ -21,9 +21,9 @@ const initialState = {
}; };
export default handleActions({ export default handleActions({
[GET_SHORT_URL_DETAIL_START]: (state) => ({ ...state, loading: true }), [GET_SHORT_URL_DETAIL_START]: () => ({ ...initialState, loading: true }),
[GET_SHORT_URL_DETAIL_ERROR]: (state) => ({ ...state, loading: false, error: true }), [GET_SHORT_URL_DETAIL_ERROR]: () => ({ ...initialState, loading: false, error: true }),
[GET_SHORT_URL_DETAIL]: (state, { shortUrl }) => ({ shortUrl, loading: false, error: false }), [GET_SHORT_URL_DETAIL]: (state, { shortUrl }) => ({ ...initialState, shortUrl }),
}, initialState); }, initialState);
export const getShortUrlDetail = (buildShlinkApiClient) => (shortCode, domain) => async (dispatch, getState) => { export const getShortUrlDetail = (buildShlinkApiClient) => (shortCode, domain) => async (dispatch, getState) => {

20
src/visits/reducers/shortUrlVisits.js
View file

@ -33,27 +33,13 @@ const initialState = {
}; };
export default handleActions({ export default handleActions({
[GET_SHORT_URL_VISITS_START]: (state) => ({ [GET_SHORT_URL_VISITS_START]: () => ({ ...initialState, loading: true }),
...state, [GET_SHORT_URL_VISITS_ERROR]: () => ({ ...initialState, error: true }),
loading: true,
loadingLarge: false,
cancelLoad: false,
}),
[GET_SHORT_URL_VISITS_ERROR]: (state) => ({
...state,
loading: false,
loadingLarge: false,
error: true,
cancelLoad: false,
}),
[GET_SHORT_URL_VISITS]: (state, { visits, shortCode, domain }) => ({ [GET_SHORT_URL_VISITS]: (state, { visits, shortCode, domain }) => ({
...initialState,
visits, visits,
shortCode, shortCode,
domain, domain,
loading: false,
loadingLarge: false,
error: false,
cancelLoad: false,
}), }),
[GET_SHORT_URL_VISITS_LARGE]: (state) => ({ ...state, loadingLarge: true }), [GET_SHORT_URL_VISITS_LARGE]: (state) => ({ ...state, loadingLarge: true }),
[GET_SHORT_URL_VISITS_CANCEL]: (state) => ({ ...state, cancelLoad: true }), [GET_SHORT_URL_VISITS_CANCEL]: (state) => ({ ...state, cancelLoad: true }),

24
src/visits/reducers/tagVisits.js
View file

@ -30,27 +30,9 @@ const initialState = {
}; };
export default handleActions({ export default handleActions({
[GET_TAG_VISITS_START]: (state) => ({ [GET_TAG_VISITS_START]: () => ({ ...initialState, loading: true }),
...state, [GET_TAG_VISITS_ERROR]: () => ({ ...initialState, error: true }),
loading: true, [GET_TAG_VISITS]: (state, { visits, tag }) => ({ ...initialState, visits, tag }),
loadingLarge: false,
cancelLoad: false,
}),
[GET_TAG_VISITS_ERROR]: (state) => ({
...state,
loading: false,
loadingLarge: false,
error: true,
cancelLoad: false,
}),
[GET_TAG_VISITS]: (state, { visits, tag }) => ({
visits,
tag,
loading: false,
loadingLarge: false,
error: false,
cancelLoad: false,
}),
[GET_TAG_VISITS_LARGE]: (state) => ({ ...state, loadingLarge: true }), [GET_TAG_VISITS_LARGE]: (state) => ({ ...state, loadingLarge: true }),
[GET_TAG_VISITS_CANCEL]: (state) => ({ ...state, cancelLoad: true }), [GET_TAG_VISITS_CANCEL]: (state) => ({ ...state, cancelLoad: true }),
[CREATE_VISIT]: (state, { shortUrl, visit }) => { // eslint-disable-line object-shorthand [CREATE_VISIT]: (state, { shortUrl, visit }) => { // eslint-disable-line object-shorthand