mirror
/
remix-project
mirror of https://github.com/ethereum/remix-project.git
2
0
Fork 0
Code Issues Releases Wiki Activity

checkboxes styles for SUT

Browse Source
pull/5370/head
lianahus 2 years ago committed by Aniket
parent 3a7e460b20
commit 43d397e175
2 changed files with 119 additions and 109 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 87
      libs/remix-ui/solidity-unit-testing/src/lib/solidity-unit-testing.tsx
  2. 141
      libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx

87
libs/remix-ui/solidity-unit-testing/src/lib/solidity-unit-testing.tsx
Unescape View File

@ -1,14 +1,14 @@
import React, {useState, useRef, useEffect, ReactElement} from 'react' // eslint-disable-line
import {FormattedMessage, useIntl} from 'react-intl'
import React, { useState, useRef, useEffect, ReactElement } from 'react' // eslint-disable-line
import { FormattedMessage, useIntl } from 'react-intl'
import * as semver from 'semver'
import {eachOfSeries} from 'async' // eslint-disable-line
import { eachOfSeries } from 'async' // eslint-disable-line
import type Web3 from 'web3'
import {canUseWorker, urlFromVersion} from '@remix-project/remix-solidity'
import {Renderer} from '@remix-ui/renderer' // eslint-disable-line
import {Toaster} from '@remix-ui/toaster' // eslint-disable-line
import {format} from 'util'
import { canUseWorker, urlFromVersion } from '@remix-project/remix-solidity'
import { Renderer } from '@remix-ui/renderer' // eslint-disable-line
import { Toaster } from '@remix-ui/toaster' // eslint-disable-line
import { format } from 'util'
import './css/style.css'
import {CustomTooltip} from '@remix-ui/helper'
import { CustomTooltip } from '@remix-ui/helper'
const _paq = ((window as any)._paq = (window as any)._paq || []) // eslint-disable-line @typescript-eslint/no-explicit-any
@ -44,8 +44,8 @@ interface FinalResult {
export const SolidityUnitTesting = (props: Record<string, any>) => {
// eslint-disable-line @typescript-eslint/no-explicit-any
const {helper, testTab, initialPath} = props
const {testTabLogic} = testTab
const { helper, testTab, initialPath } = props
const { testTabLogic } = testTab
const intl = useIntl()
@ -55,8 +55,8 @@ export const SolidityUnitTesting = (props: Record<string, any>) => {
const [disableGenerateButton, setDisableGenerateButton] = useState<boolean>(false)
const [disableStopButton, setDisableStopButton] = useState<boolean>(true)
const [disableRunButton, setDisableRunButton] = useState<boolean>(false)
const [runButtonTitle, setRunButtonTitle] = useState<string>(intl.formatMessage({id: 'solidityUnitTesting.runButtonTitle1'}))
const [stopButtonLabel, setStopButtonLabel] = useState<string>(intl.formatMessage({id: 'solidityUnitTesting.stopButtonLabel1'}))
const [runButtonTitle, setRunButtonTitle] = useState<string>(intl.formatMessage({ id: 'solidityUnitTesting.runButtonTitle1' }))
const [stopButtonLabel, setStopButtonLabel] = useState<string>(intl.formatMessage({ id: 'solidityUnitTesting.stopButtonLabel1' }))
const [checkSelectAll, setCheckSelectAll] = useState<boolean>(true)
const [testsOutput, setTestsOutput] = useState<ReactElement[]>([])
@ -179,11 +179,11 @@ export const SolidityUnitTesting = (props: Record<string, any>) => {
await updateForNewCurrent(file)
})
testTab.on('solidity', 'compilerLoaded', async (version: string, license: string) => {
const {currentVersion} = testTab.compileTab.getCurrentCompilerConfig()
const { currentVersion } = testTab.compileTab.getCurrentCompilerConfig()
if (!semver.gt(truncateVersion(currentVersion), '0.4.12')) {
setDisableRunButton(true)
setRunButtonTitle(intl.formatMessage({id: 'solidityUnitTesting.runButtonTitle2'}))
setRunButtonTitle(intl.formatMessage({ id: 'solidityUnitTesting.runButtonTitle2' }))
}
})
}, []) // eslint-disable-line
@ -272,7 +272,7 @@ export const SolidityUnitTesting = (props: Record<string, any>) => {
finalLogs = finalLogs + '&emsp;' + formattedLog + '\n'
}
_paq.push(['trackEvent', 'solidityUnitTesting', 'hardhat', 'console.log'])
testTab.call('terminal', 'logHtml', {type: 'log', value: finalLogs})
testTab.call('terminal', 'logHtml', { type: 'log', value: finalLogs })
}
const discardHighlight = async () => {
@ -285,11 +285,11 @@ export const SolidityUnitTesting = (props: Record<string, any>) => {
const file = split[2]
const parsedLocation = {
start: parseInt(split[0]),
length: parseInt(split[1])
length: parseInt(split[1]),
}
const locationToHighlight = testTab.offsetToLineColumnConverter.offsetToLineColumnWithContent(parsedLocation, parseInt(file), filesContent[fileName].content)
await testTab.call('editor', 'discardHighlight')
await testTab.call('editor', 'highlight', locationToHighlight, fileName, '', {focus: true})
await testTab.call('editor', 'highlight', locationToHighlight, fileName, '', { focus: true })
}
}
@ -346,9 +346,9 @@ export const SolidityUnitTesting = (props: Record<string, any>) => {
if (!test.rendered) {
let debugBtn
if (test.debugTxHash) {
const {web3, debugTxHash} = test
const { web3, debugTxHash } = test
debugBtn = (
<div id={test.value.replaceAll(' ', '_')} className="btn border btn btn-sm ml-1" style={{cursor: 'pointer'}} onClick={() => startDebug(debugTxHash, web3)}>
<div id={test.value.replaceAll(' ', '_')} className="btn border btn btn-sm ml-1" style={{ cursor: 'pointer' }} onClick={() => startDebug(debugTxHash, web3)}>
<CustomTooltip placement={'top-start'} tooltipClasses="text-nowrap" tooltipId="info-recorder" tooltipText="Start debugging">
<i className="fas fa-bug"></i>
</CustomTooltip>
@ -465,17 +465,17 @@ export const SolidityUnitTesting = (props: Record<string, any>) => {
if (errors && errors.errors) {
errors.errors.forEach((err: any) => {
// eslint-disable-line @typescript-eslint/no-explicit-any
const errorCard: ReactElement = <Renderer message={err.formattedMessage || err.message} plugin={testTab} opt={{type: err.severity, errorType: err.type}} />
const errorCard: ReactElement = <Renderer message={err.formattedMessage || err.message} plugin={testTab} opt={{ type: err.severity, errorType: err.type }} />
setTestsOutput((prevCards) => [...prevCards, errorCard])
})
} else if (errors && Array.isArray(errors) && (errors[0].message || errors[0].formattedMessage)) {
errors.forEach((err) => {
const errorCard: ReactElement = <Renderer message={err.formattedMessage || err.message} plugin={testTab} opt={{type: err.severity, errorType: err.type}} />
const errorCard: ReactElement = <Renderer message={err.formattedMessage || err.message} plugin={testTab} opt={{ type: err.severity, errorType: err.type }} />
setTestsOutput((prevCards) => [...prevCards, errorCard])
})
} else if (errors && !errors.errors && !Array.isArray(errors)) {
// To track error like this: https://github.com/ethereum/remix/pull/1438
const errorCard: ReactElement = <Renderer message={errors.formattedMessage || errors.message} plugin={testTab} opt={{type: 'error'}} />
const errorCard: ReactElement = <Renderer message={errors.formattedMessage || errors.message} plugin={testTab} opt={{ type: 'error' }} />
setTestsOutput((prevCards) => [...prevCards, errorCard])
}
}
@ -549,7 +549,7 @@ export const SolidityUnitTesting = (props: Record<string, any>) => {
passed: result.totalPassing,
failed: result.totalFailing,
timeTaken: totalTime,
rendered: false
rendered: false,
}
testsResultByFilename[filename]['summary'] = testsSummary
showTestsResult()
@ -569,7 +569,7 @@ export const SolidityUnitTesting = (props: Record<string, any>) => {
if (_errors || hasBeenStopped.current || readyTestsNumber === runningTestsNumber) {
// All tests are ready or the operation has been canceled or there was a compilation error in one of the test files.
setDisableStopButton(true)
setStopButtonLabel(intl.formatMessage({id: 'solidityUnitTesting.stopButtonLabel1'}))
setStopButtonLabel(intl.formatMessage({ id: 'solidityUnitTesting.stopButtonLabel1' }))
if (selectedTests.current?.length !== 0) {
setDisableRunButton(false)
}
@ -588,16 +588,16 @@ export const SolidityUnitTesting = (props: Record<string, any>) => {
.readFile(testFilePath)
.then(async (content: string) => {
const runningTests: Record<string, Record<string, string>> = {}
runningTests[testFilePath] = {content}
filesContent[testFilePath] = {content}
const {currentVersion, evmVersion, optimize, runs, isUrl} = testTab.compileTab.getCurrentCompilerConfig()
runningTests[testFilePath] = { content }
filesContent[testFilePath] = { content }
const { currentVersion, evmVersion, optimize, runs, isUrl } = testTab.compileTab.getCurrentCompilerConfig()
const currentCompilerUrl = isUrl ? currentVersion : urlFromVersion(currentVersion)
const compilerConfig = {
currentCompilerUrl,
evmVersion,
optimize,
usingWorker: canUseWorker(currentVersion),
runs
runs,
}
const deployCb = async (file: string, contractAddress: string) => {
const compilerData = await testTab.call('compilerArtefacts', 'getCompilerAbstract', file)
@ -624,7 +624,7 @@ export const SolidityUnitTesting = (props: Record<string, any>) => {
.then((result: any) => cb(null, result))
.catch((error: Error) => cb(error.message)) // eslint-disable-line @typescript-eslint/no-explicit-any
},
{testFilePath: testFilePath}
{ testFilePath: testFilePath }
)
})
.catch((error: Error) => {
@ -660,16 +660,16 @@ export const SolidityUnitTesting = (props: Record<string, any>) => {
if (!isSolidityActive || !selectedTests.current.length) {
setDisableRunButton(true)
if (!currentFile || (currentFile && currentFile.split('.').pop().toLowerCase() !== 'sol')) {
setRunButtonTitle(intl.formatMessage({id: 'solidityUnitTesting.runButtonTitle3'}))
setRunButtonTitle(intl.formatMessage({ id: 'solidityUnitTesting.runButtonTitle3' }))
} else {
setRunButtonTitle(intl.formatMessage({id: 'solidityUnitTesting.runButtonTitle4'}))
setRunButtonTitle(intl.formatMessage({ id: 'solidityUnitTesting.runButtonTitle4' }))
}
} else setDisableRunButton(false)
}
const stopTests = () => {
hasBeenStopped.current = true
setStopButtonLabel(intl.formatMessage({id: 'solidityUnitTesting.stopButtonLabel2'}))
setStopButtonLabel(intl.formatMessage({ id: 'solidityUnitTesting.stopButtonLabel2' }))
setDisableStopButton(true)
setDisableRunButton(true)
}
@ -687,12 +687,12 @@ export const SolidityUnitTesting = (props: Record<string, any>) => {
setCheckSelectAll(true)
setDisableRunButton(false)
if ((readyTestsNumber === runningTestsNumber || hasBeenStopped.current) && stopButtonLabel.trim() === 'Stop') {
setRunButtonTitle(intl.formatMessage({id: 'solidityUnitTesting.runButtonTitle1'}))
setRunButtonTitle(intl.formatMessage({ id: 'solidityUnitTesting.runButtonTitle1' }))
}
} else if (!selectedTests.current.length) {
setCheckSelectAll(false)
setDisableRunButton(true)
setRunButtonTitle(intl.formatMessage({id: 'solidityUnitTesting.runButtonTitle5'}))
setRunButtonTitle(intl.formatMessage({ id: 'solidityUnitTesting.runButtonTitle5' }))
} else setCheckSelectAll(false)
}
@ -713,7 +713,7 @@ export const SolidityUnitTesting = (props: Record<string, any>) => {
const updateTestFileList = () => {
if (allTests.current?.length) {
testFiles = allTests.current.map((testFile: string) => {
return {fileName: testFile, checked: true}
return { fileName: testFile, checked: true }
})
setCheckSelectAll(true)
} else testFiles = []
@ -755,7 +755,7 @@ export const SolidityUnitTesting = (props: Record<string, any>) => {
data-id="uiPathInput"
name="utPath"
value={inputPathValue}
style={{backgroundImage: 'var(--primary)'}}
style={{ backgroundImage: 'var(--primary)' }}
onKeyDown={() => {
if (inputPathValue === '/') setInputPathValue('')
}}
@ -841,13 +841,14 @@ export const SolidityUnitTesting = (props: Record<string, any>) => {
<div className="d-flex align-items-center mx-3 pb-2 mt-2 border-bottom">
<input
id="checkAllTests"
className="custom-control-input"
type="checkbox"
data-id="testTabCheckAllTests"
onClick={checkAll}
checked={checkSelectAll}
onChange={() => {}} // eslint-disable-line
/>
<label className="text-nowrap pl-2 mb-0" htmlFor="checkAllTests">
<label htmlFor="checkAllTests" className="form-check-label mb-0 ml-4 custom-control-label text-nowrap" style={{ paddingTop: '0.125rem' }}>
{' '}
<FormattedMessage id="solidityUnitTesting.selectAll" />{' '}
</label>
@ -857,16 +858,20 @@ export const SolidityUnitTesting = (props: Record<string, any>) => {
? testFiles.map((testFileObj: TestObject, index) => {
const elemId = `singleTest${testFileObj.fileName}`
return (
<div className="d-flex align-items-center py-1" key={index}>
<div className="d-flex align-items-center pl-0 custom-control custom-checkbox" key={index}>
<input
data-id="singleTest"
className="singleTest"
className="singleTest custom-control-input"
id={elemId}
onChange={(e) => toggleCheckbox(e.target.checked, index)}
type="checkbox"
checked={testFileObj.checked}
/>
<label className="singleTestLabel text-nowrap pl-2 mb-0" htmlFor={elemId}>
<label
className="singleTestLabel text-nowrap mb-0 form-check-label mb-0 ml-4 custom-control-label text-nowrap"
htmlFor={elemId}
style={{ paddingTop: '0.125rem' }}
>
{testFileObj.fileName}
</label>
</div>
@ -876,7 +881,7 @@ export const SolidityUnitTesting = (props: Record<string, any>) => {
</div>
<div className="align-items-start flex-column mt-2 mx-3 mb-0">
<span className="text-info h6" hidden={progressBarHidden}>
<FormattedMessage id="solidityUnitTesting.progress" values={{readyTestsNumber, runningTestsNumber}} />
<FormattedMessage id="solidityUnitTesting.progress" values={{ readyTestsNumber, runningTestsNumber }} />
</span>
<label className="text-warning h6" data-id="testTabTestsExecutionStopped" hidden={testsExecutionStoppedHidden}>
<FormattedMessage id="solidityUnitTesting.testTabTestsExecutionStopped" />

141
libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
Unescape View File

@ -1,6 +1,6 @@
/* eslint-disable @typescript-eslint/no-unused-vars */
import React, {useState, useEffect, useReducer, useRef, SyntheticEvent, MouseEvent} from 'react' // eslint-disable-line
import {FormattedMessage, useIntl} from 'react-intl'
import React, { useState, useEffect, useReducer, useRef, SyntheticEvent, MouseEvent } from 'react' // eslint-disable-line
import { FormattedMessage, useIntl } from 'react-intl'
import {
registerCommandAction,
registerLogScriptRunnerAction,
@ -8,15 +8,15 @@ import {
registerErrorScriptRunnerAction,
registerWarnScriptRunnerAction,
listenOnNetworkAction,
initListeningOnNetwork
initListeningOnNetwork,
} from './actions/terminalAction'
import {initialState, registerCommandReducer, addCommandHistoryReducer, registerScriptRunnerReducer} from './reducers/terminalReducer'
import {getKeyOf, getValueOf, Objectfilter, matched} from './utils/utils'
import {allCommands, allPrograms} from './commands' // eslint-disable-line
import { initialState, registerCommandReducer, addCommandHistoryReducer, registerScriptRunnerReducer } from './reducers/terminalReducer'
import { getKeyOf, getValueOf, Objectfilter, matched } from './utils/utils'
import { allCommands, allPrograms } from './commands' // eslint-disable-line
import TerminalWelcomeMessage from './terminalWelcome' // eslint-disable-line
import {Toaster} from '@remix-ui/toaster' // eslint-disable-line
import {ModalDialog} from '@remix-ui/modal-dialog' // eslint-disable-line
import {CustomTooltip} from '@remix-ui/helper'
import { Toaster } from '@remix-ui/toaster' // eslint-disable-line
import { ModalDialog } from '@remix-ui/modal-dialog' // eslint-disable-line
import { CustomTooltip } from '@remix-ui/helper'
import './remix-ui-terminal.css'
import vm from 'vm'
@ -26,8 +26,8 @@ import RenderUnKnownTransactions from './components/RenderUnknownTransactions' /
import RenderCall from './components/RenderCall' // eslint-disable-line
import RenderKnownTransactions from './components/RenderKnownTransactions' // eslint-disable-line
import parse from 'html-react-parser'
import {EMPTY_BLOCK, KNOWN_TRANSACTION, RemixUiTerminalProps, UNKNOWN_TRANSACTION} from './types/terminalTypes'
import {wrapScript} from './utils/wrapScript'
import { EMPTY_BLOCK, KNOWN_TRANSACTION, RemixUiTerminalProps, UNKNOWN_TRANSACTION } from './types/terminalTypes'
import { wrapScript } from './utils/wrapScript'
/* eslint-disable-next-line */
export interface ClipboardEvent<T = Element> extends SyntheticEvent<T, any> {
@ -35,7 +35,7 @@ export interface ClipboardEvent<T = Element> extends SyntheticEvent<T, any> {
}
export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
const {call, _deps, on, config, event, version} = props.plugin
const { call, _deps, on, config, event, version } = props.plugin
const [_cmdIndex, setCmdIndex] = useState(-1)
const [_cmdTemp, setCmdTemp] = useState('')
const [isOpen, setIsOpen] = useState<boolean>(true)
@ -45,7 +45,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
const [toaster, setToaster] = useState(false)
const [toastProvider, setToastProvider] = useState({
show: false,
fileName: ''
fileName: '',
})
const [modalState, setModalState] = useState({
message: '',
@ -54,7 +54,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
cancelLabel: '',
hide: true,
cancelFn: () => {},
handleHide: () => {}
handleHide: () => {},
})
const [clearConsole, setClearConsole] = useState(false)
@ -63,7 +63,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
const [autoCompletState, setAutoCompleteState] = useState({
activeSuggestion: 0,
data: {
_options: []
_options: [],
},
_startingElement: 0,
autoCompleteSelectedItem: {},
@ -75,7 +75,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
text: '',
userInput: '',
extraCommands: [],
commandHistoryIndex: 0
commandHistoryIndex: 0,
})
const [searchInput, setSearchInput] = useState('')
@ -92,7 +92,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
const intl = useIntl()
const scrollToBottom = () => {
messagesEndRef.current.scrollIntoView({behavior: 'smooth'})
messagesEndRef.current.scrollIntoView({ behavior: 'smooth' })
}
useEffect(() => {
@ -101,8 +101,8 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
scriptRunnerDispatch({
type: 'html',
payload: {
message: [html ? (html.innerText ? html.innerText : html) : null]
}
message: [html ? (html.innerText ? html.innerText : html) : null],
},
})
},
@ -110,14 +110,14 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
if (typeof message === 'string') {
message = {
value: message,
type: 'log'
type: 'log',
}
}
scriptRunnerDispatch({
type: message.type ? message.type : 'log',
payload: {message: [message.value]}
payload: { message: [message.value] },
})
}
},
})
}, [])
@ -128,22 +128,22 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
registerInfoScriptRunnerAction(on, 'info', newstate.commands, scriptRunnerDispatch)
registerWarnScriptRunnerAction(on, 'warn', newstate.commands, scriptRunnerDispatch)
registerErrorScriptRunnerAction(on, 'error', newstate.commands, scriptRunnerDispatch)
registerCommandAction('html', _blocksRenderer('html'), {activate: true}, dispatch)
registerCommandAction('log', _blocksRenderer('log'), {activate: true}, dispatch)
registerCommandAction('info', _blocksRenderer('info'), {activate: true}, dispatch)
registerCommandAction('warn', _blocksRenderer('warn'), {activate: true}, dispatch)
registerCommandAction('error', _blocksRenderer('error'), {activate: true}, dispatch)
registerCommandAction('html', _blocksRenderer('html'), { activate: true }, dispatch)
registerCommandAction('log', _blocksRenderer('log'), { activate: true }, dispatch)
registerCommandAction('info', _blocksRenderer('info'), { activate: true }, dispatch)
registerCommandAction('warn', _blocksRenderer('warn'), { activate: true }, dispatch)
registerCommandAction('error', _blocksRenderer('error'), { activate: true }, dispatch)
registerCommandAction(
'script',
function execute(args, scopedCommands) {
const script = String(args[0])
_shell(script, scopedCommands, function (error, output) {
if (error) scriptRunnerDispatch({type: 'error', payload: {message: error}})
if (output) scriptRunnerDispatch({type: 'script', payload: {message: '5'}})
if (error) scriptRunnerDispatch({ type: 'error', payload: { message: error } })
if (output) scriptRunnerDispatch({ type: 'script', payload: { message: '5' } })
})
},
{activate: true},
{ activate: true },
dispatch
)
}, [autoCompletState.text])
@ -169,16 +169,16 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
}
const provider = _deps.fileManager.fileProviderOf(file)
console.log({provider})
console.log({ provider })
if (!provider) {
// toolTip(`provider for path ${file} not found`)
setToastProvider({show: true, fileName: file})
setToastProvider({ show: true, fileName: file })
if (cb) cb()
return
}
provider.get(file, (error, content) => {
console.log({content})
console.log({ content })
if (error) {
// toolTip(error)
// TODO: pop up
@ -213,13 +213,13 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
},
execute: (fileName, callback) => {
return execute(fileName, callback)
}
}
},
},
}
try {
const cmds = vm.createContext(context)
const result = vm.runInContext(script, cmds) // eslint-disable-line
console.log({result})
console.log({ result })
return done(null, result)
} catch (error) {
return done(error.message)
@ -247,7 +247,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
// backspace or any key that should remove the autocompletion
setAutoCompleteState((prevState) => ({
...prevState,
showSuggestions: false
showSuggestions: false,
}))
}
if (autoCompletState.showSuggestions && (event.which === 13 || event.which === 9)) {
@ -256,7 +256,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
...prevState,
activeSuggestion: 0,
showSuggestions: false,
userInput: Object.keys(autoCompletState.data._options[0]).toString()
userInput: Object.keys(autoCompletState.data._options[0]).toString(),
}))
} else {
if (autoCompletState.showSuggestions && (event.which === 13 || event.which === 9)) {
@ -266,14 +266,14 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
showSuggestions: false,
userInput: autoCompletState.data._options[autoCompletState.activeSuggestion]
? Object.keys(autoCompletState.data._options[autoCompletState.activeSuggestion]).toString()
: inputEl.current.value
: inputEl.current.value,
}))
} else {
setAutoCompleteState((prevState) => ({
...prevState,
activeSuggestion: 0,
showSuggestions: false,
userInput: autoCompletState.data._options.length === 1 ? Object.keys(autoCompletState.data._options[0]).toString() : inputEl.current.value
userInput: autoCompletState.data._options.length === 1 ? Object.keys(autoCompletState.data._options[0]).toString() : inputEl.current.value,
}))
}
}
@ -290,22 +290,22 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
setCmdTemp('')
const script = autoCompletState.userInput.trim() // inputEl.current.innerText.trim()
if (script.length) {
cmdHistoryDispatch({type: 'cmdHistory', payload: {script}})
cmdHistoryDispatch({ type: 'cmdHistory', payload: { script } })
newstate.commands.script(wrapScript(script))
}
setAutoCompleteState((prevState) => ({...prevState, userInput: ''}))
setAutoCompleteState((prevState) => ({ ...prevState, userInput: '' }))
inputEl.current.innerText = ''
inputEl.current.focus()
setAutoCompleteState((prevState) => ({
...prevState,
showSuggestions: false
showSuggestions: false,
}))
}
} else if (newstate._commandHistory.length && event.which === 38 && !autoCompletState.showSuggestions && autoCompletState.userInput === '') {
event.preventDefault()
setAutoCompleteState((prevState) => ({
...prevState,
userInput: newstate._commandHistory[0]
userInput: newstate._commandHistory[0],
}))
} else if (event.which === 38 && autoCompletState.showSuggestions) {
event.preventDefault()
@ -315,7 +315,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
setAutoCompleteState((prevState) => ({
...prevState,
activeSuggestion: suggestionCount - 1,
userInput: Object.keys(autoCompletState.data._options[autoCompletState.activeSuggestion]).toString()
userInput: Object.keys(autoCompletState.data._options[autoCompletState.activeSuggestion]).toString(),
}))
} else if (event.which === 38 && !autoCompletState.showSuggestions) {
// <arrowUp>
@ -332,7 +332,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
setAutoCompleteState((prevState) => ({
...prevState,
activeSuggestion: suggestionCount + 1,
userInput: Object.keys(autoCompletState.data._options[autoCompletState.activeSuggestion + 1]).toString()
userInput: Object.keys(autoCompletState.data._options[autoCompletState.activeSuggestion + 1]).toString(),
}))
} else if (event.which === 40 && !autoCompletState.showSuggestions) {
if (_cmdIndex > -1) {
@ -359,7 +359,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
log: 'text-log',
info: 'text-log',
warn: 'text-warning',
error: 'text-danger'
error: 'text-danger',
}[mode] // defaults
if (mode) {
@ -389,7 +389,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
const handleClearConsole = () => {
setClearConsole(true)
dispatch({type: 'clearconsole', payload: []})
dispatch({ type: 'clearconsole', payload: [] })
inputEl.current.focus()
}
/* start of autoComplete */
@ -408,42 +408,42 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
setAutoCompleteState((prevState) => ({
...prevState,
showSuggestions: false,
userInput: inputString
userInput: inputString,
}))
} else {
setAutoCompleteState((prevState) => ({
...prevState,
showSuggestions: true,
userInput: inputString
userInput: inputString,
}))
}
const textList = inputString.split('.')
if (textList.length === 1) {
setAutoCompleteState((prevState) => ({
...prevState,
data: {_options: []}
data: { _options: [] },
}))
const result = Objectfilter(allPrograms, autoCompletState.userInput)
setAutoCompleteState((prevState) => ({
...prevState,
data: {_options: result}
data: { _options: result },
}))
} else {
setAutoCompleteState((prevState) => ({
...prevState,
data: {_options: []}
data: { _options: [] },
}))
const result = Objectfilter(allCommands, autoCompletState.userInput)
setAutoCompleteState((prevState) => ({
...prevState,
data: {_options: result}
data: { _options: result },
}))
}
} else {
setAutoCompleteState((prevState) => ({
...prevState,
showSuggestions: false,
userInput: inputString
userInput: inputString,
}))
}
}
@ -453,7 +453,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
setAutoCompleteState((prevState) => ({
...prevState,
showSuggestions: false,
userInput: result
userInput: result,
}))
inputEl.current.focus()
}
@ -466,7 +466,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
}
setAutoCompleteState((prevState) => ({
...prevState,
activeSuggestion: suggestionCount - 1
activeSuggestion: suggestionCount - 1,
}))
} else if (event.keyCode === 40) {
if (autoCompletState.activeSuggestion - 1 === autoCompletState.data._options.length) {
@ -474,7 +474,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
}
setAutoCompleteState((prevState) => ({
...prevState,
activeSuggestion: suggestionCount + 1
activeSuggestion: suggestionCount + 1,
}))
}
}
@ -488,12 +488,12 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
okFn,
cancelLabel,
cancelFn,
hide
hide,
}))
}
const handleHideModal = () => {
setModalState((prevState) => ({...prevState, hide: true}))
setModalState((prevState) => ({ ...prevState, hide: true }))
}
const txDetails = (event, tx) => {
@ -515,7 +515,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
display:
autoCompletState.showSuggestions && autoCompletState.userInput !== '' && autoCompletState.userInput.length > 0 && autoCompletState.data._options.length > 0
? 'block'
: 'none'
: 'none',
}}
>
<div>
@ -545,7 +545,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
setAutoCompleteState((prevState) => ({
...prevState,
activeSuggestion: 0,
showSuggestions: false
showSuggestions: false,
}))
}
@ -572,7 +572,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
const classNameBlock = 'remix_ui_terminal_block px-4 py-1 text-break'
return (
<div style={{flexGrow: 1}} className="remix_ui_terminal_panel" ref={panelRef}>
<div style={{ flexGrow: 1 }} className="remix_ui_terminal_panel" ref={panelRef}>
<div className="remix_ui_terminal_bar d-flex">
<div className="remix_ui_terminal_menu d-flex w-100 align-items-center position-relative border-top border-dark bg-light" ref={terminalMenu} data-id="terminalToggleMenu">
<CustomTooltip placement="top" tooltipId="terminalToggle" tooltipClasses="text-nowrap" tooltipText={isOpen ? 'Hide Terminal' : 'Show Terminal'}>
@ -590,12 +590,17 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
<CustomTooltip placement="top" tooltipId="terminalClear" tooltipClasses="text-nowrap" tooltipText="Pending Transactions">
<div className="mx-2">0</div>
</CustomTooltip>
<div className="pt-1 h-80 mx-3 align-items-center remix_ui_terminal_listenOnNetwork custom-control custom-checkbox">
<CustomTooltip placement="top" tooltipId="terminalClear" tooltipClasses="text-nowrap" tooltipText={intl.formatMessage({id: 'terminal.listenTitle'})}>
<div className="h-80 mx-3 align-items-center remix_ui_terminal_listenOnNetwork custom-control custom-checkbox">
<CustomTooltip placement="top" tooltipId="terminalClear" tooltipClasses="text-nowrap" tooltipText={intl.formatMessage({ id: 'terminal.listenTitle' })}>
<input className="custom-control-input" id="listenNetworkCheck" onChange={listenOnNetwork} type="checkbox" />
</CustomTooltip>
<CustomTooltip placement="top" tooltipId="terminalClear" tooltipClasses="text-nowrap" tooltipText={intl.formatMessage({id: 'terminal.listenTitle'})}>
<label className="pt-1 form-check-label custom-control-label text-nowrap" htmlFor="listenNetworkCheck" data-id="listenNetworkCheckInput">
<CustomTooltip placement="top" tooltipId="terminalClear" tooltipClasses="text-nowrap" tooltipText={intl.formatMessage({ id: 'terminal.listenTitle' })}>
<label
className="form-check-label custom-control-label text-nowrap"
style={{ paddingTop: '0.125rem' }}
htmlFor="listenNetworkCheck"
data-id="listenNetworkCheckInput"
>
<FormattedMessage id="terminal.listen" />
</label>
</CustomTooltip>
@ -607,7 +612,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
type="text"
className="remix_ui_terminal_filter border form-control"
id="searchInput"
placeholder={intl.formatMessage({id: 'terminal.search'})}
placeholder={intl.formatMessage({ id: 'terminal.search' })}
data-id="terminalInputSearch"
/>
</div>

Write Preview
Loading…
Cancel
Save