fix pktDrop & FlowRTT merge (#381)

jpinsonneau · web-flow · commit e53bf2e61f2f · 2023-09-07T18:58:40.000+02:00
diff --git a/web/src/components/netflow-traffic.tsx b/web/src/components/netflow-traffic.tsx
@@ -1393,6 +1393,7 @@ export const NetflowTraffic: React.FC<{
         allowConnectionFilter={isConnectionTracking()}
         allowDNSFilter={isDNSTracking()}
         allowPktDrops={isPktDrop()}
+        allowRTTFilter={isFlowRTT()}
       />
       {
         <Flex className="netflow-traffic-tabs-container">
diff --git a/web/src/utils/filter-definitions.ts b/web/src/utils/filter-definitions.ts
@@ -561,7 +561,7 @@ export const getFilterDefinitions = (
     ];
   }
 
-  if (allowConnectionFilter && allowDNSFilter && allowRTTFilter) {
+  if (allowConnectionFilter && allowDNSFilter && allowPktDrops && allowRTTFilter) {
     return filterDefinitions;
   } else {
     return filterDefinitions.filter(

Original file line number	Diff line number	Diff line change
`@@ -1393,6 +1393,7 @@ export const NetflowTraffic: React.FC<{`
`1393`	`1393`	`allowConnectionFilter={isConnectionTracking()}`
`1394`	`1394`	`allowDNSFilter={isDNSTracking()}`
`1395`	`1395`	`allowPktDrops={isPktDrop()}`
	`1396`	`+ allowRTTFilter={isFlowRTT()}`
`1396`	`1397`	`/>`
`1397`	`1398`	`{`
`1398`	`1399`	`<Flex className="netflow-traffic-tabs-container">`
Original file line number	Diff line number	Diff line change
`@@ -561,7 +561,7 @@ export const getFilterDefinitions = (`
`561`	`561`	`];`
`562`	`562`	`}`
`563`	`563`
`564`		`- if (allowConnectionFilter && allowDNSFilter && allowRTTFilter) {`
	`564`	`+ if (allowConnectionFilter && allowDNSFilter && allowPktDrops && allowRTTFilter) {`
`565`	`565`	`return filterDefinitions;`
`566`	`566`	`} else {`
`567`	`567`	`return filterDefinitions.filter(`