From 84e2b63c49842f4c2eba841894b74e69089f85c8 Mon Sep 17 00:00:00 2001
From: FRC <pico2x@gmail.com>
Date: Wed, 12 Oct 2022 16:02:57 +0100
Subject: [PATCH] Entire homepage now loads simultaneously including featured
 (#1034)

---
 web/components/groups/group-overview.tsx |  1 +
 web/pages/home/index.tsx                 | 95 +++++++++++++-----------
 2 files changed, 54 insertions(+), 42 deletions(-)

diff --git a/web/components/groups/group-overview.tsx b/web/components/groups/group-overview.tsx
index c5a7a46a..df646ce2 100644
--- a/web/components/groups/group-overview.tsx
+++ b/web/components/groups/group-overview.tsx
@@ -231,6 +231,7 @@ export function PinnedItems(props: {
   return pinned.length > 0 || isEditable ? (
     <div>
       <Row className="mb-3 items-center justify-between">
+        <SectionHeader label={'Featured'} href={`#`} />
         {isEditable && (
           <Button
             color="gray"
diff --git a/web/pages/home/index.tsx b/web/pages/home/index.tsx
index 2330e17b..f497fb8b 100644
--- a/web/pages/home/index.tsx
+++ b/web/pages/home/index.tsx
@@ -62,10 +62,12 @@ import { Post } from 'common/post'
 import { useAllPosts } from 'web/hooks/use-post'
 import { useGlobalConfig } from 'web/hooks/use-global-config'
 import { useAdmin } from 'web/hooks/use-admin'
+import { GlobalConfig } from 'common/globalConfig'
 
 export default function Home() {
   const user = useUser()
   const isAdmin = useAdmin()
+  const globalConfig = useGlobalConfig()
 
   useTracking('view home')
 
@@ -103,12 +105,50 @@ export default function Home() {
     groups?.map((g) => g.slug)
   )
 
+  const [pinned, setPinned] = useState<JSX.Element[] | null>(null)
+
+  useEffect(() => {
+    const pinnedItems = globalConfig?.pinnedItems
+
+    async function getPinned() {
+      if (pinnedItems == null) {
+        if (globalConfig != null) {
+          updateGlobalConfig(globalConfig, { pinnedItems: [] })
+        }
+      } else {
+        const itemComponents = await Promise.all(
+          pinnedItems.map(async (element) => {
+            if (element.type === 'post') {
+              const post = await getPost(element.itemId)
+              if (post) {
+                return <PostCard post={post as Post} />
+              }
+            } else if (element.type === 'contract') {
+              const contract = await getContractFromId(element.itemId)
+              if (contract) {
+                return <ContractCard contract={contract as Contract} />
+              }
+            }
+          })
+        )
+        setPinned(
+          itemComponents.filter(
+            (element) => element != undefined
+          ) as JSX.Element[]
+        )
+      }
+    }
+    getPinned()
+  }, [globalConfig])
+
   const isLoading =
     !user ||
     !contractMetricsByProfit ||
     !trendingContracts ||
     !newContracts ||
-    !dailyTrendingContracts
+    !dailyTrendingContracts ||
+    !globalConfig ||
+    !pinned
 
   return (
     <Page>
@@ -140,7 +180,9 @@ export default function Home() {
                 'daily-trending': dailyTrendingContracts,
                 'daily-movers': contractMetricsByProfit,
               },
-              isAdmin
+              isAdmin,
+              globalConfig,
+              pinned
             )}
 
             {groups && groupContracts && trendingGroups.length > 0 ? (
@@ -215,7 +257,9 @@ function renderSections(
     newest: CPMMBinaryContract[]
     score: CPMMBinaryContract[]
   },
-  isAdmin: boolean
+  isAdmin: boolean,
+  globalConfig: GlobalConfig,
+  pinned: JSX.Element[]
 ) {
   type sectionTypes = typeof HOME_SECTIONS[number]['id']
 
@@ -233,7 +277,7 @@ function renderSections(
         if (id === 'featured') {
           // For now, only admins can see the featured section, until we all agree its ship-ready
           if (!isAdmin) return <></>
-          return <FeaturedSection />
+          return <FeaturedSection globalConfig={globalConfig} pinned={pinned} />
         }
 
         const contracts = sectionContracts[id]
@@ -349,44 +393,12 @@ function SearchSection(props: {
   )
 }
 
-function FeaturedSection() {
-  const [pinned, setPinned] = useState<JSX.Element[]>([])
+function FeaturedSection(props: {
+  globalConfig: GlobalConfig
+  pinned: JSX.Element[]
+}) {
+  const { globalConfig, pinned } = props
   const posts = useAllPosts()
-  const globalConfig = useGlobalConfig()
-
-  useEffect(() => {
-    const pinnedItems = globalConfig?.pinnedItems
-
-    async function getPinned() {
-      if (pinnedItems == null) {
-        if (globalConfig != null) {
-          updateGlobalConfig(globalConfig, { pinnedItems: [] })
-        }
-      } else {
-        const itemComponents = await Promise.all(
-          pinnedItems.map(async (element) => {
-            if (element.type === 'post') {
-              const post = await getPost(element.itemId)
-              if (post) {
-                return <PostCard post={post as Post} />
-              }
-            } else if (element.type === 'contract') {
-              const contract = await getContractFromId(element.itemId)
-              if (contract) {
-                return <ContractCard contract={contract as Contract} />
-              }
-            }
-          })
-        )
-        setPinned(
-          itemComponents.filter(
-            (element) => element != undefined
-          ) as JSX.Element[]
-        )
-      }
-    }
-    getPinned()
-  }, [globalConfig])
 
   async function onSubmit(selectedItems: { itemId: string; type: string }[]) {
     if (globalConfig == null) return
@@ -408,7 +420,6 @@ function FeaturedSection() {
 
   return (
     <Col>
-      <SectionHeader label={'Featured'} href={`#`} />
       <PinnedItems
         posts={posts}
         isEditable={true}