Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-22 23:09:41 +02:00
Code Issues Releases Activity

fix(kube-tables): update table accessor fns [EE-5464] (#8920)

Browse source 
* fix(services): update accessor fns [EE-5464]

* small fixes

---------

Co-authored-by: testa113 <testa113>
This commit is contained in:
Ali 2023-05-11 12:55:15 +12:00 • committed by GitHub
parent 22f4c5d650
commit 42fce1ec57
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 148 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

71
app/react/kubernetes/ServicesView/ServicesDatatable/columns/clusterIP.tsx
View file

@ -1,38 +1,41 @@
import { columnHelper } from './helper';
export const clusterIP = columnHelper.accessor('ClusterIPs', {
header: 'Cluster IP',
id: 'clusterIP',
cell: ({ getValue }) => {
const clusterIPs = getValue();
export const clusterIP = columnHelper.accessor(
(row) => row.ClusterIPs?.join(','),
{
header: 'Cluster IP',
id: 'clusterIP',
cell: ({ row }) => {
const clusterIPs = row.original.ClusterIPs;
if (!clusterIPs?.length) {
return '-';
}
return clusterIPs.map((ip) => <div key={ip}>{ip}</div>);
},
sortingFn: (rowA, rowB) => {
const a = rowA.original.ClusterIPs;
const b = rowB.original.ClusterIPs;
const ipA = a?.[0];
const ipB = b?.[0];
// no ip's at top, followed by 'None', then ordered by ip
if (!ipA) return 1;
if (!ipB) return -1;
if (ipA === ipB) return 0;
if (ipA === 'None') return 1;
if (ipB === 'None') return -1;
// natural sort of the ip
return ipA.localeCompare(
ipB,
navigator.languages[0] || navigator.language,
{
numeric: true,
ignorePunctuation: true,
if (!clusterIPs?.length) {
return '-';
}
);
},
});
return clusterIPs.map((ip) => <div key={ip}>{ip}</div>);
},
sortingFn: (rowA, rowB) => {
const a = rowA.original.ClusterIPs;
const b = rowB.original.ClusterIPs;
const ipA = a?.[0];
const ipB = b?.[0];
// no ip's at top, followed by 'None', then ordered by ip
if (!ipA) return 1;
if (!ipB) return -1;
if (ipA === ipB) return 0;
if (ipA === 'None') return 1;
if (ipB === 'None') return -1;
// natural sort of the ip
return ipA.localeCompare(
ipB,
navigator.languages[0] || navigator.language,
{
numeric: true,
ignorePunctuation: true,
}
);
},
}
);