fix failing test

pull/1104/head
tizah 4 years ago
parent 845cb3bc3c
commit 18cb9d4742
  1. 21
      libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx

@ -81,19 +81,24 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
const [warningState, setWarningState] = useState([]) const [warningState, setWarningState] = useState([])
useEffect(() => { useEffect(() => {
if (autoRun) { if (autoRun) {
const setCompilationResult = async (data, source, file) => { const setCompilationResult = async (data, source, file) => {
await setResult({ lastCompilationResult: data, lastCompilationSource: source, currentFile: file }) await setResult({ lastCompilationResult: data, lastCompilationSource: source, currentFile: file })
} }
if (props.analysisModule) { if (props.analysisModule) {
props.analysisModule.on( props.analysisModule.on(
'solidity', 'solidity',
'compilationFinished', 'compilationFinished',
(file, source, languageVersion, data) => { (file, source, languageVersion, data) => {
if (languageVersion.indexOf('soljson') !== 0) return if (languageVersion.indexOf('soljson') !== 0) return
setCompilationResult(data, source, file) setCompilationResult(data, source, file)
run(data, source, file) if(categoryIndex.length > 0){
run(data, source, file)
}
} }
) )
} }
@ -102,7 +107,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
} }
return () => { } return () => { }
}, [autoRun]) }, [autoRun, categoryIndex])
const run = (lastCompilationResult, lastCompilationSource, currentFile) => { const run = (lastCompilationResult, lastCompilationSource, currentFile) => {
// const highlightLocation = async (location, fileName) => { // const highlightLocation = async (location, fileName) => {
@ -197,8 +202,9 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
const groupedCategory = groupBy(resultArray, 'warningModuleName') const groupedCategory = groupBy(resultArray, 'warningModuleName')
setWarningState(groupedCategory) setWarningState(groupedCategory)
}) })
if(categoryIndex.length > 0){
props.event.trigger('staticAnaysisWarning', [warningCount]) props.event.trigger('staticAnaysisWarning', [warningCount])
}
} else { } else {
setRunButtonState(true) setRunButtonState(true)
if (categoryIndex.length) { if (categoryIndex.length) {
@ -217,8 +223,9 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
}) })
) )
} else { } else {
setCategoryIndex(_.uniq([...categoryIndex, ...index])) setCategoryIndex(_.uniq([...categoryIndex]))
} }
} }
const handleCheckOrUncheckCategory = (category) => { const handleCheckOrUncheckCategory = (category) => {
@ -353,9 +360,9 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
{result.currentFile && result.currentFile} {result.currentFile && result.currentFile}
</span> </span>
</div> </div>
{ Object.entries(warningState).length > 0 && { categoryIndex.length > 0 && Object.entries(warningState).length > 0 &&
<div id='staticanalysisresult' > <div id='staticanalysisresult' >
<div className="mb-4 warning"> <div className="mb-4">
{ {
(Object.entries(warningState).map((element) => ( (Object.entries(warningState).map((element) => (
<> <>

Loading…
Cancel
Save