Merge branch 'main' into bugfix/RI-3432-fix-commands-order

Author: ALENA NABOKA

.circleci/config.yml

@@ -404,7 +404,7 @@ jobs:
                   docker-compose \
                   -f tests/e2e/rte.docker-compose.yml \
                   -f tests/e2e/docker.web.docker-compose.yml \
-                  up --abort-on-container-exit --force-recreate
+                  up --abort-on-container-exit --force-recreate --build
                 no_output_timeout: 5m
       - when:
           condition:
@@ -675,7 +675,7 @@ jobs:
       - <<: *scan
       - <<: *validate
   docker:
-    executor: linux-executor-dlc
+    executor: linux-executor
     parameters:
       env:
         type: enum

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.

package.json

@@ -226,6 +226,7 @@
     "html-entities": "^2.3.2",
     "html-react-parser": "^1.2.4",
     "java-object-serialization": "^0.1.1",
+    "jpickle": "^0.4.1",
     "jsonpath": "^1.1.1",
     "lodash": "^4.17.21",
     "php-serialize": "^4.0.2",

redisinsight/ui/src/components/advanced-settings/AdvancedSettings.tsx

@@ -10,7 +10,7 @@ import InputFieldSentinel from './input-field-sentinel/InputFieldSentinel'
 import PageBreadcrumbs from './page-breadcrumbs/PageBreadcrumbs'
 import ContentEditable from './ContentEditable'
 import Config from './config'
-import AdvancedSettings from './advanced-settings/AdvancedSettings'
+import SettingItem from './settings-item/SettingItem'
 import { ConsentsSettings, ConsentsSettingsPopup, ConsentsPrivacy, ConsentsNotifications } from './consents-settings'
 import KeyboardShortcut from './keyboard-shortcut/KeyboardShortcut'
 import ShortcutsFlyout from './shortcuts-flyout/ShortcutsFlyout'
@@ -38,7 +38,7 @@ export {
   ConsentsSettingsPopup,
   ConsentsPrivacy,
   ConsentsNotifications,
-  AdvancedSettings,
+  SettingItem,
   KeyboardShortcut,
   MonitorConfig,
   PubSubConfig,

redisinsight/ui/src/components/index.ts

@@ -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/QueryCard.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/components/query-card/QueryCardHeader/QueryCardHeader.tsx

@@ -4,7 +4,7 @@ import {
   screen,
   fireEvent,
 } from 'uiSrc/utils/test-utils'
-import AdvancedSettingsItem from './AdvancedSettingsItem'
+import SettingItem from './SettingItem'
 
 jest.mock('uiSrc/slices/user/user-settings', () => ({
   ...jest.requireActual('uiSrc/slices/user/user-settings'),
@@ -28,24 +28,24 @@ const mockedProps = {
   label: 'Keys to Scan:',
 }
 
-describe('AdvancedSettingsItem', () => {
+describe('SettingItem', () => {
   it('should render', () => {
-    expect(render(<AdvancedSettingsItem {...mockedProps} />)).toBeTruthy()
+    expect(render(<SettingItem {...mockedProps} />)).toBeTruthy()
   })
 
   it('should render keys to scan value', () => {
-    render(<AdvancedSettingsItem {...mockedProps} />)
+    render(<SettingItem {...mockedProps} />)
     expect(screen.getByTestId(/keys-to-scan-value/)).toHaveTextContent('10000')
   })
 
   it('should render keys to scan input after click value', () => {
-    render(<AdvancedSettingsItem {...mockedProps} />)
+    render(<SettingItem {...mockedProps} />)
     fireEvent.click(screen.getByTestId(/keys-to-scan-value/))
     expect(screen.getByTestId(/keys-to-scan-input/)).toBeInTheDocument()
   })
 
   it('should change keys to scan input properly', () => {
-    render(<AdvancedSettingsItem {...mockedProps} />)
+    render(<SettingItem {...mockedProps} />)
     fireEvent.click(screen.getByTestId(/keys-to-scan-value/))
     fireEvent.change(
       screen.getByTestId(/keys-to-scan-input/),
@@ -57,7 +57,7 @@ describe('AdvancedSettingsItem', () => {
   })
 
   it('should properly apply changes', () => {
-    render(<AdvancedSettingsItem {...mockedProps} />)
+    render(<SettingItem {...mockedProps} />)
 
     fireEvent.click(screen.getByTestId(/keys-to-scan-value/))
     fireEvent.change(
@@ -71,7 +71,7 @@ describe('AdvancedSettingsItem', () => {
   })
 
   it('should properly decline changes', async () => {
-    render(<AdvancedSettingsItem {...mockedProps} />)
+    render(<SettingItem {...mockedProps} />)
     fireEvent.click(screen.getByTestId(/keys-to-scan-value/))
 
     fireEvent.change(

redisinsight/ui/src/components/advanced-settings/AdvancedSettingsItem.spec.tsx renamed to redisinsight/ui/src/components/settings-item/SettingItem.spec.tsx

@@ -25,7 +25,7 @@ export interface Props {
   validation: (value: string) => string,
 }
 
-const AdvancedSettingsItem = (props: Props) => {
+const SettingItem = (props: Props) => {
   const { initValue, title, summary, testid, placeholder, label, onApply, validation = (val: string) => val } = props
 
   const [value, setValue] = useState<string>(initValue)
@@ -117,4 +117,4 @@ const AdvancedSettingsItem = (props: Props) => {
   )
 }
 
-export default AdvancedSettingsItem
+export default SettingItem