Просмотр исходного кода

Migrate Topic Consumers page to new version of table component (#2717)

* Migrate Dashboard table to the new version on table components #2682

* Added universal component to the column section and added part of test  #2682

* Added universal component for the all new tables in project  #2682

* deleted color argument on LinkCell component

* deleted link on topic count

* Migrate Topic Consumers page to new version of table component #2681

Co-authored-by: davitbejanyan <dbejanyan@provectus.com>
Co-authored-by: Oleg Shur <workshur@gmail.com>
David 2 лет назад
Родитель
Сommit
15e7fc42d2

+ 57 - 50
kafka-ui-react-app/src/components/Topics/Topic/ConsumerGroups/TopicConsumerGroups.tsx

@@ -1,65 +1,72 @@
 import React from 'react';
-import { Link } from 'react-router-dom';
 import { clusterConsumerGroupsPath, RouteParamsClusterTopic } from 'lib/paths';
-import { Table } from 'components/common/table/Table/Table.styled';
-import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeaderCell';
-import { Tag } from 'components/common/Tag/Tag.styled';
-import { TableKeyLink } from 'components/common/table/Table/TableKeyLink.styled';
-import getTagColor from 'components/common/Tag/getTagColor';
+import { ConsumerGroup } from 'generated-sources';
 import useAppParams from 'lib/hooks/useAppParams';
 import { useTopicConsumerGroups } from 'lib/hooks/api/topics';
+import { ColumnDef } from '@tanstack/react-table';
+import Table, { LinkCell, TagCell } from 'components/common/NewTable';
 
 const TopicConsumerGroups: React.FC = () => {
   const { clusterName, topicName } = useAppParams<RouteParamsClusterTopic>();
 
-  const { data: consumerGroups } = useTopicConsumerGroups({
+  const { data: consumerGroups = [] } = useTopicConsumerGroups({
     clusterName,
     topicName,
   });
+  const columns = React.useMemo<ColumnDef<ConsumerGroup>[]>(
+    () => [
+      {
+        header: 'Consumer Group ID',
+        accessorKey: 'groupId',
+        enableSorting: false,
+        // eslint-disable-next-line react/no-unstable-nested-components
+        cell: ({ row }) => (
+          <LinkCell
+            value={row.original.groupId}
+            to={`${clusterConsumerGroupsPath(clusterName)}/${
+              row.original.groupId
+            }`}
+          />
+        ),
+      },
+      {
+        header: 'Active Consumers',
+        accessorKey: 'members',
+        enableSorting: false,
+      },
+      {
+        header: 'Messages Behind',
+        accessorKey: 'messagesBehind',
+        enableSorting: false,
+      },
+      {
+        header: 'Coordinator',
+        accessorKey: 'coordinator',
+        enableSorting: false,
+        cell: ({ getValue }) => {
+          const coordinator = getValue<ConsumerGroup['coordinator']>();
+          if (coordinator === undefined) {
+            return 0;
+          }
+          return coordinator.id;
+        },
+      },
+      {
+        header: 'State',
+        accessorKey: 'state',
+        enableSorting: false,
+        cell: TagCell,
+      },
+    ],
+    []
+  );
   return (
-    <Table isFullwidth>
-      <thead>
-        <tr>
-          <TableHeaderCell title="Consumer Group ID" />
-          <TableHeaderCell title="Active Consumers" />
-          <TableHeaderCell title="Messages Behind" />
-          <TableHeaderCell title="Coordinator" />
-          <TableHeaderCell title="State" />
-        </tr>
-      </thead>
-      <tbody>
-        {consumerGroups?.map((consumer) => (
-          <tr key={consumer.groupId}>
-            <TableKeyLink>
-              <Link
-                to={`${clusterConsumerGroupsPath(clusterName)}/${
-                  consumer.groupId
-                }`}
-              >
-                {consumer.groupId}
-              </Link>
-            </TableKeyLink>
-            <td>{consumer.members}</td>
-            <td>{consumer.messagesBehind}</td>
-            <td>{consumer.coordinator?.id}</td>
-            <td>
-              {consumer.state && (
-                <Tag color={getTagColor(consumer.state)}>{`${consumer.state
-                  .charAt(0)
-                  .toUpperCase()}${consumer.state
-                  .slice(1)
-                  .toLowerCase()}`}</Tag>
-              )}
-            </td>
-          </tr>
-        ))}
-        {(!consumerGroups || consumerGroups.length === 0) && (
-          <tr>
-            <td colSpan={10}>No active consumer groups</td>
-          </tr>
-        )}
-      </tbody>
-    </Table>
+    <Table
+      columns={columns}
+      data={consumerGroups}
+      enableSorting
+      emptyMessage="No active consumer groups"
+    />
   );
 };