Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
frontend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
minerva
frontend
Commits
40f492e5
Commit
40f492e5
authored
10 months ago
by
Piotr Gawron
Browse files
Options
Downloads
Patches
Plain Diff
provide error when redux is rejected
parent
82cef990
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!223
reset the pin numbers before search results are fetch (so the results will be...
,
!199
Resolve "[MIN-321] form for reporting errors in minerva"
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/redux/overlays/overlays.thunks.ts
+8
-14
8 additions, 14 deletions
src/redux/overlays/overlays.thunks.ts
with
8 additions
and
14 deletions
src/redux/overlays/overlays.thunks.ts
+
8
−
14
View file @
40f492e5
...
...
@@ -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
}));
}
},
);
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment