Merge branch 'main' into feature/RI-4352-bulk_upload_from_tutorials

Author: vlad-dargel

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

@@ -174,7 +174,7 @@ export default merge(commonConfig, {
 
   devServer: {
     host: HOST,
-    disableHostCheck: true,
+    allowedHosts: 'all',
     port: 8080,
     hot: true, // enable HMR on the server
     historyApiFallback: true,

package.json

@@ -77,7 +77,8 @@
   ],
   "homepage": "https://github.com/RedisInsight/RedisInsight#readme",
   "resolutions": {
-    "**/node-sass": "^6.0.1"
+    "**/node-sass": "^6.0.1",
+    "**/trim": "0.0.3"
   },
   "devDependencies": {
     "@babel/core": "^7.12.9",
@@ -103,10 +104,7 @@
     "@babel/preset-react": "^7.12.7",
     "@babel/preset-typescript": "^7.12.7",
     "@babel/register": "^7.12.1",
-    "@nestjs/cli": "^7.0.0",
-    "@nestjs/schematics": "^7.0.0",
-    "@nestjs/testing": "^7.0.0",
-    "@pmmmwh/react-refresh-webpack-plugin": "^0.4.3",
+    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.10",
     "@svgr/webpack": "^6.2.1",
     "@teamsupercell/typings-for-css-modules-loader": "^2.4.0",
     "@testing-library/jest-dom": "^5.16.4",
@@ -153,7 +151,7 @@
     "core-js": "^3.6.5",
     "cross-env": "^7.0.2",
     "css-loader": "^5.0.1",
-    "css-minimizer-webpack-plugin": "^1.2.0",
+    "css-minimizer-webpack-plugin": "^2.0.0",
     "electron": "19.0.7",
     "electron-builder": "^23.6.0",
     "electron-builder-notarize": "^1.5.1",
@@ -211,7 +209,7 @@
     "webpack": "^5.5.1",
     "webpack-bundle-analyzer": "^4.1.0",
     "webpack-cli": "^4.3.0",
-    "webpack-dev-server": "^3.11.0",
+    "webpack-dev-server": "^4.13.3",
     "webpack-merge": "^5.4.0",
     "whatwg-fetch": "^3.6.2",
     "yarn-deduplicate": "^3.1.0"

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

@@ -105,8 +105,8 @@ describe('KeysBusinessService', () => {
     databaseService = module.get(DatabaseService);
     browserTool = module.get<BrowserToolService>(BrowserToolService);
     browserHistory = module.get<BrowserHistoryService>(BrowserHistoryService);
-    const scannerManager = get(service, 'scanner');
-    const keyInfoManager = get(service, 'keyInfoManager');
+    const scannerManager: any = get(service, 'scanner');
+    const keyInfoManager: any = get(service, 'keyInfoManager');
     standaloneScanner = scannerManager.getStrategy(ConnectionType.STANDALONE);
     clusterScanner = scannerManager.getStrategy(ConnectionType.CLUSTER);
     stringTypeInfoManager = keyInfoManager.getStrategy(RedisDataType.String);

redisinsight/api/src/modules/profiler/profiler.gateway.ts

@@ -69,6 +69,6 @@ export class ProfilerGateway implements OnGatewayConnection, OnGatewayDisconnect
   }
 
   static getInstanceId(client: Socket): string {
-    return get(client, 'handshake.query.instanceId');
+    return get(client, 'handshake.query.instanceId') as string;
   }
 }

redisinsight/api/src/modules/profiler/providers/profiler-client.provider.ts

@@ -28,7 +28,7 @@ export class ProfilerClientProvider {
 
         // set database alias as part of the log file name
         const alias = (await this.databaseService.get(
-          get(socket, 'handshake.query.instanceId'),
+          get(socket, 'handshake.query.instanceId') as string,
         )).name;
         profilerLogFile.setAlias(alias);
 

redisinsight/api/src/modules/pub-sub/model/redis-client.spec.ts

@@ -86,7 +86,7 @@ describe('RedisClient', () => {
     });
     it('should emit message event (message source)', async () => {
       await redisClient['connect']();
-      const [id, message] = await new Promise((res) => {
+      const [id, message] = await new Promise((res: (value: any[]) => void) => {
         redisClient.on('message', (i, m) => res([i, m]));
         nodeClient.emit('message', 'channel-a', 'message-a');
       });
@@ -97,7 +97,7 @@ describe('RedisClient', () => {
     });
     it('should emit message event (pmessage source)', async () => {
       await redisClient['connect']();
-      const [id, message] = await new Promise((res) => {
+      const [id, message] = await new Promise((res: (value: any[]) => void) => {
         redisClient.on('message', (i, m) => res([i, m]));
         nodeClient.emit('pmessage', '*', 'channel-aa', 'message-aa');
       });

redisinsight/api/src/modules/recommendation/recommendation.service.ts

@@ -39,7 +39,7 @@ export class RecommendationService {
       exclude,
     } = dto;
 
-    const recommendations = new Map([
+    const recommendations = new Map<string, () => Promise<Recommendation | null>>([
       [
         RECOMMENDATION_NAMES.LUA_SCRIPT,
         async () => await this.recommendationProvider.determineLuaScriptRecommendation(client),

redisinsight/api/src/modules/workbench/workbench.service.ts

@@ -81,7 +81,6 @@ export class WorkbenchService {
       db,
       databaseId: clientMetadata.databaseId,
     };
-    let executionTimeInNanoseconds = BigInt(0);
 
     const startCommandExecutionTime = process.hrtime.bigint();
 
@@ -96,11 +95,9 @@ export class WorkbenchService {
         });
       }
       const result = await this.commandsExecutor.sendCommand(clientMetadata, { ...dto, command });
-      const endCommandExecutionTime = process.hrtime.bigint();
-
-      executionTimeInNanoseconds += (endCommandExecutionTime - startCommandExecutionTime);
       return ({ ...result[0], command });
     }));
+    const executionTimeInNanoseconds = process.hrtime.bigint() - startCommandExecutionTime;
 
     if (Number(executionTimeInNanoseconds) !== 0) {
       commandExecution.executionTime = Math.round(Number(executionTimeInNanoseconds) / 1000);