Skip to content

#RI-2576 - add indents for dedicated editor #421

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
Mar 21, 2022
Merged

#RI-2576 - add indents for dedicated editor #421

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
22 changes: 13 additions & 9 deletions redisinsight/ui/src/components/query/DedicatedEditor/DedicatedEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useEffect, useRef } from 'react'
import React, { useEffect, useRef, useState } from 'react'
import { compact, findIndex } from 'lodash'
import * as monacoEditor from 'monaco-editor/esm/vs/editor/editor.api'
import MonacoEditor, { monaco } from 'react-monaco-editor'
Expand Down Expand Up @@ -29,7 +29,7 @@ import { getCypherMonarchTokensProvider } from 'uiSrc/utils/monaco/cypher/monarc
import styles from './styles.module.scss'

export interface Props {
value: string
query: string
lang: string
onSubmit: (query?: string) => void
onCancel: () => void
Expand All @@ -47,11 +47,14 @@ const langs: MonacoSyntaxLang = {
}
}
let decorations: string[] = []
const notCommandRegEx = /^\s|\/\//

const DedicatedEditor = (props: Props) => {
const { width, value = '', lang, onCancel, onSubmit } = props
const { width, query = '', lang, onCancel, onSubmit } = props
const selectedLang = langs[lang]
let contribution: Nullable<ISnippetController> = null

const [value, setValue] = useState<string>(query)
const monacoObjects = useRef<Nullable<IEditorMount>>(null)
let disposeCompletionItemProvider = () => {}

Expand All @@ -67,7 +70,6 @@ const DedicatedEditor = (props: Props) => {
if (!monacoObjects.current) return
const commands = value.split('\n')
const { monaco, editor } = monacoObjects.current
const notCommandRegEx = /^\s|\/\//

const newDecorations = compact(commands.map((command, index) => {
if (!command || notCommandRegEx.test(command)) return null
Expand All @@ -78,10 +80,7 @@ const DedicatedEditor = (props: Props) => {
)
}))

decorations = editor.deltaDecorations(
decorations,
newDecorations
)
decorations = editor.deltaDecorations(decorations, newDecorations)
}, [value])

const handleKeyDown = (e: React.KeyboardEvent) => {
Expand All @@ -92,7 +91,11 @@ const DedicatedEditor = (props: Props) => {

const handleSubmit = () => {
const { editor } = monacoObjects?.current || {}
onSubmit(editor?.getValue() || '')
const val = editor?.getValue()
.split('\n')
.map((line: string, i: number) => (i > 0 && !notCommandRegEx.test(line)) ? `\t${line}` : line)
.join('\n')
onSubmit(val || '')
}

const onKeyDownMonaco = (e: monacoEditor.IKeyboardEvent) => {
Expand Down Expand Up @@ -194,6 +197,7 @@ const DedicatedEditor = (props: Props) => {
<MonacoEditor
language={selectedLang.id || MonacoLanguage.Cypher}
value={value}
onChange={setValue}
options={options}
className={`${lang}-editor`}
editorDidMount={editorDidMount}
Expand Down
2 changes: 1 addition & 1 deletion redisinsight/ui/src/components/query/Query/Query.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ const Query = (props: Props) => {
{isDedicatedEditorOpen && (
<DedicatedEditor
lang={syntaxCommand.current.lang}
value={selectedArg.current.replace(aroundQuotesRegExp, '')}
query={selectedArg.current.replace(aroundQuotesRegExp, '')}
onSubmit={updateArgFromDedicatedEditor}
onCancel={onCancelDedicatedEditor}
width={input?.current?.scrollWidth || 300}
Expand Down