Skip to content

Commit 2eaa99b

Browse files
authored
Merge pull request #2451 from RedisInsight/fe/bugfix/RI-4838
#RI-4838 - add custom error message for fetch plans
2 parents 58bd665 + c5baafa commit 2eaa99b

File tree

1 file changed

+13
-5
lines changed
  • redisinsight/ui/src/slices/oauth

1 file changed

+13
-5
lines changed

redisinsight/ui/src/slices/oauth/cloud.ts

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { AxiosError } from 'axios'
33
import { remove } from 'lodash'
44
import { apiService, localStorageService } from 'uiSrc/services'
55
import { ApiEndpoints, BrowserStorageItem, Pages } from 'uiSrc/constants'
6-
import { getApiErrorMessage, isStatusSuccessful, Nullable } from 'uiSrc/utils'
6+
import { getApiErrorMessage, getAxiosError, isStatusSuccessful, Nullable } from 'uiSrc/utils'
77

88
import { CloudJobName, CloudJobStatus } from 'uiSrc/electron/constants'
99
import {
@@ -16,7 +16,14 @@ import { CloudJobInfo } from 'apiSrc/modules/cloud/job/models'
1616
import { CloudSubscriptionPlanResponse } from 'apiSrc/modules/cloud/subscription/dto'
1717

1818
import { AppDispatch, RootState } from '../store'
19-
import { CloudCapiKey, CloudJobInfoState, Instance, OAuthSocialSource, StateAppOAuth } from '../interfaces'
19+
import {
20+
CloudCapiKey,
21+
CloudJobInfoState,
22+
EnhancedAxiosError,
23+
Instance,
24+
OAuthSocialSource,
25+
StateAppOAuth
26+
} from '../interfaces'
2027
import {
2128
addErrorNotification,
2229
addInfiniteNotification,
@@ -361,9 +368,10 @@ export function fetchPlans(onSuccessAction?: () => void, onFailAction?: () => vo
361368

362369
onSuccessAction?.()
363370
}
364-
} catch (_err) {
365-
const error = _err as AxiosError
366-
dispatch(addErrorNotification(error))
371+
} catch (error) {
372+
const err = getAxiosError(error as EnhancedAxiosError)
373+
374+
dispatch(addErrorNotification(err))
367375
dispatch(getPlansFailure())
368376
dispatch(removeInfiniteNotification(InfiniteMessagesIds.oAuthProgress))
369377
onFailAction?.()

0 commit comments

Comments
 (0)