Skip to content
Snippets Groups Projects
Commit 40f492e5 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

provide error when redux is rejected

parent 82cef990
No related branches found
No related tags found
2 merge requests!223reset the pin numbers before search results are fetch (so the results will be...,!199Resolve "[MIN-321] form for reporting errors in minerva"
......@@ -12,7 +12,6 @@ import { createAsyncThunk } from '@reduxjs/toolkit';
import { z } from 'zod';
import { PluginsEventBus } from '@/services/pluginsManager/pluginsEventBus';
import { showToast } from '@/utils/showToast';
import { getErrorMessage } from '@/utils/getErrorMessage';
import { ThunkConfig } from '@/types/store';
import { BASE_API_URL } from '@/constants';
import { getError } from '@/utils/error-report/getError';
......@@ -50,7 +49,7 @@ export const getAllPublicOverlaysByProjectId = createAsyncThunk<MapOverlay[], st
export const getAllUserOverlaysByCreator = createAsyncThunk<MapOverlay[], void, ThunkConfig>(
'overlays/getAllUserOverlaysByCreator',
async (_, { getState, rejectWithValue }) => {
async (_, { getState }) => {
try {
const state = getState() as RootState;
const creator = state.user.login;
......@@ -77,8 +76,7 @@ export const getAllUserOverlaysByCreator = createAsyncThunk<MapOverlay[], void,
return isDataValid ? sortedUserOverlays : [];
} catch (error) {
const errorMessage = getErrorMessage({ error, prefix: USER_OVERLAYS_FETCHING_ERROR_PREFIX });
return rejectWithValue(errorMessage);
return Promise.reject(getError({ error, prefix: USER_OVERLAYS_FETCHING_ERROR_PREFIX }));
}
},
);
......@@ -196,7 +194,7 @@ export const addOverlay = createAsyncThunk<undefined, AddOverlayArgs, ThunkConfi
'overlays/addOverlay',
async (
{ filename, content, description, name, type, projectId },
{ rejectWithValue, dispatch },
{ dispatch },
// eslint-disable-next-line consistent-return
) => {
try {
......@@ -222,8 +220,7 @@ export const addOverlay = createAsyncThunk<undefined, AddOverlayArgs, ThunkConfi
showToast({ type: 'success', message: USER_OVERLAY_ADD_SUCCESS_MESSAGE });
} catch (error) {
const errorMessage = getErrorMessage({ error, prefix: USER_OVERLAY_ADD_ERROR_PREFIX });
return rejectWithValue(errorMessage);
return Promise.reject(getError({ error, prefix: USER_OVERLAY_ADD_ERROR_PREFIX }));
}
},
);
......@@ -231,7 +228,7 @@ export const addOverlay = createAsyncThunk<undefined, AddOverlayArgs, ThunkConfi
export const updateOverlays = createAsyncThunk<undefined, MapOverlay[], ThunkConfig>(
'overlays/updateOverlays',
// eslint-disable-next-line consistent-return
async (userOverlays, { rejectWithValue }) => {
async userOverlays => {
try {
const userOverlaysPromises = userOverlays.map(userOverlay =>
axiosInstance.patch<MapOverlay>(
......@@ -255,9 +252,7 @@ export const updateOverlays = createAsyncThunk<undefined, MapOverlay[], ThunkCon
showToast({ type: 'success', message: USER_OVERLAY_UPDATE_SUCCESS_MESSAGE });
} catch (error) {
const errorMessage = getErrorMessage({ error, prefix: USER_OVERLAY_UPDATE_ERROR_PREFIX });
return rejectWithValue(errorMessage);
return Promise.reject(getError({ error, prefix: USER_OVERLAY_UPDATE_ERROR_PREFIX }));
}
},
);
......@@ -265,7 +260,7 @@ export const updateOverlays = createAsyncThunk<undefined, MapOverlay[], ThunkCon
export const removeOverlay = createAsyncThunk<undefined, { overlayId: number }, ThunkConfig>(
'overlays/removeOverlay',
// eslint-disable-next-line consistent-return
async ({ overlayId }, { dispatch, rejectWithValue }) => {
async ({ overlayId }, { dispatch }) => {
try {
await axiosInstance.delete(apiPath.removeOverlay(overlayId), {
withCredentials: true,
......@@ -277,8 +272,7 @@ export const removeOverlay = createAsyncThunk<undefined, { overlayId: number },
showToast({ type: 'success', message: USER_OVERLAY_REMOVE_SUCCESS_MESSAGE });
} catch (error) {
const errorMessage = getErrorMessage({ error, prefix: USER_OVERLAY_REMOVE_ERROR_PREFIX });
return rejectWithValue(errorMessage);
return Promise.reject(getError({ error, prefix: USER_OVERLAY_REMOVE_ERROR_PREFIX }));
}
},
);
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment