Merge pull request #2446 from RedisInsight/fe/bugfix/RI-4838

#RI-4838 - fix closing processing message on error

Author: rsergeenko

redisinsight/ui/src/components/oauth/oauth-select-account-dialog/OAuthSelectAccountDialog.tsx

@@ -70,6 +70,9 @@ const OAuthSelectAccountDialog = () => {
           dispatch(removeInfiniteNotification(InfiniteMessagesIds.oAuthProgress))
           history.push(Pages.redisCloudSubscriptions)
         },
+        () => {
+          dispatch(removeInfiniteNotification(InfiniteMessagesIds.oAuthProgress))
+        }
       ))
       dispatch(setSelectAccountDialogState(false))
     } else {

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

@@ -16,7 +16,7 @@ import { CloudJobInfo } from 'apiSrc/modules/cloud/job/models'
 import { CloudSubscriptionPlanResponse } from 'apiSrc/modules/cloud/subscription/dto'
 
 import { AppDispatch, RootState } from '../store'
-import { CloudCapiKey, Instance, OAuthSocialSource, StateAppOAuth } from '../interfaces'
+import { CloudCapiKey, CloudJobInfoState, Instance, OAuthSocialSource, StateAppOAuth } from '../interfaces'
 import {
   addErrorNotification,
   addInfiniteNotification,
@@ -117,7 +117,7 @@ const oauthCloudSlice = createSlice({
     setSelectAccountDialogState: (state, { payload }: PayloadAction<boolean>) => {
       state.isOpenSelectAccountDialog = payload
     },
-    setJob: (state, { payload }: PayloadAction<CloudJobInfo>) => {
+    setJob: (state, { payload }: PayloadAction<CloudJobInfoState>) => {
       state.job = payload
     },
 
@@ -365,6 +365,7 @@ export function fetchPlans(onSuccessAction?: () => void, onFailAction?: () => vo
       const error = _err as AxiosError
       dispatch(addErrorNotification(error))
       dispatch(getPlansFailure())
+      dispatch(removeInfiniteNotification(InfiniteMessagesIds.oAuthProgress))
       onFailAction?.()
     }
   }

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

@@ -1017,6 +1017,7 @@ describe('oauth cloud slice', () => {
           getPlans(),
           addErrorNotification(responsePayload as AxiosError),
           getPlansFailure(),
+          removeInfiniteNotification(InfiniteMessagesIds.oAuthProgress),
         ]
         expect(store.getActions()).toEqual(expectedActions)
       })