Merge pull request #1354 from bipuladh/bz-975

Fixes storage client resource name in list page
red-hat-storage · May 3, 2024 · c6dfe50 · c6dfe50
2 parents b8ba46a + e3691a0
commit c6dfe50
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/packages/odf/components/storage-consumers/client-list.tsx b/packages/odf/components/storage-consumers/client-list.tsx
@@ -3,7 +3,6 @@ import { Kebab } from '@odf/shared';
 import { ODF_OPERATOR } from '@odf/shared/constants/common';
 import { getTimeDifferenceInSeconds } from '@odf/shared/details-page/datetime';
 import { useFetchCsv } from '@odf/shared/hooks';
-import { getName } from '@odf/shared/selectors/k8s';
 import { StorageConsumerKind } from '@odf/shared/types';
 import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook';
 import { getOprVersionFromCSV } from '@odf/shared/utils';
@@ -83,7 +82,7 @@ const ClientsList: React.FC<ClientListProps> = (props) => {
     () => [
       {
         title: t('Name'),
-        sort: 'metadata.name',
+        sort: 'status.client.name',
         transforms: [sortable],
         props: {
           className: tableColumns[0].className,
@@ -92,6 +91,7 @@ const ClientsList: React.FC<ClientListProps> = (props) => {
       },
       {
         title: t('Cluster ID'),
+        sort: 'status.client.clusterId',
         props: {
           className: tableColumns[1].className,
         },
@@ -253,10 +253,10 @@ const StorageClientRow: React.FC<
   return (
     <>
       <TableData {...tableColumns[0]} activeColumnIDs={activeColumnIDs}>
-        {getName(obj)}
+        {obj?.status?.client?.name}
       </TableData>
       <TableData {...tableColumns[1]} activeColumnIDs={activeColumnIDs}>
-        {getName(obj).split('storageconsumer-')[1]}
+        {obj?.status?.client?.clusterId}
       </TableData>
       <TableData {...tableColumns[2]} activeColumnIDs={activeColumnIDs}>
         {getOpenshiftVersion(obj)}

diff --git a/packages/shared/src/types/storage.ts b/packages/shared/src/types/storage.ts
@@ -177,6 +177,9 @@ type StorageConsumerStatus = {
 type ClientStatus = {
   platformVersion: string;
   operatorVersion: string;
+  clusterId: string;
+  clusterName: string;
+  name: string;
 };
 
 export type StorageConsumerKind = K8sResourceCommon & {