Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/remix-ide-e2e/src/tests/circom.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ module.exports = {
.click('[data-id="compute_witness_btn"]')
.frameParent()
.clickLaunchIcon('filePanel')
.pause(5000)
.openFile('circuits/.bin/simple_js/simple.wtn')
.waitForElementPresent('[data-id="treeViewLitreeViewItemcircuits/.bin/simple_js/simple.wtn"]')
.waitForElementVisible('[data-id="treeViewLitreeViewItemcircuits/.bin/simple_js/simple.wtn"]')
Expand Down
1 change: 1 addition & 0 deletions apps/remix-ide-e2e/src/tests/contract_flattener.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ module.exports = {
},
'Should not be able to flatten contract without imports': function (browser: NightwatchBrowser) {
browser.waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts"]')
.openFile('contracts')
.waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts/3_Ballot.sol"]')
.pause(1000)
.click('*[data-id="treeViewLitreeViewItemcontracts/3_Ballot.sol"]')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ module.exports = {
const selectedElements = []
browser
.openFile('contracts')
.click('*[data-id="treeViewDivtreeViewItemcontracts"]')
.click({ selector: '//*[@data-id="treeViewDivtreeViewItemcontracts/1_Storage.sol"]', locateStrategy: 'xpath' })
.findElement({ selector: '//*[@data-id="treeViewDivtreeViewItemcontracts/2_Owner.sol"]', locateStrategy: 'xpath' }, (el) => {
selectedElements.push(el)
Expand Down
2 changes: 1 addition & 1 deletion apps/remix-ide-e2e/src/tests/pinned_contracts.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ module.exports = {
browser
.clickLaunchIcon('filePanel')
.waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts"]')
// .click('*[data-id="treeViewLitreeViewItemcontracts"]')
.click('*[data-id="treeViewLitreeViewItemcontracts"]')
.click('*[data-id="treeViewLitreeViewItemcontracts/1_Storage.sol"]')
.waitForElementVisible('*[data-id="compile-action"]')
.pause(3000)
Expand Down
1 change: 1 addition & 0 deletions apps/remix-ide-e2e/src/tests/script-runner.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ const tests = {
browser
.waitForElementVisible('*[data-id="verticalIconsKindfilePanel"]')
.click('*[data-id="verticalIconsKindfilePanel"]')
.openFile('scripts/deploy_with_ethers.ts')
.waitForElementVisible('*[data-id="treeViewDivtreeViewItemscripts/deploy_with_ethers.ts"]')
// .click('*[data-id="treeViewDivtreeViewItemscripts"]')
// .pause(3000)
Expand Down
1 change: 1 addition & 0 deletions apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ module.exports = {
browser
.clickLaunchIcon('filePanel')
.waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts"]')
.openFile('contracts')
.click('*[data-id="treeViewLitreeViewItemcontracts/2_Owner.sol"]')
.clickLaunchIcon('solidity')
.click('*[id="compileBtn"]')
Expand Down
2 changes: 1 addition & 1 deletion libs/remix-ui/top-bar/src/components/WorkspaceDropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ export const WorkspacesDropdown: React.FC<WorkspacesDropdownProps> = ({ menuItem
try {
setTimeout(async () => {
workspaces = await getWorkspaces()
const updated = workspaces.map((workspace) => {
const updated = (workspaces || []).map((workspace) => {
(workspace as any).submenu = subItems
return workspace as any
})
Expand Down
3 changes: 1 addition & 2 deletions libs/remix-ui/top-bar/src/context/topbarContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { createContext, SyntheticEvent } from 'react'
export const TopbarContext = createContext<{
fs: any,
plugin: Topbar,
modal:(title: string | JSX.Element, message: string | JSX.Element, okLabel: string, okFn: () => void, cancelLabel?: string, cancelFn?: () => void) => void,
dispatchInitWorkspace:() => Promise<void>,
modal:(title: string | JSX.Element, message: string | JSX.Element, okLabel: string, okFn: () => void, cancelLabel?: string, cancelFn?: () => void) => void
}>(null)

9 changes: 0 additions & 9 deletions libs/remix-ui/top-bar/src/context/topbarProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,6 @@ export const TopbarProvider = (props: TopbarProviderProps) => {
const [focusToaster, setFocusToaster] = useState<string>('')
const [toasters, setToasters] = useState<string[]>([])

const dispatchInitWorkspace = async () => {
await initWorkspace(plugin.filePanel)(fsDispatch)
}

useEffect(() => {
dispatchInitWorkspace()
}, [])

useEffect(() => {
if (modals.length > 0) {
setFocusModal(() => {
Expand Down Expand Up @@ -159,7 +151,6 @@ export const TopbarProvider = (props: TopbarProviderProps) => {
plugin: plugin as unknown as Topbar,
modal,
toast,
dispatchInitWorkspace,
}

return (
Expand Down
1 change: 0 additions & 1 deletion libs/remix-ui/workspace/src/lib/contexts/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ export const FileSystemContext = createContext<{
fs: any,
plugin: any,
modal:(title: string | JSX.Element, message: string | JSX.Element, okLabel: string, okFn: () => void, cancelLabel?: string, cancelFn?: () => void) => void,
dispatchInitWorkspace:() => Promise<void>,
dispatchFetchDirectory:(path: string) => Promise<void>,
dispatchAddInputField:(path: string, type: 'file' | 'folder') => Promise<void>,
dispatchRemoveInputField:(path: string) => Promise<void>,
Expand Down