titles for terminal and e2e fix

pull/5370/head
lianahus 2 years ago committed by Aniket
parent 0ba8d8c94c
commit 6a5e26f7aa
  1. 5
      apps/remix-ide-e2e/src/commands/addFile.ts
  2. 4
      libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
  3. 2
      libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx
  4. 60
      libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx

@ -54,10 +54,7 @@ function addFile(browser: NightwatchBrowser, name: string, content: NightwatchCo
suppressNotFoundErrors: true, suppressNotFoundErrors: true,
timeout: 60000 timeout: 60000
}) })
.waitForElementPresent({ .waitForElementContainsText('*[data-id="activeTabTitle"]', name)
selector: `//*[@data-id="tab-active" and contains(@title, "${name}")]`,
locateStrategy: 'xpath',
})
.setEditorValue(content.content) .setEditorValue(content.content)
.getEditorValue((result) => { .getEditorValue((result) => {
if(result != content.content) { if(result != content.content) {

@ -970,7 +970,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
<button <button
id="compileAndRunBtn" id="compileAndRunBtn"
data-id="compilerContainerCompileAndRunBtn" data-id="compilerContainerCompileAndRunBtn"
className="btn btn-secondary btn-block d-block w-100 text-break remixui_solidityCompileAndRunButton d-inline-block remixui_disabled mb-1 mt-3" className="btn btn-secondary btn-block d-block w-100 text-break remixui_solidityCompileAndRunButton d-inline-block remixui_disabled mb-1 mt-1"
onClick={compileAndRun} onClick={compileAndRun}
disabled={(configFilePath === '' && state.useFileConfiguration) || disableCompileButton} disabled={(configFilePath === '' && state.useFileConfiguration) || disableCompileButton}
> >
@ -1009,7 +1009,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
<a href="https://remix-ide.readthedocs.io/en/latest/running_js_scripts.html#compile-a-contract-and-run-a-script-on-the-fly" target="_blank" ><i className="pl-2 ml-2 mt-3 mb-1 fas fa-info text-dark"></i></a> <a href="https://remix-ide.readthedocs.io/en/latest/running_js_scripts.html#compile-a-contract-and-run-a-script-on-the-fly" target="_blank" ><i className="pl-2 ml-2 mt-3 mb-1 fas fa-info text-dark"></i></a>
</CustomTooltip> </CustomTooltip>
<CopyToClipboard tip="Click to copy the custom NatSpec tag" getContent={() => '@custom:dev-run-script file_path'} direction='top'> <CopyToClipboard tip="Click to copy the custom NatSpec tag" getContent={() => '@custom:dev-run-script file_path'} direction='top'>
<button className="btn remixui_copyButton ml-2 mt-3 mb-1 text-dark"> <button className="btn remixui_copyButton ml-2 my-1 text-dark">
<i className="remixui_copyIcon far fa-copy" aria-hidden="true"></i> <i className="remixui_copyIcon far fa-copy" aria-hidden="true"></i>
</button> </button>
</CopyToClipboard> </CopyToClipboard>

@ -101,7 +101,7 @@ export const TabsUI = (props: TabsUIProps) => {
data-id={index === currentIndexRef.current ? 'tab-active' : ''} data-id={index === currentIndexRef.current ? 'tab-active' : ''}
> >
{tab.icon ? (<img className="my-1 mr-1 iconImage" style={{ filter: invert }} src={tab.icon} />) : (<i className={classNameImg}></i>)} {tab.icon ? (<img className="my-1 mr-1 iconImage" style={{ filter: invert }} src={tab.icon} />) : (<i className={classNameImg}></i>)}
<span className={`title-tabs ${getFileDecorationClasses(tab)}`}>{tab.title}</span> <span data-id="activeTabTitle" className={`title-tabs ${getFileDecorationClasses(tab)}`}>{tab.title}</span>
{getFileDecorationIcons(tab)} {getFileDecorationIcons(tab)}
<span className="close-tabs" onClick={(event) => { props.onClose(index); event.stopPropagation() }}> <span className="close-tabs" onClick={(event) => { props.onClose(index); event.stopPropagation() }}>
<i className="text-dark fas fa-times"></i> <i className="text-dark fas fa-times"></i>

@ -8,6 +8,7 @@ import {allCommands, allPrograms} from './commands' // eslint-disable-line
import TerminalWelcomeMessage from './terminalWelcome' // eslint-disable-line import TerminalWelcomeMessage from './terminalWelcome' // eslint-disable-line
import { Toaster } from '@remix-ui/toaster' // eslint-disable-line import { Toaster } from '@remix-ui/toaster' // eslint-disable-line
import { ModalDialog } from '@remix-ui/modal-dialog' // 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 './remix-ui-terminal.css'
import vm from 'vm' import vm from 'vm'
@ -454,26 +455,51 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
<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"> <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">
<i className={`mx-2 remix_ui_terminal_toggleTerminal fas ${isOpen ? 'fa-angle-double-down' : 'fa-angle-double-up'}`} data-id="terminalToggleIcon" onClick={handleToggleTerminal}></i> <i className={`mx-2 remix_ui_terminal_toggleTerminal fas ${isOpen ? 'fa-angle-double-down' : 'fa-angle-double-up'}`} data-id="terminalToggleIcon" onClick={handleToggleTerminal}></i>
<div className="mx-2 remix_ui_terminal_console" id="clearConsole" data-id="terminalClearConsole" onClick={handleClearConsole} > <div className="mx-2 remix_ui_terminal_console" id="clearConsole" data-id="terminalClearConsole" onClick={handleClearConsole} >
<i className="fas fa-ban" aria-hidden="true" title="Clear console" <CustomTooltip
></i> placement="top"
tooltipId="terminalClear"
tooltipClasses="text-nowrap"
tooltipText="Clear console"
>
<i className="fas fa-ban" aria-hidden="true"></i>
</CustomTooltip>
</div> </div>
<div className="mx-2" title='Pending Transactions'>0</div> <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"> <div className="pt-1 h-80 mx-3 align-items-center remix_ui_terminal_listenOnNetwork custom-control custom-checkbox">
<input <CustomTooltip
className="custom-control-input" placement="top"
id="listenNetworkCheck" tooltipId="terminalClear"
onChange={listenOnNetwork} tooltipClasses="text-nowrap"
type="checkbox" tooltipText={intl.formatMessage({ id: 'terminal.listenTitle' })}
title={intl.formatMessage({ id: 'terminal.listenTitle' })} >
/> <input
<label className="custom-control-input"
className="pt-1 form-check-label custom-control-label text-nowrap" id="listenNetworkCheck"
title={intl.formatMessage({ id: 'terminal.listenTitle' })} onChange={listenOnNetwork}
htmlFor="listenNetworkCheck" type="checkbox"
data-id="listenNetworkCheckInput" />
</CustomTooltip>
<CustomTooltip
placement="top"
tooltipId="terminalClear"
tooltipClasses="text-nowrap"
tooltipText={intl.formatMessage({ id: 'terminal.listenTitle' })}
> >
<FormattedMessage id='terminal.listen' /> <label
</label> className="pt-1 form-check-label custom-control-label text-nowrap"
htmlFor="listenNetworkCheck"
data-id="listenNetworkCheckInput"
>
<FormattedMessage id='terminal.listen' />
</label>
</CustomTooltip>
</div> </div>
<div className="remix_ui_terminal_search d-flex align-items-center h-100"> <div className="remix_ui_terminal_search d-flex align-items-center h-100">
<i <i

Loading…
Cancel
Save