Merge remote-tracking branch 'origin/main' into update_electron_version

Author: egor-zalenski

electron-builder.json

@@ -63,9 +63,14 @@
   "extraResources": [
     "./resources/**",
     {
-      "from": "./redisinsight/api/src/static",
+      "from": "./redisinsight/api/static",
       "to": "static",
       "filter": ["**/*"]
+    },
+    {
+      "from": "./redisinsight/api/defaults",
+      "to": "defaults",
+      "filter": ["**/*"]
     }
   ]
 }

redisinsight/ui/src/components/consents-settings/ConsentsSettings.tsx

@@ -171,7 +171,7 @@ const ConsentsSettings = ({ liveEditMode = false }: Props) => {
         {!liveEditMode && (
           <>
             <EuiCallOut>
-              <EuiText size="s">
+              <EuiText size="s" data-testid="plugin-section">
                 While adding new visualization plugins, use files only from trusted authors
                 to avoid automatic execution of malicious code.
               </EuiText>

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

@@ -147,6 +147,7 @@ const QueryCardCliPlugin = (props: Props) => {
           ref={pluginIframeRef}
           referrerPolicy="no-referrer"
           sandbox="allow-same-origin allow-scripts"
+          data-testid="pluginIframe"
         />
         {!!error && (
           <div className={styles.container}>

redisinsight/ui/src/pages/browser/components/key-list/KeyList.tsx

@@ -16,7 +16,7 @@ import {
   formatLongName,
   replaceSpaces,
   truncateTTLToDuration,
-  truncateTTLToRange,
+  truncateTTLToFirstUnit,
   truncateTTLToSeconds,
 } from 'uiSrc/utils'
 import {
@@ -192,7 +192,7 @@ const KeyList = (props: Props) => {
     },
     {
       id: 'ttl',
-      label: 'TTL(s)',
+      label: 'TTL',
       absoluteWidth: 65,
       minWidth: 65,
       truncateText: true,
@@ -221,7 +221,7 @@ const KeyList = (props: Props) => {
                   </>
                 )}
               >
-                <>{truncateTTLToRange(cellData)}</>
+                <>{truncateTTLToFirstUnit(cellData)}</>
               </EuiToolTip>
             </div>
           </EuiText>

redisinsight/ui/src/pages/instance/styles.module.scss

@@ -1,5 +1,5 @@
 .mainComponent {
-  height: calc(100% - 29px) !important;
+  height: calc(100% - 26px) !important;
 }
 
 .resizableButton {

redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementAreaWrapper.tsx

@@ -67,6 +67,7 @@ const EnablementAreaWrapper = React.memo(({ isMinimized, setIsMinimized, scriptE
       className={cx(styles.areaWrapper, { [styles.minimized]: isMinimized })}
       onClick={() => isMinimized && setIsMinimized(false)}
       direction="column"
+      responsive={false}
       gutterSize="none"
       data-testid="enablement-area-container"
     >

redisinsight/ui/src/styles/components/_buttons.scss

@@ -29,6 +29,12 @@
       box-shadow: none;
     }
   }
+  &.euiButton--fill {
+    color: var(--euiColorPrimaryText) !important;
+    &:hover {
+      color: var(--euiColorPrimaryText) !important;
+    }
+  }
 }
 .euiButton.euiButton--fill {
   &.euiButton--secondary {

redisinsight/ui/src/utils/plugins.ts

@@ -4,7 +4,7 @@ import { getBaseApiUrl } from 'uiSrc/utils/common'
 export const getVisualizationsByCommand = (query: string, visualizations: IPluginVisualization[]) =>
   visualizations.filter((visualization: IPluginVisualization) =>
     visualization.matchCommands.some((matchCommand) =>
-      query.startsWith(matchCommand) || (new RegExp(matchCommand.toLowerCase())).test(query.toLowerCase())))
+      query.startsWith(matchCommand) || (new RegExp(`^${matchCommand}`, 'i')).test(query)))
 
 export const urlForAsset = (basePluginUrl: string, path: string) => {
   const baseApiUrl = getBaseApiUrl()

redisinsight/ui/src/utils/tests/plugins.spec.ts

@@ -0,0 +1,27 @@
+import { getVisualizationsByCommand } from 'uiSrc/utils'
+import { IPluginVisualization } from 'uiSrc/slices/interfaces'
+
+describe('getVisualizationsByCommand', () => {
+  it('should return proper visualizations by query', () => {
+    const visualizations = [
+      { matchCommands: ['ft.search', 'ft.get'] },
+      { matchCommands: ['ft._list'] },
+      { matchCommands: ['ft.*'] },
+      { matchCommands: ['get'] }
+    ] as IPluginVisualization[]
+
+    const query1 = 'ft.search sa'
+    const query2 = 'ft.get zxc'
+    const query3 = 'command ft. zxc zxcz ft'
+    const query4 = 'command ft'
+    const query5 = 'any command'
+    const query6 = 'get key'
+
+    expect(getVisualizationsByCommand(query1, visualizations)).toHaveLength(2)
+    expect(getVisualizationsByCommand(query2, visualizations)).toHaveLength(2)
+    expect(getVisualizationsByCommand(query3, visualizations)).toHaveLength(0)
+    expect(getVisualizationsByCommand(query4, visualizations)).toHaveLength(0)
+    expect(getVisualizationsByCommand(query5, visualizations)).toHaveLength(0)
+    expect(getVisualizationsByCommand(query6, visualizations)).toHaveLength(1)
+  })
+})

redisinsight/ui/src/utils/tests/truncateTTL.spec.ts

@@ -1,5 +1,6 @@
 import {
   truncateTTLToDuration,
+  truncateTTLToFirstUnit,
   truncateTTLToRange,
   truncateTTLToSeconds,
 } from '../truncateTTL'
@@ -101,16 +102,15 @@ describe('Truncate TTL util tests', () => {
       const expectedResponse2 = '25 min, 34 s'
       const expectedResponse3 = '15 h, 5 min, 34 s'
       const expectedResponse4 = '1 mo, 19 d, 1 h, 33 min, 54 s'
-      // TODO started failing
-      // const expectedResponse5 = '3 yr, 6 mo, 19 d, 10 h, 32 min, 10 s';
-      // const expectedResponse6 = '67 yr, 2 mo, 6 d, 12 h, 38 min, 20 s';
+      const expectedResponse5 = '3 yr, 6 mo, 19 d, 10 h, 32 min, 10 s'
+      const expectedResponse6 = '67 yr, 2 mo, 6 d, 12 h, 38 min, 20 s'
 
       expect(truncateTTLToDuration(ttl1)).toEqual(expectedResponse1)
       expect(truncateTTLToDuration(ttl2)).toEqual(expectedResponse2)
       expect(truncateTTLToDuration(ttl3)).toEqual(expectedResponse3)
       expect(truncateTTLToDuration(ttl4)).toEqual(expectedResponse4)
-      // expect(truncateTTLToDuration(ttl5)).toEqual(expectedResponse5);
-      // expect(truncateTTLToDuration(ttl6)).toEqual(expectedResponse6);
+      expect(truncateTTLToDuration(ttl5)).toEqual(expectedResponse5)
+      expect(truncateTTLToDuration(ttl6)).toEqual(expectedResponse6)
     })
   })
 
@@ -132,4 +132,29 @@ describe('Truncate TTL util tests', () => {
       expect(truncateTTLToSeconds(ttl4)).toEqual(expectedResponse4)
     })
   })
+
+  describe('truncateTTLToFirstUnit', () => {
+    it('truncateTTLToFirstUnit should return appropriate value', () => {
+      const ttl1 = 100
+      const ttl2 = 1_534
+      const ttl3 = 54_334
+      const ttl4 = 4_325_634
+      const ttl5 = 112_012_330
+      const ttl6 = 2_120_042_300
+
+      const expectedResponse1 = '1 min' // '1 min, 40 s'
+      const expectedResponse2 = '25 min' // '25 min, 34 s'
+      const expectedResponse3 = '15 h' // '15 h, 5 min, 34 s'
+      const expectedResponse4 = '1 mo' // '1 mo, 19 d, 1 h, 33 min, 54 s'
+      const expectedResponse5 = '3 yr' // '3 yr, 6 mo, 19 d, 10 h, 32 min, 10 s'
+      const expectedResponse6 = '67 yr' // '67 yr, 2 mo, 6 d, 12 h, 38 min, 20 s'
+
+      expect(truncateTTLToFirstUnit(ttl1)).toEqual(expectedResponse1)
+      expect(truncateTTLToFirstUnit(ttl2)).toEqual(expectedResponse2)
+      expect(truncateTTLToFirstUnit(ttl3)).toEqual(expectedResponse3)
+      expect(truncateTTLToFirstUnit(ttl4)).toEqual(expectedResponse4)
+      expect(truncateTTLToFirstUnit(ttl5)).toEqual(expectedResponse5)
+      expect(truncateTTLToFirstUnit(ttl6)).toEqual(expectedResponse6)
+    })
+  })
 })