Merge branch 'main' into feature/RI-4141_Data_decompressors

Author: egor-zalenski

configs/webpack.config.web.prod.babel.js

@@ -207,8 +207,5 @@ export default merge(commonConfig, {
       },
     ],
   },
-  externals: {
-    react: 'React',
-    'react-dom': 'ReactDOM',
-  },
+  externals: {},
 });

electron-builder.json

@@ -1,7 +1,7 @@
 {
   "productName": "RedisInsight-v2",
   "appId": "org.RedisLabs.RedisInsight-V2",
-  "copyright": "Copyright © 2021 Redis Ltd.",
+  "copyright": "Copyright © 2023 Redis Ltd.",
   "files": [
     "dist/",
     "node_modules/",

redisinsight/api/src/modules/database/database.analytics.spec.ts

@@ -103,6 +103,7 @@ describe('DatabaseAnalytics', () => {
           numberedDatabases: mockRedisGeneralInfo.databases,
           numberOfModules: 0,
           timeout: mockDatabaseWithTlsAuth.timeout / 1_000, // milliseconds to seconds
+          databaseIndex: 0,
           ...DEFAULT_REDIS_MODULES_SUMMARY,
         },
       );
@@ -132,6 +133,7 @@ describe('DatabaseAnalytics', () => {
           numberedDatabases: mockRedisGeneralInfo.databases,
           numberOfModules: 0,
           timeout: mockDatabaseWithTlsAuth.timeout / 1_000, // milliseconds to seconds
+          databaseIndex: 0,
           ...DEFAULT_REDIS_MODULES_SUMMARY,
         },
       );
@@ -163,6 +165,45 @@ describe('DatabaseAnalytics', () => {
           numberedDatabases: undefined,
           numberOfModules: 2,
           timeout: mockDatabaseWithTlsAuth.timeout / 1_000, // milliseconds to seconds
+          databaseIndex: 0,
+          ...DEFAULT_REDIS_MODULES_SUMMARY,
+          RediSearch: {
+            loaded: true,
+            version: 20000,
+          },
+          customModules: [{ name: 'rediSQL', version: 1 }],
+        },
+      );
+    });
+    it('should emit event without db index', () => {
+      const instance = {
+        ...mockDatabaseWithTlsAuth,
+        db: 2,
+        modules: [{ name: 'search', version: 20000 }, { name: 'rediSQL', version: 1 }],
+      };
+      service.sendInstanceAddedEvent(instance, {
+        version: mockRedisGeneralInfo.version,
+      });
+
+      expect(sendEventSpy).toHaveBeenCalledWith(
+        TelemetryEvents.RedisInstanceAdded,
+        {
+          databaseId: instance.id,
+          connectionType: instance.connectionType,
+          provider: instance.provider,
+          useTLS: 'enabled',
+          verifyTLSCertificate: 'enabled',
+          useTLSAuthClients: 'enabled',
+          useSNI: 'enabled',
+          useSSH: 'disabled',
+          version: mockRedisGeneralInfo.version,
+          numberOfKeys: undefined,
+          numberOfKeysRange: undefined,
+          totalMemory: undefined,
+          numberedDatabases: undefined,
+          numberOfModules: 2,
+          timeout: mockDatabaseWithTlsAuth.timeout / 1_000, // milliseconds to seconds
+          databaseIndex: 2,
           ...DEFAULT_REDIS_MODULES_SUMMARY,
           RediSearch: {
             loaded: true,

redisinsight/api/src/modules/database/database.analytics.ts

@@ -66,6 +66,7 @@ export class DatabaseAnalytics extends TelemetryBaseService {
           numberedDatabases: additionalInfo.databases,
           numberOfModules: instance.modules?.length || 0,
           timeout: instance.timeout / 1_000, // milliseconds to seconds
+          databaseIndex: instance.db || 0,
           ...modulesSummary,
         },
       );

redisinsight/splash.html

@@ -87,7 +87,7 @@
     const copyrightEl = document.getElementById('copyright') || null
 
     if (copyrightEl) {
-      copyrightEl.innerHTML = `RedisInsight ${appVersion}  © ${new Date().getFullYear() || '2022'} Redis Ltd.`
+      copyrightEl.innerHTML = `RedisInsight ${appVersion}  © ${new Date().getFullYear() || '2023'} Redis Ltd.`
     }
   }
 

redisinsight/ui/index.html.ejs

@@ -10,14 +10,9 @@
   <div id="root"></div>
 
   <!-- Dependencies -->
-  <% if (webpackConfig.mode=='production' ) { %>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/react/18.2.0/umd/react.production.min.js"
-      integrity="sha512-8Q6Y9XnTbOE+JNvjBQwJ2H8S+UV4uA6hiRykhdtIyDYZ2TprdNmWOUaKdGzOhyr4dCyk287OejbPvwl7lrfqrQ==" crossorigin="anonymous"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/react-dom/18.2.0/umd/react-dom.production.min.js"
-      integrity="sha512-MOCpqoRoisCTwJ8vQQiciZv0qcpROCidek3GTFS6KTk2+y7munJIlKCVkFCYY+p3ErYFXCjmFjnfTTRSC1OHWQ==" crossorigin="anonymous"></script>
-    <% } else { %>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/react/18.2.0/umd/react.development.js"
-        integrity="sha512-m7nhpWHotpucPI37I4lPovL28Bm2BhAMV8poF3F8Z9oOEZ3jlxGzkgvG0EMt1mVL1xydr1erlBbmN90js/ssUw==" crossorigin="anonymous"></script>
-      <% } %>
+  <% if (webpackConfig.mode=='development' ) { %>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/react/18.2.0/umd/react.development.js"
+      integrity="sha512-m7nhpWHotpucPI37I4lPovL28Bm2BhAMV8poF3F8Z9oOEZ3jlxGzkgvG0EMt1mVL1xydr1erlBbmN90js/ssUw==" crossorigin="anonymous"></script>
+  <% } %>
 </body>
 </html>

redisinsight/ui/src/assets/img/workbench/vis_tag_cloud.svg

@@ -60,6 +60,7 @@ const MonacoJson = (props: Props) => {
       preview: false,
       showStatusBar: false,
       showIcons: false,
+      showProperties: false,
     },
     quickSuggestions: false,
     minimap: {

redisinsight/ui/src/components/monaco-json/MonacoJson.tsx

@@ -18,6 +18,7 @@ export interface Props {
   value: string
   options: string[]
   placeholder: string
+  disableSubmit?: boolean
   onSubmit: () => void
   onKeyDown?: (e: React.KeyboardEvent) => void
   suggestions?: {
@@ -45,6 +46,7 @@ const MultiSearch = (props: Props) => {
     options = [],
     suggestions,
     placeholder,
+    disableSubmit,
     onSubmit,
     onChangeOptions,
     onChange,
@@ -137,6 +139,18 @@ const MultiSearch = (props: Props) => {
     onSubmit()
   }
 
+  const SubmitBtn = () => (
+    <EuiButtonIcon
+      iconType="search"
+      color="primary"
+      aria-label="Search"
+      disabled={disableSubmit}
+      className={styles.searchButton}
+      onClick={handleSubmit}
+      data-testid="search-btn"
+    />
+  )
+
   return (
     <EuiOutsideClickDetector onOutsideClick={exitAutoSuggestions}>
       <div
@@ -255,14 +269,17 @@ const MultiSearch = (props: Props) => {
             </EuiToolTip>
           )}
         </div>
-        <EuiButtonIcon
-          iconType="search"
-          color="primary"
-          aria-label="Search"
-          className={styles.searchButton}
-          onClick={handleSubmit}
-          data-testid="search-btn"
-        />
+        {disableSubmit && (
+          <EuiToolTip
+            position="top"
+            display="inlineBlock"
+            anchorClassName={styles.anchorSubmitBtn}
+            content="Please choose index in order to preform the search"
+          >
+            {SubmitBtn()}
+          </EuiToolTip>
+        )}
+        {!disableSubmit && SubmitBtn()}
       </div>
     </EuiOutsideClickDetector>
   )

redisinsight/ui/src/components/multi-search/MultiSearch.tsx

@@ -18,11 +18,18 @@
     background-color: var(--browserTableRowEven);
     background-repeat: no-repeat;
     background-size: 0 100%;
-    transition: box-shadow 150ms ease-in, background-image 150ms ease-in, background-size 150ms ease-in, background-color 150ms ease-in;
+    transition: box-shadow 150ms ease-in, background-image 150ms ease-in, background-size 150ms ease-in,
+      background-color 150ms ease-in;
 
     &.isFocused {
       background-size: 100% 100%;
-      background-image: linear-gradient(to top, var(--euiColorPrimary), var(--euiColorPrimary) 2px, transparent 2px, transparent 100%) !important;
+      background-image: linear-gradient(
+        to top,
+        var(--euiColorPrimary),
+        var(--euiColorPrimary) 2px,
+        transparent 2px,
+        transparent 100%
+      ) !important;
     }
   }
 
@@ -48,7 +55,8 @@
     border-radius: 100%;
     margin-left: 5px;
 
-    &:hover, &:focus {
+    &:hover,
+    &:focus {
       background-color: var(--separatorColor) !important;
     }
 
@@ -83,7 +91,8 @@
       padding: 6px 10px;
       cursor: default;
 
-      &:hover, &.focused {
+      &:hover,
+      &.focused {
         background: var(--comboBoxBadgeBgColor);
         .suggestionRemoveBtn {
           visibility: visible;
@@ -139,13 +148,25 @@
     color: var(--euiColorPrimaryText) !important;
     border-radius: 0 4px 4px 0;
 
-    &:hover, &:focus, &:focus-within {
+    &:hover:not(:disabled),
+    &:focus,
+    &:focus-within {
       background-color: var(--buttonSecondaryHoverColor) !important;
       transform: none !important;
     }
 
     &:hover {
       transform: none;
     }
+
+    &:disabled {
+      border: 1px solid var(--separatorColor);
+      border-left: none;
+      background-color: var(--euiColorLightestShade);
+    }
+  }
+
+  .anchorSubmitBtn {
+    height: 100%;
   }
 }