Merge pull request #7 from webamon-org/release/v0.1.2

Release/v0.1.2
webamon-org · Aug 30, 2024 · 1e0f70b · 1e0f70b
2 parents 88ebc53 + ea432a0
commit 1e0f70b
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v0.1.2] - 2024-08-30
 
+### Removed
+- Removed google tracking, was included 1+ year ago for web hosted stale/old/different version/solution
+
+### Fixed
+- API, incorrect reply for /domains was a 200 when no results, caused incorrect frontend update logic
+- API, incorrect reply for /servers was a 200 when no results, caused incorrect frontend update logic
+- Frontend change to handle above, 400 returned, result tables is cleared
+- setLoading(false) domains page, loading wheel continued when results returned
+- setLoading(false) servers page, loading wheel continued when results returned
+---
 ## [v0.1.1] - 2024-08-30
 
 ### Fixed

diff --git a/Console/public/index.html b/Console/public/index.html
@@ -1,14 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <script async src="https://www.googletagmanager.com/gtag/js?id=G-KXBQJG415Z"></script>
-    <script>
-  window.dataLayer = window.dataLayer || [];
-  function gtag(){dataLayer.push(arguments);}
-  gtag('js', new Date());
-
-  gtag('config', 'G-KXBQJG415Z');
-</script>
     <meta charset="utf-8" />
     <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />

diff --git a/Console/src/scenes/domains/index.js b/Console/src/scenes/domains/index.js
@@ -55,8 +55,10 @@ const Domains = () => {
       }));
 
       setResults(mappedResults);
+      setLoading(false);
     } catch (err) {
             if (err.response && err.response.status === 400) {
+            setLoading(false);
               setResults([]);
             }
           }
@@ -159,7 +161,7 @@ const Domains = () => {
                   sx={{ mr: '10px' }}
                 />
             <TextField
-              label="Country"
+              label="COUNTRY"
               variant="outlined"
               value={filters['country.name']}
               onChange={(e) => handleFilterChange('country.name', e.target.value)}

diff --git a/Console/src/scenes/scans/index.js b/Console/src/scenes/scans/index.js
@@ -201,38 +201,38 @@ const buildQueryParams = () => {
             sx={{ mr: '10px' }}
           />
             <TextField
-              label="ASN Name"
+              label="ASN NAME"
               variant="outlined"
-              value={filters['server.asn.asn_org']}
-              onChange={(e) => handleFilterChange('server.asn.asn_org', e.target.value)}
+              value={filters['server.asn.name']}
+              onChange={(e) => handleFilterChange('server.asn.name', e.target.value)}
               sx={{ mr: '10px' }}
             />
           <TextField
-            label="Country"
+            label="COUNTRY"
             variant="outlined"
-            value={filters['server.country.country']}
-            onChange={(e) => handleFilterChange('server.country.country', e.target.value)}
+            value={filters['server.country.name']}
+            onChange={(e) => handleFilterChange('server.country.name', e.target.value)}
             sx={{ mr: '10px' }}
           />
           <TextField
             label="DOMAIN"
             variant="outlined"
-            value={filters['domain.domain']}
-            onChange={(e) => handleFilterChange('domain.domain', e.target.value)}
+            value={filters['domain.name']}
+            onChange={(e) => handleFilterChange('domain.name', e.target.value)}
             sx={{ mr: '10px' }}
           />
             <TextField
-              label="Server"
+              label="SERVER"
               variant="outlined"
               value={filters['server.server']}
               onChange={(e) => handleFilterChange('server.server', e.target.value)}
               sx={{ mr: '10px' }}
             />
           <TextField
-          label="Technology"
+          label="TECHNOLOGY"
           variant="outlined"
-          value={filters['technology.technology']}
-          onChange={(e) => handleFilterChange('technology.technology', e.target.value)}
+          value={filters['technology.name']}
+          onChange={(e) => handleFilterChange('technology.name', e.target.value)}
           sx={{ mr: '10px' }}
         />
         </Box>

diff --git a/Console/src/scenes/servers/index.js b/Console/src/scenes/servers/index.js
@@ -56,10 +56,13 @@ headers: {
       }));
 
       setResults(mappedResults);
+      setLoading(false);
     } catch (err) {
-          console.log('error')
-                   setLoading(false);
-          }
+                  if (err.response && err.response.status === 400) {
+                  setLoading(false);
+                    setResults([]);
+                  }
+                }
   };
 
   useEffect(() => {
@@ -106,7 +109,7 @@ headers: {
         </Box>
         <Box sx={{ display: 'flex', mb: '20px' }}>
           <TextField
-            label="Server"
+            label="SERVER NAME"
             variant="outlined"
             value={filters.server}
             onChange={(e) => handleFilterChange('server', e.target.value)}
@@ -120,21 +123,21 @@ headers: {
             sx={{ mr: '10px' }}
           />
           <TextField
-            label="ASN"
+            label="ASN NAME"
             variant="outlined"
-            value={filters['asn.asn_org']}
-            onChange={(e) => handleFilterChange('asn.asn_org', e.target.value)}
+            value={filters['asn.name']}
+            onChange={(e) => handleFilterChange('asn.name', e.target.value)}
             sx={{ mr: '10px' }}
           />
           <TextField
-            label="Country"
+            label="COUNTRY"
             variant="outlined"
-            value={filters['country.country']}
-            onChange={(e) => handleFilterChange('country.country', e.target.value)}
+            value={filters['country.name']}
+            onChange={(e) => handleFilterChange('country.name', e.target.value)}
             sx={{ mr: '10px' }}
           />
           <TextField
-            label="Domain"
+            label="DOMAIN"
             variant="outlined"
             value={filters.domain}
             onChange={(e) => handleFilterChange('domain', e.target.value)}