Merge branch 'feature/RI-4399-beta_features' into e2e/feature/RI-4399-hide_recommendations_for_users

Author: vlad-dargel

redisinsight/api/src/modules/database-recommendation/scanner/strategies/integer-in-set.strategy.spec.ts

@@ -36,13 +36,13 @@ describe('IntegersInSetStrategy', () => {
       })).toEqual({ isReached: false });
     });
 
-    it('should return false when some member is not an integer in the first 50 members and not all members are uniq', async () => {
+    it('should return false when some member is not an integer in the first 50 members', async () => {
       expect(await strategy.isRecommendationReached({
         client: nodeClient,
         databaseId: mockDatabaseId,
-        members: [...mockIntegerMembers, ...mockNotIntegerMembers, ...mockNotIntegerMembers] as RedisString[],
+        members: [...mockIntegerMembers, ...mockNotIntegerMembers] as RedisString[],
         keyName: mockKeyName,
-      })).toEqual({ isReached: false });
+      })).toEqual({ isReached: true, params: { keys: [mockKeyName] } });
     });
 
     it('should return false when 51th member is not an integer', async () => {
@@ -53,14 +53,5 @@ describe('IntegersInSetStrategy', () => {
         keyName: mockKeyName,
       })).toEqual({ isReached: false });
     });
-
-    it('should return true when some member is not an integer in the first 50 members and all members are uniq', async () => {
-      expect(await strategy.isRecommendationReached({
-        client: nodeClient,
-        databaseId: mockDatabaseId,
-        members: [...mockIntegerMembers, ...mockNotIntegerMembers] as RedisString[],
-        keyName: mockKeyName,
-      })).toEqual({ isReached: true, params: { keys: [mockKeyName] } });
-    });
   });
 });

redisinsight/api/src/modules/database-recommendation/scanner/strategies/integer-in-set.strategy.ts

@@ -1,4 +1,4 @@
-import { isNaN, toNumber, uniq } from 'lodash';
+import { isNaN, toNumber } from 'lodash';
 import { AbstractRecommendationStrategy }
   from 'src/modules/database-recommendation/scanner/strategies/abstract.recommendation.strategy';
 import { IDatabaseRecommendationStrategyData }
@@ -21,9 +21,7 @@ export class IntegersInSetStrategy extends AbstractRecommendationStrategy {
       (member) => isNaN(toNumber(getUTF8FromRedisString(member))),
     );
 
-    const isAllMembersUniq = uniq(membersForCheck).length === membersForCheck.length;
-
-    return isNotIntegerInSet && isAllMembersUniq
+    return isNotIntegerInSet
       ? { isReached: true, params: { keys: [data?.keyName] } }
       : { isReached: false };
   }

redisinsight/ui/src/components/navigation-menu/components/help-menu/HelpMenu.tsx

@@ -15,6 +15,7 @@ import React, { useState } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
 
 import { EXTERNAL_LINKS } from 'uiSrc/constants/links'
+import { ReleaseNotesSource } from 'uiSrc/constants/telemetry'
 import { appElectronInfoSelector, setReleaseNotesViewed, setShortcutsFlyoutState } from 'uiSrc/slices/app/info'
 import { ONBOARDING_FEATURES } from 'uiSrc/components/onboarding-features'
 import { setOnboarding } from 'uiSrc/slices/app/features'
@@ -24,6 +25,8 @@ import { connectedInstanceSelector } from 'uiSrc/slices/instances/instances'
 import { ReactComponent as GithubHelpCenterSVG } from 'uiSrc/assets/img/github.svg'
 import { ReactComponent as BulbSVG } from 'uiSrc/assets/img/bulb.svg'
 
+import { addMessageNotification } from 'uiSrc/slices/app/notifications'
+import successMessages from 'uiSrc/components/notifications/success-messages'
 import navStyles from '../../styles.module.scss'
 import styles from './styles.module.scss'
 
@@ -40,6 +43,15 @@ const HelpMenu = () => {
   }
 
   const onClickReleaseNotes = async () => {
+    dispatch(addMessageNotification(
+      successMessages.INSTALLED_NEW_UPDATE('2.2.1', () => dispatch(setReleaseNotesViewed(true)))
+    ))
+    sendEventTelemetry({
+      event: TelemetryEvent.RELEASE_NOTES_LINK_CLICKED,
+      eventData: {
+        source: ReleaseNotesSource.helpCenter
+      }
+    })
     if (isReleaseNotesViewed === false) {
       dispatch(setReleaseNotesViewed(true))
     }

redisinsight/ui/src/components/notifications/success-messages.tsx

@@ -163,7 +163,8 @@ export default {
         <>
           Action completed
           <br />
-          <EuiText color="ghost">Data uploaded with file: {formatLongName(fileName, 24, 5)}</EuiText>
+          <EuiText color="ghost">Commands executed from file:</EuiText>
+          <EuiText color="ghost">{formatLongName(fileName, 34, 5)}</EuiText>
         </>
       ),
       message: (

redisinsight/ui/src/constants/featuresHighlighting.tsx

@@ -10,9 +10,5 @@ interface BuildHighlightingFeature {
 }
 
 export const BUILD_FEATURES: Record<string, BuildHighlightingFeature> = {
-  bulkUpload: {
-    type: 'tooltip',
-    title: (<span><i>New:</i> Bulk Upload</span>),
-    content: 'Upload your data in bulk from a file.',
-  }
+
 } as const

redisinsight/ui/src/constants/telemetry.ts

@@ -0,0 +1,4 @@
+export enum ReleaseNotesSource {
+  helpCenter = 'Help Center',
+  updateNotification = 'Update notification'
+}

redisinsight/ui/src/electron/utils/ipcCheckUpdates.ts

@@ -2,6 +2,7 @@ import { ipcRenderer } from 'electron'
 import { Dispatch } from 'react'
 import { omit } from 'lodash'
 import { sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry'
+import { ReleaseNotesSource } from 'uiSrc/constants/telemetry'
 import { setElectronInfo, setReleaseNotesViewed } from 'uiSrc/slices/app/info'
 import { addMessageNotification } from 'uiSrc/slices/app/notifications'
 import successMessages from 'uiSrc/components/notifications/success-messages'
@@ -23,7 +24,15 @@ export const ipcCheckUpdates = async (serverInfo: GetServerInfoResponse, dispatc
   if (isUpdateDownloaded && !isUpdateAvailable) {
     if (serverInfo.appVersion === updateDownloadedVersion) {
       dispatch(addMessageNotification(
-        successMessages.INSTALLED_NEW_UPDATE(updateDownloadedVersion, () => dispatch(setReleaseNotesViewed(true)))
+        successMessages.INSTALLED_NEW_UPDATE(updateDownloadedVersion, () => {
+          dispatch(setReleaseNotesViewed(true))
+          sendEventTelemetry({
+            event: TelemetryEvent.RELEASE_NOTES_LINK_CLICKED,
+            eventData: {
+              source: ReleaseNotesSource.updateNotification
+            }
+          })
+        })
       ))
     }
 

redisinsight/ui/src/pages/browser/components/bulk-actions/BulkUpload/BulkUpload.tsx

@@ -131,7 +131,7 @@ const BulkUpload = (props: Props) => {
           loading={loading}
           status={status}
           progress={progress}
-          title="Upload with file"
+          title="Commands executed from file"
           subTitle={(<div className="truncateText" style={{ paddingTop: 6 }}>{fileName}</div>)}
         >
           <BulkActionSummary

redisinsight/ui/src/pages/browser/components/keys-header/KeysHeader.tsx

@@ -24,16 +24,11 @@ import { isRedisearchAvailable } from 'uiSrc/utils'
 
 import { OnboardingStepName, OnboardingSteps } from 'uiSrc/constants/onboarding'
 import {
-  appFeatureHighlightingSelector,
-  incrementOnboardStepAction,
-  removeFeatureFromHighlighting
+  incrementOnboardStepAction
 } from 'uiSrc/slices/app/features'
 import { OnboardingTour } from 'uiSrc/components'
 import { ONBOARDING_FEATURES } from 'uiSrc/components/onboarding-features'
 import { setBulkActionType } from 'uiSrc/slices/browser/bulkActions'
-import { BUILD_FEATURES } from 'uiSrc/constants/featuresHighlighting'
-import HighlightedFeature from 'uiSrc/components/hightlighted-feature/HighlightedFeature'
-import { getHighlightingFeatures } from 'uiSrc/utils/highlighting'
 import AutoRefresh from '../auto-refresh'
 import FilterKeyType from '../filter-key-type'
 import RediSearchIndexesList from '../redisearch-key-list'
@@ -84,8 +79,6 @@ const KeysHeader = (props: Props) => {
   const { id: instanceId, modules } = useSelector(connectedInstanceSelector)
   const { viewType, searchMode, isFiltered } = useSelector(keysSelector)
   const { selectedIndex } = useSelector(redisearchSelector)
-  const { features } = useSelector(appFeatureHighlightingSelector)
-  const { bulkUpload: bulkUploadHighlighting } = getHighlightingFeatures(features)
 
   const rootDivRef: Ref<HTMLDivElement> = useRef(null)
 
@@ -250,7 +243,6 @@ const KeysHeader = (props: Props) => {
   const openBulkActions = () => {
     dispatch(setBulkActionType(BulkActionsType.Delete))
     handleBulkActionsPanel(true)
-    dispatch(removeFeatureFromHighlighting('bulkUpload'))
   }
 
   const handleSwitchView = (type: KeyViewType) => {
@@ -311,27 +303,18 @@ const KeysHeader = (props: Props) => {
   )
 
   const BulkActionsBtn = (
-    <HighlightedFeature
-      isHighlight={bulkUploadHighlighting}
-      title={BUILD_FEATURES?.bulkUpload?.title}
-      content={BUILD_FEATURES?.bulkUpload?.content}
-      type={BUILD_FEATURES?.bulkUpload?.type}
-      wrapperClassName={styles.bulkActionsHighlighting}
-      hideFirstChild
-    >
-      <EuiToolTip content="Bulk Actions" position="top">
-        <EuiButton
-          fill
-          size="s"
-          color="secondary"
-          onClick={openBulkActions}
-          className={styles.bulkActions}
-          data-testid="btn-bulk-actions"
-        >
-          <EuiIcon type={BulkActionsIcon} />
-        </EuiButton>
-      </EuiToolTip>
-    </HighlightedFeature>
+    <EuiToolTip content="Bulk Actions" position="top">
+      <EuiButton
+        fill
+        size="s"
+        color="secondary"
+        onClick={openBulkActions}
+        className={styles.bulkActions}
+        data-testid="btn-bulk-actions"
+      >
+        <EuiIcon type={BulkActionsIcon} />
+      </EuiButton>
+    </EuiToolTip>
   )
 
   const ViewSwitch = (width: number) => (

redisinsight/ui/src/pages/browser/components/keys-header/styles.module.scss

@@ -29,10 +29,6 @@
       padding: 0 !important;
     }
   }
-
-  .bulkActionsHighlighting {
-    display: inline-block;
-  }
 }
 
 .top,