#RI-4936 - small fixes

Author: egor-zalenski

redisinsight/ui/src/components/notifications/Notifications.tsx

@@ -22,8 +22,9 @@ import { IError, IMessage, InfiniteMessage } from 'uiSrc/slices/interfaces'
 import { ApiEncryptionErrors } from 'uiSrc/constants/apiErrors'
 import { DEFAULT_ERROR_MESSAGE } from 'uiSrc/utils'
 import { showOAuthProgress } from 'uiSrc/slices/oauth/cloud'
-
 import { CustomErrorCodes } from 'uiSrc/constants'
+import { TelemetryEvent, sendEventTelemetry } from 'uiSrc/telemetry'
+
 import errorMessages from './error-messages'
 import { InfiniteMessagesIds } from './components'
 
@@ -115,9 +116,25 @@ const Notifications = () => {
       text: Inner,
       color: 'success',
       onClose: () => {
-        if (id === InfiniteMessagesIds.oAuthProgress) {
-          dispatch(showOAuthProgress(false))
+        switch (id) {
+          case InfiniteMessagesIds.oAuthProgress:
+            dispatch(showOAuthProgress(false))
+            break
+          case InfiniteMessagesIds.databaseExists:
+            sendEventTelemetry({
+              event: TelemetryEvent.CLOUD_IMPORT_EXISTING_DATABASE_FORM_CLOSED,
+            })
+            break
+          case InfiniteMessagesIds.subscriptionExists:
+            sendEventTelemetry({
+              event: TelemetryEvent.CLOUD_CREATE_DATABASE_IN_SUBSCRIPTION_FORM_CLOSED,
+            })
+            break
+
+          default:
+            break
         }
+
         dispatch(removeInfiniteNotification(id))
       },
       toastLifeTimeMs: 3_600_000,

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

@@ -27,6 +27,7 @@ export const INFINITE_MESSAGES = {
                 { (step === CloudJobStep.Credentials || !step) && 'Processing Cloud API keys…'}
                 { step === CloudJobStep.Subscription && 'Processing Cloud subscriptions…'}
                 { step === CloudJobStep.Database && 'Creating a free Cloud database…'}
+                { step === CloudJobStep.Import && 'Importing a free Cloud database…'}
               </span>
             </EuiTitle>
             <EuiText size="xs">
@@ -83,7 +84,7 @@ export const INFINITE_MESSAGES = {
       >
         <EuiTitle className="infiniteMessage__title"><span>You already have a free Redis Enterprise Cloud subscription.</span></EuiTitle>
         <EuiText size="xs">
-          Do you want to import existing databases into RedisInsight?
+          Do you want to import your existing database into RedisInsight?
         </EuiText>
         <EuiSpacer size="m" />
         <EuiFlexGroup justifyContent="spaceBetween" gutterSize="none">

redisinsight/ui/src/electron/constants/cloudAuth.ts

@@ -25,6 +25,7 @@ export enum CloudJobStep {
   Credentials = 'credentials',
   Subscription = 'subscription',
   Database = 'database',
+  Import = 'import',
 }
 
 export enum CloudJobName {