Skip to content

#RI-6228 - fix load all, composite args #3969

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
Oct 17, 2024
Merged

#RI-6228 - fix load all, composite args #3969

Show file tree
Hide file tree
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
12 changes: 7 additions & 5 deletions redisinsight/ui/src/pages/workbench/components/query/Query/Query.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import { addOwnTokenToArgs, findCurrentArgument, } from 'uiSrc/pages/workbench/u
import { getRange, getRediSearchSignutureProvider, } from 'uiSrc/pages/workbench/utils/monaco'
import { CursorContext } from 'uiSrc/pages/workbench/types'
import { asSuggestionsRef, getCommandsSuggestions, isIndexComplete } from 'uiSrc/pages/workbench/utils/suggestions'
import { COMMANDS_TO_GET_INDEX_INFO, EmptySuggestionsIds, } from 'uiSrc/pages/workbench/constants'
import { COMMANDS_TO_GET_INDEX_INFO, COMPOSITE_ARGS, EmptySuggestionsIds, } from 'uiSrc/pages/workbench/constants'
import { useDebouncedEffect } from 'uiSrc/services'
import { fetchRedisearchInfoAction } from 'uiSrc/slices/browser/redisearch'
import { findSuggestionsByArg } from 'uiSrc/pages/workbench/utils/searchSuggestions'
Expand Down Expand Up @@ -111,9 +111,11 @@ const Query = (props: Props) => {
[commands]
)

const COMPOSITE_ARGS = useMemo(() => commands
.filter((command) => command.name && command.name.includes(' '))
.map(({ name }) => name),
const compositeTokens = useMemo(() =>
commands
.filter((command) => command.token && command.token.includes(' '))
.map(({ token }) => token)
.concat(...COMPOSITE_ARGS),
[commands])

const { instanceId = '' } = useParams<{ instanceId: string }>()
Expand Down Expand Up @@ -342,7 +344,7 @@ const Query = (props: Props) => {
e.position,
REDIS_COMMANDS_SPEC,
REDIS_COMMANDS_ARRAY,
COMPOSITE_ARGS as string[]
compositeTokens as string[]
)
handleSuggestions(editor, command)
handleDslSyntax(e, command)
Expand Down
4 changes: 4 additions & 0 deletions redisinsight/ui/src/pages/workbench/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@ export const COMMANDS_WITHOUT_INDEX_PROPOSE = [
'FT.CREATE'
]

export const COMPOSITE_ARGS = [
'LOAD *',
]

export enum DefinedArgumentName {
index = 'index',
query = 'query',
Expand Down