Skip to content

Fix Bazza UI data table filters issues #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jaruesink merged 1 commit into from
May 10, 2025
Merged

Fix Bazza UI data table filters issues #59

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
70 changes: 21 additions & 49 deletions apps/docs/src/remix-hook-form/data-table-bazza-filters.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,60 +311,31 @@ const columns: ColumnDef<MockIssue>[] = [
// --- NEW Wrapper Component using Loader Data ---
function DataTableWithBazzaFilters() {
const loaderData = useLoaderData<DataResponse>();
const location = useLocation();
const navigate = useNavigate();
const location = useLocation(); // Get location for reading initial params

// Extract data and meta from loader, provide defaults
const data = useMemo(() => loaderData?.data ?? [], [loaderData?.data]);
const pageCount = useMemo(() => loaderData?.meta.pageCount ?? 0, [loaderData?.meta.pageCount]);

// NEW: Convert to Map of Maps
const facetedCounts = useMemo(() => {
const rawCounts = loaderData?.facetedCounts ?? {};
const mapOfMaps = new Map<string, Map<string, number>>();
for (const columnId in rawCounts) {
const innerObject = rawCounts[columnId as keyof typeof rawCounts];
const innerMap = new Map<string, number>();
if (innerObject) {
// Check if innerObject is not undefined
for (const optionValue in innerObject) {
innerMap.set(optionValue, innerObject[optionValue as keyof typeof innerObject]);
}
}
mapOfMaps.set(columnId, innerMap);
}
return mapOfMaps;
}, [loaderData?.facetedCounts]);

// Use filter sync hook (this manages filters in the URL)
const [filters, setFilters] = useFilterSync();

// Ensure all filter changes update the URL and trigger loader reload
const handleFiltersChange: React.Dispatch<React.SetStateAction<FiltersState>> = (updater) => {
if (typeof updater === 'function') {
setFilters((prev) => updater(prev));
} else {
setFilters(updater);
}
};
// Ensure we have data even if loaderData is undefined
const data = loaderData?.data ?? [];
const pageCount = loaderData?.meta.pageCount ?? 0;
const facetedCounts = loaderData?.facetedCounts ?? {};

// --- REVISED PAGINATION STATE MANAGEMENT ---
// Define defaults for pagination
const defaultPageIndex = dataTableRouterParsers.page.defaultValue;
const defaultPageSize = dataTableRouterParsers.pageSize.defaultValue;
// Default pagination values
const defaultPageIndex = 0;
const defaultPageSize = 10;

// Get current pagination values from URL (via loaderData) or use defaults
const currentPageIndexFromUrl = loaderData?.meta.page ?? defaultPageIndex;
const currentPageSizeFromUrl = loaderData?.meta.pageSize ?? defaultPageSize;
// Use useFilterSync to synchronize filters with URL
const { filters, handleFiltersChange } = useFilterSync({
defaultValue: [],
paramName: 'filters',
});

// Manage local pagination and sorting state
// Initialize from URL-derived values
// Local state for pagination and sorting
const [pagination, setPagination] = useState<PaginationState>({
pageIndex: currentPageIndexFromUrl,
pageSize: currentPageSizeFromUrl,
pageIndex: loaderData?.meta.page ?? defaultPageIndex,
pageSize: loaderData?.meta.pageSize ?? defaultPageSize,
});

// Initialize sorting state from URL params if they exist
// Extract sorting from URL
const [sorting, setSorting] = useState<SortingState>(() => {
const params = new URLSearchParams(location.search);
const sortField = params.get('sortField');
Expand Down Expand Up @@ -444,7 +415,7 @@ function DataTableWithBazzaFilters() {
// Setup TanStack Table instance
const table = useReactTable({
data,
columns: columns, // <-- FIX: Use original columns for cell rendering
columns: columns, // <-- Use original columns for cell rendering
state: {
pagination, // Controlled by local state, which is synced from URL
sorting, // Controlled by local state, which is synced from URL
Expand Down Expand Up @@ -571,9 +542,10 @@ const handleDataFetch = async ({ request }: LoaderFunctionArgs): Promise<DataRes
const start = page * pageSize;
const paginatedData = processedData.slice(start, start + pageSize);

// Calculate faceted counts based on the *original* database
// Calculate faceted counts based on the filtered data (not the original database)
// This ensures counts reflect the current filtered dataset
const facetedColumns: Array<keyof MockIssue> = ['status', 'assignee', 'priority'];
const facetedCounts = calculateFacetedCounts(mockDatabase, facetedColumns, allDefinedOptions);
const facetedCounts = calculateFacetedCounts(processedData, facetedColumns, allDefinedOptions);

const response: DataResponse = {
data: paginatedData,
Expand Down