Merge pull request #2537 from RedisInsight/release/2.32.0

Release/2.32.0

Author: mariasergeenko

package.json

@@ -225,7 +225,6 @@
   "dependencies": {
     "@elastic/datemath": "^5.0.3",
     "@elastic/eui": "34.6.0",
-    "@msgpack/msgpack": "^2.7.2",
     "@reduxjs/toolkit": "^1.6.2",
     "@stablelib/snappy": "^1.0.2",
     "axios": "^0.25.0",
@@ -247,13 +246,14 @@
     "html-entities": "^2.3.2",
     "html-react-parser": "^1.2.4",
     "java-object-serialization": "^0.1.1",
-    "jpickle": "^0.4.1",
     "json-bigint": "^1.0.0",
     "jsonpath": "^1.1.1",
     "lodash": "^4.17.21",
     "lz4js": "^0.2.0",
+    "msgpackr": "^1.9.7",
     "pako": "^2.1.0",
     "php-serialize": "^4.0.2",
+    "pickleparser": "^0.1.0",
     "rawproto": "^0.7.6",
     "react": "^18.2.0",
     "react-contenteditable": "^3.3.5",

redisinsight/api/config/features-config.json

@@ -1,5 +1,5 @@
 {
-  "version": 2.3201,
+  "version": 2.3202,
   "features": {
     "insightsRecommendations": {
       "flag": true,
@@ -39,6 +39,16 @@
                 "provider": "GCP",
                 "regions": ["asia-northeast1"]
               }
+            ],
+            "redisStackPreview": [
+              {
+                "provider": "AWS",
+                "regions": ["us-east-2", "ap-southeast-1", "sa-east-1"]
+              },
+              {
+                "provider": "GCP",
+                "regions": ["asia-northeast-1", "europe-west-1", "us-central-1"]
+              }
             ]
           }
         }

redisinsight/api/src/__mocks__/feature.ts

@@ -179,6 +179,16 @@ export const mockFeatureSso = Object.assign(new Feature(), {
             regions: ['asia-northeast1'],
           },
         ],
+        redisStackPreview: [
+          {
+            provider: 'AWS',
+            regions: ['us-east-2', 'ap-southeast-1', 'sa-east-1']
+          },
+          {
+            provider: 'GCP',
+            regions: ['asia-northeast-1', 'europe-west-1', 'us-central-1']
+          }
+        ],
       },
     },
   },

redisinsight/api/src/modules/settings/repositories/local.agreements.repository.spec.ts

@@ -60,7 +60,7 @@ describe('LocalAgreementsRepository', () => {
       const result = await service.update(mockUserId, mockAgreements);
 
       expect(result).toEqual(mockAgreements);
-      expect(repository.update).toHaveBeenCalledWith({}, {
+      expect(repository.update).toHaveBeenCalledWith("1", {
         ...mockAgreementsEntity,
       });
     });

redisinsight/api/src/modules/settings/repositories/local.agreements.repository.ts

@@ -24,7 +24,7 @@ export class LocalAgreementsRepository extends AgreementsRepository {
   }
 
   async update(id: string, agreements: Agreements): Promise<Agreements> {
-    await this.repository.update({}, classToClass(AgreementsEntity, agreements));
+    await this.repository.update(id || {}, classToClass(AgreementsEntity, agreements));
 
     return this.getOrCreate();
   }

redisinsight/desktop/app.ts

@@ -22,13 +22,6 @@ if (!config.isProduction) {
   sourceMapSupport.install()
 }
 
-const gotTheLock = app.requestSingleInstanceLock()
-
-// deep link open (win)
-if (!gotTheLock) {
-  app.quit()
-}
-
 const init = async () => {
   await launchApiServer()
   initLogging()

redisinsight/desktop/index.ts

@@ -1,3 +1,12 @@
-import app from './app'
+import { app } from 'electron'
+import init from './app'
 
-app()
+const gotTheLock = app.requestSingleInstanceLock() || process.platform === 'darwin'
+
+// deep link open (win)
+if (!gotTheLock) {
+  console.log('Didn\'t get the lock. Quiting...')
+  app.quit()
+} else {
+  init()
+}

redisinsight/ui/src/components/oauth/oauth-select-plan/OAuthSelectPlan.spec.tsx

@@ -3,8 +3,9 @@ import { cloneDeep } from 'lodash'
 import { cleanup, fireEvent, mockedStore, render, within } from 'uiSrc/utils/test-utils'
 import { TelemetryEvent, sendEventTelemetry } from 'uiSrc/telemetry'
 import { addFreeDb, oauthCloudPlanSelector, oauthCloudSelector, initialState } from 'uiSrc/slices/oauth/cloud'
+import { appFeatureFlagsFeaturesSelector } from 'uiSrc/slices/app/features'
 import { OAuthSocialSource } from 'uiSrc/slices/interfaces'
-import { MOCK_NO_TF_REGION, MOCK_REGIONS } from 'uiSrc/constants/mocks/mock-sso'
+import { MOCK_NO_TF_REGION, MOCK_REGIONS, MOCK_RS_PREVIEW_REGION, MOCK_CUSTOM_REGIONS } from 'uiSrc/constants/mocks/mock-sso'
 import OAuthSelectPlan from './OAuthSelectPlan'
 
 jest.mock('uiSrc/telemetry', () => ({
@@ -41,7 +42,17 @@ jest.mock('uiSrc/slices/app/features', () => ({
                 provider: 'GCP',
                 regions: ['asia-northeast1']
               }
-            ]
+            ],
+            redisStackPreview: [
+              {
+                provider: 'AWS',
+                regions: ['us-east-2', 'ap-southeast-1', 'sa-east-1']
+              },
+              {
+                provider: 'GCP',
+                regions: ['asia-northeast-1', 'europe-west-1', 'us-central-1']
+              }
+            ],
           }
         }
       }
@@ -121,6 +132,72 @@ describe('OAuthSelectPlan', () => {
     expect(tfIconEl).toBeInTheDocument()
   })
 
+  it('if source is not Trigger and Functions region with RS should be selected by default', async () => {
+    const container = render(<OAuthSelectPlan />)
+
+    const { queryByTestId } = within(container.queryByTestId('select-oauth-region') as HTMLElement)
+    const tfIconEl = queryByTestId(/rs-text-/)
+
+    expect(tfIconEl).toBeInTheDocument()
+  })
+
+  it('Should display region with RS preview text', async () => {
+    (oauthCloudPlanSelector as jest.Mock).mockReturnValue({
+      isOpenDialog: true,
+      data: [MOCK_RS_PREVIEW_REGION],
+    })
+
+    const container = render(<OAuthSelectPlan />)
+
+    const { queryByTestId } = within(container.queryByTestId('select-oauth-region') as HTMLElement)
+    const rsTextEl = queryByTestId(/rs-text-/)
+
+    expect(rsTextEl).toBeInTheDocument()
+  })
+
+  it('should be selected first region by default', async () => {
+    (oauthCloudPlanSelector as jest.Mock).mockReturnValue({
+      isOpenDialog: true,
+      data: MOCK_CUSTOM_REGIONS,
+    })
+
+    const container = render(<OAuthSelectPlan />)
+
+    const { queryByTestId } = within(container.queryByTestId('select-oauth-region') as HTMLElement)
+    const selectedEl = queryByTestId('option-custom-1')
+
+    expect(selectedEl).toBeInTheDocument()
+  })
+
+  it('should be selected us-east-2 region by default', async () => {
+    (oauthCloudPlanSelector as jest.Mock).mockReturnValue({
+      isOpenDialog: true,
+      data: [MOCK_NO_TF_REGION, MOCK_RS_PREVIEW_REGION, ...MOCK_CUSTOM_REGIONS],
+    });
+    (appFeatureFlagsFeaturesSelector as jest.Mock).mockReturnValueOnce({})
+
+    const container = render(<OAuthSelectPlan />)
+
+    const { queryByTestId } = within(container.queryByTestId('select-oauth-region') as HTMLElement)
+    const selectedEl = queryByTestId('option-us-east-2')
+
+    expect(selectedEl).toBeInTheDocument()
+  })
+
+  it('Should select region with RS preview text by default', async () => {
+    (oauthCloudPlanSelector as jest.Mock).mockReturnValue({
+      isOpenDialog: true,
+      data: [MOCK_RS_PREVIEW_REGION, ...MOCK_CUSTOM_REGIONS],
+    })
+
+    const container = render(<OAuthSelectPlan />)
+
+    const { queryByTestId } = within(container.queryByTestId('select-oauth-region') as HTMLElement)
+    const rsTextEl = queryByTestId(/rs-text-/)
+
+    expect(rsTextEl).toBeInTheDocument()
+  })
+
   it('should display text if no Trigger and Function regions available on this vendor', async () => {
     (oauthCloudPlanSelector as jest.Mock).mockReturnValue({
       isOpenDialog: true,

redisinsight/ui/src/components/oauth/oauth-select-plan/OAuthSelectPlan.tsx

@@ -28,7 +28,7 @@ import { INFINITE_MESSAGES } from 'uiSrc/components/notifications/components'
 import { CloudJobStep } from 'uiSrc/electron/constants'
 import { appFeatureFlagsFeaturesSelector } from 'uiSrc/slices/app/features'
 import { FeatureFlags, Theme } from 'uiSrc/constants'
-import { OAuthSocialSource, TFRegion } from 'uiSrc/slices/interfaces'
+import { OAuthSocialSource, Region } from 'uiSrc/slices/interfaces'
 import { ThemeContext } from 'uiSrc/contexts/themeContext'
 import TriggeredFunctionsDarkSVG from 'uiSrc/assets/img/sidebar/gears.svg'
 import TriggeredFunctionsLightSVG from 'uiSrc/assets/img/sidebar/gears_active.svg'
@@ -37,9 +37,10 @@ import { CloudSubscriptionPlanResponse } from 'apiSrc/modules/cloud/subscription
 import { OAuthProvider, OAuthProviders } from './constants'
 import styles from './styles.module.scss'
 
-export const DEFAULT_REGION = 'us-east-1'
+export const DEFAULT_REGIONS = ['us-east-2', 'asia-northeast-1']
 export const DEFAULT_PROVIDER = OAuthProvider.AWS
-const getTFProviderRegions = (regions: TFRegion[], provider: OAuthProvider) =>
+
+const getProviderRegions = (regions: Region[], provider: OAuthProvider) =>
   (find(regions, { provider }) || {}).regions || []
 
 const OAuthSelectPlan = () => {
@@ -48,38 +49,43 @@ const OAuthSelectPlan = () => {
   const { source } = useSelector(oauthCloudSelector)
   const { [FeatureFlags.cloudSso]: cloudSsoFeature = {} } = useSelector(appFeatureFlagsFeaturesSelector)
 
-  const tfRegions: TFRegion[] = get(cloudSsoFeature, 'data.selectPlan.components.triggersAndFunctions', [])
+  const tfRegions: Region[] = get(cloudSsoFeature, 'data.selectPlan.components.triggersAndFunctions', [])
+  const rsRegions: Region[] = get(cloudSsoFeature, 'data.selectPlan.components.redisStackPreview', [])
 
   const [plans, setPlans] = useState(plansInit || [])
   const [planIdSelected, setPlanIdSelected] = useState('')
   const [providerSelected, setProviderSelected] = useState<OAuthProvider>(DEFAULT_PROVIDER)
-  const [tfProviderRegions, setTfProviderRegions] = useState(getTFProviderRegions(tfRegions, providerSelected))
+  const [tfProviderRegions, setTfProviderRegions] = useState(getProviderRegions(tfRegions, providerSelected))
+  const [rsProviderRegions, setRsProviderRegions] = useState(getProviderRegions(rsRegions, providerSelected))
 
   const dispatch = useDispatch()
 
   const isTFSource = source?.endsWith(OAuthSocialSource.TriggersAndFunctions)
 
   useEffect(() => {
-    setTfProviderRegions(getTFProviderRegions(tfRegions, providerSelected))
-  }, [providerSelected])
+    setTfProviderRegions(getProviderRegions(tfRegions, providerSelected))
+    setRsProviderRegions(getProviderRegions(rsRegions, providerSelected))
+  }, [providerSelected, plansInit])
 
   useEffect(() => {
     if (!plansInit.length) {
       return
     }
 
-    const defaultRegions = isTFSource ? tfProviderRegions || [DEFAULT_REGION] : [DEFAULT_REGION]
+    const defaultRegions = isTFSource
+      ? [tfProviderRegions, DEFAULT_REGIONS].find((arr) => arr?.length)
+      : DEFAULT_REGIONS
 
     const filteredPlans = filter(plansInit, { provider: providerSelected })
       .sort((a, b) => (a?.details?.displayOrder || 0) - (b?.details?.displayOrder || 0))
 
     const defaultPlan = filteredPlans.find(({ region = '' }) => defaultRegions?.includes(region))
-
-    const planId = (defaultPlan || first(filteredPlans) || {}).id?.toString() || ''
+    const rsPreviewPlan = filteredPlans.find(({ region = '' }) => rsProviderRegions?.includes(region))
+    const planId = (defaultPlan || rsPreviewPlan || first(filteredPlans) || {}).id?.toString() || ''
 
     setPlans(filteredPlans)
     setPlanIdSelected(planId)
-  }, [isTFSource, plansInit, providerSelected, tfProviderRegions])
+  }, [isTFSource, plansInit, providerSelected, tfProviderRegions, rsProviderRegions])
 
   const handleOnClose = useCallback(() => {
     sendEventTelemetry({
@@ -96,11 +102,15 @@ const OAuthSelectPlan = () => {
   const getOptionDisplay = (item: CloudSubscriptionPlanResponse) => {
     const { region = '', details: { countryName = '', cityName = '' }, provider } = item
     const tfProviderRegions: string[] = find(tfRegions, { provider })?.regions || []
+    const rsProviderRegions: string[] = find(rsRegions, { provider })?.regions || []
 
     return (
-      <EuiText color="subdued" size="s">
+      <EuiText color="subdued" size="s" data-testid={`option-${region}`}>
         {`${countryName} (${cityName})`}
         <EuiTextColor className={styles.regionName}>{region}</EuiTextColor>
+        {rsProviderRegions?.includes(region) && (
+          <EuiTextColor className={styles.rspreview} data-testid={`rs-text-${region}`}>(Redis 7.2)</EuiTextColor>
+        )}
         { tfProviderRegions?.includes(region) && (
           <EuiToolTip
             content="Triggers and functions are available in this region"
@@ -156,7 +166,7 @@ const OAuthSelectPlan = () => {
           </EuiTitle>
           <section className={styles.providers}>
             { OAuthProviders.map(({ icon, id, label }) => (
-              <div className={styles.provider}>
+              <div className={styles.provider} key={id}>
                 {id === providerSelected
                   && <div className={cx(styles.providerActiveIcon)}><EuiIcon type="check" /></div>}
                 <EuiButton

redisinsight/ui/src/components/oauth/oauth-select-plan/styles.module.scss

@@ -145,3 +145,9 @@
   margin-left: 11px;
   margin-bottom: 0 !important;
 }
+
+:global(.euiTextColor).rspreview {
+  font-size: 12px !important;
+  margin-left: 11px;
+  color: var(--euiColorMediumShade) !important;
+}