[Glitch] Handle `createAppAsyncThunk` rejected actions in the errors middleware
Port 69e5771881
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
pull/2699/head
parent
7f404fd635
commit
375bd52d97
|
@ -1,16 +1,27 @@
|
|||
import { isAction } from '@reduxjs/toolkit';
|
||||
import {
|
||||
isAction,
|
||||
isAsyncThunkAction,
|
||||
isRejectedWithValue,
|
||||
} from '@reduxjs/toolkit';
|
||||
import type { Action, Middleware } from '@reduxjs/toolkit';
|
||||
|
||||
import type { RootState } from '..';
|
||||
import { showAlertForError } from '../../actions/alerts';
|
||||
import type { AsyncThunkRejectValue } from '../typed_functions';
|
||||
|
||||
const defaultFailSuffix = 'FAIL';
|
||||
const isFailedAction = new RegExp(`${defaultFailSuffix}$`, 'g');
|
||||
|
||||
interface ActionWithMaybeAlertParams extends Action {
|
||||
skipAlert?: boolean;
|
||||
skipNotFound?: boolean;
|
||||
error?: unknown;
|
||||
interface ActionWithMaybeAlertParams extends Action, AsyncThunkRejectValue {}
|
||||
|
||||
interface RejectedAction extends Action {
|
||||
payload: AsyncThunkRejectValue;
|
||||
}
|
||||
|
||||
function isRejectedActionWithPayload(
|
||||
action: unknown,
|
||||
): action is RejectedAction {
|
||||
return isAsyncThunkAction(action) && isRejectedWithValue(action);
|
||||
}
|
||||
|
||||
function isActionWithmaybeAlertParams(
|
||||
|
@ -23,7 +34,11 @@ export const errorsMiddleware: Middleware<Record<string, never>, RootState> =
|
|||
({ dispatch }) =>
|
||||
(next) =>
|
||||
(action) => {
|
||||
if (
|
||||
if (isRejectedActionWithPayload(action) && !action.payload.skipAlert) {
|
||||
dispatch(
|
||||
showAlertForError(action.payload.error, action.payload.skipNotFound),
|
||||
);
|
||||
} else if (
|
||||
isActionWithmaybeAlertParams(action) &&
|
||||
!action.skipAlert &&
|
||||
action.type.match(isFailedAction)
|
||||
|
|
|
@ -7,8 +7,14 @@ import type { AppDispatch, RootState } from './store';
|
|||
export const useAppDispatch = useDispatch.withTypes<AppDispatch>();
|
||||
export const useAppSelector = useSelector.withTypes<RootState>();
|
||||
|
||||
export interface AsyncThunkRejectValue {
|
||||
skipAlert?: boolean;
|
||||
skipNotFound?: boolean;
|
||||
error?: unknown;
|
||||
}
|
||||
|
||||
export const createAppAsyncThunk = createAsyncThunk.withTypes<{
|
||||
state: RootState;
|
||||
dispatch: AppDispatch;
|
||||
rejectValue: string;
|
||||
rejectValue: AsyncThunkRejectValue;
|
||||
}>();
|
||||
|
|
Loading…
Reference in New Issue