Custom tables 2

src/common/index.ts

@@ -8,7 +8,7 @@ export { default as gameAttributeHasHistory } from "./gameAttributeHasHistory";
 export { default as gameAttributesArrayToObject } from "./gameAttributesArrayToObject";
 export { default as getAdjustedTicketPrice } from "./getAdjustedTicketPrice";
 export { default as getDraftLotteryProbs } from "./getDraftLotteryProbs";
-export { default as getCols } from "./getCols";
+export { default as getCols } from "../ui/util/columns/getCols";
 export { default as getPeriodName } from "./getPeriodName";
 export { default as helpers } from "./helpers";
 export { default as isSport } from "./isSport";

src/common/types.ts

@@ -1621,6 +1621,7 @@ export type UpdateEvents = (
 	| "account"
 	| "allStarDunk"
 	| "allStarThree"
+	| "customizeTable"
 	| "firstRun"
 	| "g.goatFormula"
 	| "gameAttributes"

src/ui/components/BoxScore.basketball.tsx

@@ -21,13 +21,13 @@ const StatsTable = ({
 }) => {
 	const [sortBys, setSortBys] = useState<SortBy[]>([]);
 
-	const onClick = (event: MouseEvent, i: number) => {
+	const onClick = (event: MouseEvent, colKey: string) => {
 		setSortBys(prevSortBys => {
 			const newSortBys =
 				updateSortBys({
 					cols,
 					event,
-					i,
+					colKey,
 					prevSortBys,
 				}) ?? [];
 

src/ui/components/BoxScore.football.tsx

@@ -39,7 +39,7 @@ export const StatsHeader = ({
 	sortable,
 }: {
 	cols: Col[];
-	onClick: (b: MouseEvent, a: number) => void;
+	onClick: (b: MouseEvent, a: string) => void;
 	sortBys: SortBy[];
 	sortable: boolean;
 }) => {
@@ -59,7 +59,7 @@ export const StatsHeader = ({
 						className={className}
 						key={i}
 						onClick={event => {
-							onClick(event, i);
+							onClick(event, col.key);
 						}}
 						title={desc}
 					>
@@ -78,7 +78,7 @@ export const sortByStats = (
 ) => {
 	return (a: any, b: any) => {
 		for (const [index, order] of sortBys) {
-			const stat = stats[index];
+			const stat = index.includes(":") ? index.split(":")[1] : index;
 
 			const aValue = getValue?.(a, stat) ?? a.processed[stat];
 			const bValue = getValue?.(b, stat) ?? b.processed[stat];
@@ -109,20 +109,21 @@ const StatsTableIndividual = ({
 
 	const [sortBys, setSortBys] = useState(() => {
 		return PLAYER_GAME_STATS[type].sortBy.map(
-			stat => [stats.indexOf(stat), "desc"] as SortBy,
+			stat => [`stat:${stat}`, "desc"] as SortBy,
 		);
 	});
 
-	const onClick = (event: MouseEvent, i: number) => {
-		setSortBys(
-			prevSortBys =>
+	const onClick = (event: MouseEvent, colKey: string) => {
+		setSortBys(prevSortBys => {
+			return (
 				updateSortBys({
 					cols,
 					event,
-					i,
+					colKey,
 					prevSortBys,
-				}) ?? [],
-		);
+				}) ?? []
+			);
+		});
 	};
 
 	const players = t.players

src/ui/components/BoxScore.hockey.tsx

@@ -41,20 +41,21 @@ const StatsTable = ({
 
 	const [sortBys, setSortBys] = useState(() => {
 		return PLAYER_GAME_STATS[type].sortBy.map(
-			stat => [stats.indexOf(stat), "desc"] as SortBy,
+			stat => [`stat:${stat}`, "desc"] as SortBy,
 		);
 	});
 
-	const onClick = (event: MouseEvent, i: number) => {
-		setSortBys(
-			prevSortBys =>
+	const onClick = (event: MouseEvent, colKey: string) => {
+		setSortBys(prevSortBys => {
+			return (
 				updateSortBys({
 					cols,
 					event,
-					i,
+					colKey,
 					prevSortBys,
-				}) ?? [],
-		);
+				}) ?? []
+			);
+		});
 	};
 
 	const players = t.players

src/ui/components/DataTable/Controls.tsx

@@ -15,6 +15,7 @@ const style = {
 
 const Controls = ({
 	enableFilters,
+	enableCustomizeColumns,
 	hideAllControls,
 	name,
 	onExportCSV,
@@ -25,6 +26,7 @@ const Controls = ({
 	searchText,
 }: {
 	enableFilters: boolean;
+	enableCustomizeColumns: boolean;
 	hideAllControls?: boolean;
 	name: string;
 	onExportCSV: () => void;
@@ -130,9 +132,11 @@ const Controls = ({
 					<span className="glyphicon glyphicon-option-vertical text-muted" />
 				</Dropdown.Toggle>
 				<Dropdown.Menu>
-					<Dropdown.Item onClick={onSelectColumns}>
-						Customize Columns
-					</Dropdown.Item>
+					{enableCustomizeColumns ? (
+						<Dropdown.Item onClick={onSelectColumns}>
+							Customize Columns
+						</Dropdown.Item>
+					) : null}
 					<Dropdown.Item onClick={onExportCSV}>
 						Download Spreadsheet
 					</Dropdown.Item>