Skip to content

Commit a4c1777

Browse files
committed
#RI-4838 - add custom error message for fetch plans
1 parent 9a9f16e commit a4c1777

File tree

1 file changed

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

1 file changed

+14
-5
lines changed

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

Lines changed: 14 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, parseCloudOAuthError } from 'uiSrc/utils'
77

88
import { CloudJobName, CloudJobStatus } from 'uiSrc/electron/constants'
99
import {
@@ -16,7 +16,15 @@ 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+
CustomError,
23+
EnhancedAxiosError,
24+
Instance,
25+
OAuthSocialSource,
26+
StateAppOAuth
27+
} from '../interfaces'
2028
import {
2129
addErrorNotification,
2230
addInfiniteNotification,
@@ -361,9 +369,10 @@ export function fetchPlans(onSuccessAction?: () => void, onFailAction?: () => vo
361369

362370
onSuccessAction?.()
363371
}
364-
} catch (_err) {
365-
const error = _err as AxiosError
366-
dispatch(addErrorNotification(error))
372+
} catch (error) {
373+
const err = getAxiosError(error as EnhancedAxiosError)
374+
375+
dispatch(addErrorNotification(err))
367376
dispatch(getPlansFailure())
368377
dispatch(removeInfiniteNotification(InfiniteMessagesIds.oAuthProgress))
369378
onFailAction?.()

0 commit comments

Comments
 (0)