From a9d6a68545aa0f0ad65f66a3707af1de7a9fe86b Mon Sep 17 00:00:00 2001
From: Matthias Kretschmann <m@kretschmann.io>
Date: Wed, 19 Oct 2022 18:05:19 +0100
Subject: [PATCH] tweak data ordering

---
 src/pages/index.tsx  | 6 ++++--
 src/utils/getData.ts | 9 +++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index 5958095..63759bf 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -37,7 +37,7 @@ export default function HomePage(): ReactElement {
     async function getStatuses() {
       setIsloading(true)
       const data = await getData()
-      if (!data) setError(`Could not fetch data from ${statusApiUri}`)
+      if (!data) setError(`Could not get data from ${statusApiUri}`)
       setData(data)
       setIsloading(false)
     }
@@ -76,7 +76,9 @@ export default function HomePage(): ReactElement {
         ) : (
           Object.entries(data || {}).map(([networkName, value]) => (
             <Fragment key={networkName}>
-              <h2 className={styles.networkName}>{networkName}</h2>
+              <h2 className={styles.networkName}>
+                {networkName == 'general' ? null : networkName}
+              </h2>
               <div className={styles.grid}>
                 {value.components.map((component) => (
                   <div
diff --git a/src/utils/getData.ts b/src/utils/getData.ts
index 51a8e07..fd298d4 100644
--- a/src/utils/getData.ts
+++ b/src/utils/getData.ts
@@ -8,12 +8,13 @@ export async function getData(): Promise<{ [key: string]: Status }> {
     if (!response?.data || response.status !== 200)
       throw Error('ERROR: no data recieved')
 
-    // transform data into object with network names as keys,
-    // and make sure 'general' is always the first key
-    const output = Object.fromEntries(
+    // transform data into object with network names as keys
+    let output = Object.fromEntries(
       response.data?.map((item) => [item.network, item])
     )
-    console.log('Got new data', output)
+    // make sure 'general' is always the first key
+    output = Object.assign({ general: output['general'] }, output)
+    console.log('Got new data', JSON.stringify(output))
     return output
   } catch (error) {
     console.error(error.message)