Merge pull request #2638 from RedisInsight/fe/bugfix/regression_2.34.0

#RI-4983, #RI-4991, #RI-4993

Author: mariasergeenko

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

@@ -104,6 +104,7 @@ export const INFINITE_MESSAGES = {
             <EuiButton
               size="s"
               color="secondary"
+              className="infiniteMessage__btn"
               onClick={() => onClose?.()}
               data-testid="cancel-import-db-sso-btn"
             >
@@ -144,6 +145,7 @@ export const INFINITE_MESSAGES = {
             <EuiButton
               size="s"
               color="secondary"
+              className="infiniteMessage__btn"
               onClick={() => onClose?.()}
               data-testid="cancel-create-subscription-sso-btn"
             >

redisinsight/ui/src/components/notifications/styles.module.scss

@@ -62,5 +62,9 @@
       margin-right: 8px;
       margin-top: 2px;
     }
+
+    .infiniteMessage__btn .euiButton__text {
+      color: var(--euiColorSecondaryText) !important;
+    }
   }
 }

redisinsight/ui/src/slices/instances/instances.ts

@@ -436,17 +436,26 @@ function autoCreateAndConnectToInstanceActionSuccess(
   onSuccess?: (id: string) => void,
   onFail?: () => void,
 ) {
-  return async (dispatch: AppDispatch) => {
-    dispatch(setAppContextInitialState())
-    dispatch(setConnectedInstanceId(id ?? ''))
-
-    dispatch(checkConnectToInstanceAction(id, (id) => {
-      setTimeout(() => {
-        dispatch(removeInfiniteNotification(InfiniteMessagesIds.autoCreateDb))
-        dispatch(addMessageNotification(message))
-        onSuccess?.(id)
-      }, HIDE_CREATING_DB_DELAY_MS)
-    }, onFail))
+  return async (dispatch: AppDispatch, stateInit: () => RootState) => {
+    try {
+      const state = stateInit()
+      const isConnectedId = state.app?.context?.contextInstanceId === id
+      if (!isConnectedId) {
+        dispatch(setAppContextInitialState())
+        dispatch(setConnectedInstanceId(id ?? ''))
+      }
+      dispatch(checkConnectToInstanceAction(id, (id) => {
+        setTimeout(() => {
+          dispatch(removeInfiniteNotification(InfiniteMessagesIds.autoCreateDb))
+          dispatch(addMessageNotification(message))
+          onSuccess?.(id)
+        }, HIDE_CREATING_DB_DELAY_MS)
+      },
+      onFail,
+      !isConnectedId))
+    } catch (error) {
+      // process error if needed
+    }
   }
 }
 

redisinsight/ui/src/telemetry/checkAnalytics.ts

@@ -0,0 +1,6 @@
+import { get } from 'lodash'
+import { store } from 'uiSrc/slices/store'
+
+// Check is user give access to collect his events
+export const checkIsAnalyticsGranted = (): boolean =>
+  !!get(store.getState(), 'user.settings.config.agreements.analytics', false)

redisinsight/ui/src/telemetry/telemetryUtils.ts

@@ -17,9 +17,14 @@ import {
   RedisModules,
 } from './interfaces'
 import { TelemetryEvent } from './events'
+import { checkIsAnalyticsGranted } from './checkAnalytics'
 
 const sendEventTelemetry = async ({ event, eventData = {} }: ITelemetrySendEvent) => {
   try {
+    const isAnalyticsGranted = checkIsAnalyticsGranted()
+    if (!isAnalyticsGranted) {
+      return
+    }
     await apiService.post(`${ApiEndpoints.ANALYTICS_SEND_EVENT}`, { event, eventData })
   } catch (e) {
     // continue regardless of error
@@ -28,6 +33,10 @@ const sendEventTelemetry = async ({ event, eventData = {} }: ITelemetrySendEvent
 
 const sendPageViewTelemetry = async ({ name }: ITelemetrySendPageView) => {
   try {
+    const isAnalyticsGranted = checkIsAnalyticsGranted()
+    if (!isAnalyticsGranted) {
+      return
+    }
     await apiService.post(`${ApiEndpoints.ANALYTICS_SEND_PAGE}`, { event: name })
   } catch (e) {
     // continue regardless of error