Merge pull request #164 from mgalesloot/feature/sort-inventory-age

flux: fix sorting on lastUpdated, source, age

Author: ashu8912

flux/src/common/Table.tsx

@@ -94,7 +94,8 @@ export function Table(props: TableProps) {
           case 'lastUpdated':
             return {
               header: 'Last Updated',
-              accessorFn: item => <DateLabel format="mini" date={prepareLastUpdated(item)} />,
+              accessorFn: item => prepareLastUpdated(item),
+              Cell: ({ cell }: any) => <DateLabel format="mini" date={cell.getValue()} />,
             };
           case 'age':
             return {
@@ -116,6 +117,10 @@ export function Table(props: TableProps) {
             return {
               header: 'Source',
               accessorFn: item => {
+                const { name } = getSourceNameAndType(item);
+                return name;
+              },
+              Cell: ({ row: {original: item}}: any) => {
                 const { name, type } = getSourceNameAndType(item);
                 return (
                   <Link

flux/src/inventory/index.tsx

@@ -1,7 +1,7 @@
 import { K8s } from '@kinvolk/headlamp-plugin/lib';
 import { DateLabel, Link } from '@kinvolk/headlamp-plugin/lib/components/common';
 import { KubeObject } from '@kinvolk/headlamp-plugin/lib/lib/k8s/cluster';
-import React from 'react';
+import React, { cloneElement } from 'react';
 import Table from '../common/Table';
 import { prepareNameLink } from '../helpers/index';
 
@@ -99,7 +99,8 @@ export function GetResourcesFromInventory(props: {
           },
           {
             header: 'Age',
-            accessorFn: item => <DateLabel date={item?.metadata?.creationTimestamp} />,
+            accessorKey: 'metadata.creationTimestamp',
+            Cell: ({ cell }: any) => <DateLabel date={cell.getValue()} />,
           },
         ]}
       />