diff --git a/apps/remix-ide/src/app/tabs/compile-tab.js b/apps/remix-ide/src/app/tabs/compile-tab.js index 9652823ce9..d277a02057 100644 --- a/apps/remix-ide/src/app/tabs/compile-tab.js +++ b/apps/remix-ide/src/app/tabs/compile-tab.js @@ -1,8 +1,9 @@ /* global */ import React from 'react' // eslint-disable-line import ReactDOM from 'react-dom' -import { SolidityCompiler } from '@remix-ui/solidity-compiler' // eslint-disable-line +import { SolidityCompiler, CompileTab as CompileTabLogic } from '@remix-ui/solidity-compiler' // eslint-disable-line import { ViewPlugin } from '@remixproject/engine-web' +import { Renderer } from '@remix-ui/renderer' import * as packageJson from '../../../../../package.json' import publishToStorage from '../../publishToStorage' import { compile } from '@remix-project/remix-solidity' @@ -18,7 +19,7 @@ const copyToClipboard = require('../ui/copy-to-clipboard') const modalDialogCustom = require('../ui/modal-dialog-custom') const parseContracts = require('./compileTab/contractParser') const addTooltip = require('../ui/tooltip') -const Renderer = require('../ui/renderer') +// const Renderer = require('../ui/renderer') const globalRegistry = require('../../global/registry') var css = require('./styles/compile-tab-styles') @@ -58,11 +59,10 @@ class CompileTab extends ViewPlugin { // dependencies this.editor = editor this.config = config - this.renderer = new Renderer(this) + // this.renderer = new Renderer(this) this.fileManager = fileManager - + this.contractsDetails = {} this.data = { - contractsDetails: {}, eventHandlers: {}, loading: false } @@ -86,7 +86,7 @@ class CompileTab extends ViewPlugin { this._view.errorContainer.innerHTML = '' } this.currentFile = '' - this.data.contractsDetails = {} + this.contractsDetails = {} yo.update(this._view.contractSelection, this.contractSelection()) this.emit('statusChanged', { key: 'none' }) this.renderComponent() @@ -162,9 +162,9 @@ class CompileTab extends ViewPlugin { }) } else this.emit('statusChanged', { key: 'succeed', title: 'compilation successful', type: 'success' }) // Store the contracts - this.data.contractsDetails = {} + this.contractsDetails = {} this.compiler.visitContracts((contract) => { - this.data.contractsDetails[contract.name] = parseContracts( + this.contractsDetails[contract.name] = parseContracts( contract.name, contract.object, this.compiler.getSource(contract.file) @@ -181,11 +181,11 @@ class CompileTab extends ViewPlugin { yo.update(this._view.contractSelection, contractSelection) if (data.error) { - this.renderer.error( - data.error.formattedMessage || data.error, - this._view.errorContainer, - { type: data.error.severity || 'error', errorType: data.error.type } - ) + // this.renderer.error( + // data.error.formattedMessage || data.error, + // this._view.errorContainer, + // { type: data.error.severity || 'error', errorType: data.error.type } + // ) if (data.error.mode === 'panic') { return modalDialogCustom.alert(yo`
@@ -199,13 +199,14 @@ class CompileTab extends ViewPlugin { data.errors.forEach((err) => { if (this.config.get('hideWarnings')) { if (err.severity !== 'warning') { - this.renderer.error(err.formattedMessage, this._view.errorContainer, { type: err.severity, errorType: err.type }) + // this.renderer.error(err.formattedMessage, this._view.errorContainer, { type: err.severity, errorType: err.type }) } } else { - this.renderer.error(err.formattedMessage, this._view.errorContainer, { type: err.severity, errorType: err.type }) + // this.renderer.error(err.formattedMessage, this._view.errorContainer, { type: err.severity, errorType: err.type }) } }) } + this.renderComponent() } this.compiler.event.register('compilationFinished', this.data.eventHandlers.onCompilationFinished) @@ -301,73 +302,73 @@ class CompileTab extends ViewPlugin { * Section to select the compiled contract * @param {string[]} contractList Names of the compiled contracts */ - contractSelection (contractMap) { - // Return the file name of a path: ex "browser/ballot.sol" -> "ballot.sol" - const getFileName = (path) => { - const part = path.split('/') - return part[part.length - 1] - } - const contractList = contractMap ? Object.keys(contractMap).map((key) => ({ - name: key, - file: getFileName(contractMap[key].file) - })) : [] - const selectEl = yo` - - ` - // define swarm logo - - const result = contractList.length - ? yo`
- -
- - ${selectEl} -
-
- - - - -
-
-
- - -
-
-
-
- ` - : yo`
- No Contract Compiled Yet -
` - - if (contractList.length) { - this.selectedContract = selectEl.value - } else { - delete this.selectedContract - } - return result - } + // contractSelection (contractMap) { + // // Return the file name of a path: ex "browser/ballot.sol" -> "ballot.sol" + // const getFileName = (path) => { + // const part = path.split('/') + // return part[part.length - 1] + // } + // const contractList = contractMap ? Object.keys(contractMap).map((key) => ({ + // name: key, + // file: getFileName(contractMap[key].file) + // })) : [] + // const selectEl = yo` + // + // ` + // // define swarm logo + + // const result = contractList.length + // ? yo`
+ // + //
+ // + // ${selectEl} + //
+ //
+ // + // + // + // + //
+ //
+ //
+ // + // + //
+ //
+ //
+ // + //
` + // : yo`
+ // No Contract Compiled Yet + //
` + + // if (contractList.length) { + // this.selectedContract = selectEl.value + // } else { + // delete this.selectedContract + // } + // return result + // } // TODO : Add success alert when compilation succeed contractCompiledSuccess () { @@ -403,7 +404,7 @@ class CompileTab extends ViewPlugin { web3Deploy: 'Copy/paste this code to any JavaScript/Web3 console to deploy this contract' } if (!this.selectedContract) throw new Error('No contract compiled yet') - const contractProperties = this.data.contractsDetails[this.selectedContract] + const contractProperties = this.contractsDetails[this.selectedContract] const log = yo`
` Object.keys(contractProperties).map(propertyName => { const copyDetails = yo`${copyToClipboard(() => contractProperties[propertyName])}` @@ -457,7 +458,7 @@ class CompileTab extends ViewPlugin { getContractProperty (property) { if (!this.selectedContract) throw new Error('No contract compiled yet') - const contractProperties = this.data.contractsDetails[this.selectedContract] + const contractProperties = this.contractsDetails[this.selectedContract] return contractProperties[property] || null } @@ -503,6 +504,7 @@ class CompileTab extends ViewPlugin { plugin={this} compileTabLogic={this.compileTabLogic} compiledFileName={this.currentFile} + contractsDetails={this.contractsDetails} /> , this.el) } diff --git a/libs/remix-ui/solidity-compiler/src/index.ts b/libs/remix-ui/solidity-compiler/src/index.ts index 3634357b17..576801a333 100644 --- a/libs/remix-ui/solidity-compiler/src/index.ts +++ b/libs/remix-ui/solidity-compiler/src/index.ts @@ -1 +1,2 @@ export * from './lib/solidity-compiler' +export * from './lib/compileTabLogic' diff --git a/libs/remix-ui/solidity-compiler/src/lib/compileTabLogic.ts b/libs/remix-ui/solidity-compiler/src/lib/compileTabLogic.ts index 63c3c563c9..6d21951efb 100644 --- a/libs/remix-ui/solidity-compiler/src/lib/compileTabLogic.ts +++ b/libs/remix-ui/solidity-compiler/src/lib/compileTabLogic.ts @@ -9,7 +9,7 @@ const profile = { description: 'Compile solidity contracts - Logic', version: packageJson.version } -export default class CompileTab extends Plugin { +export class CompileTab extends Plugin { public compiler public optimize public runs: number diff --git a/libs/remix-ui/solidity-compiler/src/lib/contract-selection.tsx b/libs/remix-ui/solidity-compiler/src/lib/contract-selection.tsx index cae8d6bee2..c8e3c532ae 100644 --- a/libs/remix-ui/solidity-compiler/src/lib/contract-selection.tsx +++ b/libs/remix-ui/solidity-compiler/src/lib/contract-selection.tsx @@ -5,11 +5,9 @@ import { PublishToStorage } from '@remix-ui/publish-to-storage' import './css/style.css' export const ContractSelection = (props: ContractSelectionProps) => { - const { contractMap } = props - const [state, setState] = useState({ - contractList: null, - selectedContract: '' - }) + const { contractMap, fileProvider, fileManager, contractsDetails } = props + const [contractList, setContractList] = useState([]) + const [selectedContract, setSelectedContract] = useState('') useEffect(() => { const contractList = contractMap ? Object.keys(contractMap).map((key) => ({ @@ -17,9 +15,7 @@ export const ContractSelection = (props: ContractSelectionProps) => { file: getFileName(contractMap[key].file) })) : [] - setState(prevState => { - return { ...prevState, contractList } - }) + setContractList(contractList) }, []) // Return the file name of a path: ex "browser/ballot.sol" -> "ballot.sol" const getFileName = (path) => { @@ -29,9 +25,7 @@ export const ContractSelection = (props: ContractSelectionProps) => { } const selectContract = (contractName: string) => { - setState(prevState => { - return { ...prevState, selectedContract: contractName } - }) + setSelectedContract(contractName) } const handlePublishToStorage = (type) => { @@ -60,12 +54,15 @@ export const ContractSelection = (props: ContractSelectionProps) => { } const getContractProperty = (property) => { - // if (!this.selectedContract) throw new Error('No contract compiled yet') - // const contractProperties = this.data.contractsDetails[this.selectedContract] - // return contractProperties[property] || null + if (!selectedContract) throw new Error('No contract compiled yet') + const contractProperties = contractsDetails[selectedContract] + + return contractProperties[property] || null } const details = () => { + if (!selectedContract) throw new Error('No contract compiled yet') + const help = { Assembly: 'Assembly opcodes describing the contract including corresponding solidity source code', Opcodes: 'Assembly opcodes describing the contract', @@ -80,17 +77,22 @@ export const ContractSelection = (props: ContractSelectionProps) => { swarmLocation: 'Swarm url where all metadata information can be found (contract needs to be published first)', web3Deploy: 'Copy/paste this code to any JavaScript/Web3 console to deploy this contract' } - if (!this.selectedContract) throw new Error('No contract compiled yet') - const contractProperties = this.data.contractsDetails[this.selectedContract] - const log = yo`
` + const contractProperties = contractsDetails[selectedContract] + const log =
+ Object.keys(contractProperties).map(propertyName => { - const copyDetails = yo`${copyToClipboard(() => contractProperties[propertyName])}` - const questionMark = yo`` + const copyDetails = { copyToClipboard(() => contractProperties[propertyName]) } + const questionMark = + log.appendChild(yo`
${propertyName} ${copyDetails} ${questionMark}
${this.insertValue(contractProperties, propertyName)}
`) }) + + return { + + } modalDialog(this.selectedContract, log, { label: '' }, { label: 'Close' }) } @@ -101,13 +103,13 @@ export const ContractSelection = (props: ContractSelectionProps) => { return ( // define swarm logo <> - { state.contractList.length ? + { contractList.length ?
{/* Select Compiler Version */}
diff --git a/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.css b/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.css deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx b/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx index f0572d59f5..ea82b23352 100644 --- a/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx +++ b/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx @@ -1,14 +1,14 @@ import React, { useState, useEffect } from 'react' // eslint-disable-line import { SolidityCompilerProps } from './types' import { CompilerContainer } from './compiler-container' // eslint-disable-line +import { ContractSelection } from './contract-selection' import { Toaster } from '@remix-ui/toaster' // eslint-disable-line import { ModalDialog } from '@remix-ui/modal-dialog' // eslint-disable-line -import { Renderer } from '@remix-ui/renderer' import './css/style.css' export const SolidityCompiler = (props: SolidityCompilerProps) => { - const { editor, config, queryParams, plugin, compileTabLogic, compiledFileName } = props + const { editor, config, queryParams, plugin, compileTabLogic, compiledFileName, fileProvider, fileManager, contractsDetails } = props const [state, setState] = useState({ contractsDetails: {}, eventHandlers: {}, @@ -66,7 +66,7 @@ export const SolidityCompiler = (props: SolidityCompilerProps) => { <>
- {/* ${this._view.contractSelection} */} +
diff --git a/libs/remix-ui/solidity-compiler/src/lib/types/index.ts b/libs/remix-ui/solidity-compiler/src/lib/types/index.ts index b0d701b9e1..8dba36f4bd 100644 --- a/libs/remix-ui/solidity-compiler/src/lib/types/index.ts +++ b/libs/remix-ui/solidity-compiler/src/lib/types/index.ts @@ -8,7 +8,8 @@ export interface SolidityCompilerProps { plugin: any, queryParams: any, compileTabLogic: any, - compiledFileName: string + compiledFileName: string, + contractsDetails: Record } export interface CompilerContainerProps { @@ -23,5 +24,7 @@ export interface CompilerContainerProps { export interface ContractSelectionProps { contractMap: { file: string - } + } | Record, + fileManager: any, + fileProvider: any }