Merge pull request #3876 from ethereum/ssa-button-fix

Static Analyzers Run Button Fix
pull/3902/head^2
Joseph Izang 2 years ago committed by GitHub
commit 880a3d335c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts
  2. 22
      libs/remix-ui/static-analyser/src/lib/Button/StaticAnalyserButton.tsx
  3. 2
      libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx

@ -40,8 +40,11 @@ module.exports = {
.click('*[id="compileBtn"]')
.pause(10000)
.clickLaunchIcon('solidityStaticAnalysis')
.click('*[id="staticAnalysisRunBtn"]')
.waitForElementPresent('#staticanalysisresult .warning', 5000)
.useXpath()
.click('//*[@id="staticAnalysisRunBtn"]')
// .waitForElementPresent('div#staticanalysisresult .warning', 5000)
.waitForElementPresent('//*[@id="staticanalysisresult"]', 5000)
.useCss()
// Check warning count
.click('*[data-rb-event-key="remix"]')
.assert.containsText('span#ssaRemixtab > *[data-id="RemixStaticAnalysisErrorCount"]', '1')

@ -16,12 +16,17 @@ const StaticAnalyserButton = ({
title,
classList
}: StaticAnalyserButtonProps) => {
const defaultStyle = "btn btn-sm w-25 btn-primary"
const defaultStyle = "btn btn-sm btn-block btn-primary"
const newclassList = disabled && classList.length > 0 ? `${classList} disabled` :
classList.length === 0 && disabled ? `${defaultStyle} disabled` : classList.length > 0 ? `${classList}` : defaultStyle
const buttonWithoutTooltip = () => (
<button id="staticAnalysisRunBtn" className={newclassList} disabled={disabled} onClick={onClick}>
<button
id="staticAnalysisRunBtn"
className={newclassList}
disabled={disabled}
onClick={onClick}
>
<span className="pl-3 pr-4">
{buttonText}
</span>
@ -29,18 +34,27 @@ const StaticAnalyserButton = ({
)
const buttonWithTooltip = () => (
<button id="staticAnalysisRunBtn" className={newclassList} disabled={disabled} onClick={onClick}>
<CustomTooltip
placement="right"
tooltipId="ssaRunButtonTooltip"
tooltipClasses="text-nowrap"
tooltipText={title}
>
<div id="staticAnalysisWrapper" className={`${newclassList} p-0`}>
<button
id="staticAnalysisRunBtn"
className={newclassList}
disabled={disabled}
onClick={onClick}
style={{ pointerEvents: 'none', color: 'white' }}
>
<span className="pl-3 pr-4">
{buttonText}
</span>
</button>
</div>
</CustomTooltip>
</button>)
)
return (
title && title.length > 0 ? buttonWithTooltip() : buttonWithoutTooltip()

@ -130,7 +130,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
`${
state && state.data && state.file.length > 0
? "Run analysis"
: "To run analysis tools, first compile a contract."
: "To run analysis for selected tools, first compile a contract"
}`
);
}

Loading…
Cancel
Save