Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 29 additions & 1 deletion src/Table/CSVTable.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ const CSVTable = ({dateStr}) => {
const date = new Date(dateStr).toISOString().split('T')[0].replaceAll('-', '_');
const [data, setData] = useState([]);
const [categories, setCategories] = useState({});
const [checkedCategories, setCheckedCategories] = useState({});
const [checkedCategories, setCheckedCategories] = useState(() => ({}));
const [rankingMap, setRankingMap] = useState(new Map());
const [screenWidth, setScreenWidth] = useState(window.innerWidth);

const [searchParams, setSearchParams] = useSearchParams();
Expand Down Expand Up @@ -73,6 +74,7 @@ const CSVTable = ({dateStr}) => {
const columns = useMemo(() => {
let res = [
{ label: "Model", accessor: "model", sortable: true, visible: true },
{ label: "Ranking", accessor: "ranking", sortable: true, visible: true, sortByFn: (a, b) => rankingMap.get(a.model) - rankingMap.get(b.model) },
{ label: "CTA", accessor: "cta", sortable: true, visible: false },
{ label: "JoinMap", accessor: "tablejoin", sortable: true, visible: false },
{ label: "Table Reformat", accessor: "tablereformat", sortable: true, visible: false },
Expand Down Expand Up @@ -110,6 +112,27 @@ const CSVTable = ({dateStr}) => {

const [sortedData, handleSorting, handleSearch, handleFilter, sortField, sortOrder, searchQuery, filter] = useTable(data, columns, checkedCategories, categories, 'model', modelLinks);

// Calculate initial rankings when data and categories are loaded
useEffect(() => {
if (!data.length || !Object.keys(categories).length) return;

// Use current checkedCategories if available, otherwise create default
const rankingCategories = Object.keys(checkedCategories).length ? checkedCategories :
Object.keys(categories).reduce((acc, category) => {
acc[category] = { average: true, allSubcategories: false };
return acc;
}, {});

const map = new Map();
const initialRanking = [...data].sort(
(a, b) => getGlobalAverage(b, rankingCategories, categories) - getGlobalAverage(a, rankingCategories, categories)
);
initialRanking.forEach((row, idx) => {
map.set(row.model, idx + 1);
});
setRankingMap(map);
}, [data, categories]);

useEffect(() => {
fetch(process.env.PUBLIC_URL + `/table_${date}.csv`)
.then(response => response.text())
Expand Down Expand Up @@ -408,6 +431,10 @@ const CSVTable = ({dateStr}) => {
<table className="main-tabl table">
<thead>
<tr>
<th
className={`sticky-col ${getSortClass("ranking")}`}
onClick={() => handleSortingChange("ranking")}>
Ranking</th>
<th
className={`sticky-col ${getSortClass("model")}`}
onClick={() => handleSortingChange("model")}>
Expand Down Expand Up @@ -442,6 +469,7 @@ const CSVTable = ({dateStr}) => {
<tbody>
{sortedData.map((row, index) =>
(showReasoners || !modelLinks[row.model]?.reasoner) && <tr key={index}>
<td className="sticky-col">{rankingMap.get(row.model)}</td>
<td className="sticky-col model-col">
<a href={modelLinks[row.model]?.url ?? '#'} target={modelLinks[row.model]?.url ? "_blank" : ""} rel="noopener noreferrer">
{showApiName ? row.model : (() => {
Expand Down
11 changes: 8 additions & 3 deletions src/Table/SortTable.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,13 @@ export const useTable = (data, columns, checkedCategories, categories, searchCol
});
};

const sortData = (sortField, sortOrder, sortingData, checkedCategories, categories) => {
const sortData = (sortField, sortOrder, sortingData, checkedCategories, categories, columns) => {
const column = columns.find(col => col.accessor === sortField);
return [...sortingData].sort((a, b) => {
// Use custom sort function if provided
if (column?.sortByFn) {
return column.sortByFn(a, b) * (sortOrder === "asc" ? 1 : -1);
}
let primaryCompare = 0;

// Null handling standard across all fields
Expand Down Expand Up @@ -82,13 +87,13 @@ export const useTable = (data, columns, checkedCategories, categories, searchCol
}, [columns]);

useEffect(() => {
let sortedData = sortData(sortField, sortOrder, data, checkedCategories, categories);
let sortedData = sortData(sortField, sortOrder, data, checkedCategories, categories, columns);
if (searchQuery !== "" && searchColumn !== "") {
sortedData = searchData(searchQuery, searchColumn, sortedData);
}
sortedData = filterData(filter, sortedData);
setTableData(sortedData);
}, [data, sortField, sortOrder, searchQuery, searchColumn, checkedCategories, categories, filter]);
}, [data, sortField, sortOrder, searchQuery, searchColumn, checkedCategories, categories, filter, columns]);

const handleSorting = (sortField, sortOrder) => {
setSortField(sortField);
Expand Down