Skip to content

Commit

Permalink
fix catastrophic test failures. Resort to default tab naming
Browse files Browse the repository at this point in the history
  • Loading branch information
joeizang authored and Aniket-Engg committed Jun 17, 2024
1 parent 7038e0a commit 0e54bdb
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 26 deletions.
1 change: 0 additions & 1 deletion apps/remix-ide-e2e/src/tests/terminal.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ module.exports = {
.waitForElementPresent('*[data-id="universalDappUiContractActionWrapper"]', 60000)
.clickInstance(0)
.clickFunction('changeOwner - transact (not payable)', { types: 'address newOwner', values: '0xd9145CCE52D386f254917e481eB44e9943F39138' }) // execute the "changeOwner" function
.pause()
.waitForElementContainsText('*[data-id="terminalJournal"]', 'previousOwner', 60000) // check that the script is logging the event
.waitForElementContainsText('*[data-id="terminalJournal"]', '0x5B38Da6a701c568545dCfcB03FcB875f56beddC4', 60000) // check that the script is logging the event
.waitForElementContainsText('*[data-id="terminalJournal"]', 'newOwner', 60000)
Expand Down
8 changes: 0 additions & 8 deletions apps/remix-ide/src/app/panels/tab-proxy.js
Original file line number Diff line number Diff line change
Expand Up @@ -241,15 +241,7 @@ export class TabProxy extends Plugin {
icon = 'assets/img/vyperLogo2.webp'
}
if (title === 'Solidity Compile Details') {
let updatedName = this.fileManager.currentFile()
icon = 'assets/img/solidity.webp'
name = updatedName.split('/')[1]
let newTitle = ''
title.split(' ').forEach((x, index) => {
if (index !== 0) {
newTitle += ` ${x}`
}})
title = `${name} - ${newTitle}`
}


Expand Down
28 changes: 11 additions & 17 deletions apps/remix-ide/src/app/plugins/compile-details.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,38 +6,32 @@ import { RemixUiCompileDetails } from '@remix-ui/solidity-compile-details'

const _paq = (window._paq = window._paq || [])

type CompileDetailsPayload = {
contractProperties: any,
selectedContract: string,
help: any,
insertValue: any,
saveAs: any,
}

interface ICompilationDetailsPlugin extends ViewPlugin {
showDetails: (payload: any) => void
}

const profile = {
name: 'compilationDetails',
displayName: 'Solidity Compile Details',
description: 'Displays details from solidity compiler',
location: 'mainPanel',
methods: ['showDetails', 'getTabHeadDetails'],
methods: ['showDetails'],
events: []
}

export class CompilationDetailsPlugin extends ViewPlugin implements ICompilationDetailsPlugin {
export class CompilationDetailsPlugin extends ViewPlugin {
dispatch: React.Dispatch<any> = () => {}
appManager: RemixAppManager
element: HTMLDivElement
payload: CompileDetailsPayload
payload: any
constructor(appManager: RemixAppManager) {
super(profile)
this.appManager = appManager
this.element = document.createElement('div')
this.element.setAttribute('id', 'compileDetails')
this.payload
this.payload = {
contractProperties: {} as any,
selectedContract: '',
help: {} as any,
insertValue: {} as any,
saveAs: {} as any,
}
}

async onActivation() {
Expand All @@ -50,7 +44,7 @@ export class CompilationDetailsPlugin extends ViewPlugin implements ICompilation

async showDetails(sentPayload: any) {
await this.call('tabs', 'focus', 'compilationDetails')
setTimeout(async () => {
setTimeout(() => {
this.payload = sentPayload
this.renderComponent()
}, 2000)
Expand Down

0 comments on commit 0e54bdb

Please sign in to comment.