Merge pull request #215 from shwetaap/COO-1684

COO-1684: Fix for Event query string not being updated

Author: openshift-merge-bot[bot]

web/src/__tests__/k8s.spec.ts

@@ -179,6 +179,15 @@ describe('K8sDomain.queryToLink', () => {
       url: `k8s/ns/x/rbac.authorization.k8s.io~v1~Role/y`,
     },
     { query: `k8s:Pod:{}`, url: 'k8s/all-namespaces/core~v1~Pod' },
+    // Event queries without fields (directly querying events by namespace)
+    {
+      query: 'k8s:Event.v1.events.k8s.io:{"namespace":"openshift-logging"}',
+      url: 'k8s/ns/openshift-logging/events.k8s.io~v1~Event',
+    },
+    {
+      query: 'k8s:Event.v1:{"namespace":"openshift-cluster-observability-operator"}',
+      url: 'k8s/ns/openshift-cluster-observability-operator/core~v1~Event',
+    },
   ])('converts $query to $url', ({ url, query }) => {
     expect(k8s.queryToLink(Query.parse(query)).toString()).toEqual(new URIRef(url).toString());
   });

web/src/korrel8r/k8s.ts

@@ -95,17 +95,22 @@ export class K8sDomain extends Domain {
     let namespace = selector.namespace;
     let name = selector.name;
     let events = '';
-    if (isEvent(model)) {
+    if (isEvent(model) && selector.fields) {
       // Special case for events, generate URL of involved object with '/events' modifier.
+      // Only apply this if fields are present (indicating an event about a specific object).
       const eventClass = this.modelClass(model);
       const about = eventAboutField(model);
-      const [group, version] = parseAPIVersion(selector.fields[`${about}.apiVersion`]);
+      const apiVersion = selector.fields[`${about}.apiVersion`];
       const kind = selector.fields[`${about}.kind`];
-      model = findGVK(group, version, kind);
-      if (!model) throw this.badQuery(query, `no resource matching ${eventClass}.${about}`);
-      namespace = selector.fields[`${about}.namespace`] || '';
-      name = selector.fields[`${about}.name`] || '';
-      events = '/events';
+      // Only treat as an involved object event if the required fields are present
+      if (apiVersion && kind) {
+        const [group, version] = parseAPIVersion(apiVersion);
+        model = findGVK(group, version, kind);
+        if (!model) throw this.badQuery(query, `no resource matching ${eventClass}.${about}`);
+        namespace = selector.fields[`${about}.namespace`] || '';
+        name = selector.fields[`${about}.name`] || '';
+        events = '/events';
+      }
     }
     // Prepare parts of the URL
     const nsPath = namespace ? `ns/${namespace}` : 'all-namespaces';