From f8f9aeb416ef9ef947f1b809ae04571999d1dc36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Gangloff?= <contact@maelgangloff.fr>
Date: Sat, 27 Jul 2024 17:19:25 +0200
Subject: [PATCH] feat: sort entities on Domain result

---
 assets/App.tsx                               | 11 ++++++-----
 assets/pages/FAQPage.tsx                     |  8 --------
 assets/pages/search/DomainSearchPage.tsx     |  5 ++++-
 assets/pages/search/EntitySearchPage.tsx     |  2 +-
 assets/pages/search/NameserverSearchPage.tsx |  2 +-
 assets/pages/tracking/ConnectorsPage.tsx     |  2 +-
 assets/pages/tracking/WatchlistPage.tsx      |  7 +++++++
 assets/pages/tracking/WatchlistsPage.tsx     |  7 -------
 8 files changed, 20 insertions(+), 24 deletions(-)
 delete mode 100644 assets/pages/FAQPage.tsx
 create mode 100644 assets/pages/tracking/WatchlistPage.tsx
 delete mode 100644 assets/pages/tracking/WatchlistsPage.tsx

diff --git a/assets/App.tsx b/assets/App.tsx
index e25f301..1d06849 100644
--- a/assets/App.tsx
+++ b/assets/App.tsx
@@ -23,19 +23,20 @@ import EntitySearchPage from "./pages/search/EntitySearchPage";
 import NameserverSearchPage from "./pages/search/NameserverSearchPage";
 import TldPage from "./pages/info/TldPage";
 import StatisticsPage from "./pages/info/StatisticsPage";
-import WatchlistsPage from "./pages/tracking/WatchlistsPage";
+import WatchlistPage from "./pages/tracking/WatchlistPage";
 import UserPage from "./pages/watchdog/UserPage";
 import React, {useCallback, useEffect, useMemo, useState} from "react";
 import {getUser} from "./utils/api";
-import FAQPage from "./pages/FAQPage";
 import LoginPage, {AuthenticatedContext} from "./pages/LoginPage";
 import ConnectorsPage from "./pages/tracking/ConnectorsPage";
 import NotFoundPage from "./pages/NotFoundPage";
+import {ItemType, MenuItemType} from "antd/lib/menu/interface";
 
 import tos from "./content/tos.md";
 import privacy from "./content/privacy.md";
 import home from './content/home.md'
-import {ItemType, MenuItemType} from "antd/lib/menu/interface";
+import faq from './content/faq.md'
+
 
 export default function App() {
     const {
@@ -230,12 +231,12 @@ export default function App() {
                             <Route path="/info/tld" element={<TldPage/>}/>
                             <Route path="/info/stats" element={<StatisticsPage/>}/>
 
-                            <Route path="/tracking/watchlist" element={<WatchlistsPage/>}/>
+                            <Route path="/tracking/watchlist" element={<WatchlistPage/>}/>
                             <Route path="/tracking/connectors" element={<ConnectorsPage/>}/>
 
                             <Route path="/user" element={<UserPage/>}/>
 
-                            <Route path="/faq" element={<FAQPage/>}/>
+                            <Route path="/faq" element={<TextPage markdown={faq}/>}/>
                             <Route path="/tos" element={<TextPage markdown={tos}/>}/>
                             <Route path="/privacy" element={<TextPage markdown={privacy}/>}/>
 
diff --git a/assets/pages/FAQPage.tsx b/assets/pages/FAQPage.tsx
deleted file mode 100644
index 4f4d4cf..0000000
--- a/assets/pages/FAQPage.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import React from "react";
-
-
-export default function FAQPage() {
-    return <p>
-        FAQ Page
-    </p>
-}
\ No newline at end of file
diff --git a/assets/pages/search/DomainSearchPage.tsx b/assets/pages/search/DomainSearchPage.tsx
index 6472af9..02f4a35 100644
--- a/assets/pages/search/DomainSearchPage.tsx
+++ b/assets/pages/search/DomainSearchPage.tsx
@@ -156,7 +156,10 @@ export default function DomainSearchPage() {
                                             <List
                                                 className="demo-loadmore-list"
                                                 itemLayout="horizontal"
-                                                dataSource={domain.entities}
+                                                dataSource={domain.entities.sort((e1, e2) => {
+                                                    const p = (r: string[]) => r.includes('registrant') ? 4 : r.includes('administrative') ? 3 : r.includes('billing') ? 2 : 1
+                                                    return p(e2.roles) - p(e1.roles)
+                                                })}
                                                 renderItem={(e) => {
                                                     const jCard = vCard.fromJSON(e.entity.jCard)
                                                     let name = ''
diff --git a/assets/pages/search/EntitySearchPage.tsx b/assets/pages/search/EntitySearchPage.tsx
index b2ed95b..d7d1cae 100644
--- a/assets/pages/search/EntitySearchPage.tsx
+++ b/assets/pages/search/EntitySearchPage.tsx
@@ -2,6 +2,6 @@ import React from "react";
 
 export default function EntitySearchPage() {
     return <p>
-        Entity Search Page
+        Not implemented
     </p>
 }
\ No newline at end of file
diff --git a/assets/pages/search/NameserverSearchPage.tsx b/assets/pages/search/NameserverSearchPage.tsx
index dc7d52e..992ba64 100644
--- a/assets/pages/search/NameserverSearchPage.tsx
+++ b/assets/pages/search/NameserverSearchPage.tsx
@@ -2,6 +2,6 @@ import React from "react";
 
 export default function NameserverSearchPage() {
     return <p>
-        NS Search Page
+        Not implemented
     </p>
 }
\ No newline at end of file
diff --git a/assets/pages/tracking/ConnectorsPage.tsx b/assets/pages/tracking/ConnectorsPage.tsx
index c537ce1..0b81f38 100644
--- a/assets/pages/tracking/ConnectorsPage.tsx
+++ b/assets/pages/tracking/ConnectorsPage.tsx
@@ -2,6 +2,6 @@ import React from "react";
 
 export default function ConnectorsPage() {
     return <p>
-        Connectors Page
+        Not implemented
     </p>
 }
\ No newline at end of file
diff --git a/assets/pages/tracking/WatchlistPage.tsx b/assets/pages/tracking/WatchlistPage.tsx
new file mode 100644
index 0000000..02b9594
--- /dev/null
+++ b/assets/pages/tracking/WatchlistPage.tsx
@@ -0,0 +1,7 @@
+import React from "react";
+
+export default function WatchlistPage() {
+    return <p>
+        Not implemented
+    </p>
+}
\ No newline at end of file
diff --git a/assets/pages/tracking/WatchlistsPage.tsx b/assets/pages/tracking/WatchlistsPage.tsx
deleted file mode 100644
index c336ded..0000000
--- a/assets/pages/tracking/WatchlistsPage.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import React from "react";
-
-export default function WatchlistsPage() {
-    return <p>
-        Watchlists Page
-    </p>
-}
\ No newline at end of file