Merge pull request #142 from kaleido-io/fetchreferences

[fetchreferences] fetchreferences for event table and tx details
hyperledger · Mar 25, 2022 · 2ccb2bb · 2ccb2bb
2 parents bcb5517 + c435f76
commit 2ccb2bb
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 13 deletions.
diff --git a/src/components/Cards/EventCards/EventCardWrapper.tsx b/src/components/Cards/EventCards/EventCardWrapper.tsx
@@ -3,6 +3,7 @@ import { useTranslation } from 'react-i18next';
 import {
   FF_EVENTS_CATEGORY_MAP,
   FF_TX_CATEGORY_MAP,
+  getEnrichedEventText,
   IEvent,
 } from '../../../interfaces';
 import { getFFTime } from '../../../utils';
@@ -26,14 +27,6 @@ export const EventCardWrapper = ({
 }: Props) => {
   const { t } = useTranslation();
 
-  const getEnrichedText = (event: IEvent) => {
-    const eventObject = FF_EVENTS_CATEGORY_MAP[event.type];
-    if (eventObject) {
-      return eventObject.enrichedEventString(event);
-    }
-    return t('event');
-  };
-
   return (
     <>
       <BaseCard
@@ -47,7 +40,7 @@ export const EventCardWrapper = ({
             ? t(FF_TX_CATEGORY_MAP[event.transaction?.type]?.nicename)
             : t(t(FF_EVENTS_CATEGORY_MAP[event.type]?.nicename))
         }
-        description={getEnrichedText(event)}
+        description={getEnrichedEventText(event)}
         timestamp={getFFTime(event.created)}
         status={<HashPopover address={event.id} shortHash paper />}
         color={FF_EVENTS_CATEGORY_MAP[event.type]?.color}

diff --git a/src/interfaces/enums/eventTypes.ts b/src/interfaces/enums/eventTypes.ts
@@ -48,6 +48,14 @@ interface IEventCategory {
   nicename: string;
 }
 
+export const getEnrichedEventText = (event: IEvent) => {
+  const eventObject = FF_EVENTS_CATEGORY_MAP[event.type];
+  if (eventObject) {
+    return eventObject.enrichedEventString(event);
+  }
+  return t('event');
+};
+
 export const FF_EVENTS_CATEGORY_MAP: {
   [key in FF_EVENTS]: IEventCategory;
 } = {

diff --git a/src/pages/Activity/views/Events.tsx b/src/pages/Activity/views/Events.tsx
@@ -38,6 +38,7 @@ import {
   EventFilters,
   FF_EVENTS_CATEGORY_MAP,
   FF_Paths,
+  getEnrichedEventText,
   ICreatedFilter,
   IDataTableRecord,
   IEvent,
@@ -137,9 +138,11 @@ export const ActivityEvents: () => JSX.Element = () => {
       fetchCatcher(
         `${FF_Paths.nsPrefix}/${selectedNamespace}${
           FF_Paths.events
-        }?limit=${rowsPerPage}&count&skip=${rowsPerPage * currentPage}${
-          createdFilterObject.filterString
-        }${filterString !== undefined ? filterString : ''}`
+        }?limit=${rowsPerPage}&fetchreferences&count&skip=${
+          rowsPerPage * currentPage
+        }${createdFilterObject.filterString}${
+          filterString !== undefined ? filterString : ''
+        }`
       )
         .then((eventRes: IPagedEventResponse) => {
           if (isMounted) {
@@ -186,6 +189,7 @@ export const ActivityEvents: () => JSX.Element = () => {
 
   const eventsColumnHeaders = [
     t('type'),
+    t('details'),
     t('id'),
     t('reference'),
     t('transactionID'),
@@ -204,6 +208,11 @@ export const ActivityEvents: () => JSX.Element = () => {
             />
           ),
         },
+        {
+          value: (
+            <FFTableText color="secondary" text={getEnrichedEventText(event)} />
+          ),
+        },
         {
           value: (
             <HashPopover shortHash={true} address={event.id}></HashPopover>

diff --git a/src/pages/Activity/views/TransactionDetails.tsx b/src/pages/Activity/views/TransactionDetails.tsx
@@ -128,7 +128,7 @@ export const TransactionDetails: () => JSX.Element = () => {
         });
       // Transaction events
       fetchCatcher(
-        `${FF_Paths.nsPrefix}/${selectedNamespace}${FF_Paths.events}?tx=${txID}`
+        `${FF_Paths.nsPrefix}/${selectedNamespace}${FF_Paths.events}?tx=${txID}&fetchreferences`
       )
         .then((events: IEvent[]) => {
           isMounted && setTxEvents(events);