Skip to content

fix(data-table): guard undefined defaultSort in hasActiveQuery #758

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
rohanchkrabrty merged 2 commits into from
Apr 27, 2026
Merged

fix(data-table): guard undefined defaultSort in hasActiveQuery #758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53c8636
fix(data-table): guard undefined defaultSort in hasActiveQuery
singh-pk Apr 27, 2026
401ea15
fix: defaultSort check in getDefaultTableQuery
singh-pk Apr 27, 2026
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
2 changes: 1 addition & 1 deletion packages/raystack/components/data-table/data-table.types.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ export interface DataTableProps<TData, TValue> {
totalRowCount?: number;
loadingRowCount?: number;
onTableQueryChange?: (query: DataTableQuery) => void;
defaultSort: DataTableSort;
defaultSort?: DataTableSort;
onLoadMore?: () => Promise<void>;
onRowClick?: (row: TData) => void;
onColumnVisibilityChange?: (columnVisibility: VisibilityState) => void;
Expand Down
9 changes: 6 additions & 3 deletions packages/raystack/components/data-table/utils/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ const generateFilterMap = (
};

const generateSortMap = (sort: DataTableSort[] = []): Map<string, string> => {
return new Map(sort.map(({ name, order }) => [name, order]));
return new Map(sort.filter(Boolean).map(({ name, order }) => [name, order]));
};

const isFilterChanged = (
Expand Down Expand Up @@ -173,7 +173,10 @@ export const hasActiveQuery = (
const hasSearch = Boolean(
tableQuery?.search && tableQuery.search.trim() !== ''
);
const sortChanged = isSortChanged([defaultSort], tableQuery.sort || []);
const sortChanged = isSortChanged(
defaultSort ? [defaultSort] : [],
tableQuery.sort || []
);
const groupChanged = isGroupChanged(
[defaultGroupOption.id],
tableQuery.group_by || []
Expand Down Expand Up @@ -346,7 +349,7 @@ export function getDefaultTableQuery(
const internalQuery = dataTableQueryToInternal(oldQuery);

return {
sort: [defaultSort],
sort: defaultSort ? [defaultSort] : [],
group_by: [defaultGroupOption.id],
...internalQuery
};
Expand Down
Loading