From 171617d1e3fa8fd6f6261885a5715508d17130ec Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Tue, 20 Jun 2023 22:22:57 +0100
Subject: [PATCH] fix badge logic. make tab switching stateful

---
 .../src/lib/components/BasicTitle.tsx         | 17 +++++----
 .../src/lib/remix-ui-static-analyser.tsx      | 38 +++++++++++--------
 2 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/libs/remix-ui/static-analyser/src/lib/components/BasicTitle.tsx b/libs/remix-ui/static-analyser/src/lib/components/BasicTitle.tsx
index 51a539418d..8f3c2307df 100644
--- a/libs/remix-ui/static-analyser/src/lib/components/BasicTitle.tsx
+++ b/libs/remix-ui/static-analyser/src/lib/components/BasicTitle.tsx
@@ -4,6 +4,7 @@ import { ErrorRendererOptions } from '../../staticanalyser'
 type BasicTitleProps = {
   warningStateEntries: any
   hideWarnings?: boolean
+  showLibsWarnings?: boolean
 }
 
 type warningResultOption = {
@@ -32,13 +33,15 @@ export function calculateWarningStateEntries(entries: [string, any][]) {
 export function BasicTitle(props: BasicTitleProps) {
 
   return (
-    <span>Remix{props.warningStateEntries.length > 0 ?   !props.hideWarnings ? <i data-id="StaticAnalysisErrorCount" className={`badge ${calculateWarningStateEntries(props.warningStateEntries).length > 0 ? 'badge-warning' : 'badge-danger'} rounded-circle ml-1 text-center`}>{calculateWarningStateEntries(props.warningStateEntries).length}</i>: (
-      <i className="badge badge-warning rounded-circle ml-1 text-center">
-        {
-          calculateWarningStateEntries(props.warningStateEntries).errors.length
-        }
-      </i>
-    ) : null}
+    <span>Remix{props.warningStateEntries.length > 0 ?   !props.hideWarnings ? props.showLibsWarnings ?  <i data-id="StaticAnalysisErrorCount" className={`badge ${calculateWarningStateEntries(props.warningStateEntries).length > 0 ? 'badge-warning' : 'badge-danger'} rounded-circle ml-1 text-center`}>
+      {
+        calculateWarningStateEntries(props.warningStateEntries).length}</i>: (
+          <i className="badge badge-warning rounded-circle ml-1 text-center">
+            {
+              calculateWarningStateEntries(props.warningStateEntries).errors.length
+            }
+          </i>
+        ) : null : null}
     </span>
   )
 }
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 1f35d4a677..361da8684a 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
@@ -81,6 +81,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
   const [hints, setHints] = useState<SolHintReport[]>([])
   const [slitherWarnings, setSlitherWarnings] = useState([])
   const [ssaWarnings, setSsaWarnings] = useState([])
+  const [tabKey, setTabKey] = useState('basic')
 
   const warningContainer = useRef(null)
   const allWarnings = useRef({})
@@ -107,6 +108,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
   }
 
   useEffect(() => {
+    setWarningState({})
     setHints([])
     setSlitherWarnings([])
     setSsaWarnings([])
@@ -143,7 +145,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
   useEffect(() => {
     props.analysisModule.on('filePanel', 'setWorkspace', (currentWorkspace) => {
       // Reset warning state
-      setWarningState([])
+      setWarningState({})
       // Reset badge
       props.event.trigger('staticAnaysisWarning', [])
       // Reset state
@@ -165,7 +167,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
       // Hide 'Enable Slither Analysis' checkbox
       if (plugin.name === 'remixd') {
         // Reset warning state
-        setWarningState([])
+        setWarningState({})
         setHints([])
         setSlitherWarnings([])
         setSlitherEnabled(false)
@@ -218,8 +220,10 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
         }
       }
     }
-    props.event.trigger('staticAnaysisWarning', [newWarningCount])
-    setWarningState(newWarningState)
+    if (newWarningCount > 0) {
+      props.event.trigger('staticAnaysisWarning', [newWarningCount])
+      setWarningState(newWarningState)
+    }
   }
 
   useEffect(() => {
@@ -511,6 +515,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
         <BasicTitle
           warningStateEntries={Object.entries(warningState)}
           hideWarnings={hideWarnings}
+          showLibsWarnings={showLibsWarning}
         />
       ),
       child: (
@@ -520,8 +525,8 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
               <div className="mb-4 pt-2">
                 {Object.entries(warningState).map((element, index) => (
                   <div key={index}>
-                    { !hideWarnings && element[1]['length'] > 0 ? <span className="text-dark h6">{element[0]}</span> : null}
-                    {!hideWarnings ? element[1]["map"](
+                    { hideWarnings === false ? <span className="text-dark h6">{element[0]}</span> : null}
+                    { hideWarnings === false ? element[1]["map"](
                       (x,i) => // eslint-disable-line dot-notation
                         x.hasWarning
                         ? ( // eslint-disable-next-line  dot-notation
@@ -753,8 +758,9 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
               />
             </div>
             <Tabs
-              defaultActiveKey={tabKeys[0].tabKey}
+              defaultActiveKey={tabKeys[1].tabKey}
               className="px-1"
+              onSelect={(newKey) => setTabKey(newKey)}
             >
               {
                 checkBasicStatus() ? <Tab
@@ -766,14 +772,16 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
                   {tabKeys[1].child}
                 </Tab> : null
               }
-              {solhintEnabled ? <Tab
-                key={tabKeys[0].tabKey}
-                title={tabKeys[0].title}
-                eventKey={tabKeys[0].tabKey}
-                tabClassName="text-decoration-none font-weight-bold px-2"
-              >
-                {tabKeys[0].child}
-              </Tab> : null}
+              {
+                solhintEnabled ? <Tab
+                  key={tabKeys[0].tabKey}
+                  title={tabKeys[0].title}
+                  eventKey={tabKeys[0].tabKey}
+                  tabClassName="text-decoration-none font-weight-bold px-2"
+                >
+                  {tabKeys[0].child}
+                </Tab> : null
+              }
               { showSlither && slitherEnabled ? <Tab
                 key={tabKeys[2].tabKey}
                 title={tabKeys[2].title}