Skip to content

#RI-4357 + #RI-4358 fixes #1920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 6, 2023
Merged

#RI-4357 + #RI-4358 fixes #1920

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions redisinsight/ui/src/utils/commands.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ enum ArgumentType {
BLOCK = 'block',
PURE_TOKEN = 'pure-token',
COMMAND = 'command',
ENUM = 'enum', // temporary for backward compatibility
}

export class Argument {
Expand All @@ -36,6 +37,8 @@ export class Argument {

protected arguments: Argument[]

protected enum: string[]

constructor(data: Record<string, any>) {
this.stack = []
this.name = data?.name
Expand All @@ -44,12 +47,13 @@ export class Argument {
this.multiple = !!data?.multiple
this.multipleToken = !!data?.multiple_token
this.token = data?.token
this.display = data?.display_text || this.name
this.display = data?.display_text || data?.command || this.name
this.enum = data?.enum
// todo: why we need this?
if (this.token === '') {
this.token = '""'
}
this.arguments = ((data?.arguments || []) as Record<string, any>[])
this.arguments = ((data?.arguments || data?.block || []) as Record<string, any>[])
.map((childArg) => new Argument(childArg))
}

Expand All @@ -71,6 +75,9 @@ export class Argument {
case ArgumentType.ONEOF:
args += this.arguments.map((arg) => arg.syntax()).join(' | ')
break
case ArgumentType.ENUM:
args += this.enum?.join(' | ')
break
case ArgumentType.PURE_TOKEN:
break
default:
Expand Down