Merge branch 'main' into e2e/feature/workbench-raw-mode

# Conflicts:
#	tests/e2e/tests/critical-path/database/clone-databases.e2e.ts
#	tests/e2e/tests/critical-path/notifications/notification-center.e2e.ts

Author: vlad-dargel

README.md

@@ -39,12 +39,10 @@ Check out the [release notes](https://docs.redis.com/latest/ri/release-notes/).
 
 ## Get started with RedisInsight
 
-This repository includes the code for RedisInsight 2.0, Currently available in public preview. Check out the [blogpost](https://redis.com/blog/introducing-redisinsight-2/) announcing it. 
-
-The current GA version of RedisInsight is 1.11. You can install RedisInsight 2.0 along with the GA version. 
+This repository includes the code for the GA version of RedisInsight 2.0. Check out the [blogpost](https://redis.com/blog/introducing-redisinsight-2/) announcing it. 
 
 ### Installable 
-Available to download for free from [here](https://redis.com/redis-enterprise/redis-insight/#insight-form). 
+Available to download for free from [here](https://redis.com/redis-enterprise/redis-insight/#insight-form).
 
 ### Build 
 Alternatively you can also build from source. See our wiki for instructions.

redisinsight/api/config/production.ts

@@ -22,6 +22,9 @@ export default {
   server: {
     env: 'production',
   },
+  analytics: {
+    writeKey: process.env.SEGMENT_WRITE_KEY || 'lK5MNZgHbxj6vQwFgqZxygA0BiDQb32n',
+  },
   db: {
     database: join(homedir, 'redisinsight.db'),
   },

redisinsight/api/config/staging.ts

@@ -22,6 +22,9 @@ export default {
   server: {
     env: 'staging',
   },
+  analytics: {
+    writeKey: process.env.SEGMENT_WRITE_KEY || 'Ba1YuGnxzsQN9zjqTSvzPc6f3AvmH1mj',
+  },
   db: {
     database: join(homedir, 'redisinsight.db'),
   },

redisinsight/ui/src/components/cli/CliWrapper.spec.tsx

@@ -1,16 +1,15 @@
 import { cloneDeep } from 'lodash'
 import React from 'react'
-import { processCliClient, setCliEnteringCommand } from 'uiSrc/slices/cli/cli-settings'
-import { cleanup, mockedStore, render } from 'uiSrc/utils/test-utils'
+import { InitOutputText } from 'uiSrc/constants/cliOutput'
+import { concatToOutput } from 'uiSrc/slices/cli/cli-output'
+import { setCliEnteringCommand } from 'uiSrc/slices/cli/cli-settings'
+import { cleanup, clearStoreActions, mockedStore, render } from 'uiSrc/utils/test-utils'
 import CliWrapper from './CliWrapper'
 
-jest.mock('uiSrc/slices/cli/cli-output', () => ({
-  ...jest.requireActual('uiSrc/slices/cli/cli-output'),
-  concatToOutput: () => jest.fn(),
-}))
-
 const redisCommandsPath = 'uiSrc/slices/app/redis-commands'
 
+let mathRandom: jest.SpyInstance<number>
+const random = 0.91911
 let store: typeof mockedStore
 beforeEach(() => {
   cleanup()
@@ -32,6 +31,14 @@ jest.mock(redisCommandsPath, () => {
 })
 
 describe('CliWrapper', () => {
+  beforeAll(() => {
+    mathRandom = jest.spyOn(Math, 'random').mockImplementation(() => random)
+  })
+
+  afterAll(() => {
+    mathRandom.mockRestore()
+  })
+
   it('should render', () => {
     expect(render(<CliWrapper />)).toBeTruthy()
   })
@@ -40,7 +47,12 @@ describe('CliWrapper', () => {
 
     unmount()
 
-    const expectedActions = [processCliClient(), setCliEnteringCommand()]
-    expect(store.getActions().slice(-2)).toEqual(expectedActions)
+    const handleWorkbenchClick = () => {}
+
+    const expectedActions = [
+      concatToOutput(InitOutputText('', 0, 0, true, handleWorkbenchClick)),
+      setCliEnteringCommand(),
+    ]
+    expect(clearStoreActions(store.getActions().slice(-2))).toEqual(clearStoreActions(expectedActions))
   })
 })

redisinsight/ui/src/components/cli/components/cli-body/CliBodyWrapper.tsx

@@ -53,7 +53,7 @@ const CliBodyWrapper = () => {
   const { db: currentDbIndex } = useSelector(outputSelector)
 
   useEffect(() => {
-    !cliClientUuid && dispatch(createCliClientAction(handleWorkbenchClick))
+    !cliClientUuid && dispatch(createCliClientAction(instanceId, handleWorkbenchClick))
   }, [])
 
   useEffect(() => {

redisinsight/ui/src/components/navigation-menu/components/notifications-center/Notification/Notification.tsx

@@ -44,6 +44,7 @@ const Notification = (props: Props) => {
             <EuiBadge
               className={styles.category}
               style={{ backgroundColor: notification.categoryColor ?? '#666' }}
+              data-testid="notification-category"
             >
               {truncateText(notification.category, 32)}
             </EuiBadge>

redisinsight/ui/src/components/query-card/QueryCard.tsx

@@ -30,6 +30,7 @@ export interface Props {
   result: Maybe<CommandExecutionResult[]>
   activeMode: RunQueryMode
   mode: RunQueryMode
+  emptyCommand: boolean
   createdAt?: Date
   loading?: boolean
   onQueryDelete: () => void
@@ -52,7 +53,8 @@ const QueryCard = (props: Props) => {
     onQueryOpen,
     onQueryDelete,
     onQueryReRun,
-    loading
+    loading,
+    emptyCommand,
   } = props
 
   const { visualizations = [] } = useSelector(appPluginsSelector)
@@ -146,6 +148,7 @@ const QueryCard = (props: Props) => {
           selectedValue={selectedViewValue}
           activeMode={activeMode}
           mode={mode}
+          emptyCommand={emptyCommand}
           toggleOpen={toggleOpen}
           toggleFullScreen={toggleFullScreen}
           setSelectedValue={changeViewTypeSelected}

redisinsight/ui/src/components/query-card/QueryCardHeader/QueryCardHeader.tsx

@@ -43,6 +43,7 @@ export interface Props {
   queryType: WBQueryType
   selectedValue: string
   loading?: boolean
+  emptyCommand: boolean
   toggleOpen: () => void
   toggleFullScreen: () => void
   setSelectedValue: (type: WBQueryType, value: string) => void
@@ -63,6 +64,7 @@ const QueryCardHeader = (props: Props) => {
     mode,
     activeMode,
     selectedValue,
+    emptyCommand,
     setSelectedValue,
     onQueryDelete,
     onQueryReRun,
@@ -302,7 +304,13 @@ const QueryCardHeader = (props: Props) => {
               content="Run again"
               position="left"
             >
-              <EuiButtonIcon iconType="play" aria-label="Re-run command" data-testid="re-run-command" onClick={handleQueryReRun} />
+              <EuiButtonIcon
+                disabled={emptyCommand}
+                iconType="play"
+                aria-label="Re-run command"
+                data-testid="re-run-command"
+                onClick={handleQueryReRun}
+              />
             </EuiToolTip>
           </EuiFlexItem>
         )}

redisinsight/ui/src/constants/workbenchResults.ts

@@ -1 +1,3 @@
 export const bulkReplyCommands = ['LOLWUT', 'INFO', 'CLIENT', 'CLUSTER', 'MEMORY', 'MONITOR', 'PSUBSCRIBE']
+
+export const EMPTY_COMMAND = 'Encrypted data'

redisinsight/ui/src/mocks/handlers/app/index.ts

@@ -0,0 +1,6 @@
+import { DefaultBodyType, MockedRequest, RestHandler } from 'msw'
+
+import info from './infoHandlers'
+
+const handlers: RestHandler<MockedRequest<DefaultBodyType>>[] = [].concat(info)
+export default handlers