Merge branch 'main' into feat/3938-bot-human-links

# Conflicts:
#	users/serializers.py

Author: hlbmtc

front_end/package-lock.json

@@ -94,7 +94,7 @@
     "remark": "^15.0.1",
     "sass": "^1.77.6",
     "sharp": "^0.33.5",
-    "storybook": "^9.0.13",
+    "storybook": "^9.1.17",
     "strip-markdown": "^6.0.0",
     "stripe": "^17.7.0",
     "tailwind-merge": "^2.5.5",

front_end/package.json

@@ -24,7 +24,13 @@ const HeaderBlockInfo: FC<Props> = async ({ tournament }) => {
         </Suspense>
       );
     case TournamentType.Index:
-      return <IndexHeaderBlock tournament={tournament} />;
+      return (
+        <Suspense fallback={<Skeleton />}>
+          <IndexHeaderBlock tournament={tournament}>
+            <TournamentTimeline tournament={tournament} />
+          </IndexHeaderBlock>
+        </Suspense>
+      );
     default:
       return (
         <div className="flex flex-wrap gap-x-9 gap-y-4 py-4">

front_end/src/app/(main)/(tournaments)/tournament/components/header_block_info.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { useTranslations } from "next-intl";
-import { useMemo, useState } from "react";
+import { ReactNode, useMemo, useState } from "react";
 
 import FanChart from "@/components/charts/fan_chart";
 import ButtonGroup, { GroupButton } from "@/components/ui/button_group";
@@ -26,9 +26,10 @@ type YearTab = "overview" | string;
 
 type Props = {
   tournament: Tournament;
+  children?: ReactNode;
 };
 
-export default function IndexHeaderBlock({ tournament }: Props) {
+export default function IndexHeaderBlock({ tournament, children }: Props) {
   const t = useTranslations();
   const idx = tournament.index_data;
 
@@ -134,6 +135,8 @@ export default function IndexHeaderBlock({ tournament }: Props) {
             max={idx?.max ?? null}
           />
         )}
+
+        {children ? <div className="mt-4 sm:mt-5">{children}</div> : null}
       </div>
     </div>
   );

front_end/src/app/(main)/(tournaments)/tournament/components/index/index_header_block.tsx

@@ -84,7 +84,7 @@ const ServicesPageTemplate: React.FC<Props> = async ({
       });
       const curated = all.filter(({ id, slug }) =>
         mainPageTournamentsList.some(
-          ({ id: want }) => want === slug || want === String(id)
+          ({ id: want }) => String(want) === slug || want === id
         )
       );
       tournamentsData = sortServiceTournaments(curated);

front_end/src/app/(main)/services/components/templates/services_page_template.tsx

@@ -6,10 +6,10 @@ export function sortServiceTournaments(tournaments: TournamentPreview[]) {
   const { tournamentsOrder } = ServiceConfig;
   return tournaments.sort(
     (a, b) =>
-      (tournamentsOrder.find((t) => t.id === String(a.slug ?? a.id))?.order ??
-        0) -
-      (tournamentsOrder.find((t) => t.id === String(b.slug ?? b.id))?.order ??
-        0)
+      (tournamentsOrder.find((t) => t.id === a.id || String(t.id) === a.slug)
+        ?.order ?? 0) -
+      (tournamentsOrder.find((t) => t.id === b.id || String(t.id) === b.slug)
+        ?.order ?? 0)
   );
 }
 

front_end/src/app/(main)/services/helpers.ts

@@ -25,7 +25,7 @@ export default async function ServicesPage() {
   ]);
   const mainPageTournaments = tournaments.filter((tournament) =>
     mainPageTournamentsList.find(
-      ({ id }) => id === tournament.slug || id === String(tournament.id)
+      ({ id }) => String(id) === tournament.slug || id === tournament.id
     )
   );
   const sortedTournaments = sortServiceTournaments(mainPageTournaments);

front_end/src/app/(main)/services/page.tsx

@@ -14,25 +14,41 @@ const ServiceConfig = {
     "placeholder-for-last-circle",
   ],
   mainPageTournamentsList: [
-    { id: "bridgewater" },
-    { id: "keep-virginia-safe-ii" },
-    { id: "fiscal" },
-    { id: "climate" },
+    // bridgewater
+    { id: 32567 },
+    // keep-virginia-safe-ii
+    { id: 2100 },
+    // fiscal
+    { id: 32725 },
+    // climate
+    { id: 1756 },
   ],
   // Use order to sort tournaments in the carousel/list
   tournamentsOrder: [
-    { id: "bridgewater", order: 1 },
-    { id: "keep-virginia-safe-ii", order: 2 },
-    { id: "respiratory-outlook-24-25", order: 3 },
-    { id: "fiscal", order: 4 },
-    { id: "climate", order: 5 },
-    { id: "biosecurity-tournament", order: 6 },
-    { id: "market-pulse", order: 7 },
-    { id: "flusight-challenge23-24", order: 8 },
-    { id: "global-pulse", order: 9 },
-    { id: "aibq2", order: 10 },
-    { id: "metaculus-cup", order: 11 },
-    { id: "ukraine-conflict", order: 12 },
+    // bridgewater
+    { id: 32567, order: 1 },
+    // keep-virginia-safe-ii
+    { id: 2100, order: 2 },
+    // respiratory-outlook-24-25
+    { id: 3411, order: 3 },
+    // fiscal
+    { id: 32725, order: 4 },
+    // climate
+    { id: 1756, order: 5 },
+    // biosecurity-tournament
+    { id: 1703, order: 6 },
+    // market-pulse
+    { id: 32917, order: 7 },
+    // flusight-challenge23-24
+    { id: 2569, order: 8 },
+    // global-pulse
+    { id: 2722, order: 9 },
+    // aibq2
+    { id: 32721, order: 10 },
+    // metaculus-cup
+    { id: 32828, order: 11 },
+    // ukraine-conflict
+    { id: 1426, order: 12 },
   ],
   spotlightTournamentId: "bridgewater",
   partnersLogos: [

front_end/src/app/(main)/services/serviceConfig.ts

@@ -138,7 +138,6 @@ const PredictionFlowPost: FC<Props> = ({ tournamentSlug }) => {
                 <ForecastMaker
                   post={detailedPost}
                   onPredictionSubmit={onPredictionSubmit}
-                  disableResolveButtons={true}
                 />
               </div>
 

front_end/src/app/(prediction-flow)/components/prediction_flow_post.tsx

@@ -83,7 +83,6 @@ type Props = {
   questions: QuestionWithNumericForecasts[];
   groupVariable: string;
   canPredict: boolean;
-  canResolve: boolean;
   predictionMessage: ReactNode;
   onPredictionSubmit?: () => void;
 };