Merge pull request #142 from PeterYurkovich/manual-cherry-pick

COO-981,COO-982: Manual Cherry Pick

Author: openshift-merge-bot[bot]

web/src/components/Korrel8rPanel.tsx

@@ -54,10 +54,10 @@ export default function Korrel8rPanel() {
     persistedSearch?.queryStr
       ? persistedSearch
       : ({
-          ...defaultSearch,
-          queryStr: locationQuery?.toString(),
-          constraint: persistedSearch?.constraint,
-        } as Search),
+        ...defaultSearch,
+        queryStr: locationQuery?.toString(),
+        constraint: persistedSearch?.constraint,
+      } as Search),
   );
   const [result, setResult] = React.useState<Result | null>(null);
   const [showQuery, setShowQuery] = React.useState(false);

web/src/components/topology/Korrel8rTopology.tsx

@@ -151,7 +151,7 @@ export const Korrel8rTopology: React.FC<{
         navigate(link.startsWith('/') ? link : `/${link}`);
       } catch (e) {
         // eslint-disable-next-line no-console
-        console.error(`navigateToQuery failed for: ${query.toString()}: `, e);
+        console.error(`korrel8r navigateToQuery: ${e}`, "\nquery", query);
       }
     },
     [navigate],

web/src/hooks/useLocationQuery.ts

@@ -8,6 +8,8 @@ export const useLocationQuery = (): Query | undefined => {
   try {
     const link = new URIRef(location.pathname + location.search);
     const q = allDomains.linkToQuery(link);
+    // eslint-disable-next-line no-console
+    console.log('korrel8r linkToQuery', "\nlink", link, "\nquery", q);
     return q;
   } catch (e) {
     // eslint-disable-next-line no-console

web/src/korrel8r/k8s.ts

@@ -49,16 +49,18 @@ export class K8sDomain extends Domain {
     const model = findResource(resource, link.searchParams.get('kind'));
     if (!model || !model.kind) throw this.badLink(link, `unknown resource "${resource}"`);
     if (events) {
+      const event = eventModel();
+      const about = eventAboutField(event);
       const apiVersion = `${model.apiGroup ? `${model.apiGroup}/` : ''}${model.apiVersion || 'v1'}`;
       const data = {
         fields: {
-          'involvedObject.namespace': namespace,
-          'involvedObject.name': name,
-          'involvedObject.apiVersion': apiVersion,
-          'involvedObject.kind': model.kind,
+          [`${about}.namespace`]: namespace,
+          [`${about}.name`]: name,
+          [`${about}.apiVersion`]: apiVersion,
+          [`${about}.kind`]: model.kind,
         },
       };
-      return this.modelClass(eventModel()).query(JSON.stringify(data));
+      return this.modelClass(event).query(JSON.stringify(data));
     } else {
       const data = {
         namespace: namespace,
@@ -77,23 +79,20 @@ export class K8sDomain extends Domain {
       throw this.badQuery(query, e.message);
     }
     const m = query.class.name.match(/^([^.]+)(?:\.([^.]*)(?:\.(.*))?)?$/) ?? [];
-    if (!m) throw this.badQuery(query);
+    if (!m) throw this.badQuery(query, "incorrect format");
     let model = findGVK(m[3], m[2], m[1]);
-    if (!model) throw this.badQuery(query);
+    if (!model) throw this.badQuery(query, "no matching resource");
     let namespace = data.namespace;
     let name = data.name;
     let events = '';
     if (isEvent(model)) {
       // Special treatment for event objects: focus on the involved object, not the event.
       events = '/events';
       const about = eventAboutField(model);
-      model = findGVK(
-        data.fields[`${about}.apiGroup`],
-        data.fields[`${about}.apiVersion`],
-        data.fields[`${about}.kind`],
-      );
-      if (!model)
-        throw this.badQuery(query, `no resource for '${about}' field in ${query.selector}`);
+      const [group, version] = data.fields[`${about}.apiVersion`]?.split("/") ?? []
+      const kind = data.fields[`${about}.kind`]
+      model = findGVK(group, version, kind)
+      if (!model) throw this.badQuery(query, `no resource for group=${group} version=${version} kind=${kind}`);
       namespace = data.fields[`${about}.namespace`] || '';
       name = data.fields[`${about}.name`] || '';
     }
@@ -128,12 +127,13 @@ export class K8sDomain extends Domain {
 
 // Original k8s Event resource was in the core group, modern Event is in the events.k8s.io group.
 // Event.v1 has an 'involvedObject' field, Event.v1.events.k8s.io has a 'regarding' field.
-// Handle both variations.
+// Need to handle both variations.
 const EVENT = {
   group: 'events.k8s.io',
   version: 'v1',
   kind: 'Event',
 };
+
 function isEvent(m: Model): boolean {
   return (
     m.kind == EVENT.kind &&