Merge pull request #3661 from RedisInsight/fe/bugfix/RI-5967-remove-new-message-from-imported-databases

RI-5967 Show new message only on freedb create, redirect to browser o…

Author: mariasergeenko

redisinsight/ui/src/components/notifications/components/infinite-messages/InfiniteMessages.tsx

@@ -11,14 +11,15 @@ import {
 } from '@elastic/eui'
 import { find } from 'lodash'
 import cx from 'classnames'
-import { CloudJobStep } from 'uiSrc/electron/constants'
+import { CloudJobName, CloudJobStep } from 'uiSrc/electron/constants'
 import ExternalLink from 'uiSrc/components/base/external-link'
 import ChampagneIcon from 'uiSrc/assets/img/icons/champagne.svg'
 import Divider from 'uiSrc/components/divider/Divider'
 import { OAuthProviders } from 'uiSrc/components/oauth/oauth-select-plan/constants'
 
 import { CloudSuccessResult } from 'uiSrc/slices/interfaces'
 
+import { Maybe } from 'uiSrc/utils'
 import styles from './styles.module.scss'
 
 export enum InfiniteMessagesIds {
@@ -91,8 +92,11 @@ export const INFINITE_MESSAGES = {
       </div>
     )
   }),
-  SUCCESS_CREATE_DB: (details: Omit<CloudSuccessResult, 'resourceId'>, onSuccess: () => void) => {
+  SUCCESS_CREATE_DB: (details: Omit<CloudSuccessResult, 'resourceId'>, onSuccess: () => void, jobName: Maybe<CloudJobName>) => {
     const vendor = find(OAuthProviders, ({ id }) => id === details.provider)
+    const withFeed = jobName
+      && [CloudJobName.CreateFreeDatabase, CloudJobName.CreateFreeSubscriptionAndDatabase].includes(jobName)
+    const text = `You can now use your Redis Stack database in Redis Cloud${withFeed ? ' with pre-loaded sample data' : ''}.`
     return ({
       id: InfiniteMessagesIds.oAuthSuccess,
       className: 'wide',
@@ -110,7 +114,7 @@ export const INFINITE_MESSAGES = {
             <EuiFlexItem grow>
               <EuiTitle className="infiniteMessage__title"><span>Congratulations!</span></EuiTitle>
               <EuiText size="xs">
-                You can now use your Redis Stack database in Redis Cloud with pre-loaded sample data.
+                {text}
                 <EuiSpacer size="s" />
                 <b>Notice:</b> the database will be deleted after 15 days of inactivity.
               </EuiText>

redisinsight/ui/src/components/oauth/oauth-jobs/OAuthJobs.tsx

@@ -26,6 +26,7 @@ import { setSSOFlow } from 'uiSrc/slices/instances/cloud'
 const OAuthJobs = () => {
   const {
     status,
+    name: jobName,
     error,
     step,
     result,
@@ -44,7 +45,7 @@ const OAuthJobs = () => {
         break
 
       case CloudJobStatus.Finished:
-        dispatch(fetchInstancesAction(() => dispatch(createFreeDbSuccess(result, history))))
+        dispatch(fetchInstancesAction(() => dispatch(createFreeDbSuccess(result, history, jobName))))
         dispatch(setJob({ id: '', name: CloudJobName.CreateFreeSubscriptionAndDatabase, status: '' }))
         localStorageService.remove(BrowserStorageItem.OAuthJobId)
         break

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

@@ -3,7 +3,7 @@ import { AxiosError } from 'axios'
 import { remove } from 'lodash'
 import { apiService, localStorageService } from 'uiSrc/services'
 import { ApiEndpoints, BrowserStorageItem, Pages } from 'uiSrc/constants'
-import { getApiErrorCode, getApiErrorMessage, getAxiosError, isStatusSuccessful, Nullable } from 'uiSrc/utils'
+import { getApiErrorCode, getApiErrorMessage, getAxiosError, isStatusSuccessful, Maybe, Nullable } from 'uiSrc/utils'
 
 import { CloudJobName, CloudJobStatus } from 'uiSrc/electron/constants'
 import {
@@ -242,7 +242,7 @@ export const oauthCapiKeysSelector = (state: RootState) => state.oauth.cloud.cap
 // The reducer
 export default oauthCloudSlice.reducer
 
-export function createFreeDbSuccess(result: CloudSuccessResult, history: any) {
+export function createFreeDbSuccess(result: CloudSuccessResult, history: any, jobName: Maybe<CloudJobName>) {
   return async (dispatch: AppDispatch, stateInit: () => RootState) => {
     const { resourceId: id, ...details } = result
     try {
@@ -257,12 +257,12 @@ export function createFreeDbSuccess(result: CloudSuccessResult, history: any) {
           dispatch(checkConnectToInstanceAction(id))
         }
 
-        history.push(Pages.workbench(id))
+        history.push(Pages.browser(id))
       }
 
       dispatch(showOAuthProgress(true))
       dispatch(removeInfiniteNotification(InfiniteMessagesIds.oAuthProgress))
-      dispatch(addInfiniteNotification(INFINITE_MESSAGES.SUCCESS_CREATE_DB(details, onConnect)))
+      dispatch(addInfiniteNotification(INFINITE_MESSAGES.SUCCESS_CREATE_DB(details, onConnect, jobName)))
       dispatch(setSelectAccountDialogState(false))
     } catch (_err) {
       const error = _err as AxiosError

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

@@ -1024,13 +1024,13 @@ describe('oauth cloud slice', () => {
         const onConnect = () => {}
 
         // Act
-        await store.dispatch<any>(createFreeDbSuccess(result, {}))
+        await store.dispatch<any>(createFreeDbSuccess(result, {}, CloudJobName.CreateFreeDatabase))
 
         // Assert
         const expectedActions = [
           showOAuthProgress(true),
           removeInfiniteNotification(InfiniteMessagesIds.oAuthProgress),
-          addInfiniteNotification(INFINITE_MESSAGES.SUCCESS_CREATE_DB({}, onConnect)),
+          addInfiniteNotification(INFINITE_MESSAGES.SUCCESS_CREATE_DB({}, onConnect, CloudJobName.CreateFreeDatabase)),
           setSelectAccountDialogState(false),
         ]
         expect(clearStoreActions(store.getActions())).toEqual(clearStoreActions(expectedActions))