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

Author: Artem

README.md

@@ -32,7 +32,7 @@ RedisInsight is an intuitive and efficient GUI for Redis, allowing you to intera
 * Visualizations of your [RediSearch](https://oss.redis.com/redisearch/) index, queries, and aggregations
 * Ability to build your own data visualization plugins
 * Built-in click-through guides for Redis capabilities
-* Oficially supported for Redis OSS, [Redis Cloud](https://redis.com/try-free/). Works with Microsoft Azure Cache for Redis (official support upcoming).
+* Officially supported for Redis OSS, [Redis Cloud](https://redis.com/try-free/). Works with Microsoft Azure Cache for Redis (official support upcoming).
 * Available for macOS (including M1), Windows and Linux 
 
 Check out the [release notes](https://docs.redis.com/latest/ri/release-notes/). 

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

@@ -66,6 +66,7 @@ export default merge(baseConfig, {
       SERVER_TLS_KEY: process.env.SERVER_TLS_KEY || '',
       APP_FOLDER_NAME: process.env.APP_FOLDER_NAME || '',
       UPGRADES_LINK: process.env.UPGRADES_LINK || '',
+      RI_HOSTNAME: '127.0.0.1',
       BUILD_TYPE: 'ELECTRON',
       APP_VERSION: version,
       AWS_BUCKET_NAME: 'AWS_BUCKET_NAME' in process.env ? process.env.AWS_BUCKET_NAME : '',

configs/webpack.config.main.stage.babel.js

@@ -26,6 +26,7 @@ export default merge(mainProdConfig, {
       SERVER_TLS_KEY: process.env.SERVER_TLS_KEY || '',
       APP_FOLDER_NAME: process.env.APP_FOLDER_NAME || '',
       UPGRADES_LINK: process.env.UPGRADES_LINK || '',
+      RI_HOSTNAME: '127.0.0.1',
       BUILD_TYPE: 'ELECTRON',
       APP_VERSION: version,
       AWS_BUCKET_NAME: 'AWS_BUCKET_NAME' in process.env ? process.env.AWS_BUCKET_NAME : '',

redisinsight/api/config/default.ts

@@ -39,6 +39,7 @@ export default {
   },
   server: {
     env: 'development',
+    listenInterface: process.env.RI_HOSTNAME ?? '0.0.0.0',
     port: 5000,
     docPrefix: 'api/docs',
     globalPrefix: 'api',

redisinsight/api/src/__mocks__/commands.ts

@@ -4,6 +4,7 @@ export const mockMainCommands = {
     complexity: 'O(N). Where N is the number of configured users.',
     since: '6.0.0',
     group: 'server',
+    provider: 'main',
   },
 };
 
@@ -19,6 +20,7 @@ export const mockRedisearchCommands = {
     ],
     since: '1.0.0',
     group: 'search',
+    provider: 'search',
   },
 };
 
@@ -39,6 +41,7 @@ export const mockRedijsonCommands = {
     ],
     since: '1.0.0',
     group: 'json',
+    provider: 'json',
   },
 };
 
@@ -102,6 +105,7 @@ export const mockRedistimeseriesCommands = {
     ],
     since: '1.0.0',
     group: 'timeseries',
+    provider: 'timeseries',
   },
 };
 
@@ -143,6 +147,7 @@ export const mockRedisaiCommands = {
     ],
     since: '1.2.5',
     group: 'tensor',
+    provider: 'sai',
   },
 };
 
@@ -161,6 +166,7 @@ export const mockRedisgraphCommands = {
     ],
     since: '1.0.0',
     group: 'graph',
+    provider: 'graph',
   },
 };
 

redisinsight/api/src/main.ts

@@ -12,10 +12,11 @@ import { AppModule } from './app.module';
 import SWAGGER_CONFIG from '../config/swagger';
 import LOGGER_CONFIG from '../config/logger';
 
+const serverConfig = get('server');
+
 export default async function bootstrap(): Promise<Function> {
   await migrateHomeFolder();
 
-  const serverConfig = get('server');
   const port = process.env.API_PORT || serverConfig.port;
   const logger = WinstonModule.createLogger(LOGGER_CONFIG);
 
@@ -47,7 +48,7 @@ export default async function bootstrap(): Promise<Function> {
 
   const logFileProvider = app.get(LogFileProvider);
 
-  await app.listen(port);
+  await app.listen(port, serverConfig.listenInterface);
   logger.log({
     message: `Server is running on http(s)://localhost:${port}`,
     context: 'bootstrap',

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

@@ -6,8 +6,9 @@ import {
   NotFoundException,
 } from '@nestjs/common';
 import { chunk, flatMap, isNull } from 'lodash';
-import * as isGlob from 'is-glob';
-import { catchAclError, catchTransactionError, unescapeGlob } from 'src/utils';
+import {
+  catchAclError, catchTransactionError, isRedisGlob, unescapeRedisGlob,
+} from 'src/utils';
 import ERROR_MESSAGES from 'src/constants/error-messages';
 import { RedisErrorCodes } from 'src/constants';
 import config from 'src/utils/config';
@@ -105,8 +106,8 @@ export class HashBusinessService {
           new NotFoundException(ERROR_MESSAGES.KEY_NOT_EXIST),
         );
       }
-      if (dto.match && !isGlob(dto.match, { strict: false })) {
-        const field = unescapeGlob(dto.match);
+      if (dto.match && !isRedisGlob(dto.match)) {
+        const field = unescapeRedisGlob(dto.match);
         result.nextCursor = 0;
         const value = await this.browserTool.execCommand(
           clientMetadata,

redisinsight/api/src/modules/browser/services/keys-business/scanner/strategies/cluster.strategy.ts

@@ -1,7 +1,6 @@
 import { toNumber, omit, isNull } from 'lodash';
-import * as isGlob from 'is-glob';
 import config from 'src/utils/config';
-import { unescapeGlob } from 'src/utils';
+import { isRedisGlob, unescapeRedisGlob } from 'src/utils';
 import {
   BrowserToolClusterService,
 } from 'src/modules/browser/services/browser-tool-cluster/browser-tool-cluster.service';
@@ -46,8 +45,8 @@ export class ClusterStrategy extends AbstractStrategy {
     const settings = await this.settingsService.getAppSettings('1');
     await this.calculateNodesTotalKeys(nodes);
 
-    if (!isGlob(match, { strict: false })) {
-      const keyName = Buffer.from(unescapeGlob(match));
+    if (!isRedisGlob(match)) {
+      const keyName = Buffer.from(unescapeRedisGlob(match));
       nodes.forEach((node) => {
         // eslint-disable-next-line no-param-reassign
         node.cursor = 0;

redisinsight/api/src/modules/browser/services/keys-business/scanner/strategies/standalone.strategy.ts

@@ -1,7 +1,6 @@
-import * as isGlob from 'is-glob';
 import { isNull } from 'lodash';
 import config from 'src/utils/config';
-import { unescapeGlob } from 'src/utils';
+import { isRedisGlob, unescapeRedisGlob } from 'src/utils';
 import {
   GetKeyInfoResponse,
   GetKeysWithDetailsResponse,
@@ -47,8 +46,8 @@ export class StandaloneStrategy extends AbstractStrategy {
 
     node.total = await getTotal(client);
 
-    if (!isGlob(match, { strict: false })) {
-      const keyName = Buffer.from(unescapeGlob(match));
+    if (!isRedisGlob(match)) {
+      const keyName = Buffer.from(unescapeRedisGlob(match));
       node.cursor = 0;
       node.scanned = isNull(node.total) ? 1 : node.total;
       node.keys = await this.getKeysInfo(client, [keyName]);

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

@@ -5,11 +5,12 @@ import {
   Logger,
   NotFoundException,
 } from '@nestjs/common';
-import * as isGlob from 'is-glob';
 import { RedisErrorCodes } from 'src/constants';
 import ERROR_MESSAGES from 'src/constants/error-messages';
 import config from 'src/utils/config';
-import { catchAclError, catchTransactionError, unescapeGlob } from 'src/utils';
+import {
+  catchAclError, catchTransactionError, isRedisGlob, unescapeRedisGlob,
+} from 'src/utils';
 import { ReplyError } from 'src/models';
 import { ClientMetadata } from 'src/common/models';
 import {
@@ -101,8 +102,8 @@ export class SetBusinessService {
           new NotFoundException(ERROR_MESSAGES.KEY_NOT_EXIST),
         );
       }
-      if (dto.match && !isGlob(dto.match, { strict: false })) {
-        const member = unescapeGlob(dto.match);
+      if (dto.match && !isRedisGlob(dto.match)) {
+        const member = unescapeRedisGlob(dto.match);
         result.nextCursor = 0;
         const memberIsExist = await this.browserTool.execCommand(
           clientMetadata,