cleanup and save config for next session

pull/5370/head
lianahus 3 years ago committed by yann300
parent ca70eae59f
commit e374916c99
  1. 1
      apps/remix-ide/src/app/panels/tab-proxy.js
  2. 2
      apps/remix-ide/src/app/plugins/config.ts
  3. 2
      apps/remix-ide/src/app/tabs/compile-tab.js
  4. 14
      apps/solidity-compiler/src/app/compiler.ts
  5. 2
      libs/remix-ui/run-tab/src/lib/components/instanceContainerUI.tsx
  6. 4
      libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
  7. 3
      libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts
  8. 13
      libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx
  9. 6
      libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx

@ -215,6 +215,7 @@ export class TabProxy extends Plugin {
}
renameTab (oldName, newName) {
// The new tab is being added by FileManager
this.removeTab(oldName)
}

@ -18,7 +18,7 @@ export class ConfigPlugin extends Plugin {
const queryParams = new QueryParams()
const params = queryParams.get()
const config = Registry.getInstance().get('config').api
let param = params[name] || config.get(name) || config.get('settings/' + name)
const param = params[name] || config.get(name) || config.get('settings/' + name)
if (param === 'true') return true
if (param === 'false') return false
return param

@ -135,8 +135,6 @@ class CompileTab extends CompilerApiMixin(ViewPlugin) { // implements ICompilerA
}
setCompilerParameters (params) {
console.log("compiler-tab.ts")
this.queryParams.update(params)
}

@ -6,19 +6,6 @@ import { CompilerApiMixin } from './compiler-api'
import { ICompilerApi } from '@remix-project/remix-lib-ts'
import { CompileTabLogic } from '@remix-ui/solidity-compiler'
const profile = {
name: 'solidity',
displayName: 'Solidity compiler',
icon: 'assets/img/solidity.webp',
description: 'Compile solidity contracts',
kind: 'compiler',
permission: true,
location: 'sidePanel',
documentation: 'https://remix-ide.readthedocs.io/en/latest/solidity_editor.html',
version: '0.0.1',
methods: ['getCompilationResult', 'compile', 'compileWithParameters', 'setCompilerConfig', 'compileFile', 'getCompilerState']
}
const defaultCompilerParameters = {
runs: '200',
optimize: false,
@ -52,7 +39,6 @@ export class CompilerClientApi extends CompilerApiMixin(PluginClient) implements
}
setCompilerParameters (params) {
console.log("compiler.ts")
for (const key of Object.keys(params)) {
localStorage.setItem(key, params[key])
}

@ -11,7 +11,7 @@ export function InstanceContainerUI (props: InstanceContainerProps) {
}
return (
<div className="udapp_instanceContainer border-0 list-group-item">
<div className="udapp_instanceContainer mt-3 border-0 list-group-item">
<label className="udapp_deployedContracts d-flex justify-content-between align-items-center pl-2 mb-0"
title="Autogenerated generic user interfaces for interaction with deployed contracts">
Deployed Contracts

@ -61,13 +61,11 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
}
})
api.setAppParameter('configFilePath', "/compiler_config.json")
api.setAppParameter('useFileConfiguration', false)
setShowFilePathInput(false)
}, [workspaceName])
useEffect(() => {
const listener = (event) => {
console.log("mouse event ", event)
if (configFilePathInput.current !== event.target) {
setShowFilePathInput(false)
return;
@ -194,9 +192,9 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
const toggleConfigType = () => {
setState(prevState => {
api.setAppParameter('useFileConfiguration', !state.useFileConfiguration)
return { ...prevState, useFileConfiguration: !state.useFileConfiguration }
})
api.setAppParameter('useFileConfiguration', state.useFileConfiguration)
}
const openFile = async () => {

@ -49,8 +49,7 @@ export class CompileTabLogic {
this.compiler.set('evmVersion', this.evmVersion)
//this.useFileConfiguration = this.api.getCompilerParameters().useFileConfiguration
console.log("logic this.configFilePath ", this.configFilePath)
console.log("logic this.api.getCompilerParameters().configFilePath ", this.api.getCompilerParameters().configFilePath)
console.log("logic this.api.getCompilerParameters().configFilePath ", this.api.getCompilerParameters().useFileConfiguration)
this.configFilePath = this.api.getCompilerParameters().configFilePath
this.language = getValidLanguage(this.api.getCompilerParameters().language)
if (this.language != null) {

@ -151,7 +151,18 @@ export const SolidityCompiler = (props: SolidityCompilerProps) => {
return (
<>
<div id="compileTabView">
<CompilerContainer api={api} isHardhatProject={state.isHardhatProject} workspaceName={state.workspaceName} isTruffleProject={state.isTruffleProject} compileTabLogic={compileTabLogic} tooltip={toast} modal={modal} compiledFileName={currentFile} updateCurrentVersion={updateCurrentVersion} configurationSettings={configurationSettings} />
<CompilerContainer
api={api}
isHardhatProject={state.isHardhatProject}
workspaceName={state.workspaceName}
isTruffleProject={state.isTruffleProject}
compileTabLogic={compileTabLogic}
tooltip={toast}
modal={modal}
compiledFileName={currentFile}
updateCurrentVersion={updateCurrentVersion}
configurationSettings={configurationSettings}
/>
{ contractsFile[currentFile] && contractsFile[currentFile].contractsDetails && <ContractSelection api={api} contractsDetails={contractsFile[currentFile].contractsDetails} contractList={contractsFile[currentFile].contractList} modal={modal} /> }
{ compileErrors[currentFile] &&
<div className="remixui_errorBlobs p-4" data-id="compiledErrors">

@ -228,9 +228,9 @@ export function Workspace () {
</div>
</header>
</div>
<div className='h-100 remixui_fileExplorerTree'>
<div className='h-100'>
<div className='pl-2 h-100 remixui_treeview' data-id='filePanelFileExplorerTree'>
<div className='remixui_fileExplorerTree'>
<div>
<div className='pl-2 remixui_treeview' data-id='filePanelFileExplorerTree'>
{ (global.fs.mode === 'browser') && (currentWorkspace !== NO_WORKSPACE) &&
<FileExplorer
name={currentWorkspace}

Loading…
Cancel
Save