From a4b3112113b83666a52f26e88cd5417b23451748 Mon Sep 17 00:00:00 2001 From: Joseph Izang Date: Mon, 12 Jun 2023 13:13:26 +0100 Subject: [PATCH] fix slither checkbox disabling now reliant on remixd --- .../src/lib/remix-ui-static-analyser.tsx | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx index 639595e8d4..e0d833aea8 100644 --- a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx +++ b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx @@ -69,6 +69,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => { const [basicEnabled, setBasicEnabled] = useState(true) const [solhintEnabled, setSolhintEnabled] = useState(true) // assuming that solhint is always enabled const [showSlither, setShowSlither] = useState(false) + const [slitherEnabled, setSlitherEnabled] = useState(false) const [isSupportedVersion, setIsSupportedVersion] = useState(false) let [showLibsWarning, setShowLibsWarning] = useState(false) // eslint-disable-line prefer-const const [categoryIndex, setCategoryIndex] = useState(groupedModuleIndex(groupedModules)) @@ -77,7 +78,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => { const [hints, setHints] = useState([]) const [slitherWarnings, setSlitherWarnings] = useState([]) const [ssaWarnings, setSsaWarnings] = useState([]) - + const warningContainer = useRef(null) const allWarnings = useRef({}) const [state, dispatch] = useReducer(analysisReducer, initialState) @@ -138,9 +139,13 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => { setSlitherWarnings([]) setSsaWarnings([]) // Show 'Enable Slither Analysis' checkbox - if (currentWorkspace && currentWorkspace.isLocalhost === true) setShowSlither(true) + if (currentWorkspace && currentWorkspace.isLocalhost === true) { + setShowSlither(true) + setSlitherEnabled(true) + } else { setShowSlither(false) + setSlitherEnabled(false) } }) props.analysisModule.on('manager', 'pluginDeactivated', (plugin) => { @@ -150,6 +155,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => { setWarningState([]) setHints([]) setSlitherWarnings([]) + setSlitherEnabled(false) setSsaWarnings([]) // Reset badge props.event.trigger('staticAnaysisWarning', []) @@ -225,7 +231,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => { filterWarnings() } - + const handleCheckAllModules = (groupedModules) => { const index = groupedModuleIndex(groupedModules) if (index.every(el => categoryIndex.includes(el))) { @@ -256,7 +262,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => { const checkRemixd = await props.analysisModule.call('manager', 'isActive', 'remixd') if (showSlither) { setShowSlither(false) - } + } if(!showSlither) { setShowSlither(true) } @@ -495,7 +501,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
{element[1]["map"]( (x,i) => // eslint-disable-line dot-notation - x.hasWarning && !hideWarnings + x.hasWarning && !hideWarnings ? ( // eslint-disable-next-line dot-notation
{
- {!hideWarnings + {!hideWarnings ? showLibsWarning ? slitherWarnings.filter(warning => warning.isLibrary).map((warning, index) => (
{ tooltipPlacement={'bottom-start'} optionalClassName="mr-3" /> - + {}} tooltipPlacement={'top-start'} optionalClassName="mr-3" /> - + {}} optionalClassName="mr-3" - title="Run Slither static analysis." + title={"Run Slither static analysis."} />