From f5d15e581aab674f7b282a556e69e6f22da36711 Mon Sep 17 00:00:00 2001
From: zkldi <20380519+zkldi@users.noreply.github.com>
Date: Thu, 6 Jan 2022 10:49:57 +0000
Subject: [PATCH] Whoops

---
 client/src/components/tables/folders/FolderTable.tsx | 3 ++-
 client/src/components/tables/headers/ChartHeader.tsx | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/client/src/components/tables/folders/FolderTable.tsx b/client/src/components/tables/folders/FolderTable.tsx
index f308f0307..67fbd82a6 100644
--- a/client/src/components/tables/folders/FolderTable.tsx
+++ b/client/src/components/tables/folders/FolderTable.tsx
@@ -15,6 +15,7 @@ import TachiTable, { Header } from "../components/TachiTable";
 import { usePBState } from "../components/UseScoreState";
 import PBDropdown from "../dropdowns/PBDropdown";
 import ScoreCoreCells from "../game-core-cells/ScoreCoreCells";
+import ChartHeader from "../headers/ChartHeader";
 import { GetGPTCoreHeaders } from "../headers/GameHeaders";
 import { FolderIndicatorHeader } from "../headers/IndicatorHeader";
 
@@ -32,7 +33,7 @@ export default function FolderTable<I extends IDStrings = IDStrings>({
 	const [rating, setRating] = useState(defaultRating);
 
 	const headers: Header<FolderDataset[0]>[] = [
-		["Chart", "Chart", NumericSOV(x => x.levelNum)],
+		ChartHeader<FolderDataset>(game, playtype, k => k),
 		FolderIndicatorHeader,
 		["Song", "Song", StrSOV(x => x.__related.song.title)],
 		...GetGPTCoreHeaders<FolderDataset>(game, playtype, rating, setRating, x => x.__related.pb),
diff --git a/client/src/components/tables/headers/ChartHeader.tsx b/client/src/components/tables/headers/ChartHeader.tsx
index aebf5e3ce..ee9eb7a2a 100644
--- a/client/src/components/tables/headers/ChartHeader.tsx
+++ b/client/src/components/tables/headers/ChartHeader.tsx
@@ -1,8 +1,8 @@
-import { ZTableSortFn } from "components/util/table/useZTable";
 import { ChartDocument, Game } from "tachi-common";
 import { FolderDataset, PBDataset, ScoreDataset } from "types/tables";
 import { Playtype } from "types/tachi";
 import { IsNotNullish } from "util/misc";
+import { NumericSOV } from "util/sorts";
 import { Header } from "../components/TachiTable";
 
 function CascadingTierlistValue(
@@ -23,7 +23,7 @@ export default function ChartHeader<D extends ScoreDataset | FolderDataset | PBD
 	playtype: Playtype,
 	chartGetter: (k: D[0]) => ChartDocument
 ): Header<D[0]> {
-	let sortFn: ZTableSortFn<D[0]> = k => chartGetter(k).levelNum;
+	let sortFn: (d: D[0]) => number = k => chartGetter(k).levelNum;
 
 	if (game === "iidx") {
 		sortFn = k => CascadingTierlistValue(chartGetter(k), "kt-HC", "kt-NC");
@@ -31,5 +31,5 @@ export default function ChartHeader<D extends ScoreDataset | FolderDataset | PBD
 		sortFn = k => CascadingTierlistValue(chartGetter(k), "sgl-HC", "sgl-EC");
 	}
 
-	return ["Chart", "Chart", sortFn];
+	return ["Chart", "Chart", NumericSOV(sortFn)];
 }