Add default leagues (#118)

ystv · Apr 18, 2024 · 60dcc7c · 60dcc7c
1 parent cf6db82
commit 60dcc7c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/scores-src/src/client/pages/CreateEventModal.tsx b/scores-src/src/client/pages/CreateEventModal.tsx
@@ -73,8 +73,20 @@ export function CreateEventModal() {
             <SelectField
               title="League"
               name="league"
-              // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-              values={leagues.data?.map((l) => [l.slug!, l.name]) ?? []}
+              values={
+                leagues.data
+                  ?.sort((a, b) => {
+                    if (a.default) {
+                      return -1;
+                    }
+                    if (b.default) {
+                      return 1;
+                    }
+                    return a.name.localeCompare(b.name);
+                  })
+                  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                  ?.map((l) => [l.slug!, l.name]) ?? []
+              }
               rootAttrs={{ "data-cy": "selectLeague" }}
               required
             />

diff --git a/scores-src/src/client/pages/ListEvents.tsx b/scores-src/src/client/pages/ListEvents.tsx
@@ -119,8 +119,14 @@ export function ListEvents() {
 
   useEffect(() => {
     if (leagues?.length > 0 && selectedLeague === null) {
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      setSelectedLeague(leagues[0].slug!);
+      const def = leagues.find((x) => x.default);
+      if (def) {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        setSelectedLeague(def.slug!);
+      } else {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        setSelectedLeague(leagues[0].slug!);
+      }
     }
   }, [selectedLeague, leagues]);
 

diff --git a/scores-src/src/common/types.ts b/scores-src/src/common/types.ts
@@ -91,13 +91,15 @@ export interface League {
   name: string;
   startDate: string;
   endDate: string;
+  default?: boolean;
 }
 
 export const LeagueSchema: Yup.SchemaOf<League> = Yup.object({
   slug: Yup.string().optional(),
   name: Yup.string().required(),
   startDate: Yup.string().required(),
   endDate: Yup.string().required(),
+  default: Yup.bool().optional(),
 });
 
 export interface ActionMeta {