Merge pull request #56 from akakou/hotfix/html-bug

Hotfix/html bug
akakou · May 6, 2024 · bd4d863 · bd4d863
2 parents 3e10ff5 + 2d9d373
commit bd4d863
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/ttp/serv/views/server/localhost → ttp/serv/views/api/server/localhost b/ttp/serv/views/server/localhost → ttp/serv/views/api/server/localhost
@@ -4,14 +4,14 @@
         "domain": "example.com",
         "public_key": "MTIzNA==",
         "quote": "MTIzNA==",
-        "has_activated": true,
+        "has_activated": false,
         "edges": {
             "code": {
                 "id": 1,
                 "repository": "https://example.com",
                 "commit_id": "1234",
                 "unique_id": "MTIzNA==",
-                "is_active": true,
+                "is_active": false,
                 "edges": {}
             }
         }

diff --git a/ttp/serv/views/redirect/index.html b/ttp/serv/views/redirect/index.html
@@ -18,8 +18,11 @@
         const checkOneValidity = x => !x.edges.violation
 
         const checkAllValidity = (data) => {
-            const res = data.reduce((accumulator, current) => accumulator && checkOneValidity(current), true)
-            return res
+            if (!data.length) return false
+
+            const reduced = data.reduce((accumulator, current) => accumulator && checkOneValidity(current), true)
+            const last_activated = data[data.length - 1].has_activated
+            return last_activated && reduced
         }
 
         const TableCompornent = ({ logs }) => {
@@ -71,7 +74,7 @@
                 const resp = await axios.get(`/api/server/${referrer.hostname}`)
                 console.log(resp)
 
-                const v = checkAllValidity(resp.data)
+                const v = resp.data.length > 0 && checkAllValidity(resp.data)
                 setLogs(resp.data)
                 setIsValid(v)
                 setMessage(v ? VALID_MESSAGE : INVALID_MESSAGE)