From 73c102d11beb4ac3f76789d2ed727336e9519923 Mon Sep 17 00:00:00 2001 From: "davidzagi93@gmail.com" Date: Wed, 11 Aug 2021 07:20:09 +0100 Subject: [PATCH] fing conflictsxing conflicts --- apps/remix-ide/src/app/panels/terminal.js | 280 ------------------ .../terminal/src/lib/remix-ui-terminal.css | 1 + .../terminal/src/lib/remix-ui-terminal.tsx | 1 + 3 files changed, 2 insertions(+), 280 deletions(-) diff --git a/apps/remix-ide/src/app/panels/terminal.js b/apps/remix-ide/src/app/panels/terminal.js index fb3bc4a130..76b632a649 100644 --- a/apps/remix-ide/src/app/panels/terminal.js +++ b/apps/remix-ide/src/app/panels/terminal.js @@ -4,20 +4,12 @@ import ReactDOM from 'react-dom' import { RemixUiTerminal } from '@remix-ui/terminal' // eslint-disable-line import { Plugin } from '@remixproject/engine' import * as packageJson from '../../../../../package.json' -import * as remixBleach from '../../lib/remixBleach' - -var yo = require('yo-yo') -var javascriptserialize = require('javascript-serialize') -var jsbeautify = require('js-beautify') -var type = require('component-type') var vm = require('vm') var EventManager = require('../../lib/events') var CommandInterpreterAPI = require('../../lib/cmdInterpreterAPI') var AutoCompletePopup = require('../ui/auto-complete-popup') -var css = require('./styles/terminal-styles') - import { CompilerImports } from '@remix-project/core-plugin' // eslint-disable-line var globalRegistry = require('../../global/registry') var SourceHighlighter = require('../../app/editor/sourceHighlighter') @@ -79,14 +71,6 @@ class Terminal extends Plugin { this._components = {} this._components.cmdInterpreter = new CommandInterpreterAPI(this, null, this.blockchain) this._components.autoCompletePopup = new AutoCompletePopup(this._opts) - // this._components.autoCompletePopup.event.register('handleSelect', function (input) { - // const textList = this._view.input.innerText.split(' ') - // textList.pop() - // textList.push(input) - // this._view.input.innerText = textList - // this._view.input.focus() - // this.putCursor2End(this._view.input) - // }) this._commands = {} this.commands = {} this._JOURNAL = [] @@ -111,11 +95,6 @@ class Terminal extends Plugin { this.off('scriptRunner', 'error') } - // logHtml (html) { - // var command = this.commands.html - // if (typeof command === 'function') command(html) - // } - logHtml (html) { var command = this.commands.html if (typeof command === 'function') command(html) @@ -158,269 +137,10 @@ class Terminal extends Plugin { ) } - // _appendItem (item) { - // var self = this - // var { el, gidx } = item - // self._JOURNAL[gidx] = item - // if (!self._jobs.length) { - // requestAnimationFrame(function updateTerminal () { - // self._jobs.forEach(el => self._view.journal.appendChild(el)) - // self.scroll2bottom() - // self._jobs = [] - // }) - // } - // if (self.data.activeFilters.commands[item.cmd]) self._jobs.push(el) - // } - scroll2bottom () { - var self = this setTimeout(function () { - // self._view.term.scrollTop = self._view.term.scrollHeight }, 0) } - - // _blocksRenderer (mode) { - // if (mode === 'html') { - // return function logger (args, scopedCommands, append) { - // if (args.length) append(args[0]) - // } - // } - // mode = { - // log: 'text-info', - // info: 'text-info', - // warn: 'text-warning', - // error: 'text-danger' - // }[mode] // defaults - - // if (mode) { - // const filterUndefined = (el) => el !== undefined && el !== null - // return function logger (args, scopedCommands, append) { - // var types = args.filter(filterUndefined).map(type) - // var values = javascriptserialize.apply(null, args.filter(filterUndefined)).map(function (val, idx) { - // if (typeof args[idx] === 'string') { - // const el = document.createElement('div') - // el.innerHTML = args[idx].replace(/(\r\n|\n|\r)/gm, '
') - // val = el.children.length === 0 ? el.firstChild : el - // } - // if (types[idx] === 'element') val = jsbeautify.html(val) - // return val - // }) - // if (values.length) { - // append(yo`${values}`) - // } - // } - // } else { - // throw new Error('mode is not supported') - // } - // } - - // _scopeCommands (append) { - // var self = this - // var scopedCommands = {} - // Object.keys(self.commands).forEach(function makeScopedCommand (cmd) { - // var command = self._commands[cmd] - // scopedCommands[cmd] = function _command () { - // var args = [...arguments] - // command(args, scopedCommands, el => append(cmd, args, blockify(el))) - // } - // }) - // return scopedCommands - // } - - // registerFilter (commandName, filterFn) { - // this.data.filterFns[commandName] = filterFn - // } - - // registerCommand (name, command, opts) { - // var self = this - // name = String(name) - // if (this._commands[name]) throw new Error(`command "${name}" exists already`) - // if (typeof command !== 'function') throw new Error(`invalid command: ${command}`) - // this._commands[name] = command - // console.log({ command }) - // console.log(self._commands) - // this._INDEX.commands[name] = [] - // this._INDEX.commandsMain[name] = [] - // this.commands[name] = function _command () { - // var args = [...arguments] - // var steps = [] - // var root = { steps, cmd: name } - // var ITEM = { root, cmd: name } - // root.gidx = self._INDEX.allMain.push(ITEM) - 1 - // root.idx = self._INDEX.commandsMain[name].push(ITEM) - 1 - // function append (cmd, params, el) { - // var item - // if (cmd) { // subcommand - // item = { el, cmd, root } - // } else { // command - // item = ITEM - // item.el = el - // cmd = name - // } - // item.gidx = self._INDEX.all.push(item) - 1 - // item.idx = self._INDEX.commands[cmd].push(item) - 1 - // item.step = steps.push(item) - 1 - // item.args = params - // // self._appendItem(item) - // } - // var scopedCommands = self._scopeCommands(append) - // command(args, scopedCommands, el => append(null, args, blockify(el))) - // } - // var help = typeof command.help === 'string' ? command.help : [ - // '// no help available for:', - // `terminal.commands.${name}(...)` - // ].join('\n') - // this.commands[name].toString = _ => { return help } - // this.commands[name].help = help - // this.data.activeFilters.commands[name] = opts && opts.activate - // if (opts.filterFn) { - // this.registerFilter(name, opts.filterFn) - // } - // return this.commands[name] - // } - - // async _shell (script, scopedCommands, done) { // default shell - // if (script.indexOf('remix:') === 0) { - // return done(null, 'This type of command has been deprecated and is not functionning anymore. Please run remix.help() to list available commands.') - // } - // var self = this - // if (script.indexOf('remix.') === 0) { - // // we keep the old feature. This will basically only be called when the command is querying the "remix" object. - // // for all the other case, we use the Code Executor plugin - // var context = domTerminalFeatures(scopedCommands, self.blockchain) - // try { - // var cmds = vm.createContext(context) - // var result = vm.runInContext(script, cmds) - // return done(null, result) - // } catch (error) { - // return done(error.message) - // } - // } - // try { - // let result - // if (script.trim().startsWith('git')) { - // // result = await this.call('git', 'execute', script) - // } else { - // result = await this.call('scriptRunner', 'execute', script) - // } - // if (result) self.commands.html(yo`
${result}
`) - // done() - // } catch (error) { - // done(error.message || error) - // } - // } - // } - - // function domTerminalFeatures (scopedCommands, blockchain) { - // return { - // remix: { - // blockchain: this.blockchain, - // commandHelp: this.commandHelp, - // event: this.event, - // _deps: this._deps - // } - // } - // } - - // function loadgist (id, cb) { - // const self = this - // self._components.gistHandler.loadFromGist({ gist: id }, this._deps.fileManager) - // if (cb) cb() - // } - - // function loadurl (url, cb) { - // const self = this - // self._components.fileImport.import(url, - // (loadingMsg) => { toolTip(loadingMsg) }, - // (err, content, cleanUrl, type, url) => { - // if (err) { - // toolTip(`Unable to load ${url}: ${err}`) - // if (cb) cb(err) - // } else { - // self._deps.fileManager.writeFile(type + '/' + cleanUrl, content) - // try { - // content = JSON.parse(content) - // async.eachOfSeries(content.sources, (value, file, callbackSource) => { - // var url = value.urls[0] // @TODO retrieve all other contents ? - // self._components.fileImport.import(url, - // (loadingMsg) => { toolTip(loadingMsg) }, - // async (error, content, cleanUrl, type, url) => { - // if (error) { - // toolTip(`Cannot retrieve the content of ${url}: ${error}`) - // return callbackSource(`Cannot retrieve the content of ${url}: ${error}`) - // } else { - // try { - // await self._deps.fileManager.writeFile(type + '/' + cleanUrl, content) - // callbackSource() - // } catch (e) { - // callbackSource(e.message) - // } - // } - // }) - // }, (error) => { - // if (cb) cb(error) - // }) - // } catch (e) {} - // if (cb) cb() - // } - // }) - // } - - // function exeCurrent (cb) { - // return this.execute(undefined, cb) - // } - - // function execute (file, cb) { - // const self = this - - // function _execute (content, cb) { - // if (!content) { - // toolTip('no content to execute') - // if (cb) cb() - // return - // } - - // self._components.terminal.commands.script(content) - // } - - // if (typeof file === 'undefined') { - // var content = self._deps.editor.currentContent() - // _execute(content, cb) - // return - // } - - // var provider = self._deps.fileManager.fileProviderOf(file) - - // if (!provider) { - // toolTip(`provider for path ${file} not found`) - // if (cb) cb() - // return - // } - - // provider.get(file, (error, content) => { - // if (error) { - // // toolTip(error) - // // TODO: pop up - // if (cb) cb() - // return - // } - - // _execute(content, cb) - // }) - // } - -// function help (cb) { -// const self = this -// var help = yo`
` -// for (var k in self.commandHelp) { -// help.appendChild(yo`
${k}: ${self.commandHelp[k]}
`) -// help.appendChild(yo`
`) -// } -// self._components.terminal.commands.html(help) -// if (cb) cb() -// return '' -// } } -function blockify (el) { return yo`
${el}
` } module.exports = Terminal diff --git a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.css b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.css index 890460b43c..24e9fc6400 100644 --- a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.css +++ b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.css @@ -354,3 +354,4 @@ input #terminalCliInput { .debug:hover { opacity: 0.8; } + diff --git a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx index 94c45e2b90..32a23f19e5 100644 --- a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx +++ b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx @@ -639,6 +639,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => { const txDetails = (event, tx, obj) => { if (showTableDetails === null) { setShowTableDetails(true) + console.log({tx: tx.hash}) } else { setShowTableDetails(null) }