Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
11 changes: 8 additions & 3 deletions redisinsight/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
6 changes: 5 additions & 1 deletion redisinsight/api/src/common/models/client-metadata.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
12 changes: 10 additions & 2 deletions redisinsight/api/src/modules/browser/dto/redisearch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 })
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
6 changes: 5 additions & 1 deletion redisinsight/api/src/modules/database/models/database.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Loading