Merge remote-tracking branch 'origin/main' into feature/RI-6855/vector-search

Author: KrumTy

redisinsight/ui/src/components/oauth/oauth-sign-in-button/OAuthSignInButton.tsx

@@ -1,4 +1,5 @@
 import React from 'react'
+import styled from 'styled-components'
 import { OAuthSsoHandlerDialog } from 'uiSrc/components'
 
 import RedisLogo from 'uiSrc/assets/img/logo_small.svg'
@@ -8,6 +9,11 @@ import { SecondaryButton } from 'uiSrc/components/base/forms/buttons'
 import { RiImage } from 'uiSrc/components/base/display'
 import styles from './styles.module.scss'
 
+const LogoWrapper = styled.div`
+  width: 15px;
+  height: 15px;
+`
+
 export interface Props {
   source: OAuthSocialSource
 }
@@ -29,7 +35,9 @@ const OAuthSignInButton = (props: Props) => {
           }
           data-testid="cloud-sign-in-btn"
         >
-          <RiImage className={styles.logo} src={RedisLogo} alt="Redis logo" />
+          <LogoWrapper>
+            <RiImage $size={"fullWidth"} className={styles.logo} src={RedisLogo} alt="Redis logo" />
+          </LogoWrapper>
           <span>Cloud sign in</span>
         </SecondaryButton>
       )}

redisinsight/ui/src/pages/browser/components/filter-key-type/FilterKeyType.tsx

@@ -23,18 +23,27 @@ import { appFeatureFlagsFeaturesSelector } from 'uiSrc/slices/app/features'
 import { AdditionalRedisModule } from 'uiSrc/slices/interfaces'
 import { OutsideClickDetector } from 'uiSrc/components/base/utils'
 import { HealthText } from 'uiSrc/components/base/text/HealthText'
-import { RiSelect } from 'uiSrc/components/base/forms/select/RiSelect'
+import {
+  defaultValueRender,
+  RiSelect,
+} from 'uiSrc/components/base/forms/select/RiSelect'
 import { Modal } from 'uiSrc/components/base/display'
 import { FILTER_KEY_TYPE_OPTIONS } from './constants'
 
 import styles from './styles.module.scss'
+import styled from 'styled-components'
 
 const ALL_KEY_TYPES_VALUE = 'all'
 
 export interface Props {
   modules?: AdditionalRedisModule[]
 }
 
+const FilterKeyTypeSelect = styled(RiSelect)`
+  height: 100%;
+  border-radius: 0;
+`
+
 const FilterKeyType = ({ modules }: Props) => {
   const [isSelectOpen, setIsSelectOpen] = useState<boolean>(false)
   const [typeSelected, setTypeSelected] = useState<string>('all')
@@ -157,7 +166,9 @@ const FilterKeyType = ({ modules }: Props) => {
           onCancel={() => setIsInfoPopoverOpen(false)}
           className={styles.unsupportedInfoModal}
           data-testid="filter-not-available-modal"
-          content={<FilterNotAvailable onClose={() => setIsInfoPopoverOpen(false)} />}
+          content={
+            <FilterNotAvailable onClose={() => setIsInfoPopoverOpen(false)} />
+          }
           title={null}
         />
         {!isVersionSupported && (
@@ -168,15 +179,10 @@ const FilterKeyType = ({ modules }: Props) => {
             data-testid="unsupported-btn-anchor"
           />
         )}
-        <RiSelect
+        <FilterKeyTypeSelect
           disabled={!isVersionSupported}
           options={options}
-          valueRender={({ option, isOptionValue }) => {
-            if (isOptionValue) {
-              return option.inputDisplay
-            }
-            return option.dropdownDisplay
-          }}
+          valueRender={defaultValueRender}
           defaultOpen={isSelectOpen}
           value={typeSelected}
           onChange={(value: string) => onChangeType(value)}

redisinsight/ui/src/pages/database-analysis/components/header/Header.spec.tsx

@@ -140,7 +140,7 @@ describe('DatabaseAnalysisHeader', () => {
 
     const analizeButtonId = screen.getByTestId('start-database-analysis-btn')
     expect(analizeButtonId).toBeInTheDocument()
-    expect(analizeButtonId).toHaveTextContent('Analyze')
+    expect(analizeButtonId.textContent).toContain('New Report')
   })
 
   it.skip('should call onChangeSelectedAnalysis after change selector', async () => {

redisinsight/ui/src/pages/pub-sub/components/messages-list/EmptyMessagesList/EmptyMessagesList.tsx

@@ -5,8 +5,8 @@ import { ConnectionType } from 'uiSrc/slices/interfaces'
 import { Text } from 'uiSrc/components/base/text'
 
 import { RiIcon } from 'uiSrc/components/base/icons/RiIcon'
-import { Row } from 'uiSrc/components/base/layout/flex'
 import styles from './styles.module.scss'
+import { Row } from 'uiSrc/components/base/layout/flex'
 
 export interface Props {
   connectionType?: ConnectionType

redisinsight/ui/src/pages/rdi/pipeline-management/components/source-pipeline-dialog/SourcePipelineModal.spec.tsx

@@ -38,6 +38,16 @@ jest.mock('uiSrc/telemetry', () => ({
   sendEventTelemetry: jest.fn(),
 }))
 
+jest.mock('uiSrc/slices/rdi/pipeline', () => ({
+  ...jest.requireActual('uiSrc/slices/rdi/pipeline'),
+  rdiPipelineSelector: jest.fn(),
+}))
+
+jest.mock('uiSrc/slices/app/context', () => ({
+  ...jest.requireActual('uiSrc/slices/app/context'),
+  appContextPipelineManagement: jest.fn(),
+}))
+
 jest.mock('uiSrc/components/base/display', () => {
   const actual = jest.requireActual('uiSrc/components/base/display')
 

redisinsight/ui/src/pages/rdi/pipeline-management/components/source-pipeline-dialog/SourcePipelineModal.tsx

@@ -1,4 +1,4 @@
-import React, { useState } from 'react'
+import React, { useEffect, useState } from 'react'
 import { keys } from '@elastic/eui'
 import { useDispatch, useSelector } from 'react-redux'
 import { useParams } from 'react-router-dom'

yarn.lock

@@ -1560,18 +1560,6 @@
   dependencies:
     "@isaacs/balanced-match" "^4.0.1"
 
-"@isaacs/balanced-match@^4.0.1":
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz#3081dadbc3460661b751e7591d7faea5df39dd29"
-  integrity sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==
-
-"@isaacs/brace-expansion@^5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz#4b3dabab7d8e75a429414a96bd67bf4c1d13e0f3"
-  integrity sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==
-  dependencies:
-    "@isaacs/balanced-match" "^4.0.1"
-
 "@isaacs/cliui@^8.0.2":
   version "8.0.2"
   resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"