Skip to content

Sorting connectors duplicates items #119

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
Haarolean merged 3 commits into from
Feb 16, 2024
Merged

Sorting connectors duplicates items #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00719f6
Fixed the case when table components had same key (name)
Nilumilak Feb 12, 2024
abcb2ad
Added prop setRowId to Table component
Nilumilak Feb 14, 2024
476a4c6
Eslint fixes
Nilumilak Feb 15, 2024
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
1 change: 1 addition & 0 deletions frontend/src/components/Connect/List/List.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ const List: React.FC = () => {
navigate(clusterConnectConnectorPath(clusterName, connect, name))
}
emptyMessage="No connectors found"
setRowId={(originalRow) => `${originalRow.name}-${originalRow.connect}`}
/>
);
};
Expand Down
8 changes: 7 additions & 1 deletion frontend/src/components/common/NewTable/Table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ export interface TableProps<TData> {

onRowHover?: (row: Row<TData>) => void;
onMouseLeave?: () => void;

setRowId?: (originalRow: Row<TData>) => string;
}

type UpdaterFn<T> = (previousState: T) => T;
Expand Down Expand Up @@ -132,6 +134,7 @@ const Table: React.FC<TableProps<any>> = ({
onRowClick,
onRowHover,
onMouseLeave,
setRowId,
}) => {
const [searchParams, setSearchParams] = useSearchParams();
const location = useLocation();
Expand Down Expand Up @@ -164,7 +167,10 @@ const Table: React.FC<TableProps<any>> = ({
rowSelection,
},
getRowId: (originalRow, index) => {
return originalRow.name ? originalRow.name : `${index}`;
return (
setRowId?.(originalRow) ||
(originalRow.name ? originalRow.name : `${index}`)
);
},
onSortingChange: onSortingChange as OnChangeFn<SortingState>,
onPaginationChange: onPaginationChange as OnChangeFn<PaginationState>,
Expand Down