Merge pull request #192 from shwetaap/COO1315

COO-1315: Update Query string when multiple namespaces are selected in Network Traffic

Author: openshift-merge-bot[bot]

web/src/__tests__/netflow.spec.ts

@@ -43,6 +43,16 @@ describe('NetflowNode.fromQuery', () => {
         end: '2025-03-25T22:00:00.000Z',
       },
     },
+    {
+      url: `netflow-traffic?tenant=network&filters=${encodeURIComponent(
+        'dst_kind=Pod;src_namespace="openshift-oauth-apiserver","tracing-app-k6"',
+      )}&startTime=1742896800&endTime=1742940000`,
+      query: 'netflow:network:{DstK8S_Type="Pod",SrcK8S_Namespace=~"openshift-oauth-apiserver|tracing-app-k6"}',
+      constraint: {
+        start: '2025-03-25T10:00:00.000Z',
+        end: '2025-03-25T22:00:00.000Z',
+      },
+    },
   ])(`from $query`, ({ query, url, constraint }) =>
     expect(
       new NetflowDomain().queryToLink(Query.parse(query), Constraint.fromAPI(constraint)),
@@ -63,6 +73,12 @@ describe('NetflowNode.fromURL', () => {
       url: 'netflow-traffic?timeRange=300&limit=5&match=all&packetLoss=all&recordType=flowLog&filters=flow_layer%3Dapp%3Bdst_kind%3DPod%3Bsrc_kind%3DPod&bnf=false',
       query: 'netflow:network:{DstK8S_Type="Pod",SrcK8S_Type="Pod"}',
     },
+    {
+      url: `netflow-traffic?tenant=network&filters=${encodeURIComponent(
+        'dst_kind=Pod;dst_namespace=hostpath-provisioner;src_namespace="openshift-oauth-apiserver","tracing-app-k6"',
+      )}`,
+      query: 'netflow:network:{DstK8S_Type="Pod",DstK8S_Namespace="hostpath-provisioner",SrcK8S_Namespace=~"openshift-oauth-apiserver|tracing-app-k6"}',
+    },
   ])(`from $url`, ({ query, url }) =>
     expect(new NetflowDomain().linkToQuery(new URIRef(url))).toEqual(Query.parse(query)),
   );

web/src/korrel8r/netflow.ts

@@ -40,9 +40,21 @@ export class NetflowDomain extends Domain {
       ?.split(';')
       .map((filter) => {
         const [, key, operator, value] = filter.match(/^\s*([^!=\s]+)\s*(!?=~?)\s*(.+)\s*$/) || [];
-        // Removes surrounding quotes
+
+        if (!key || !linkToQueryName[key]) return '';
+
+        // Check if value contains multiple comma-separated quoted strings like "val1","val2"
+        const quotedValues = value?.match(/"([^"]+)"/g);
+        if (quotedValues && quotedValues.length > 1) {
+          // Extract the actual values (remove quotes)
+          const values = quotedValues.map(v => v.slice(1, -1));
+          // Convert to LogQL regex syntax with OR operator
+          return `${linkToQueryName[key]}=~"${values.join('|')}"`;
+        }
+
+        // Single value - removes surrounding quotes
         const trimmedValue = value?.replace(/^"(.*)"$/, '$1');
-        return linkToQueryName[key] ? `${linkToQueryName[key]}${operator}"${trimmedValue}"` : '';
+        return `${linkToQueryName[key]}${operator}"${trimmedValue}"`;
       })
       .filter((s) => s)
       .join(',');
@@ -61,7 +73,17 @@ export class NetflowDomain extends Domain {
         const [, key, operator, value] =
           filter.match(/^\s*([^!=\s]+)\s*(!?=~?)\s*"(.+)"\s*$/) || [];
         if (!key) throw this.badQuery(query, 'bad selector format');
-        return queryToURLName[key] ? `${queryToURLName[key]}${operator}${value}` : '';
+
+        // Convert LogQL regex pattern to URL format for netflow
+        if (queryToURLName[key]) {
+          // If operator is =~ and value contains |, convert to comma-separated quoted format
+          if (operator === '=~' && value.includes('|')) {
+            const values = value.split('|').map(v => `"${v}"`).join(',');
+            return `${queryToURLName[key]}=${values}`;
+          }
+          return `${queryToURLName[key]}${operator}${value}`;
+        }
+        return '';
       })
       .filter((s) => s)
       .join(';');