fix step into + add tests

Author: jpinsonneau

web/src/components/__tests-data__/scopes.ts

@@ -7,7 +7,8 @@ export const ScopeDefSample: ScopeConfigDef[] = [
     shortName: 'Cl',
     description: 'Cluster name or identifier',
     labels: ['K8S_ClusterName'],
-    feature: 'multiCluster'
+    feature: 'multiCluster',
+    stepInto: 'zone'
   },
   {
     id: 'zone',
@@ -16,23 +17,26 @@ export const ScopeDefSample: ScopeConfigDef[] = [
     description: 'Availability zone',
     labels: ['SrcK8S_Zone', 'DstK8S_Zone'],
     feature: 'zones',
-    groups: ['clusters']
+    groups: ['clusters'],
+    stepInto: 'host'
   },
   {
     id: 'host',
     name: 'Node',
     shortName: 'Nd',
     description: 'Node on which the resources are running',
     labels: ['SrcK8S_HostName', 'DstK8S_HostName'],
-    groups: ['clusters', 'zones', 'clusters+zones']
+    groups: ['clusters', 'zones', 'clusters+zones'],
+    stepInto: 'resource'
   },
   {
     id: 'namespace',
     name: 'Namespace',
     shortName: 'NS',
     description: 'Resource namespace',
     labels: ['SrcK8S_Namespace', 'DstK8S_Namespace'],
-    groups: ['clusters', 'clusters+zones', 'clusters+hosts', 'zones', 'zones+hosts', 'hosts']
+    groups: ['clusters', 'clusters+zones', 'clusters+hosts', 'zones', 'zones+hosts', 'hosts'],
+    stepInto: 'owner'
   },
   {
     id: 'owner',
@@ -58,7 +62,8 @@ export const ScopeDefSample: ScopeConfigDef[] = [
       'hosts',
       'hosts+namespaces',
       'namespaces'
-    ]
+    ],
+    stepInto: 'resource'
   },
   {
     id: 'resource',

web/src/components/tabs/netflow-topology/2d/topology-content.tsx

@@ -206,7 +206,10 @@ export const TopologyContent: React.FC<TopologyContentProps> = ({
   const onStepInto = React.useCallback(
     (data: Decorated<ElementData>) => {
       const groupTypes: TopologyGroupTypes = metricScope;
-      const scope = getStepInto(metricScope, scopes);
+      const scope = getStepInto(
+        metricScope,
+        scopes.map(sc => sc.id)
+      );
       if (data.nodeType && data.peer && scope) {
         setMetricScope(scope);
         setOptions({ ...options, groupTypes });

web/src/model/__tests__/topology.spec.ts

@@ -1,7 +1,12 @@
 import { ScopeDefSample } from '../../components/__tests-data__/scopes';
-import { getGroupName, getGroupsForScope } from '../scope';
+import { ContextSingleton } from '../../utils/context';
+import { getGroupName, getGroupsForScope, getStepInto } from '../scope';
 
 describe('Check enabled groups', () => {
+  beforeEach(() => {
+    ContextSingleton.setScopes(ScopeDefSample);
+  });
+
   it('should get group from scope', () => {
     let groups = getGroupsForScope('cluster', ScopeDefSample);
     expect(groups).toEqual(['none']);
@@ -41,4 +46,18 @@ describe('Check enabled groups', () => {
     name = getGroupName('namespaces+zzz', ScopeDefSample, (s: string) => s);
     expect(name).toEqual('Namespace + invalid zzz');
   });
+
+  it('should get next scope', () => {
+    let next = getStepInto('cluster', ['cluster', 'zone', 'host', 'namespace', 'owner', 'resource']);
+    expect(next).toEqual('zone');
+
+    next = getStepInto('cluster', ['cluster', 'host']);
+    expect(next).toEqual('host');
+
+    next = getStepInto('cluster', ['cluster']);
+    expect(next).toEqual(undefined);
+
+    next = getStepInto('resource', ['cluster', 'zone', 'host', 'namespace', 'owner', 'resource']);
+    expect(next).toEqual(undefined);
+  });
 });

web/src/model/scope.ts

@@ -13,7 +13,7 @@ export type ScopeConfigDef = {
   groups?: string[];
   filter?: string;
   filters?: string[];
-  stepInto?: string;
+  stepInto?: FlowScope;
 };
 
 export const getScopeName = (sc: ScopeConfigDef | undefined, t: (k: string) => string) => {
@@ -77,6 +77,11 @@ export const getDirectionnalScopes = () => {
   return ContextSingleton.getScopes().filter(sc => isDirectionnal(sc));
 };
 
-export const getStepInto = (scopeId: FlowScope, scopes: ScopeConfigDef[]): FlowScope | undefined => {
-  return scopes.find(sc => sc.id === scopeId)?.stepInto;
+export const getStepInto = (scopeId: FlowScope, allowedIds: FlowScope[]): FlowScope | undefined => {
+  const next = ContextSingleton.getScopes().find(sc => sc.id === scopeId)?.stepInto;
+  if (!next || allowedIds.includes(next)) {
+    return next;
+  }
+  // recursively get next scope as some may be hidden due to selected features
+  return getStepInto(next, allowedIds);
 };

web/src/model/topology.ts

@@ -546,7 +546,11 @@ export const generateDataModel = (
   };
 
   const peerToNodeData = (p: TopologyMetricPeer): NodeData => {
-    const canStepInto = getStepInto(metricScope, scopes) !== undefined;
+    const canStepInto =
+      getStepInto(
+        metricScope,
+        scopes.map(sc => sc.id)
+      ) !== undefined;
     switch (metricScope) {
       case 'owner':
         return p.owner ? { peer: p, nodeType: 'owner', canStepInto } : { peer: p, nodeType: 'unknown' };