Skip to content

Commit fc6c320

Browse files
author
Dylan Huang
committed
put flattened dataset into globalstate
1 parent bde8639 commit fc6c320

2 files changed

Lines changed: 11 additions & 8 deletions

File tree

vite-app/src/GlobalState.tsx

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { makeAutoObservable } from "mobx";
22
import type { EvaluationRow } from "./types/eval-protocol";
3+
import flattenJson from "./util/flatten-json";
34

45
export class GlobalState {
56
isConnected: boolean = false;
@@ -53,6 +54,14 @@ export class GlobalState {
5354
);
5455
}
5556

57+
get flattenedDataset() {
58+
return this.sortedDataset.map((row) => flattenJson(row));
59+
}
60+
61+
get flattenedDatasetKeys() {
62+
return this.flattenedDataset.map((row) => Object.keys(row));
63+
}
64+
5665
get totalCount() {
5766
return Object.keys(this.dataset).length;
5867
}

vite-app/src/components/Dashboard.tsx

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import { observer } from "mobx-react";
2-
import { useMemo, useState, useEffect } from "react";
2+
import { useState, useEffect } from "react";
33
import { useLocation, useNavigate } from "react-router-dom";
44
import { state } from "../App";
55
import Button from "./Button";
66
import { EvaluationTable } from "./EvaluationTable";
77
import PivotTab from "./PivotTab";
88
import TabButton from "./TabButton";
9-
import flattenJson from "../util/flatten-json";
109

1110
interface DashboardProps {
1211
onRefresh: () => void;
@@ -68,11 +67,6 @@ const Dashboard = observer(({ onRefresh }: DashboardProps) => {
6867
setActiveTab(deriveTabFromPath(location.pathname));
6968
}, [location.pathname]);
7069

71-
const flattened = useMemo(() => {
72-
const flattenedDataset = state.sortedDataset.map((row) => flattenJson(row));
73-
return flattenedDataset;
74-
}, [state.sortedDataset]);
75-
7670
return (
7771
<div className="text-sm">
7872
{/* Summary */}
@@ -132,7 +126,7 @@ const Dashboard = observer(({ onRefresh }: DashboardProps) => {
132126
{activeTab === "table" ? (
133127
<EvaluationTable />
134128
) : (
135-
<PivotTab data={flattened} />
129+
<PivotTab data={state.flattenedDataset} />
136130
)}
137131
</div>
138132
</div>

0 commit comments

Comments
 (0)