Merge pull request #2335 from RedisInsight/dependabot-fixes

vlad-dargel · web-flow · commit 1a9a9650a733 · 2023-07-28T11:44:06.000+03:00
Dependabot fixes
diff --git a/package.json b/package.json
@@ -80,7 +80,9 @@
   "homepage": "https://github.com/RedisInsight/RedisInsight#readme",
   "resolutions": {
     "**/node-sass": "^8.0.0",
-    "**/trim": "0.0.3"
+    "**/trim": "0.0.3",
+    "word-wrap": "1.2.4",
+    "electron-builder/app-builder-lib/@electron/universal/dir-compare/minimatch": "^3.0.5"
   },
   "devDependencies": {
     "@babel/core": "^7.12.9",
diff --git a/redisinsight/api/package.json b/redisinsight/api/package.json
@@ -37,6 +37,12 @@
     "typeorm:migrate": "cross-env NODE_ENV=staging yarn typeorm migration:generate ./migration/migration",
     "typeorm:run": "yarn typeorm migration:run"
   },
+  "resolutions": {
+    "nanoid": "^3.1.31",
+    "word-wrap": "1.2.4",
+    "mocha/minimatch": "^3.0.5",
+    "@nestjs/platform-socket.io/socket.io": "^4.7.1"
+  },
   "dependencies": {
     "@nestjs/common": "^9.0.11",
     "@nestjs/core": "^9.0.11",
@@ -52,7 +58,7 @@
     "axios": "^0.25.0",
     "body-parser": "^1.19.0",
     "class-transformer": "^0.2.3",
-    "class-validator": "^0.12.2",
+    "class-validator": "^0.14.0",
     "connect-timeout": "^1.9.0",
     "date-fns": "^2.29.3",
     "detect-port": "^1.5.1",
@@ -69,7 +75,7 @@
     "node-version-compare": "^1.0.3",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.5.6",
-    "socket.io": "^4.4.0",
+    "socket.io": "^4.6.2",
     "source-map-support": "^0.5.19",
     "sqlite3": "5.1.6",
     "ssh2": "^1.14.0",
@@ -85,7 +91,6 @@
     "@nestjs/schematics": "^9.0.3",
     "@nestjs/testing": "^9.0.11",
     "@types/adm-zip": "^0.5.0",
-    "@types/axios": "^0.14.0",
     "@types/express": "^4.17.3",
     "@types/jest": "^26.0.15",
     "@types/lodash": "^4.14.167",
diff --git a/redisinsight/api/src/common/models/client-metadata.ts b/redisinsight/api/src/common/models/client-metadata.ts
@@ -21,7 +21,11 @@ export class ClientMetadata {
   databaseId: string;
 
   @IsNotEmpty()
-  @IsEnum(ClientContext)
+  @IsEnum(ClientContext, {
+    message: `context must be a valid enum value. Valid values: ${Object.values(
+      ClientContext,
+    )}.`,
+  })
   context: ClientContext;
 
   @IsOptional()
diff --git a/redisinsight/api/src/modules/browser/dto/browser-history/create.browser-history.dto.ts b/redisinsight/api/src/modules/browser/dto/browser-history/create.browser-history.dto.ts
@@ -20,6 +20,10 @@ export class CreateBrowserHistoryDto {
     example: BrowserHistoryMode.Pattern,
   })
   @IsOptional()
-  @IsEnum(BrowserHistoryMode)
+  @IsEnum(BrowserHistoryMode, {
+    message: `mode must be a valid enum value. Valid values: ${Object.values(
+      BrowserHistoryMode,
+    )}.`,
+  })
   mode?: BrowserHistoryMode = BrowserHistoryMode.Pattern;
 }
diff --git a/redisinsight/api/src/modules/browser/dto/browser-history/get.browser-history.dto.ts b/redisinsight/api/src/modules/browser/dto/browser-history/get.browser-history.dto.ts
@@ -12,7 +12,11 @@ export class ScanFilter {
   })
   @IsOptional()
   @Expose()
-  @IsEnum(RedisDataType)
+  @IsEnum(RedisDataType, {
+    message: `type must be a valid enum value. Valid values: ${Object.values(
+      RedisDataType,
+    )}.`,
+  })
   type?: RedisDataType = null;
 
   @ApiProperty({
diff --git a/redisinsight/api/src/modules/browser/dto/redisearch.ts b/redisinsight/api/src/modules/browser/dto/redisearch.ts
@@ -43,7 +43,11 @@ export class CreateRedisearchIndexFieldDto {
     enum: RedisearchIndexDataType,
   })
   @IsDefined()
-  @IsEnum(RedisearchIndexDataType)
+  @IsEnum(RedisearchIndexDataType, {
+    message: `type must be a valid enum value. Valid values: ${Object.values(
+      RedisearchIndexDataType,
+    )}.`,
+  })
   type: RedisearchIndexDataType;
 }
 
@@ -62,7 +66,11 @@ export class CreateRedisearchIndexDto {
     enum: RedisearchIndexKeyType,
   })
   @IsDefined()
-  @IsEnum(RedisearchIndexKeyType)
+  @IsEnum(RedisearchIndexKeyType, {
+    message: `type must be a valid enum value. Valid values: ${Object.values(
+      RedisearchIndexKeyType,
+    )}.`,
+  })
   type: RedisearchIndexKeyType;
 
   @ApiPropertyOptional({
diff --git a/redisinsight/api/src/modules/bulk-actions/dto/create-bulk-action.dto.ts b/redisinsight/api/src/modules/bulk-actions/dto/create-bulk-action.dto.ts
@@ -12,7 +12,11 @@ export class CreateBulkActionDto extends BulkActionIdDto {
   databaseId: string;
 
   @IsNotEmpty()
-  @IsEnum(BulkActionType)
+  @IsEnum(BulkActionType, {
+    message: `type must be a valid enum value. Valid values: ${Object.values(
+      BulkActionType,
+    )}.`,
+  })
   type: BulkActionType;
 
   @IsNotEmpty()
diff --git a/redisinsight/api/src/modules/bulk-actions/models/bulk-action-filter.ts b/redisinsight/api/src/modules/bulk-actions/models/bulk-action-filter.ts
@@ -6,7 +6,11 @@ import { IBulkActionFilterOverview } from 'src/modules/bulk-actions/interfaces/b
 
 export class BulkActionFilter {
   @IsOptional()
-  @IsEnum(RedisDataType)
+  @IsEnum(RedisDataType, {
+    message: `type must be a valid enum value. Valid values: ${Object.values(
+      RedisDataType,
+    )}.`,
+  })
   type?: RedisDataType = null;
 
   @IsOptional()
diff --git a/redisinsight/api/src/modules/cloud/autodiscovery/dto/add-cloud-database.dto.ts b/redisinsight/api/src/modules/cloud/autodiscovery/dto/add-cloud-database.dto.ts
@@ -14,7 +14,11 @@ export class AddCloudDatabaseDto {
   @IsInt({ always: true })
   subscriptionId: number;
 
-  @IsEnum(CloudSubscriptionType)
+  @IsEnum(CloudSubscriptionType, {
+    message: `subscriptionType must be a valid enum value. Valid values: ${Object.values(
+      CloudSubscriptionType,
+    )}.`,
+  })
   @IsNotEmpty()
   subscriptionType: CloudSubscriptionType;
 
diff --git a/redisinsight/api/src/modules/cloud/autodiscovery/dto/get-cloud-subscription-database.dto.ts b/redisinsight/api/src/modules/cloud/autodiscovery/dto/get-cloud-subscription-database.dto.ts
@@ -16,7 +16,11 @@ export class GetCloudSubscriptionDatabaseDto {
   @Type(() => Number)
   subscriptionId: number;
 
-  @IsEnum(CloudSubscriptionType)
+  @IsEnum(CloudSubscriptionType, {
+    message: `subscriptionType must be a valid enum value. Valid values: ${Object.values(
+      CloudSubscriptionType,
+    )}.`,
+  })
   @IsNotEmpty()
   subscriptionType: CloudSubscriptionType;
 
diff --git a/redisinsight/api/src/modules/cloud/autodiscovery/dto/get-cloud-subscription-databases.dto.ts b/redisinsight/api/src/modules/cloud/autodiscovery/dto/get-cloud-subscription-databases.dto.ts
@@ -20,7 +20,11 @@ export class GetCloudSubscriptionDatabasesDto {
     description: 'Subscription Id',
     enum: CloudSubscriptionType,
   })
-  @IsEnum(CloudSubscriptionType)
+  @IsEnum(CloudSubscriptionType, {
+    message: `subscriptionType must be a valid enum value. Valid values: ${Object.values(
+      CloudSubscriptionType,
+    )}.`,
+  })
   @IsNotEmpty()
   subscriptionType: CloudSubscriptionType;
 }
diff --git a/redisinsight/api/src/modules/cloud/autodiscovery/models/cloud-database-details.ts b/redisinsight/api/src/modules/cloud/autodiscovery/models/cloud-database-details.ts
@@ -26,7 +26,11 @@ export class CloudDatabaseDetails {
   })
   @Expose()
   @IsNotEmpty()
-  @IsEnum(CloudSubscriptionType)
+  @IsEnum(CloudSubscriptionType, {
+    message: `subscriptionType must be a valid enum value. Valid values: ${Object.values(
+      CloudSubscriptionType,
+    )}.`,
+  })
   subscriptionType: CloudSubscriptionType;
 
   @ApiPropertyOptional({
diff --git a/redisinsight/api/src/modules/custom-tutorial/models/custom-tutorial.manifest.ts b/redisinsight/api/src/modules/custom-tutorial/models/custom-tutorial.manifest.ts
@@ -50,7 +50,11 @@ export class CustomTutorialManifest {
 
   @ApiProperty({ enum: CustomTutorialManifestType })
   @Expose()
-  @IsEnum(CustomTutorialManifestType)
+  @IsEnum(CustomTutorialManifestType, {
+    message: `type must be a valid enum value. Valid values: ${Object.values(
+      CustomTutorialManifestType,
+    )}.`,
+  })
   type: CustomTutorialManifestType;
 
   @ApiProperty({ type: String })
diff --git a/redisinsight/api/src/modules/database-analysis/models/scan-filter.ts b/redisinsight/api/src/modules/database-analysis/models/scan-filter.ts
@@ -13,7 +13,11 @@ export class ScanFilter {
   })
   @IsOptional()
   @Expose()
-  @IsEnum(RedisDataType)
+  @IsEnum(RedisDataType, {
+    message: `type must be a valid enum value. Valid values: ${Object.values(
+      RedisDataType,
+    )}.`,
+  })
   type?: RedisDataType = null;
 
   @ApiProperty({
diff --git a/redisinsight/api/src/modules/database-recommendation/dto/modify.database-recommendation.dto.ts b/redisinsight/api/src/modules/database-recommendation/dto/modify.database-recommendation.dto.ts
@@ -9,7 +9,11 @@ export class ModifyDatabaseRecommendationDto {
     enum: Vote,
   })
   @IsOptional()
-  @IsEnum(Vote)
+  @IsEnum(Vote, {
+    message: `vote must be a valid enum value. Valid values: ${Object.values(
+      Vote,
+    )}.`,
+  })
   vote?: Vote;
 
   @ApiPropertyOptional({
diff --git a/redisinsight/api/src/modules/database/dto/update.database.dto.ts b/redisinsight/api/src/modules/database/dto/update.database.dto.ts
@@ -166,7 +166,11 @@ export class UpdateDatabaseDto extends CreateDatabaseDto {
     enum: Compressor,
   })
   @Expose()
-  @IsEnum(Compressor)
+  @IsEnum(Compressor, {
+    message: `compressor must be a valid enum value. Valid values: ${Object.values(
+      Compressor,
+    )}.`,
+  })
   @IsOptional()
   compressor?: Compressor = Compressor.NONE;
 }
diff --git a/redisinsight/api/src/modules/database/models/database.ts b/redisinsight/api/src/modules/database/models/database.ts
@@ -274,7 +274,11 @@ export class Database {
     enum: Compressor,
   })
   @Expose()
-  @IsEnum(Compressor)
+  @IsEnum(Compressor, {
+    message: `compressor must be a valid enum value. Valid values: ${Object.values(
+      Compressor,
+    )}.`,
+  })
   @IsOptional()
   compressor?: Compressor = Compressor.NONE;
 
diff --git a/redisinsight/api/src/modules/pub-sub/dto/subscription.dto.ts b/redisinsight/api/src/modules/pub-sub/dto/subscription.dto.ts
@@ -7,6 +7,10 @@ export class SubscriptionDto {
   channel: string;
 
   @IsNotEmpty()
-  @IsEnum(SubscriptionType)
+  @IsEnum(SubscriptionType, {
+    message: `type must be a valid enum value. Valid values: ${Object.values(
+      SubscriptionType,
+    )}.`,
+  })
   type: SubscriptionType;
 }
diff --git a/redisinsight/api/yarn.lock b/redisinsight/api/yarn.lock
diff --git a/redisinsight/ui/src/packages/redistimeseries-app/yarn.lock b/redisinsight/ui/src/packages/redistimeseries-app/yarn.lock
diff --git a/redisinsight/yarn.lock b/redisinsight/yarn.lock
diff --git a/tests/e2e/package.json b/tests/e2e/package.json
diff --git a/tests/e2e/yarn.lock b/tests/e2e/yarn.lock
diff --git a/yarn.lock b/yarn.lock
