Merge branch 'main' into fe/bugfix/RI-7463-sentinel-databases-rerender

Author: pd-redis

.eslintrc.js

@@ -261,9 +261,6 @@ module.exports = {
       rules: {
         semi: 'off',
         '@typescript-eslint/semi': 'off',
-        '@typescript-eslint/no-unused-vars': 'off',
-        '@typescript-eslint/no-use-before-define': 'off',
-        '@typescript-eslint/no-unused-expressions': 'off',
         'sonarjs/no-identical-functions': 'off',
         'sonarjs/prefer-immediate-return': 'off',
         'sonarjs/no-duplicate-string': 'off',
@@ -274,14 +271,10 @@ module.exports = {
         'no-underscore-dangle': 'off',
         'import/no-duplicates': 'off',
         'no-console': 'off',
-        'prettier/prettier': 'off',
         'prefer-destructuring': 'off',
         'no-unneeded-ternary': 'off',
         'prefer-template': 'off',
         'prefer-const': 'off',
-        '@typescript-eslint/naming-convention': 'off',
-        '@typescript-eslint/lines-between-class-members': 'off',
-        '@typescript-eslint/no-shadow': 'off',
         // REDUNDANT: These are OFF by default in newer Airbnb config
         // 'prefer-arrow-callback': 'off',
         // 'no-restricted-syntax': 'off',
@@ -427,7 +420,9 @@ module.exports = {
     'node_modules',
     'release',
     'redisinsight/ui/src/packages/**/icons/*.js*',
+    'redisinsight/ui/src/packages/**',
     'redisinsight/api/report/**',
+    'redisinsight/api/static/**',
     'redisinsight/api/migration/**',
     // Config files that don't need linting
     '.eslintrc.js',

.github/workflows/tests-integration.yml

@@ -50,12 +50,13 @@ env:
   TEST_MEDIUM_DB_DUMP: ${{ secrets.TEST_MEDIUM_DB_DUMP }}
   TEST_BIG_DB_DUMP: ${{ secrets.TEST_BIG_DB_DUMP }}
   REPORT_NAME: 'report-it'
+  #  Disabled RTE for now. Need to prepare reasonable dataset to not take so much time for tests.
+  #  "oss-st-big": "OSS Standalone v6 and all modules and predefined amount of data inside (~3-4M)",
   ITESTS_NAMES: |
     {
       "oss-st-5": "OSS Standalone v5",
       "oss-st-5-pass": "OSS Standalone v5 with admin pass required",
       "oss-st-6": "OSS Standalone v6 and all modules",
-      "oss-st-big": "OSS Standalone v6 and all modules and predefined amount of data inside (~3-4M)",
       "mods-preview": "OSS Standalone and all preview modules",
       "oss-st-6-tls": "OSS Standalone v6 with TLS enabled",
       "oss-st-6-tls-auth": "OSS Standalone v6 with TLS auth required",
@@ -153,6 +154,15 @@ jobs:
           cp ./redisinsight/api/test/test-runs/coverage/test-run-result.xml ./itest/results/${{ matrix.rte }}.result.xml
           cp ./redisinsight/api/test/test-runs/coverage/test-run-coverage.json ./itest/coverages/${{ matrix.rte }}.coverage.json
 
+      - name: Process test results
+        if: always()
+        run: |
+          mkdir -p itest/coverages && mkdir -p itest/results
+
+          cp ./redisinsight/api/test/test-runs/coverage/test-run-result.json ./itest/results/${{ matrix.rte }}.result.json
+          cp ./redisinsight/api/test/test-runs/coverage/test-run-result.xml ./itest/results/${{ matrix.rte }}.result.xml
+          cp ./redisinsight/api/test/test-runs/coverage/test-run-coverage.json ./itest/coverages/${{ matrix.rte }}.coverage.json
+
       - name: Upload coverage files as artifact
         if: always()
         uses: actions/upload-artifact@v4
@@ -230,7 +240,7 @@ jobs:
           reporter: java-junit
           list-tests: 'failed'
           list-suites: 'failed'
-          fail-on-error: 'false'
+          fail-on-error: 'true'
 
       - name: Add link to report in the workflow summary
         if: always()

.storybook/preview-head.html

@@ -19,7 +19,7 @@
       display: flex;
       flex-direction: column;
     }
-
+  
     .sbdocs-wrapper div:has(>div>.toc-wrapper){
       width:14rem;
     }

redisinsight/api/config/default.ts

@@ -114,11 +114,8 @@ export default {
     databaseManagement: process.env.RI_DATABASE_MANAGEMENT !== 'false',
     maxPayloadSize: process.env.RI_MAX_PAYLOAD_SIZE || '512MB',
     cors: {
-      origin: process.env.RI_CORS_ORIGIN
-        ? process.env.RI_CORS_ORIGIN
-        : '*',
-      credentials:
-        process.env.RI_CORS_CREDENTIALS === 'true',
+      origin: process.env.RI_CORS_ORIGIN ? process.env.RI_CORS_ORIGIN : '*',
+      credentials: process.env.RI_CORS_CREDENTIALS === 'true',
     },
   },
   statics: {

redisinsight/api/config/features-config.json

@@ -121,6 +121,10 @@
     "vectorSearch": {
       "flag": false,
       "perc": [[0, 100]]
+    },
+    "databasesListV2": {
+      "flag": true,
+      "perc": [[0, 100]]
     }
   }
 }

redisinsight/api/config/logger.ts

@@ -6,10 +6,7 @@ import {
 } from 'nest-winston';
 import { join } from 'path';
 import config from 'src/utils/config';
-import {
-  prepareLogsData,
-  prettyFileFormat,
-} from 'src/utils/logsFormatter';
+import { prepareLogsData, prettyFileFormat } from 'src/utils/logsFormatter';
 
 const PATH_CONFIG = config.get('dir_path');
 const LOGGER_CONFIG = config.get('logger');

redisinsight/api/package.json

@@ -34,7 +34,7 @@
     "typeorm": "ts-node -r tsconfig-paths/register ./node_modules/typeorm/cli.js -d ./config/ormconfig.ts",
     "test:api": "cross-env NODE_ENV=test ts-mocha --paths --config ./test/api/.mocharc.yml",
     "test:api:cov": "nyc --reporter=html --reporter=text --reporter=text-summary yarn run test:api",
-    "test:api:ci:cov": "cross-env NODE_ENV=test nyc --temp-dir coverage/.nyc_output --report-dir coverage --instrument -r text -r text-summary -r html yarn run test:api --reporter mocha-multi-reporters --reporter-options configFile=test/api/reporters.json; echo 'Exit code from tests:' $? > coverage/debug.log; echo 'NYC tests completed, checking .nyc_output...' >> coverage/debug.log; ls -la coverage/.nyc_output >> coverage/debug.log 2>&1; echo 'Running NYC merge...' >> coverage/debug.log; nyc merge coverage/.nyc_output coverage/test-run-coverage.json >> coverage/debug.log 2>&1; echo 'NYC merge exit code:' $? >> coverage/debug.log; echo 'NYC merge completed!' >> coverage/debug.log; ls -la coverage/test-run-coverage.json >> coverage/debug.log 2>&1",
+    "test:api:ci:cov": "cross-env nyc -r text -r text-summary -r html yarn run test:api --reporter mocha-multi-reporters --reporter-options configFile=test/api/reporters.json && nyc merge .nyc_output ./coverage/test-run-coverage.json",
     "typeorm:migrate": "cross-env NODE_ENV=staging yarn typeorm migration:generate ./migration/migration",
     "typeorm:run": "yarn typeorm migration:run",
     "typeorm:run:stage": "cross-env NODE_ENV=staging yarn typeorm migration:run"

redisinsight/api/src/common/decorators/client-metadata/client-metadata.decorator.ts

@@ -38,17 +38,24 @@ export const clientMetadataParamFactory = (
     uniqueId = req.params?.[options.uniqueIdParam];
   }
 
-  const clientMetadata = plainToInstance(ClientMetadata, {
-    sessionMetadata: sessionMetadataFromRequestExecutionContext(undefined, ctx),
-    databaseId,
-    uniqueId,
-    context: options?.context || ClientContext.Common,
-    db: options?.ignoreDbIndex
-      ? undefined
-      : req?.headers?.[API_HEADER_DATABASE_INDEX],
-  }, {
-    groups: ['security'],
-  });
+  const clientMetadata = plainToInstance(
+    ClientMetadata,
+    {
+      sessionMetadata: sessionMetadataFromRequestExecutionContext(
+        undefined,
+        ctx,
+      ),
+      databaseId,
+      uniqueId,
+      context: options?.context || ClientContext.Common,
+      db: options?.ignoreDbIndex
+        ? undefined
+        : req?.headers?.[API_HEADER_DATABASE_INDEX],
+    },
+    {
+      groups: ['security'],
+    },
+  );
 
   const errors = validator.validateSync(clientMetadata, {
     whitelist: false, // we need this to allow additional fields if needed for flexibility

redisinsight/api/src/common/decorators/session/session-metadata.decorator.ts

@@ -34,7 +34,9 @@ export const sessionMetadataFromRequest = (
     requestMetadata,
   };
 
-  const session = plainToInstance(SessionMetadata, requestSession, { groups: ['security'] });
+  const session = plainToInstance(SessionMetadata, requestSession, {
+    groups: ['security'],
+  });
 
   const errors = validator.validateSync(session, {
     whitelist: false, // we need this to allow additional fields if needed for flexibility

redisinsight/api/src/common/logger/app-logger.spec.ts

@@ -22,22 +22,30 @@ const logLevels = Object.keys(mockWinstonLogger);
 jest.spyOn(WinstonModule, 'createLogger').mockReturnValue(mockWinstonLogger);
 
 const getSessionMetadata = () =>
-  plainToInstance(SessionMetadata, {
-    userId: '123',
-    sessionId: 'test-session-id',
-    requestMetadata: {
-      any: 'data',
+  plainToInstance(
+    SessionMetadata,
+    {
+      userId: '123',
+      sessionId: 'test-session-id',
+      requestMetadata: {
+        any: 'data',
+      },
     },
-  }, { groups: ['security' ] });
+    { groups: ['security'] },
+  );
 
 const getClientMetadata = () =>
-  plainToInstance(ClientMetadata, {
-    sessionMetadata: getSessionMetadata(),
-    databaseId: 'db-123',
-    context: ClientContext.Browser,
-    uniqueId: 'unique-id',
-    db: 1,
-  }, { groups: ['security' ] });
+  plainToInstance(
+    ClientMetadata,
+    {
+      sessionMetadata: getSessionMetadata(),
+      databaseId: 'db-123',
+      context: ClientContext.Browser,
+      uniqueId: 'unique-id',
+      db: 1,
+    },
+    { groups: ['security'] },
+  );
 
 describe('AppLogger', () => {
   let logger: AppLogger;