Merge branch 'main' into build/mac_apple_store

# Conflicts:
#	redisinsight/ui/src/packages/clients-list/yarn.lock
#	redisinsight/ui/src/packages/redisgraph/src/styles/styles.less
#	redisinsight/ui/src/packages/redistimeseries-app/src/index.html

Author: egor-zalenski

.circleci/config.yml

@@ -700,7 +700,22 @@ jobs:
       - run:
           name: Build Docker image (API + UI)
           command: |
-            docker build --build-arg NODE_ENV=<< parameters.env >> --build-arg SERVER_TLS_CERT="$SERVER_TLS_CERT" --build-arg SERVER_TLS_KEY="$SERVER_TLS_KEY" -t riv2:latest .
+            TELEMETRY=$SEGMENT_WRITE_KEY_DEV
+
+            if [ << parameters.env >> == 'production' ]; then
+              TELEMETRY=$SEGMENT_WRITE_KEY
+            fi
+
+            if [ << parameters.env >> == 'staging' ]; then
+              TELEMETRY=$SEGMENT_WRITE_KEY_STAGE
+            fi
+
+            docker build --build-arg NODE_ENV=<< parameters.env >> \
+            --build-arg SERVER_TLS_CERT="$SERVER_TLS_CERT" \
+            --build-arg SERVER_TLS_KEY="$SERVER_TLS_KEY" \
+            --build-arg SEGMENT_WRITE_KEY="$TELEMETRY" \
+            -t riv2:latest .
+
             mkdir -p docker-release
             docker image save -o docker-release/docker.tar riv2
       - persist_to_workspace:

Dockerfile

@@ -13,8 +13,10 @@ COPY redisinsight ./redisinsight
 RUN yarn --cwd redisinsight/api
 ARG SERVER_TLS_CERT
 ARG SERVER_TLS_KEY
+ARG SEGMENT_WRITE_KEY
 ENV SERVER_TLS_CERT=${SERVER_TLS_CERT}
 ENV SERVER_TLS_KEY=${SERVER_TLS_KEY}
+ENV SEGMENT_WRITE_KEY=${SEGMENT_WRITE_KEY}
 RUN yarn build:web
 RUN yarn build:statics
 
@@ -61,8 +63,10 @@ RUN dbus-uuidgen > /var/lib/dbus/machine-id
 ARG NODE_ENV=production
 ARG SERVER_TLS_CERT
 ARG SERVER_TLS_KEY
+ARG SEGMENT_WRITE_KEY
 ENV SERVER_TLS_CERT=${SERVER_TLS_CERT}
 ENV SERVER_TLS_KEY=${SERVER_TLS_KEY}
+ENV SEGMENT_WRITE_KEY=${SEGMENT_WRITE_KEY}
 ENV NODE_ENV=${NODE_ENV}
 ENV SERVER_STATIC_CONTENT=true
 ENV BUILD_TYPE='DOCKER_ON_PREMISE'

redisinsight/ui/src/packages/clients-list/yarn.lock

@@ -994,9 +994,9 @@
   integrity sha512-BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ==
 
 "@types/mdast@^3.0.0":
-  version "3.0.10"
-  resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.10.tgz#4724244a82a4598884cbbe9bcfd73dff927ee8af"
-  integrity sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==
+  version "3.0.11"
+  resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.11.tgz#dc130f7e7d9306124286f6d6cee40cf4d14a3dc0"
+  integrity sha512-Y/uImid8aAwrEA24/1tcRZwpxX3pIFTSilcNDKSPn+Y2iDywSEachzRuvgAYYLR3wpGXAsMbv5lvKLDZLeYPAw==
   dependencies:
     "@types/unist" "*"
 
@@ -1031,9 +1031,9 @@
   integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==
 
 "@types/react-beautiful-dnd@^13.0.0":
-  version "13.1.3"
-  resolved "https://registry.yarnpkg.com/@types/react-beautiful-dnd/-/react-beautiful-dnd-13.1.3.tgz#9812f6086c4b77ce08c83120788d92084a26db0f"
-  integrity sha512-BNdmvONKtsrZq3AGrujECQrIn8cDT+fZsxBLXuX3YWY/nHfZinUFx4W88eS0rkcXzuLbXpKOsu/1WCMPMLEpPg==
+  version "13.1.4"
+  resolved "https://registry.yarnpkg.com/@types/react-beautiful-dnd/-/react-beautiful-dnd-13.1.4.tgz#bcec72da719c18c0d8b4a7cb00e7fb443211d6d7"
+  integrity sha512-4bIBdzOr0aavN+88q3C7Pgz+xkb7tz3whORYrmSj77wfVEMfiWiooIwVWFR7KM2e+uGTe5BVrXqSfb0aHeflJA==
   dependencies:
     "@types/react" "*"
 
@@ -1239,9 +1239,9 @@ callsites@^3.0.0:
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
 caniuse-lite@^1.0.30001449:
-  version "1.0.30001468"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001468.tgz#0101837c6a4e38e6331104c33dcfb3bdf367a4b7"
-  integrity sha512-zgAo8D5kbOyUcRAgSmgyuvBkjrGk5CGYG5TYgFdpQv+ywcyEpo1LOWoG8YmoflGnh+V+UsNuKYedsoYs0hzV5A==
+  version "1.0.30001469"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001469.tgz#3dd505430c8522fdc9f94b4a19518e330f5c945a"
+  integrity sha512-Rcp7221ScNqQPP3W+lVOYDyjdR6dC+neEQCttoNr5bAyz54AboB4iwpnWgyi8P4YUsPybVzT4LgWiBbI3drL4g==
 
 ccount@^1.0.0:
   version "1.1.0"
@@ -1536,9 +1536,9 @@ dotenv@^7.0.0:
   integrity sha512-M3NhsLbV1i6HuGzBUH8vXrtxOk+tWmzWKDMbAVSUp3Zsjm7ywFeuwrUXhmhQyRK1q5B5GGy7hcXPbj3bnfZg2g==
 
 electron-to-chromium@^1.4.284:
-  version "1.4.333"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.333.tgz#ebb21f860f8a29923717b06ec0cb54e77ed34c04"
-  integrity sha512-YyE8+GKyGtPEP1/kpvqsdhD6rA/TP1DUFDN4uiU/YI52NzDxmwHkEb3qjId8hLBa5siJvG0sfC3O66501jMruQ==
+  version "1.4.335"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.335.tgz#69c08baa608bbb58e290d83320190fa82c835efe"
+  integrity sha512-l/eowQqTnrq3gu+WSrdfkhfNHnPgYqlKAwxz7MTOj6mom19vpEDHNXl6dxDxyTiYuhemydprKr/HCrHfgk+OfQ==
 
 emoji-regex@^8.0.0:
   version "8.0.0"
@@ -2817,7 +2817,7 @@ term-size@^2.2.1:
   resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.1.tgz#2a6a54840432c2fb6320fea0f415531e90189f54"
   integrity sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==
 
-terser@^5.16.8, terser@^5.2.0:
+terser@^5.16.6, terser@^5.2.0:
   version "5.16.6"
   resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.6.tgz#f6c7a14a378ee0630fbe3ac8d1f41b4681109533"
   integrity sha512-IBZ+ZQIA9sMaXmRZCUMDjNH0D5AQQfdn4WUjHL0+1lF4TP1IHRJbrhb6fNaXWikrYQTSkb7SLxkeXAiy1p7mbg==

redisinsight/ui/src/packages/redistimeseries-app/src/index.html

@@ -6,8 +6,8 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>Client list plugin</title>
   <script type="module" src="./main.tsx"></script>
-  <!-- <link rel="stylesheet" href="../../../../../../vendor/global_styles.css" />
-  <link rel="stylesheet" href="../../../../../../vendor/dark_theme.css" /> -->
+  <!-- <link rel="stylesheet" href="../../../../../../vendor/global_styles.css" /> -->
+  <!-- <link rel="stylesheet" href="../../../../../../vendor/dark_theme.css" /> -->
   <!-- <link rel="stylesheet" href="../../../../../../vendor/light_theme.css" /> -->
   <link rel="stylesheet" href="./styles/styles.scss" />
 

redisinsight/ui/src/services/apiService.ts

@@ -1,7 +1,7 @@
 import axios, { AxiosRequestConfig } from 'axios'
+import { isNumber } from 'lodash'
 import { sessionStorageService } from 'uiSrc/services'
 import { BrowserStorageItem } from 'uiSrc/constants'
-import { isNumber } from 'lodash'
 
 const baseApiUrl = process.env.BASE_API_URL
 const apiPort = process.env.API_PORT
@@ -20,7 +20,7 @@ const axiosInstance = axios.create({
 
 export const requestInterceptor = (config: AxiosRequestConfig) => {
   if (config?.headers) {
-    const [instanceId] = (/(?<=databases\/)(.*?)(?=\/)/gi).exec(config.url || '') || []
+    const instanceId = /databases\/([\w-]+)\/?.*/.exec(config.url || '')?.[1]
 
     if (instanceId) {
       const dbIndex = sessionStorageService.get(`${BrowserStorageItem.dbIndex}${instanceId}`)

redisinsight/ui/src/services/tests/apiService.spec.ts

@@ -1,14 +1,14 @@
+import { AxiosRequestConfig } from 'axios'
 import { sessionStorageService } from 'uiSrc/services'
 import { requestInterceptor } from 'uiSrc/services/apiService'
-import { AxiosRequestConfig } from 'axios'
 
 describe('requestInterceptor', () => {
   it('should properly set db-index to headers', () => {
     sessionStorageService.get = jest.fn().mockReturnValue(5)
 
     const config: AxiosRequestConfig = {
       headers: {},
-      url: 'http://localhost:8080/databases/instanceId/endpoint'
+      url: 'http://localhost:8080/databases/123-215gg-23/endpoint'
     }
 
     requestInterceptor(config)
@@ -20,7 +20,7 @@ describe('requestInterceptor', () => {
 
     const config: AxiosRequestConfig = {
       headers: {},
-      url: 'http://localhost:8080/settings/instanceId/endpoint'
+      url: 'http://localhost:8080/settings/123-215gg-23/endpoint'
     }
 
     requestInterceptor(config)

tests/e2e/tests/critical-path/workbench/default-scripts-area.e2e.ts

@@ -51,9 +51,8 @@ test
         await t.click(workbenchPage.internalLinkWorkingWithHashes);
 
         // Verify that telemetry event 'WORKBENCH_ENABLEMENT_AREA_GUIDE_OPENED' sent and has all expected properties
-        // unskip after closing https://redislabs.atlassian.net/browse/RI-4281
-        // await telemetry.verifyEventHasProperties(telemetryEvent, expectedProperties, logger);
-        // await telemetry.verifyEventPropertyValue(telemetryEvent, 'path', telemetryPath, logger);
+        await telemetry.verifyEventHasProperties(telemetryEvent, expectedProperties, logger);
+        await telemetry.verifyEventPropertyValue(telemetryEvent, 'path', telemetryPath, logger);
 
         await t.click(workbenchPage.preselectIndexInformation);
         // Replace the {index} with indexName value in script and send

tests/e2e/tests/smoke/browser/edit-key-name.e2e.ts

@@ -41,9 +41,8 @@ test
         await t.expect(keyNameFromDetails).contains(keyNameBefore, 'The String Key Name not correct before editing');
 
         // Verify that telemetry event 'BROWSER_KEY_VALUE_VIEWED' sent and has all expected properties
-        // unskip after closing https://redislabs.atlassian.net/browse/RI-4281
-        // await telemetry.verifyEventHasProperties(telemetryEvent, expectedProperties, logger);
-        // await telemetry.verifyEventPropertyValue(telemetryEvent, 'keyType', 'string', logger);
+        await telemetry.verifyEventHasProperties(telemetryEvent, expectedProperties, logger);
+        await telemetry.verifyEventPropertyValue(telemetryEvent, 'keyType', 'string', logger);
 
         await browserPage.editKeyName(keyNameAfter);
         keyNameFromDetails = await browserPage.keyNameFormDetails.textContent;

tests/e2e/tests/smoke/database/add-standalone-db.e2e.ts

@@ -72,8 +72,7 @@ test
         await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName);
 
         // Verify that telemetry event 'CONFIG_DATABASES_OPEN_DATABASE' sent and has all expected properties
-        // // unskip after closing https://redislabs.atlassian.net/browse/RI-4281
-        // await telemetry.verifyEventHasProperties(telemetryEvent, expectedProperties, logger);
+        await telemetry.verifyEventHasProperties(telemetryEvent, expectedProperties, logger);
 
         await t.click(browserPage.myRedisDbIcon);
         // Verify that user can't see an indicator of databases that were opened