Merge pull request #224 from alanconway/coo-1725-node-url

COO-1725: fix: Troubleshooting panel cannot focus on node URLs.

Author: openshift-merge-bot[bot]

web/locales/en/plugin__troubleshooting-panel-console-plugin.json

@@ -5,7 +5,7 @@
   "Advanced search parameters": "Advanced search parameters",
   "Cancel": "Cancel",
   "Correlation graph already matches search": "Correlation graph already matches search",
-  "Correlation graph is already focused on the current view.": "Correlation graph is already focused on the current view.",
+  "Correlation graph is focused on the current view.": "Correlation graph is focused on the current view.",
   "Correlation result was empty.": "Correlation result was empty.",
   "Current view does not provide a starting point for correlation": "Current view does not provide a starting point for correlation",
   "Custom": "Custom",

web/src/__tests__/all-domains.spec.ts

@@ -44,10 +44,11 @@ export default function Korrel8rPanel() {
   const search: Search = useSelector((state: State) => state.plugins?.tp?.get('search'));
   const result: Result | null = useSelector((state: State) => state.plugins?.tp?.get('result'));
 
-  // Is the search panel already in focus on the main view?
+  // Disable focus button if the panel is already focused on the current location,
+  // or the current result is an error.
   const isFocused = React.useMemo(
-    () => locationQuery?.toString() === search.queryStr,
-    [locationQuery, search.queryStr],
+    () => locationQuery?.toString() === search.queryStr && !result?.isError,
+    [locationQuery, search.queryStr, result?.isError],
   );
 
   // Showing advanced query
@@ -71,11 +72,22 @@ export default function Korrel8rPanel() {
     [dispatch],
   );
 
-  // Set up default locationQuery search on mount, when query is blank.
+  // Create the initial result on startup.
+  // Use the current location or an explicit "Empty" result.
+  const initialized = React.useRef(false);
   React.useEffect(() => {
-    if (!search?.queryStr && locationQuery?.toString())
-      dispatchSearch({ ...defaultSearch, queryStr: locationQuery.toString() });
-  }, [locationQuery, dispatchSearch, search?.queryStr]);
+    if (initialized.current) return;
+    initialized.current = true;
+    if (!search?.queryStr && !result) {
+      if (locationQuery?.toString())
+        dispatchSearch({ ...defaultSearch, queryStr: locationQuery.toString() });
+      else
+        dispatchResult({
+          title: t('Empty Query'),
+          message: t('No starting point for correlation'),
+        });
+    }
+  }, [locationQuery, dispatchSearch, dispatchResult, search?.queryStr, result, t]);
 
   // Skip the first fetch if we already have a stored result.
   const useStoredResult = React.useRef(result != null);
@@ -87,10 +99,8 @@ export default function Korrel8rPanel() {
       return;
     }
     const queryStr = search?.queryStr;
-    if (!queryStr) {
-      dispatchResult({ title: t('Empty Query'), message: t('No starting point for correlation') });
-      return;
-    }
+    if (!queryStr) return;
+
     let cancelled = false;
     const start: api.Start = {
       queries: [queryStr],
@@ -141,7 +151,7 @@ export default function Korrel8rPanel() {
             content={
               locationQuery
                 ? isFocused
-                  ? t('Correlation graph is already focused on the current view.')
+                  ? t('Correlation graph is focused on the current view.')
                   : t('Focus the correlation on the current view.')
                 : t('Current view does not provide a starting point for correlation')
             }

web/src/components/Korrel8rPanel.tsx

@@ -1,7 +1,11 @@
 import * as React from 'react';
 import { useSelector } from 'react-redux';
 import { AlertDomain } from '../korrel8r/alert';
-import { allDomains } from '../korrel8r/all-domains';
+import { K8sDomain } from '../korrel8r/k8s';
+import { LogDomain } from '../korrel8r/log';
+import { MetricDomain } from '../korrel8r/metric';
+import { NetflowDomain } from '../korrel8r/netflow';
+import { TraceDomain } from '../korrel8r/trace';
 import { Domains } from '../korrel8r/types';
 import { State } from '../redux-reducers';
 
@@ -16,11 +20,17 @@ export const useDomains = () => {
     return new Map<string, string>(alertRules.map(({ id, name }) => [id, name]));
   }, [alertRules]);
 
-  const domains = React.useMemo(() => {
-    // Alert domain with IDs loaded from state.
-    const alert = new AlertDomain(alertIDs);
-    // Replace the default alert domain.
-    return new Domains(...allDomains.filter((d) => d.name !== alert.name), alert);
-  }, [alertIDs]);
+  const domains = React.useMemo(
+    () =>
+      new Domains(
+        new AlertDomain(alertIDs),
+        new K8sDomain(),
+        new LogDomain(),
+        new MetricDomain(),
+        new NetflowDomain(),
+        new TraceDomain(),
+      ),
+    [alertIDs],
+  );
   return domains;
 };

web/src/hooks/useDomains.tsx

@@ -183,14 +183,22 @@ function findGVK(group: string, version: string, kind: string): Model {
 // Return a model for the resource, can be G~V~K or path. Return undefined if not found.
 function findResource(resource: string): Model {
   if (!resource) return;
-  // Try as a G~V~K string.
+  // Try as a G~V~K string
   const [g, v, k] = resource.split('~');
   if (k) return findGVK(g === 'core' ? '' : g, v, k);
+  // Try as a bare Kind
+  const m = findGVK('', 'v1', resource);
+  if (m) return m;
   // Try as a resource path
   if (resource === 'projects') resource = 'namespaces'; // Alias
-  return getCachedResources()?.models?.find(
-    (m: Model) => m.path === resource && m.verbs.includes('watch'),
-  );
+  let found: Model;
+  for (const m of getCachedResources()?.models || []) {
+    if (m.path === resource && m.verbs.includes('watch')) {
+      if (!m.apiGroup) return m; // Prefer core models
+      found = found || m;
+    }
+  }
+  return found;
 }
 
 function parseAPIVersion(apiVersion: string): [group: string, version: string] | undefined {