fix(Core UI): 🐞 Check http status in forwardflow

skupperproject · Jun 16, 2023 · b614785 · b614785
1 parent 2806d7f
commit b614785
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 7 deletions.
diff --git a/src/core/components/EmptyData/EmptyData.enum.ts b/src/core/components/EmptyData/EmptyData.enum.ts
@@ -1,3 +1,3 @@
 export enum EmptyDataLabels {
-  Default = 'no data found'
+  Default = 'no results found'
 }
diff --git a/src/pages/Processes/Processes.constant.ts b/src/pages/Processes/Processes.constant.ts
@@ -96,6 +96,24 @@ export const processesConnectedColumns: SKColumn<ProcessPairsResponse>[] = [
   }
 ];
 
+export const processesHttpConnectedColumns: SKColumn<ProcessPairsResponse>[] = [
+  {
+    name: ProcessPairsColumnsNames.Process,
+    prop: 'destinationName' as keyof ProcessPairsResponse,
+    customCellName: 'ProcessLinkCell'
+  },
+  {
+    name: ProcessPairsColumnsNames.Protocol,
+    prop: 'protocol' as keyof ProcessPairsResponse,
+    width: 10
+  },
+  {
+    name: '',
+    customCellName: 'viewDetailsLinkCell',
+    modifier: 'fitContent'
+  }
+];
+
 const oldTcpHiddenColumns: Record<string, { show: boolean }> = {
   [FlowPairsColumnsNames.Client]: {
     show: false

diff --git a/src/pages/Processes/Processes.enum.ts b/src/pages/Processes/Processes.enum.ts
@@ -61,5 +61,6 @@ export enum ProcessPairsColumnsNames {
   LatencyAvgRx = 'Avg Rx Latency',
   Flows = 'Flows',
   ViewDetails = 'view details',
-  Title = 'Processes Data transfers'
+  Title = 'Processes Data transfers',
+  Protocol = 'Protocol'
 }
diff --git a/src/pages/Processes/views/Process.tsx b/src/pages/Processes/views/Process.tsx
@@ -24,7 +24,11 @@ import { TopologyRoutesPaths, TopologyURLFilters, TopologyViews } from '@pages/T
 import { ProcessPairsResponse } from 'API/REST.interfaces';
 
 import ProcessDescription from '../components/ProcessDescription';
-import { processesConnectedColumns, ProcessesConnectedComponentsTable } from '../Processes.constant';
+import {
+  processesConnectedColumns,
+  ProcessesConnectedComponentsTable,
+  processesHttpConnectedColumns
+} from '../Processes.constant';
 import { ProcessesLabels, ProcessesRoutesPaths } from '../Processes.enum';
 import { QueriesProcesses } from '../services/services.enum';
 
@@ -157,7 +161,7 @@ const Process = function () {
               <FlexItem flex={{ default: 'flex_1' }} alignSelf={{ default: 'alignSelfStretch' }}>
                 <SkTable
                   title={ProcessesLabels.HTTPClients}
-                  columns={processesConnectedColumns}
+                  columns={processesHttpConnectedColumns}
                   rows={HTTPClients}
                   pagination={true}
                   paginationPageSize={SMALL_PAGINATION_SIZE}
@@ -177,7 +181,7 @@ const Process = function () {
               <FlexItem flex={{ default: 'flex_1' }} alignSelf={{ default: 'alignSelfStretch' }}>
                 <SkTable
                   title={ProcessesLabels.HTTPServers}
-                  columns={processesConnectedColumns}
+                  columns={processesHttpConnectedColumns}
                   rows={HTTPServers}
                   pagination={true}
                   paginationPageSize={SMALL_PAGINATION_SIZE}

diff --git a/src/pages/shared/FlowPairs/FlowPairs.constant.ts b/src/pages/shared/FlowPairs/FlowPairs.constant.ts
@@ -43,7 +43,10 @@ export const flowPairsComponentsTable = {
   DurationCell: (props: LinkCellProps<FlowPairsResponse>) =>
     DurationCell({ ...props, endTime: props.data.endTime || Date.now() * 1000, startTime: props.data.startTime }),
   ByteFormatCell: (props: HighlightValueCellProps<FlowPairsResponse>) =>
-    HighlightValueCell({ ...props, format: formatBytes })
+    HighlightValueCell({ ...props, format: formatBytes }),
+  //TODO; BE need to fix it
+  HttpStatusCell: (props: { data?: FlowPairsResponse }) =>
+    props.data?.counterFlow?.result || props.data?.forwardFlow?.result || ''
 };
 
 export const tcpFlowPairsColumns: SKColumn<FlowPairsResponse>[] = [
@@ -125,7 +128,8 @@ export const httpFlowPairsColumns: SKColumn<FlowPairsResponse>[] = [
   },
   {
     name: FlowPairsColumnsNames.StatusCode,
-    prop: 'counterFlow.result' as keyof FlowPairsResponse
+    prop: 'counterFlow.result' as keyof FlowPairsResponse,
+    customCellName: 'HttpStatusCell'
   },
   {
     name: FlowPairsColumnsNames.From,