Fix season summary if a conf has 0 teams and a league was exported/im…

…ported (so undefined in array became null)
zengm-games · Sep 30, 2024 · 1403674 · 1403674
1 parent 6545fb8
commit 1403674
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 10 deletions.
diff --git a/src/common/types.baseball.ts b/src/common/types.baseball.ts
@@ -2,7 +2,7 @@ import type teamStats from "../worker/core/team/stats.baseball";
 
 // Should all the extra ones be in teamStats["derived"]?
 export type TeamStatAttr =
-	| typeof teamStats["raw"][number]
+	| (typeof teamStats)["raw"][number]
 	| "ab"
 	| "ops"
 	| "era"
@@ -43,7 +43,7 @@ export type TeamStatAttr =
 	| "oppCsp";
 
 export type TeamStatAttrByPos =
-	| typeof teamStats["byPos"][number]
+	| (typeof teamStats)["byPos"][number]
 	| "ch"
 	| "fldp"
 	| "rf9"
@@ -77,7 +77,9 @@ export type AwardPlayer = {
 export type Awards = {
 	season: number;
 	bestRecord: AwardTeam;
-	bestRecordConfs: (AwardTeam | undefined)[];
+
+	// undefined gets turned into null by JSON.stringify
+	bestRecordConfs: (AwardTeam | undefined | null)[];
 
 	// Only in old leagues
 	bre?: AwardTeam;

diff --git a/src/common/types.basketball.ts b/src/common/types.basketball.ts
@@ -2,7 +2,7 @@ import type teamStats from "../worker/core/team/stats.basketball";
 
 // Should all the extra ones be in teamStats["derived"]?
 export type TeamStatAttr =
-	| typeof teamStats["raw"][number]
+	| (typeof teamStats)["raw"][number]
 	| "fgp"
 	| "oppFgp"
 	| "fgpAtRim"
@@ -75,7 +75,9 @@ export type Awards<
 > = {
 	season: number;
 	bestRecord: AwardTeam;
-	bestRecordConfs: (AwardTeam | undefined)[];
+
+	// undefined gets turned into null by JSON.stringify
+	bestRecordConfs: (AwardTeam | undefined | null)[];
 
 	// Only in old leagues
 	bre?: AwardTeam;

diff --git a/src/common/types.football.ts b/src/common/types.football.ts
@@ -2,7 +2,7 @@ import type teamStats from "../worker/core/team/stats.football";
 
 // Should all the extra ones be in teamStats["derived"]?
 export type TeamStatAttr =
-	| typeof teamStats["raw"][number]
+	| (typeof teamStats)["raw"][number]
 	| "mov"
 	| "oppMov"
 	| "ptsPerGame"
@@ -58,7 +58,9 @@ export type AwardPlayer = {
 export type Awards = {
 	season: number;
 	bestRecord: AwardTeam;
-	bestRecordConfs: (AwardTeam | undefined)[];
+
+	// undefined gets turned into null by JSON.stringify
+	bestRecordConfs: (AwardTeam | undefined | null)[];
 	oroy: AwardPlayer | undefined;
 	droy: AwardPlayer | undefined;
 	allRookie: (AwardPlayer | undefined)[];

diff --git a/src/common/types.hockey.ts b/src/common/types.hockey.ts
@@ -2,7 +2,7 @@ import type teamStats from "../worker/core/team/stats.hockey";
 
 // Should all the extra ones be in teamStats["derived"]?
 export type TeamStatAttr =
-	| typeof teamStats["raw"][number]
+	| (typeof teamStats)["raw"][number]
 	| "g"
 	| "a"
 	| "sa"
@@ -51,7 +51,9 @@ export type AwardPlayer = {
 export type Awards = {
 	season: number;
 	bestRecord: AwardTeam;
-	bestRecordConfs: (AwardTeam | undefined)[];
+
+	// undefined gets turned into null by JSON.stringify
+	bestRecordConfs: (AwardTeam | undefined | null)[];
 
 	// Only in old leagues
 	bre?: AwardTeam;

diff --git a/src/ui/views/History.basketball/AwardsAndChamp.tsx b/src/ui/views/History.basketball/AwardsAndChamp.tsx
@@ -115,7 +115,7 @@ const AwardsAndChamp = ({
 				)}
 				<h2>Best Record</h2>
 				{awards.bestRecordConfs
-					.filter((a: any) => a !== undefined)
+					.filter((a: any) => a !== undefined && a !== null)
 					.map((t: any, i: number) =>
 						t !== undefined ? (
 							<p key={t.tid}>