Skip to content

Commit 7d8b789

Browse files
author
Nicolas Pierre-charles
committed
fix(dedicated-servers): fix column visibility when filtering
ref: #MANAGER-18957 Signed-off-by: Nicolas Pierre-charles <[email protected]>
1 parent c7acf66 commit 7d8b789

File tree

1 file changed

+11
-9
lines changed
  • packages/manager/apps/dedicated-servers/src/pages/listing/server

1 file changed

+11
-9
lines changed

packages/manager/apps/dedicated-servers/src/pages/listing/server/index.tsx

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,19 @@ import { urls } from '@/routes/routes.constant';
1616
import { ErrorComponent } from '@/components/errorComponent';
1717

1818
export default function ServerListing() {
19-
const columns = useColumns();
20-
const [visibleColumns] = useState([
21-
'name',
19+
const [columnVisibility, setColumnVisibility] = useState([
20+
'iam.displayName',
2221
'ip',
23-
'model',
22+
'commercialRange',
2423
'region',
25-
'status',
26-
'actions',
24+
'state',
2725
'tags',
26+
'actions',
2827
]);
28+
const columns = useColumns();
29+
2930
const { sorting, setSorting } = useDataGrid({
30-
id: 'displayName',
31+
id: 'iam_displayName',
3132
desc: false,
3233
});
3334
const {
@@ -58,7 +59,7 @@ export default function ServerListing() {
5859
return (s1.iam?.displayName).localeCompare(s2.iam?.displayName);
5960
}
6061
if (key && Object.keys(s1).includes(key as string)) {
61-
return (s1[key].toString() || '').localeCompare(s2[key].toString());
62+
return (s1[key]?.toString() || '').localeCompare(s2[key]?.toString());
6263
}
6364
return 0;
6465
});
@@ -93,7 +94,8 @@ export default function ServerListing() {
9394
onSortChange={setSorting}
9495
isLoading={isLoading}
9596
filters={filters}
96-
columnVisibility={visibleColumns}
97+
columnVisibility={columnVisibility}
98+
setColumnVisibility={setColumnVisibility}
9799
search={search}
98100
className="server-data-grid"
99101
topbar={<OrderMenu />}

0 commit comments

Comments
 (0)