-
-
`
this.renderComponent()
return this.el
@@ -101,11 +94,13 @@ class CompileTab extends CompilerApiMixin(ViewPlugin) { // implements ICompilerA
super.setCompilerConfig(settings)
this.renderComponent()
// @todo(#2875) should use loading compiler return value to check whether the compiler is loaded instead of "setInterval"
- addTooltip(yo`${this.currentRequest.from} is updating the Solidity compiler configuration.
`)
+ const value = JSON.stringify(settings, null, '\t')
+
+ this.call('notification', 'toast', compilerConfigChangedToastMsg(this.currentRequest.from, value))
}
compile (fileName) {
- addTooltip(yo`${JSON.stringify(settings, null, '\t')}${this.currentRequest.from} is requiring to compile ${fileName}
`)
+ this.call('notification', 'toast', compileToastMsg(this.currentRequest.from, fileName))
super.compile(fileName)
}
diff --git a/apps/remix-ide/src/app/tabs/debugger-tab.js b/apps/remix-ide/src/app/tabs/debugger-tab.js
index 97fc748e91..741a433795 100644
--- a/apps/remix-ide/src/app/tabs/debugger-tab.js
+++ b/apps/remix-ide/src/app/tabs/debugger-tab.js
@@ -1,14 +1,12 @@
-import toaster from '../ui/tooltip'
import { DebuggerUI } from '@remix-ui/debugger-ui' // eslint-disable-line
import { DebuggerApiMixin } from '@remixproject/debugger-plugin'
import { ViewPlugin } from '@remixproject/engine-web'
import * as packageJson from '../../../../../package.json'
import React from 'react' // eslint-disable-line
import ReactDOM from 'react-dom'
-import modalDialogCustom from '../ui/modal-dialog-custom'
import * as remixBleach from '../../lib/remixBleach'
+import { compilationFinishedToastMsg, compilingToastMsg, localCompilationToastMsg, notFoundToastMsg, sourceVerificationNotAvailableToastMsg } from '@remix-ui/helper'
const css = require('./styles/debugger-tab-styles')
-const yo = require('yo-yo')
const profile = {
name: 'debugger',
@@ -26,46 +24,45 @@ const profile = {
export class DebuggerTab extends DebuggerApiMixin(ViewPlugin) {
constructor () {
super(profile)
- this.el = null
+ this.el = document.createElement('div')
+ this.el.setAttribute('id', 'debugView')
+ this.el.classList.add(css.debuggerTabView)
this.initDebuggerApi()
}
render () {
- if (this.el) return this.el
-
- this.el = yo`
-
-
-
`
-
this.on('fetchAndCompile', 'compiling', (settings) => {
- toaster(yo`Recompiling and debugging with params
`)
+ settings = JSON.stringify(settings, null, '\t')
+ this.call('notification', 'toast', compilingToastMsg(settings))
})
this.on('fetchAndCompile', 'compilationFailed', (data) => {
- toaster(yo`${JSON.stringify(settings, null, '\t')}Compilation failed... continuing without source code debugging.
`)
+ this.call('notification', 'toast', compilationFinishedToastMsg())
})
this.on('fetchAndCompile', 'notFound', (contractAddress) => {
- toaster(yo`Contract ${contractAddress} not found in source code repository continuing without source code debugging.
`)
+ this.call('notification', 'toast', notFoundToastMsg(contractAddress))
})
this.on('fetchAndCompile', 'usingLocalCompilation', (contractAddress) => {
- toaster(yo`Using compilation result from Solidity module
`)
+ this.call('notification', 'toast', localCompilationToastMsg())
})
this.on('fetchAndCompile', 'sourceVerificationNotAvailable', () => {
- toaster(yo`Source verification plugin not activated or not available. continuing without source code debugging.
`)
+ this.call('notification', 'toast', sourceVerificationNotAvailableToastMsg())
})
this.renderComponent()
-
return this.el
}
showMessage (title, message) {
try {
- modalDialogCustom.alert(title, remixBleach.sanitize(message))
+ this.call('notification', 'alert', {
+ id: 'debuggerTabShowMessage',
+ title,
+ message: remixBleach.sanitize(message)
+ })
} catch (e) {
console.log(e)
}
diff --git a/apps/remix-ide/src/app/tabs/hardhat-provider.tsx b/apps/remix-ide/src/app/tabs/hardhat-provider.tsx
index abb5eabddf..1ca0547d9a 100644
--- a/apps/remix-ide/src/app/tabs/hardhat-provider.tsx
+++ b/apps/remix-ide/src/app/tabs/hardhat-provider.tsx
@@ -66,7 +66,7 @@ export class HardhatProvider extends Plugin {
value = await ((): Promise${text}
`, null, { label: null })
- return modal('Alert', yo`${title}
`, null, { label: null })
- },
- prompt: function (title, text, inputValue, ok, cancel, focus) {
- return prompt(title, text, false, inputValue, ok, cancel, focus)
- },
- promptPassphrase: function (title, text, inputValue, ok, cancel) {
- return prompt(title, text, true, inputValue, ok, cancel)
- },
- promptPassphraseCreation: function (ok, cancel) {
- var text = 'Please provide a Passphrase for the account creation'
- var input = yo`
-
-
-
-
- -
- `
- return modal(null, yo`-
- -
${text}
`,
- {
- fn: () => {
- if (typeof ok === 'function') {
- if (input.querySelector('#prompt1').value === input.querySelector('#prompt2').value) {
- ok(null, input.querySelector('#prompt1').value)
- } else {
- ok('Passphase does not match')
- }
- }
- }
- },
- {
- fn: () => {
- if (typeof cancel === 'function') cancel()
- }
- }
- )
- },
- promptMulti: function ({ title, text, inputValue }, ok, cancel) {
- if (!inputValue) inputValue = ''
- const input = yo`
-
- `
- return modal(title, yo`${input}
${text}
`,
- {
- fn: () => { if (typeof ok === 'function') ok(document.getElementById('prompt_text').value) }
- },
- {
- fn: () => { if (typeof cancel === 'function') cancel() }
- }
- )
- },
- confirm: function (title, text, ok, cancel) {
- return modal(title, yo`${input}
${text}
`,
- {
- fn: () => { if (typeof ok === 'function') ok() }
- },
- {
- fn: () => { if (typeof cancel === 'function') cancel() }
- }
- )
- }
-}
-
-const validateInput = (e) => {
- if (!document.getElementById('modal-footer-ok')) return
-
- if (e.target.value === '') {
- document.getElementById('modal-footer-ok').classList.add('disabled')
- document.getElementById('modal-footer-ok').style.pointerEvents = 'none'
- } else {
- document.getElementById('modal-footer-ok').classList.remove('disabled')
- document.getElementById('modal-footer-ok').style.pointerEvents = 'auto'
- }
-}
-
-function prompt (title, text, hidden, inputValue, ok, cancel, focus) {
- if (!inputValue) inputValue = ''
- var type = hidden ? 'password' : 'text'
- var input = yo`
-
- `
-
- modal(title, yo`${text}
`,
- {
- fn: () => { if (typeof ok === 'function') ok(document.getElementById('prompt_text').value) }
- },
- {
- fn: () => { if (typeof cancel === 'function') cancel() }
- },
- focus ? '#prompt_text' : undefined
- )
-}
diff --git a/apps/remix-ide/src/app/ui/modaldialog.js b/apps/remix-ide/src/app/ui/modaldialog.js
deleted file mode 100644
index 1aeae287a4..0000000000
--- a/apps/remix-ide/src/app/ui/modaldialog.js
+++ /dev/null
@@ -1,150 +0,0 @@
-var yo = require('yo-yo')
-var css = require('./styles/modaldialog-styles')
-
-let incomingModal = false // in case modals are queued, ensure we are not hiding the last one.
-module.exports = (title, content, ok, cancel, focusSelector, opts) => {
- let agreed = true
- let footerIsActive = false
- opts = opts || {}
- var container = document.getElementById('modal-dialog')
- if (!container) {
- document.querySelector('body').appendChild(html(opts))
- container = document.getElementById('modal-dialog')
- incomingModal = false
- } else incomingModal = true
-
- var closeDiv = document.getElementById('modal-close')
- if (opts.hideClose) closeDiv.style.display = 'none'
-
- var okDiv = document.getElementById('modal-footer-ok')
- okDiv.innerHTML = (ok && ok.label !== undefined) ? ok.label : 'OK'
- okDiv.style.display = okDiv.innerHTML === '' ? 'none' : 'inline-block'
-
- var cancelDiv = document.getElementById('modal-footer-cancel')
- cancelDiv.innerHTML = (cancel && cancel.label !== undefined) ? cancel.label : 'Cancel'
- cancelDiv.style.display = cancelDiv.innerHTML === '' ? 'none' : 'inline-block'
-
- var modal = document.getElementById('modal-body-id')
- var modalTitle = document.getElementById('modal-title-h6')
-
- modalTitle.innerHTML = ''
- if (title) modalTitle.innerText = title
-
- modal.innerHTML = ''
- if (content) modal.appendChild(content)
-
- setFocusOn('ok')
-
- show()
-
- function setFocusOn (btn) {
- var okDiv = document.getElementById('modal-footer-ok')
- var cancelDiv = document.getElementById('modal-footer-cancel')
- if (btn === 'ok') {
- okDiv.className = okDiv.className.replace(/\bbtn-light\b/g, 'btn-dark')
- cancelDiv.className = cancelDiv.className.replace(/\bbtn-dark\b/g, 'btn-light')
- } else {
- cancelDiv.className = cancelDiv.className.replace(/\bbtn-light\b/g, 'btn-dark')
- okDiv.className = okDiv.className.replace(/\bbtn-dark\b/g, 'btn-light')
- }
- }
-
- function okListener () {
- removeEventListener()
- if (ok && ok.fn && agreed) ok.fn()
- if (!incomingModal) hide()
- incomingModal = false
- }
-
- function cancelListener () {
- removeEventListener()
- if (cancel && cancel.fn) cancel.fn()
- if (!incomingModal) hide()
- incomingModal = false
- }
-
- function modalKeyEvent (e) {
- if (e.keyCode === 27) { // Esc
- cancelListener()
- } else if (e.keyCode === 13) { // Enter
- e.preventDefault()
- okListener()
- } else if (e.keyCode === 37 && footerIsActive) { // Arrow Left
- e.preventDefault()
- agreed = true
- setFocusOn('ok')
- } else if (e.keyCode === 39 && footerIsActive) { // Arrow Right
- e.preventDefault()
- agreed = false
- setFocusOn('cancel')
- }
- }
-
- function hide () {
- if (!container) return
- container.style.display = 'none'
- if (container.parentElement) container.parentElement.removeChild(container)
- container = null
- incomingModal = false
- }
-
- function show () {
- if (!container) return
- container.style.display = 'block'
- if (focusSelector) {
- const focusTarget = document.querySelector(`.modal ${focusSelector}`)
- if (focusTarget) {
- focusTarget.focus()
- if (typeof focusTarget.setSelectionRange === 'function') {
- focusTarget.setSelectionRange(0, focusTarget.value.length)
- }
- }
- }
- }
-
- function removeEventListener () {
- okDiv.removeEventListener('click', okListener)
- cancelDiv.removeEventListener('click', cancelListener)
- closeDiv.removeEventListener('click', cancelListener)
- document.removeEventListener('keydown', modalKeyEvent)
- if (document.getElementById('modal-background')) {
- document.getElementById('modal-background').removeEventListener('click', cancelListener)
- }
- }
- okDiv.addEventListener('click', okListener)
- cancelDiv.addEventListener('click', cancelListener)
- closeDiv.addEventListener('click', cancelListener)
- document.addEventListener('keydown', modalKeyEvent)
-
- const modalDialog = document.getElementById('modal-dialog')
- if (modalDialog) {
- modalDialog.addEventListener('click', (e) => {
- footerIsActive = document.activeElement === modalDialog
- if (e.toElement === modalDialog) {
- cancelListener() // click is outside of modal-content
- }
- })
- }
- return { container, okListener, cancelListener, hide }
-}
-
-function html (opts) {
- return yo`
- ${input}
-
`
-}
diff --git a/apps/remix-ide/src/app/ui/persmission-handler.js b/apps/remix-ide/src/app/ui/persmission-handler.js
deleted file mode 100644
index f3f10b5b63..0000000000
--- a/apps/remix-ide/src/app/ui/persmission-handler.js
+++ /dev/null
@@ -1,202 +0,0 @@
-import Registry from '../state/registry'
-
-/* global localStorage */
-const yo = require('yo-yo')
-const csjs = require('csjs-inject')
-const addTooltip = require('./tooltip')
-const modalDialog = require('./modaldialog')
-
-const css = csjs`
-.permission h4 {
- text-transform: uppercase;
- text-align: center;
-}
-.permission h6 {
- text-transform: uppercase;
-}
-.remember {
- display: flex;
- justify-content: space-between;
- align-items: center;
-}
-.images {
- display: flex;
- justify-content: center;
- align-items: center;
- padding: 10px;
-}
-.images img {
- width: 40px;
- height: 40px;
-}
-.images i {
- margin: 0 20px;
-}
-`
-
-function notAllowWarning (from, to, method) {
- return `${from.displayName || from.name} is not allowed to call ${method} method of ${to.displayName || to.name}.`
-}
-
-export class PermissionHandler {
- constructor () {
- this.permissions = this._getFromLocal()
- this.currentVersion = 1
- // here we remove the old permissions saved before adding 'permissionVersion'
- // since with v1 the structure has been changed because of new engine ^0.2.0-alpha.6 changes
- if (!localStorage.getItem('permissionVersion')) {
- localStorage.setItem('plugins/permissions', '')
- localStorage.setItem('permissionVersion', this.currentVersion)
- }
- }
-
- _getFromLocal () {
- const permission = localStorage.getItem('plugins/permissions')
- return permission ? JSON.parse(permission) : {}
- }
-
- persistPermissions () {
- const permissions = JSON.stringify(this.permissions)
- localStorage.setItem('plugins/permissions', permissions)
- }
-
- clear () {
- localStorage.removeItem('plugins/permissions')
- addTooltip('All Permissions have been reset')
- }
-
- /**
- * Show a message to ask the user for a permission
- * @param {PluginProfile} from The name and hash of the plugin that make the call
- * @param {ModuleProfile} to The name of the plugin that receive the call
- * @param {string} method The name of the function to be called
- * @param {string} message from the caller plugin to add more details if needed
- * @returns {Promise<{ allow: boolean; remember: boolean }} Answer from the user to the permission
- */
- async openPermission (from, to, method, message) {
- return new Promise((resolve, reject) => {
- modalDialog(
- `Permission needed for ${to.displayName || to.name}`,
- this.form(from, to, method, message),
- {
- label: 'Accept',
- fn: () => {
- if (this.permissions[to.name][method][from.name]) {
- this.permissions[to.name][method][from.name] = {
- allow: true,
- hash: from.hash
- }
- this.persistPermissions()
- }
- resolve(true)
- }
- },
- {
- label: 'Decline',
- fn: () => {
- if (this.permissions[to.name][method][from.name]) {
- this.permissions[to.name][method][from.name] = {
- allow: false,
- hash: from.hash
- }
- this.persistPermissions()
- }
- reject(notAllowWarning(from, to, method))
- }
- }
- )
- })
- }
-
- /**
- * Check if a plugin has the permission to call another plugin and askPermission if needed
- * @param {PluginProfile} from the profile of the plugin that make the call
- * @param {ModuleProfile} to The profile of the module that receive the call
- * @param {string} method The name of the function to be called
- * @param {string} message from the caller plugin to add more details if needed
- * @returns {Promise
-
-
-
-
- ` : ''
- return yo`
-
- `
- }
-}
diff --git a/apps/remix-ide/src/app/ui/tooltip.js b/apps/remix-ide/src/app/ui/tooltip.js
deleted file mode 100644
index 700a08ef56..0000000000
--- a/apps/remix-ide/src/app/ui/tooltip.js
+++ /dev/null
@@ -1,110 +0,0 @@
-/* global Element */
-var yo = require('yo-yo')
-var css = require('./styles/tooltip-styles')
-var modal = require('./modal-dialog-custom')
-
-/**
- * Open a tooltip
- * @param {string} tooltipText The text shown by the tooltip
- * @param {function} [action] Returns An HTMLElement to display for action
- */
-module.exports = function addTooltip (tooltipText, action, opts) {
- action = action || function () { return yo`` }
- const t = new Toaster()
- return t.render(tooltipText, action(t), opts)
-}
-
-class Toaster {
- hide () {
- if (this.id) clearTimeout(this.id)
- setTimeout(() => {
- // remove from body after the animation is finished
- if (this.tooltip.parentElement) this.tooltip.parentElement.removeChild(this.tooltip)
- }, 2000)
- animation(this.tooltip, css.animateTop.className)
- }
-
- render (tooltipText, actionElement, opts) {
- opts = defaultOptions(opts)
- let canShorten = true
- if (tooltipText instanceof Element) {
- canShorten = false
- } else {
- if (typeof tooltipText === 'object') {
- if (tooltipText.message) {
- tooltipText = tooltipText.message
- } else {
- try {
- tooltipText = JSON.stringify(tooltipText)
- } catch (e) {
- }
- }
- }
- }
-
- return new Promise((resolve, reject) => {
- const shortTooltipText = (canShorten && tooltipText.length > 201) ? tooltipText.substring(0, 200) + '...' : tooltipText
- this.resolveFn = resolve
-
- function showFullMessage () {
- modal.alert(tooltipText)
- }
-
- function closeTheToaster (self) {
- self.hide()
- over()
- resolve()
- }
- const button = tooltipText.length > 201 ? yo`
-
- ` : ''
-
- this.tooltip = yo`
- Description
-${message}
- { over() }} onmouseleave=${() => { out() }}>
-
- ${shortTooltipText}
- ${button}
- ${actionElement}
-
-
-
-
-
`
- const timeOut = () => {
- return setTimeout(() => {
- if (this.id) {
- this.hide()
- resolve()
- }
- }, opts.time)
- }
- const over = () => {
- if (this.id) {
- clearTimeout(this.id)
- this.id = null
- }
- }
- const out = () => {
- if (!this.id) this.id = timeOut()
- }
- this.id = timeOut()
- document.body.appendChild(this.tooltip)
- animation(this.tooltip, css.animateBottom.className)
- })
- }
-}
-
-const defaultOptions = (opts) => {
- opts = opts || {}
- return {
- time: opts.time || 7000
- }
-}
-
-const animation = (tooltip, anim) => {
- tooltip.classList.remove(css.animateTop.className)
- tooltip.classList.remove(css.animateBottom.className)
- // eslint-disable-next-line
- void tooltip.offsetWidth // trick for restarting the animation
- tooltip.classList.add(anim)
-}
diff --git a/apps/remix-ide/src/remixAppManager.js b/apps/remix-ide/src/remixAppManager.js
index d3b4eff0b3..d87b6ee1a9 100644
--- a/apps/remix-ide/src/remixAppManager.js
+++ b/apps/remix-ide/src/remixAppManager.js
@@ -2,19 +2,18 @@
import { PluginManager } from '@remixproject/engine'
import { EventEmitter } from 'events'
import QueryParams from './lib/query-params'
-import { PermissionHandler } from './app/ui/persmission-handler'
import { IframePlugin } from '@remixproject/engine-web'
const _paq = window._paq = window._paq || []
const requiredModules = [ // services + layout views + system views
'manager', 'config', 'compilerArtefacts', 'compilerMetadata', 'contextualListener', 'editor', 'offsetToLineColumnConverter', 'network', 'theme',
'fileManager', 'contentImport', 'blockchain', 'web3Provider', 'scriptRunner', 'fetchAndCompile', 'mainPanel', 'hiddenPanel', 'sidePanel', 'menuicons',
- 'filePanel', 'terminal', 'settings', 'pluginManager', 'tabs', 'udapp', 'dGitProvider', 'solidity-logic', 'gistHandler', 'layout', 'modal', 'walkthrough']
+ 'filePanel', 'terminal', 'settings', 'pluginManager', 'tabs', 'udapp', 'dGitProvider', 'solidity-logic', 'gistHandler', 'layout', 'notification', 'permissionhandler', 'walkthrough']
const dependentModules = ['git', 'hardhat', 'slither'] // module which shouldn't be manually activated (e.g git is activated by remixd)
export function isNative (name) {
- const nativePlugins = ['vyper', 'workshops', 'debugger', 'remixd', 'menuicons', 'solidity', 'hardhat-provider', 'solidityStaticAnalysis', 'solidityUnitTesting', 'layout', 'modal']
+ const nativePlugins = ['vyper', 'workshops', 'debugger', 'remixd', 'menuicons', 'solidity', 'hardhat-provider', 'solidityStaticAnalysis', 'solidityUnitTesting', 'layout', 'notification']
return nativePlugins.includes(name) || requiredModules.includes(name)
}
@@ -40,7 +39,6 @@ export class RemixAppManager extends PluginManager {
this.event = new EventEmitter()
this.pluginsDirectory = 'https://raw.githubusercontent.com/ethereum/remix-plugins-directory/master/build/metadata.json'
this.pluginLoader = new PluginLoader()
- this.permissionHandler = new PermissionHandler()
}
async canActivatePlugin (from, to) {
@@ -72,7 +70,7 @@ export class RemixAppManager extends PluginManager {
return true
}
// ask the user for permission
- return await this.permissionHandler.askPermission(this.profiles[from], this.profiles[to], method, message)
+ return await this.call('permissionhandler', 'askPermission', this.profiles[from], this.profiles[to], method, message)
}
onPluginActivated (plugin) {
diff --git a/libs/remix-core-plugin/src/lib/gist-handler.ts b/libs/remix-core-plugin/src/lib/gist-handler.ts
index 6c22c29aa8..23ea64b937 100644
--- a/libs/remix-core-plugin/src/lib/gist-handler.ts
+++ b/libs/remix-core-plugin/src/lib/gist-handler.ts
@@ -45,7 +45,7 @@ export class GistHandler extends Plugin {
setTimeout(() => reject(new Error('Hide')), 0)
}
}
- this.call('modal', 'modal', modalContent)
+ this.call('notification', 'modal', modalContent)
})
})()
} catch (e) {
@@ -63,7 +63,7 @@ export class GistHandler extends Plugin {
title: 'Gist load error',
message: 'Error while loading gist. Please provide a valid Gist ID or URL.'
}
- this.call('modal', 'alert', modalContent)
+ this.call('notification', 'alert', modalContent)
}
} else {
const modalContent = {
@@ -71,7 +71,7 @@ export class GistHandler extends Plugin {
title: 'Gist load error',
message: 'Error while loading gist. Id cannot be empty.'
}
- this.call('modal', 'alert', modalContent)
+ this.call('notification', 'alert', modalContent)
}
return loadingFromGist
} else {
@@ -97,7 +97,7 @@ export class GistHandler extends Plugin {
modalType: 'alert',
okLabel: 'OK'
}
- await this.call('modal', 'modal', modalContent)
+ await this.call('notification', 'modal', modalContent)
return
}
} catch (e: any) {
@@ -107,7 +107,7 @@ export class GistHandler extends Plugin {
message: e.message
}
- await this.call('modal', 'alert', modalContent)
+ await this.call('notification', 'alert', modalContent)
return
}
@@ -124,7 +124,7 @@ export class GistHandler extends Plugin {
message: errorSavingFiles.message || errorSavingFiles
}
- this.call('modal', 'alert', modalContent)
+ this.call('notification', 'alert', modalContent)
}
})
})
diff --git a/libs/remix-tests/package.json b/libs/remix-tests/package.json
index 2055922334..610720e923 100644
--- a/libs/remix-tests/package.json
+++ b/libs/remix-tests/package.json
@@ -47,7 +47,7 @@
"axios": ">=0.21.1",
"change-case": "^3.0.1",
"color-support": "^1.1.3",
- "colors": "^1.1.2",
+ "colors": "1.4.0",
"commander": "^2.13.0",
"deep-equal": "^1.0.1",
"ethereumjs-util": "^7.0.10",
diff --git a/libs/remix-ui/app/src/lib/remix-app/actions/modals.ts b/libs/remix-ui/app/src/lib/remix-app/actions/modals.ts
index 95400ca77b..3a1788a8ad 100644
--- a/libs/remix-ui/app/src/lib/remix-app/actions/modals.ts
+++ b/libs/remix-ui/app/src/lib/remix-app/actions/modals.ts
@@ -21,7 +21,7 @@ export const enum modalActionTypes {
type ModalPayload = {
[modalActionTypes.setModal]: AppModal
[modalActionTypes.handleHideModal]: any
- [modalActionTypes.setToast]: string
+ [modalActionTypes.setToast]: string | JSX.Element
[modalActionTypes.handleToaster]: any
}
diff --git a/libs/remix-ui/app/src/lib/remix-app/components/modals/modal-wrapper.tsx b/libs/remix-ui/app/src/lib/remix-app/components/modals/modal-wrapper.tsx
index cff3215e1f..8d36d75cda 100644
--- a/libs/remix-ui/app/src/lib/remix-app/components/modals/modal-wrapper.tsx
+++ b/libs/remix-ui/app/src/lib/remix-app/components/modals/modal-wrapper.tsx
@@ -14,13 +14,21 @@ const ModalWrapper = (props: ModalWrapperProps) => {
const onFinishPrompt = async () => {
if (ref.current === undefined) {
- props.okFn()
+ onOkFn()
} else {
// @ts-ignore: Object is possibly 'null'.
- props.okFn(ref.current.value)
+ (props.okFn) ? props.okFn(ref.current.value) : props.resolve(ref.current.value)
}
}
+ const onOkFn = async () => {
+ (props.okFn) ? props.okFn() : props.resolve(true)
+ }
+
+ const onCancelFn = async () => {
+ (props.cancelFn) ? props.cancelFn() : props.resolve(false)
+ }
+
const createModalMessage = (defaultValue: string) => {
return (
<>
@@ -37,15 +45,24 @@ const ModalWrapper = (props: ModalWrapperProps) => {
setState({
...props,
okFn: onFinishPrompt,
+ cancelFn: onCancelFn,
message: createModalMessage(props.defaultValue)
})
break
default:
- setState({ ...props })
+ setState({
+ ...props,
+ okFn: (onOkFn),
+ cancelFn: onCancelFn
+ })
break
}
} else {
- setState({ ...props })
+ setState({
+ ...props,
+ okFn: onOkFn,
+ cancelFn: onCancelFn
+ })
}
}, [props])
diff --git a/libs/remix-ui/app/src/lib/remix-app/context/provider.tsx b/libs/remix-ui/app/src/lib/remix-app/context/provider.tsx
index 73a3a97305..ab444470f6 100644
--- a/libs/remix-ui/app/src/lib/remix-app/context/provider.tsx
+++ b/libs/remix-ui/app/src/lib/remix-app/context/provider.tsx
@@ -11,14 +11,16 @@ export const ModalProvider = ({ children = [], reducer = modalReducer, initialSt
const modal = (data: AppModal) => {
const { id, title, message, okLabel, okFn, cancelLabel, cancelFn, modalType, defaultValue, hideFn } = data
- dispatch({
- type: modalActionTypes.setModal,
- payload: { id, title, message, okLabel, okFn, cancelLabel, cancelFn, modalType: modalType || ModalTypes.default, defaultValue: defaultValue, hideFn }
+ return new Promise((resolve, reject) => {
+ dispatch({
+ type: modalActionTypes.setModal,
+ payload: { id, title, message, okLabel, okFn, cancelLabel, cancelFn, modalType: modalType || ModalTypes.default, defaultValue: defaultValue, hideFn, resolve }
+ })
})
}
const alert = (data: AlertModal) => {
- modal({ id: data.id, title: data.title || 'Alert', message: data.message || data.title, okLabel: 'OK', okFn: (value?:any) => {}, cancelLabel: '', cancelFn: () => {} })
+ return modal({ id: data.id, title: data.title || 'Alert', message: data.message || data.title, okLabel: 'OK', okFn: (value?:any) => {}, cancelLabel: '', cancelFn: () => {} })
}
const handleHideModal = () => {
@@ -28,7 +30,7 @@ export const ModalProvider = ({ children = [], reducer = modalReducer, initialSt
})
}
- const toast = (message: string) => {
+ const toast = (message: string | JSX.Element) => {
dispatch({
type: modalActionTypes.setToast,
payload: message
diff --git a/libs/remix-ui/app/src/lib/remix-app/interface/index.ts b/libs/remix-ui/app/src/lib/remix-app/interface/index.ts
index dcfcd7a1eb..0432c71e2d 100644
--- a/libs/remix-ui/app/src/lib/remix-app/interface/index.ts
+++ b/libs/remix-ui/app/src/lib/remix-app/interface/index.ts
@@ -7,12 +7,13 @@ export interface AppModal {
// eslint-disable-next-line no-undef
message: string | JSX.Element
okLabel: string
- okFn: (value?:any) => void
+ okFn?: (value?:any) => void
cancelLabel: string
- cancelFn: () => void,
+ cancelFn?: () => void,
modalType?: ModalTypes,
defaultValue?: string
- hideFn?: () => void
+ hideFn?: () => void,
+ resolve?: (value?:any) => void
}
export interface AlertModal {
@@ -23,7 +24,7 @@ export interface AlertModal {
export interface ModalState {
modals: AppModal[],
- toasters: string[],
+ toasters: (string | JSX.Element)[],
focusModal: AppModal,
- focusToaster: string
+ focusToaster: string | JSX.Element
}
diff --git a/libs/remix-ui/app/src/lib/remix-app/reducer/modals.ts b/libs/remix-ui/app/src/lib/remix-app/reducer/modals.ts
index cf202585f4..d83b9792c7 100644
--- a/libs/remix-ui/app/src/lib/remix-app/reducer/modals.ts
+++ b/libs/remix-ui/app/src/lib/remix-app/reducer/modals.ts
@@ -19,7 +19,8 @@ export const modalReducer = (state: ModalState = ModalInitialState, action: Moda
cancelFn: modalList[0].cancelFn,
modalType: modalList[0].modalType,
defaultValue: modalList[0].defaultValue,
- hideFn: modalList[0].hideFn
+ hideFn: modalList[0].hideFn,
+ resolve: modalList[0].resolve
}
modalList = modalList.slice()
@@ -31,6 +32,8 @@ export const modalReducer = (state: ModalState = ModalInitialState, action: Moda
case modalActionTypes.handleHideModal:
if (state.focusModal.hideFn) {
state.focusModal.hideFn()
+ } else if (state.focusModal.resolve) {
+ state.focusModal.resolve(undefined)
}
state.focusModal = { ...state.focusModal, hide: true, message: null }
return { ...state }
diff --git a/libs/remix-ui/clipboard/src/lib/copy-to-clipboard/copy-to-clipboard.tsx b/libs/remix-ui/clipboard/src/lib/copy-to-clipboard/copy-to-clipboard.tsx
index 88d91d3867..92ef7cf768 100644
--- a/libs/remix-ui/clipboard/src/lib/copy-to-clipboard/copy-to-clipboard.tsx
+++ b/libs/remix-ui/clipboard/src/lib/copy-to-clipboard/copy-to-clipboard.tsx
@@ -6,33 +6,43 @@ import { Placement } from 'react-bootstrap/esm/Overlay'
import './copy-to-clipboard.css'
interface ICopyToClipboard {
- content: any,
+ content?: any,
tip?: string,
icon?: string,
direction?: Placement,
className?: string,
title?: string,
- children?: JSX.Element
+ children?: JSX.Element,
+ getContent?: () => {}
}
export const CopyToClipboard = (props: ICopyToClipboard) => {
- let { content, tip = 'Copy', icon = 'fa-copy', direction = 'right', children, ...otherProps } = props
+ let { content, tip = 'Copy', icon = 'fa-copy', direction = 'right', children, getContent, ...otherProps } = props
const [message, setMessage] = useState(tip)
- const handleClick = (e) => {
- if (content && content !== '') { // module `copy` keeps last copied thing in the memory, so don't show tooltip if nothing is copied, because nothing was added to memory
- try {
- if (typeof content !== 'string') {
- content = JSON.stringify(content, null, '\t')
- }
- copy(content)
- setMessage('Copied')
- } catch (e) {
- console.error(e)
+
+ const copyData = () => {
+ try {
+ if (content === '') {
+ setMessage('Cannot copy empty content!')
+ return
+ }
+ if (typeof content !== 'string') {
+ content = JSON.stringify(content, null, '\t')
}
+ copy(content)
+ setMessage('Copied')
+ } catch (e) {
+ console.error(e)
+ }
+ }
+
+ const handleClick = (e) => {
+ if (content) { // module `copy` keeps last copied thing in the memory, so don't show tooltip if nothing is copied, because nothing was added to memory
+ copyData()
} else {
- setMessage('Cannot copy empty content!')
+ content = getContent && getContent()
+ copyData()
}
e.preventDefault()
- return false
}
const reset = () => {
diff --git a/libs/remix-ui/helper/src/index.ts b/libs/remix-ui/helper/src/index.ts
index 961f14639b..31c21f0564 100644
--- a/libs/remix-ui/helper/src/index.ts
+++ b/libs/remix-ui/helper/src/index.ts
@@ -1 +1,2 @@
export * from './lib/remix-ui-helper'
+export * from './lib/helper-components'
diff --git a/libs/remix-ui/helper/src/lib/helper-components.tsx b/libs/remix-ui/helper/src/lib/helper-components.tsx
new file mode 100644
index 0000000000..daa07cc110
--- /dev/null
+++ b/libs/remix-ui/helper/src/lib/helper-components.tsx
@@ -0,0 +1,55 @@
+import React from 'react'
+
+export const fileChangedToastMsg = (from: string, path: string) => (
+
+
+ {from}
+
+ is modifying
+ {path}
+
+
+)
+
+export const compilerConfigChangedToastMsg = (from: string, value: string) => (
+
+ { from } is updating the Solidity compiler configuration.
+
+)
+
+export const compileToastMsg = (from: string, fileName: string) => (
+ {value}
+
+ {from} is requiring to compile {fileName}
+
+)
+
+export const compilingToastMsg = (settings: string) => (
+
+ Recompiling and debugging with params
+
+)
+
+export const compilationFinishedToastMsg = () => (
+ {settings}
+ Compilation failed... continuing without source code debugging.
+
+)
+
+export const notFoundToastMsg = (address: string) => (
+
+ Contract {address} not found in source code repository continuing without source code debugging.
+
+)
+
+export const localCompilationToastMsg = () => (
+
+ Using compilation result from Solidity module
+
+)
+
+export const sourceVerificationNotAvailableToastMsg = () => (
+
+ Source verification plugin not activated or not available. continuing without source code debugging.
+
+)
\ No newline at end of file
diff --git a/libs/remix-ui/helper/tsconfig.json b/libs/remix-ui/helper/tsconfig.json
index f4023e39ff..d52e31ad74 100644
--- a/libs/remix-ui/helper/tsconfig.json
+++ b/libs/remix-ui/helper/tsconfig.json
@@ -1,5 +1,11 @@
{
"extends": "../../../tsconfig.base.json",
+ "compilerOptions": {
+ "jsx": "react",
+ "allowJs": true,
+ "esModuleInterop": true,
+ "allowSyntheticDefaultImports": true
+ },
"files": [],
"include": [],
"references": [
diff --git a/libs/remix-ui/modal-dialog/src/lib/types/index.ts b/libs/remix-ui/modal-dialog/src/lib/types/index.ts
index acb171fc0f..dd12c8e680 100644
--- a/libs/remix-ui/modal-dialog/src/lib/types/index.ts
+++ b/libs/remix-ui/modal-dialog/src/lib/types/index.ts
@@ -11,5 +11,6 @@ export interface ModalDialogProps {
showCancelIcon?: boolean,
hide?: boolean,
handleHide: (hideState?: boolean) => void,
- children?: React.ReactNode
+ children?: React.ReactNode,
+ resolve?: (value?:any) => void,
}
diff --git a/libs/remix-ui/permission-handler/.babelrc b/libs/remix-ui/permission-handler/.babelrc
new file mode 100644
index 0000000000..64a3748691
--- /dev/null
+++ b/libs/remix-ui/permission-handler/.babelrc
@@ -0,0 +1,4 @@
+{
+ "presets": ["@nrwl/react/babel"],
+ "plugins": []
+}
\ No newline at end of file
diff --git a/libs/remix-ui/permission-handler/.eslintrc.json b/libs/remix-ui/permission-handler/.eslintrc.json
new file mode 100644
index 0000000000..5a1c541d11
--- /dev/null
+++ b/libs/remix-ui/permission-handler/.eslintrc.json
@@ -0,0 +1,18 @@
+{
+ "extends": ["plugin:@nrwl/nx/react", "../../../.eslintrc"],
+ "ignorePatterns": ["!**/*"],
+ "overrides": [
+ {
+ "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+ "rules": {}
+ },
+ {
+ "files": ["*.ts", "*.tsx"],
+ "rules": {}
+ },
+ {
+ "files": ["*.js", "*.jsx"],
+ "rules": {}
+ }
+ ]
+}
\ No newline at end of file
diff --git a/libs/remix-ui/permission-handler/src/index.ts b/libs/remix-ui/permission-handler/src/index.ts
new file mode 100644
index 0000000000..dfa55cfc9d
--- /dev/null
+++ b/libs/remix-ui/permission-handler/src/index.ts
@@ -0,0 +1,2 @@
+export { default as PermissionHandlerDialog } from './lib/permission-dialog'
+export { PermissionHandlerValue, PermissionHandlerProps } from './interface/index'
diff --git a/libs/remix-ui/permission-handler/src/interface/index.ts b/libs/remix-ui/permission-handler/src/interface/index.ts
new file mode 100644
index 0000000000..a24c8570c6
--- /dev/null
+++ b/libs/remix-ui/permission-handler/src/interface/index.ts
@@ -0,0 +1,15 @@
+import { Profile } from '@remixproject/plugin-utils'
+
+export interface PermissionHandlerValue {
+ from: Profile,
+ to: Profile,
+ remember: boolean,
+ method: string,
+ message: string
+}
+
+export interface PermissionHandlerProps {
+ value: PermissionHandlerValue
+ theme: string
+ plugin: any
+}
diff --git a/libs/remix-ui/permission-handler/src/lib/permission-dialog.css b/libs/remix-ui/permission-handler/src/lib/permission-dialog.css
new file mode 100644
index 0000000000..68e0d845b5
--- /dev/null
+++ b/libs/remix-ui/permission-handler/src/lib/permission-dialog.css
@@ -0,0 +1,29 @@
+.permission h4 {
+ text-transform: uppercase;
+ text-align: center;
+ }
+ .permission h6 {
+ text-transform: uppercase;
+ }
+ .remember {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ }
+ .images {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ padding: 10px;
+ }
+ .images img {
+ width: 40px;
+ height: 40px;
+ }
+ .images i {
+ margin: 0 20px;
+ }
+
+ .invert {
+ filter: invert(1);
+ }
\ No newline at end of file
diff --git a/libs/remix-ui/permission-handler/src/lib/permission-dialog.tsx b/libs/remix-ui/permission-handler/src/lib/permission-dialog.tsx
new file mode 100644
index 0000000000..5d7928b2f4
--- /dev/null
+++ b/libs/remix-ui/permission-handler/src/lib/permission-dialog.tsx
@@ -0,0 +1,67 @@
+import React, { ChangeEventHandler, useContext, useEffect, useRef, useState } from 'react' // eslint-disable-line
+import { PermissionHandlerProps } from '../interface'
+import './permission-dialog.css'
+
+const PermissionHandlerDialog = (props: PermissionHandlerProps) => {
+ const { from, to, remember, method, message } = props.value
+ const [feedback, setFeedback] = useState
+
: null
+ }
+
+ return (Description
+{message}
+{text()} :
+{from.displayName}
+{from.description || No description Provided}
+{to.displayName} :
+{to.description || No description Provided}
+ {pluginMessage()} +
+ {rememberSwitch()}
+
+
+
+ {feedback}
+
-
diff --git a/libs/remix-ui/run-tab/src/lib/reducers/runTab.ts b/libs/remix-ui/run-tab/src/lib/reducers/runTab.ts
index 7ad0b0f500..9f0624d561 100644
--- a/libs/remix-ui/run-tab/src/lib/reducers/runTab.ts
+++ b/libs/remix-ui/run-tab/src/lib/reducers/runTab.ts
@@ -171,6 +171,11 @@ export const runTabInitialState: RunTabState = {
web3Dialog: null
}
+type AddProvider = {
+ name: string,
+ provider: any
+}
+
export const runTabReducer = (state: RunTabState = runTabInitialState, action: Action) => {
switch (action.type) {
case 'FETCH_ACCOUNTS_LIST_REQUEST': {
@@ -328,25 +333,32 @@ export const runTabReducer = (state: RunTabState = runTabInitialState, action: A
}
case 'ADD_PROVIDER': {
- const payload: string = action.payload
-
+ const payload: AddProvider = action.payload
+ const id = action.payload.name
+ state.providers.providerList.push({
+ content: payload.name,
+ dataId: id,
+ id,
+ title: payload.name,
+ value: id
+ })
return {
...state,
providers: {
...state.providers,
- providerList: { ...state.providers.providerList, payload }
+ providerList: state.providers.providerList
}
}
}
case 'REMOVE_PROVIDER': {
- const payload: string = action.payload
-
+ const id: string = action.payload
+ const providers = state.providers.providerList.filter((el) => el.id !== id)
return {
...state,
providers: {
...state.providers,
- providerList: delete state.providers.providerList[payload] ? state.providers.providerList : state.providers.providerList
+ providerList: providers
}
}
}
@@ -656,6 +668,13 @@ export const runTabReducer = (state: RunTabState = runTabInitialState, action: A
}
}
+ case 'RESET_STATE': {
+ return {
+ ...runTabInitialState,
+ ipfsChecked: state.ipfsChecked
+ }
+ }
+
default:
return state
}
diff --git a/libs/remix-ui/toaster/src/lib/toaster.tsx b/libs/remix-ui/toaster/src/lib/toaster.tsx
index d31476a424..571a0c4afa 100644
--- a/libs/remix-ui/toaster/src/lib/toaster.tsx
+++ b/libs/remix-ui/toaster/src/lib/toaster.tsx
@@ -5,19 +5,28 @@ import './toaster.css'
/* eslint-disable-next-line */
export interface ToasterProps {
- message: string
+ message: string | JSX.Element
timeOut?: number,
handleHide?: () => void
}
export const Toaster = (props: ToasterProps) => {
- const [state, setState] = useState({
+ const [state, setState] = useState<{
+ message: string | JSX.Element,
+ hide: boolean,
+ hiding: boolean,
+ timeOutId: any,
+ timeOut: number,
+ showModal: boolean,
+ showFullBtn: boolean
+ }>({
message: '',
hide: true,
hiding: false,
timeOutId: null,
timeOut: props.timeOut || 7000,
- showModal: false
+ showModal: false,
+ showFullBtn: false
})
useEffect(() => {
@@ -29,9 +38,15 @@ export const Toaster = (props: ToasterProps) => {
}, state.timeOut)
setState(prevState => {
- const shortTooltipText = props.message.length > 201 ? props.message.substring(0, 200) + '...' : props.message
+ if (typeof props.message === 'string' && (props.message.length > 201)) {
+ const shortTooltipText = props.message.substring(0, 200) + '...'
- return { ...prevState, hide: false, hiding: false, timeOutId, message: shortTooltipText }
+ return { ...prevState, hide: false, hiding: false, timeOutId, message: shortTooltipText }
+ } else {
+ const shortTooltipText = props.message
+
+ return { ...prevState, hide: false, hiding: false, timeOutId, message: shortTooltipText }
+ }
})
}
}, [props.message])
@@ -103,7 +118,7 @@ export const Toaster = (props: ToasterProps) => {
{ state.message }
- { (props.message.length > 201) && }
+ { state.showFullBtn && }
diff --git a/libs/remix-ui/workspace/src/lib/actions/events.ts b/libs/remix-ui/workspace/src/lib/actions/events.ts
index 0f9d7ba29f..7ea0b03053 100644
--- a/libs/remix-ui/workspace/src/lib/actions/events.ts
+++ b/libs/remix-ui/workspace/src/lib/actions/events.ts
@@ -1,7 +1,7 @@
import { extractParentFromKey } from '@remix-ui/helper'
import React from 'react'
import { action } from '../types'
-import { displayNotification, displayPopUp, fileAddedSuccess, fileRemovedSuccess, fileRenamedSuccess, folderAddedSuccess, loadLocalhostError, loadLocalhostRequest, loadLocalhostSuccess, removeContextMenuItem, rootFolderChangedSuccess, setContextMenuItem, setMode, setReadOnlyMode } from './payload'
+import { displayNotification, displayPopUp, fileAddedSuccess, fileRemovedSuccess, fileRenamedSuccess, folderAddedSuccess, loadLocalhostError, loadLocalhostRequest, loadLocalhostSuccess, removeContextMenuItem, removeFocus, rootFolderChangedSuccess, setContextMenuItem, setMode, setReadOnlyMode } from './payload'
import { addInputField, createWorkspace, deleteWorkspace, fetchWorkspaceDirectory, renameWorkspace, switchToWorkspace, uploadFile } from './workspace'
const LOCALHOST = ' - connect to localhost - '
@@ -45,6 +45,10 @@ export const listenOnPluginEvents = (filePanelPlugin) => {
plugin.on('fileManager', 'rootFolderChanged', async (path: string) => {
rootFolderChanged(path)
})
+
+ plugin.on('fileManager', 'fileClosed', async (file: string) => {
+ dispatch(removeFocus(file))
+ })
}
export const listenOnProviderEvents = (provider) => (reducerDispatch: React.Dispatch) => {
diff --git a/libs/remix-ui/workspace/src/lib/actions/payload.ts b/libs/remix-ui/workspace/src/lib/actions/payload.ts
index ee59ac24a3..a0ed0850cb 100644
--- a/libs/remix-ui/workspace/src/lib/actions/payload.ts
+++ b/libs/remix-ui/workspace/src/lib/actions/payload.ts
@@ -187,6 +187,13 @@ export const focusElement = (elements: { key: string, type: 'file' | 'folder' |
}
}
+export const removeFocus = (name: string) => {
+ return {
+ type: 'REMOVE_FOCUS_ELEMENT',
+ payload: name
+ }
+}
+
export const setContextMenuItem = (item: action) => {
return {
type: 'SET_CONTEXT_MENU_ITEM',
diff --git a/libs/remix-ui/workspace/src/lib/reducers/workspace.ts b/libs/remix-ui/workspace/src/lib/reducers/workspace.ts
index ef769f5c5b..a41365224b 100644
--- a/libs/remix-ui/workspace/src/lib/reducers/workspace.ts
+++ b/libs/remix-ui/workspace/src/lib/reducers/workspace.ts
@@ -497,6 +497,15 @@ export const browserReducer = (state = browserInitialState, action: Action) => {
}
}
+ case 'REMOVE_FOCUS_ELEMENT': {
+ const payload: string = action.payload
+
+ return {
+ ...state,
+ focusElement: state.focusElement.filter(element => element.key !== payload)
+ }
+ }
+
case 'SET_CONTEXT_MENU_ITEM': {
const payload = action.payload as action
diff --git a/nx.json b/nx.json
index 5f50461adc..7f7de57643 100644
--- a/nx.json
+++ b/nx.json
@@ -159,6 +159,9 @@
},
"remix-ui-run-tab": {
"tags": []
+ },
+ "remix-ui-permission-handler": {
+ "tags": []
}
},
"targetDependencies": {
diff --git a/package-lock.json b/package-lock.json
index bab7da51d1..021806d07c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9782,46 +9782,46 @@
"integrity": "sha512-IXf3XA7+XyN7CP9gGh/XB0UxVMlvARGEgGXLubFICsUMGz6Q+DU+i4gGlpOxTjKvXjkJDJC8YdqdKkDj9qZHEQ=="
},
"@remixproject/engine": {
- "version": "0.3.24",
- "resolved": "https://registry.npmjs.org/@remixproject/engine/-/engine-0.3.24.tgz",
- "integrity": "sha512-XVPaRIAwxTxEmc+u+bq9nIqUcP1NDdQFTm/8xmw8HcZicgagUW/y0RuLEMBj5GTGXF+EsljY27t6bPy7fmVHWQ==",
+ "version": "0.3.26",
+ "resolved": "https://registry.npmjs.org/@remixproject/engine/-/engine-0.3.26.tgz",
+ "integrity": "sha512-6Rq6aTUyhtXAaoQamAI8ocFSVy2txpGwu1aoYZGrqova/p/tRWn4/+PU713sffyiAQVBCk7C1z/5VKLm7tUYrQ==",
"requires": {
- "@remixproject/plugin-api": "0.3.24",
- "@remixproject/plugin-utils": "0.3.24"
+ "@remixproject/plugin-api": "0.3.26",
+ "@remixproject/plugin-utils": "0.3.26"
}
},
"@remixproject/engine-web": {
- "version": "0.3.24",
- "resolved": "https://registry.npmjs.org/@remixproject/engine-web/-/engine-web-0.3.24.tgz",
- "integrity": "sha512-6P2NLoL9KSa/84FumEM3QxvOW4g/hIEsq8NcbBA+/PHz9VnIRoxRg2K/jGJUHHqKw+dfoSdk5lQ+LkFQHcrp+w==",
+ "version": "0.3.26",
+ "resolved": "https://registry.npmjs.org/@remixproject/engine-web/-/engine-web-0.3.26.tgz",
+ "integrity": "sha512-QSW9KVOgHWuRDNqTZIp1jjBeDOXlXQZWYABgljTsC+Nig8EwlyRTfIza9PuCb+MDYT/kID8VgSPXnMrlOtvhjQ==",
"requires": {
- "@remixproject/engine": "0.3.24",
- "@remixproject/plugin-api": "0.3.24",
- "@remixproject/plugin-utils": "0.3.24"
+ "@remixproject/engine": "0.3.26",
+ "@remixproject/plugin-api": "0.3.26",
+ "@remixproject/plugin-utils": "0.3.26"
}
},
"@remixproject/plugin": {
- "version": "0.3.24",
- "resolved": "https://registry.npmjs.org/@remixproject/plugin/-/plugin-0.3.24.tgz",
- "integrity": "sha512-nGtt3IZA5X2kcXauu5h5P8EEoMtHbVGm5wWnv0c7aYYWbffhQdK8dqtNNEAtQavWrsp5TL61zekqpkFzgxVv9w==",
+ "version": "0.3.26",
+ "resolved": "https://registry.npmjs.org/@remixproject/plugin/-/plugin-0.3.26.tgz",
+ "integrity": "sha512-j0sgl4yDOVJLCuRWOEb/Wo9/fumrWlIpsO0MrtficuhVc1FGhZxKVv8Vdu3x3HgWhXkuhLUMs8VoJ1Ntd9ZkUQ==",
"requires": {
- "@remixproject/plugin-api": "0.3.24",
- "@remixproject/plugin-utils": "0.3.24",
+ "@remixproject/plugin-api": "0.3.26",
+ "@remixproject/plugin-utils": "0.3.26",
"events": "3.2.0"
}
},
"@remixproject/plugin-api": {
- "version": "0.3.24",
- "resolved": "https://registry.npmjs.org/@remixproject/plugin-api/-/plugin-api-0.3.24.tgz",
- "integrity": "sha512-mBxou9OSsQt7ggMmKTJR433jJaSAckBmVj82Ek7i/+EGxEAxSqKhPfRlh5sFiTgvUmzHQzuvqa8ndyw0Bbcq4w==",
+ "version": "0.3.26",
+ "resolved": "https://registry.npmjs.org/@remixproject/plugin-api/-/plugin-api-0.3.26.tgz",
+ "integrity": "sha512-6vR9nVF4EfXDHA0r8MrlLyVYRMJMG7J3Y3jzpaAumetW+YpvfJqgE/uhGgm2me2ypDM8vW0POQGhRaGeZTGwFg==",
"requires": {
- "@remixproject/plugin-utils": "0.3.24"
+ "@remixproject/plugin-utils": "0.3.26"
}
},
"@remixproject/plugin-utils": {
- "version": "0.3.24",
- "resolved": "https://registry.npmjs.org/@remixproject/plugin-utils/-/plugin-utils-0.3.24.tgz",
- "integrity": "sha512-nMXGCgs6filbgUc/Zvh1gReGG5HN2Bq+AI4Q7Ao08Thhg5ALj1UsbzQf86Ya/L7Q+EF6Em1CbgPT0VhcGlP66A==",
+ "version": "0.3.26",
+ "resolved": "https://registry.npmjs.org/@remixproject/plugin-utils/-/plugin-utils-0.3.26.tgz",
+ "integrity": "sha512-K/v+TXYOMV13dLf1LEgiF7CfqbOc105hC/2oapkSoHKSf3WVyWIUDlBsChRQl7osfUs/zT93q2+jNlLofWQUxg==",
"requires": {
"tslib": "2.0.1"
},
@@ -9834,13 +9834,13 @@
}
},
"@remixproject/plugin-webview": {
- "version": "0.3.24",
- "resolved": "https://registry.npmjs.org/@remixproject/plugin-webview/-/plugin-webview-0.3.24.tgz",
- "integrity": "sha512-Wcyi+gGq1AYprE58vhQS181swAKZpoLAfKlKuHJ+ezbysUDuX8jgsEiQ6u1c17nQfy8Hp9sntK6VcCcDddn8gg==",
+ "version": "0.3.26",
+ "resolved": "https://registry.npmjs.org/@remixproject/plugin-webview/-/plugin-webview-0.3.26.tgz",
+ "integrity": "sha512-hqWaFapUfcAX2Odsj0ANKvLXQbkzZ/xNONMqE0wRxFRYTIhFGZqFzJVzwSD+U4bSehP1JtzkrxwKBqNyjz5GxQ==",
"requires": {
- "@remixproject/plugin": "0.3.24",
- "@remixproject/plugin-api": "0.3.24",
- "@remixproject/plugin-utils": "0.3.24",
+ "@remixproject/plugin": "0.3.26",
+ "@remixproject/plugin-api": "0.3.26",
+ "@remixproject/plugin-utils": "0.3.26",
"axios": "^0.21.1"
},
"dependencies": {
@@ -9855,13 +9855,13 @@
}
},
"@remixproject/plugin-ws": {
- "version": "0.3.24",
- "resolved": "https://registry.npmjs.org/@remixproject/plugin-ws/-/plugin-ws-0.3.24.tgz",
- "integrity": "sha512-COIROJX61vS2TRH82MflIUlScxLauNtLkMRY7vzncVOIvufApvNc84Ua8Vr6vhSb2tZeWX+u4UTiFnpFDRL7xw==",
+ "version": "0.3.26",
+ "resolved": "https://registry.npmjs.org/@remixproject/plugin-ws/-/plugin-ws-0.3.26.tgz",
+ "integrity": "sha512-Nerd/2vGb96G6B8pGRCRNAGlO97KnJpbFmpa47SYipgjaq5Yj5iCUY+fbQzMWdGW2W4BrUPE+YBZCkq/KlfbGw==",
"requires": {
- "@remixproject/plugin": "0.3.24",
- "@remixproject/plugin-api": "0.3.24",
- "@remixproject/plugin-utils": "0.3.24"
+ "@remixproject/plugin": "0.3.26",
+ "@remixproject/plugin-api": "0.3.26",
+ "@remixproject/plugin-utils": "0.3.26"
}
},
"@restart/context": {
diff --git a/package.json b/package.json
index 0e55dd276d..b7c4a85e11 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
"workspace-schematic": "nx workspace-schematic",
"dep-graph": "nx dep-graph",
"help": "nx help",
- "lint:libs": "nx run-many --target=lint --projects=remix-analyzer,remix-astwalker,remix-debug,remix-lib,remix-simulator,remix-solidity,remix-tests,remix-url-resolver,remixd,remix-ui-tree-view,remix-ui-modal-dialog,remix-ui-toaster,remix-ui-helper,remix-ui-debugger-ui,remix-ui-workspace,remix-ui-static-analyser,remix-ui-checkbox,remix-ui-settings,remix-core-plugin,remix-ui-renderer,remix-ui-publish-to-storage,remix-ui-solidity-compiler,solidity-unit-testing,remix-ui-plugin-manager,remix-ui-terminal,remix-ui-editor,remix-ui-app,remix-ui-tabs,remix-ui-panel,remix-ui-run-tab",
+ "lint:libs": "nx run-many --target=lint --projects=remix-analyzer,remix-astwalker,remix-debug,remix-lib,remix-simulator,remix-solidity,remix-tests,remix-url-resolver,remixd,remix-ui-tree-view,remix-ui-modal-dialog,remix-ui-toaster,remix-ui-helper,remix-ui-debugger-ui,remix-ui-workspace,remix-ui-static-analyser,remix-ui-checkbox,remix-ui-settings,remix-core-plugin,remix-ui-renderer,remix-ui-publish-to-storage,remix-ui-solidity-compiler,solidity-unit-testing,remix-ui-plugin-manager,remix-ui-terminal,remix-ui-editor,remix-ui-app,remix-ui-tabs,remix-ui-panel,remix-ui-run-tab,remix-ui-permission-handle",
"build:libs": "nx run-many --target=build --parallel=false --with-deps=true --projects=remix-analyzer,remix-astwalker,remix-debug,remix-lib,remix-simulator,remix-solidity,remix-tests,remix-url-resolver,remixd",
"test:libs": "nx run-many --target=test --projects=remix-analyzer,remix-astwalker,remix-debug,remix-lib,remix-simulator,remix-solidity,remix-tests,remix-url-resolver,remixd",
"publish:libs": "npm run build:libs && lerna publish --skip-git && npm run bumpVersion:libs",
@@ -147,13 +147,13 @@
"@ethereumjs/tx": "^3.3.2",
"@ethereumjs/vm": "^5.5.3",
"@monaco-editor/react": "^4.3.1",
- "@remixproject/engine": "^0.3.24",
- "@remixproject/engine-web": "^0.3.24",
- "@remixproject/plugin": "^0.3.24",
- "@remixproject/plugin-api": "^0.3.24",
- "@remixproject/plugin-utils": "^0.3.24",
- "@remixproject/plugin-webview": "^0.3.24",
- "@remixproject/plugin-ws": "^0.3.24",
+ "@remixproject/engine": "^0.3.26",
+ "@remixproject/engine-web": "^0.3.26",
+ "@remixproject/plugin": "^0.3.26",
+ "@remixproject/plugin-api": "^0.3.26",
+ "@remixproject/plugin-utils": "^0.3.26",
+ "@remixproject/plugin-webview": "^0.3.26",
+ "@remixproject/plugin-ws": "^0.3.26",
"ansi-gray": "^0.1.1",
"async": "^2.6.2",
"axios": ">=0.21.1",
diff --git a/tsconfig.base.json b/tsconfig.base.json
index c483b6f07e..8105a813ef 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -76,7 +76,8 @@
"@remix-ui/panel": ["libs/remix-ui/panel/src/index.ts"],
"@remix-ui/editor-context-view": ["libs/remix-ui/editor-context-view/src/index.ts"],
"@remix-ui/solidity-unit-testing": ["libs/remix-ui/solidity-unit-testing/src/index.ts"],
- "@remix-ui/run-tab": ["libs/remix-ui/run-tab/src/index.ts"]
+ "@remix-ui/run-tab": ["libs/remix-ui/run-tab/src/index.ts"],
+ "@remix-ui/permission-handler": ["libs/remix-ui/permission-handler/src/index.ts"]
}
},
"exclude": ["node_modules", "tmp"]
diff --git a/workspace.json b/workspace.json
index fa7930463c..5ff3f1ca9f 100644
--- a/workspace.json
+++ b/workspace.json
@@ -1170,6 +1170,21 @@
}
}
}
+ },
+ "remix-ui-permission-handler": {
+ "root": "libs/remix-ui/permission-handler",
+ "sourceRoot": "libs/remix-ui/permission-handler/src",
+ "projectType": "library",
+ "architect": {
+ "lint": {
+ "builder": "@nrwl/linter:lint",
+ "options": {
+ "linter": "eslint",
+ "tsConfig": ["libs/remix-ui/permission-handler/tsconfig.lib.json"],
+ "exclude": ["**/node_modules/**", "libs/remix-ui/permission-handler/**/*.d.ts", "!libs/remix-ui/permission-handler/**/*"]
+ }
+ }
+ }
}
},
"cli": {