Merge branch 'main' into feature/RI-2088_get_rid_of_python_scripts

Author: Artem

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,70 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ main, latest, release/* ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ main ]
+  schedule:
+    - cron: '37 11 * * 3'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript', 'python' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

redisinsight/api/src/modules/cli/dto/cli.dto.ts

@@ -27,6 +27,15 @@ export enum ClusterNodeRole {
   Slave = 'SLAVE',
 }
 
+class ClusterNode extends EndpointDto {
+  @ApiPropertyOptional({
+    description: 'Cluster node slot.',
+    type: Number,
+    example: 0,
+  })
+  slot?: number;
+}
+
 export class CreateCliClientDto {
   @ApiPropertyOptional({
     type: String,
@@ -123,10 +132,10 @@ export class SendClusterCommandResponse {
   response: any;
 
   @ApiPropertyOptional({
-    type: () => EndpointDto,
+    type: () => ClusterNode,
     description: 'Redis Cluster Node info',
   })
-  node?: EndpointDto;
+  node?: ClusterNode;
 
   @ApiProperty({
     description: 'Redis CLI command execution status',

redisinsight/api/src/modules/cli/services/cli-business/cli-business.service.spec.ts

@@ -555,7 +555,7 @@ describe('CliBusinessService', () => {
       const command = 'set foo bar';
       const mockResult: SendClusterCommandResponse = {
         response: 'OK',
-        node: { ...mockNode, port: 7002 },
+        node: { ...mockNode, port: 7002, slot: 7008 },
         status: CommandExecutionStatus.Success,
       };
       cliTool.execCommandForNode
@@ -586,7 +586,7 @@ describe('CliBusinessService', () => {
       const command = 'set foo bar';
       const mockResult: SendClusterCommandResponse = {
         response: '-> Redirected to slot [7008] located at 127.0.0.1:7002\nOK',
-        node: { ...mockNode, port: 7002 },
+        node: { ...mockNode, port: 7002, slot: 7008 },
         status: CommandExecutionStatus.Success,
       };
       cliTool.execCommandForNode

redisinsight/api/src/modules/cli/services/cli-business/cli-business.service.ts

@@ -306,6 +306,7 @@ export class CliBusinessService {
           replyEncoding,
         );
         result.response = formatter.format(result.response, { slot, address });
+        result.slot = parseInt(slot, 10);
       } else {
         result.response = formatter.format(result.response);
       }
@@ -316,9 +317,9 @@ export class CliBusinessService {
         { command, outputFormat },
       );
       const {
-        host, port, error, ...rest
+        host, port, error, slot, ...rest
       } = result;
-      return { ...rest, node: { host, port } };
+      return { ...rest, node: { host, port, slot } };
     } catch (error) {
       this.logger.error('Failed to execute redis.cluster CLI command.', error);
 

redisinsight/api/src/modules/cli/services/cli-tool/cli-tool.service.ts

@@ -25,6 +25,7 @@ export interface ICliExecResultFromNode {
   port: number;
   response: any;
   status: CommandExecutionStatus;
+  slot?: number;
   error?: any,
 }
 

redisinsight/api/test/api/cli/POST-instance-id-cli-uuid-send_cluster_command.test.ts

@@ -37,6 +37,7 @@ const responseSchema = Joi.array().items(Joi.object().keys({
   node: Joi.object().keys({
     host: Joi.string().required(),
     port: Joi.number().integer().required(),
+    slot: Joi.number().integer(),
   })
 }).required());
 
@@ -46,6 +47,7 @@ const responseRawSchema = Joi.array().items(Joi.object().keys({
   node: Joi.object().keys({
     host: Joi.string().required(),
     port: Joi.number().integer().required(),
+    slot: Joi.number().integer(),
   })
 }).required());
 

redisinsight/main.dev.ts

@@ -136,7 +136,7 @@ const bootstrap = async () => {
 
 export const windows = new Set<BrowserWindow>();
 
-const titleSplash = 'splash';
+const titleSplash = 'RedisInsight';
 export const createSplashScreen = async () => {
   const splash = new BrowserWindow({
     width: 500,
@@ -153,7 +153,7 @@ export const createSplashScreen = async () => {
   return splash;
 };
 
-export const createWindow = async (splash: BrowserWindow | null) => {
+export const createWindow = async (splash: BrowserWindow | null = null) => {
   const RESOURCES_PATH = app.isPackaged
     ? path.join(process.resourcesPath, 'resources')
     : path.join(__dirname, '../resources');

redisinsight/ui/src/components/cli/components/cli-helper/CliHelper/styles.module.scss

@@ -17,6 +17,7 @@
   border-top: 1px solid var(--euiColorLightShade);
 
   z-index: 10;
+  overflow: hidden;
 }
 
 .searchWrapper {

redisinsight/ui/src/pages/workbench/components/wb-view/WBView/styles.module.scss

@@ -9,7 +9,7 @@
   display: flex;
   flex: 1;
   padding: 0 16px 0;
-  height: 100%;
+  height: calc(100% - 70px);
 }
 
 .sidebar {

redisinsight/ui/src/pages/workbench/components/wb-view/WBViewWrapper.spec.tsx

@@ -11,8 +11,6 @@ import {
   waitFor,
 } from 'uiSrc/utils/test-utils'
 import QueryWrapper, { Props as QueryProps } from 'uiSrc/components/query'
-import { BrowserStorageItem } from 'uiSrc/constants'
-import { localStorageService } from 'uiSrc/services'
 import { connectedInstanceSelector } from 'uiSrc/slices/instances'
 import { processWBClient } from 'uiSrc/slices/workbench/wb-settings'
 import { sendWBCommandClusterAction } from 'uiSrc/slices/workbench/wb-results'
@@ -101,15 +99,6 @@ describe('WBViewWrapper', () => {
     expect(render(<WBViewWrapper />)).toBeTruthy()
   })
 
-  it('should localStorage be called', () => {
-    const mockUuid = 'test-uuid'
-    localStorageService.get = jest.fn().mockReturnValue(mockUuid)
-
-    render(<WBViewWrapper />)
-
-    expect(localStorageService.get).toBeCalledWith(BrowserStorageItem.wbClientUuid)
-  })
-
   it('should render with SessionStorage', () => {
     render(<WBViewWrapper />)