fix fmt/lint/test

Author: jotak

web/src/components/netflow-traffic.tsx

@@ -10,6 +10,7 @@ import { Filters, getDisabledFiltersRecord, getEnabledFilters } from '../model/f
 import { filtersToString, FlowQuery, MetricType } from '../model/flow-query';
 import { netflowTrafficModel } from '../model/netflow-traffic';
 import { parseQuickFilters } from '../model/quick-filters';
+import { resolveGroupTypes } from '../model/scope';
 import { getFetchFunctions as getBackAndForthFetch } from '../utils/back-and-forth';
 import { ColumnsId, getDefaultColumns } from '../utils/columns';
 import { loadConfig } from '../utils/config';
@@ -58,7 +59,6 @@ import { FiltersToolbar } from './toolbar/filters-toolbar';
 import ChipsPopover from './toolbar/filters/chips-popover';
 import HistogramToolbar from './toolbar/histogram-toolbar';
 import ViewOptionsToolbar from './toolbar/view-options-toolbar';
-import { resolveGroupTypes } from '../model/scope';
 
 export type ViewId = 'overview' | 'table' | 'topology';
 

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

@@ -1,6 +1,6 @@
 import { ScopeDefSample } from '../../components/__tests-data__/scopes';
 import { ContextSingleton } from '../../utils/context';
-import { getGroupName, getGroupsForScope, getStepInto } from '../scope';
+import { getGroupName, getGroupsForScope, getStepInto, resolveGroupTypes } from '../scope';
 
 describe('Check enabled groups', () => {
   beforeEach(() => {
@@ -9,14 +9,15 @@ describe('Check enabled groups', () => {
 
   it('should get group from scope', () => {
     let groups = getGroupsForScope('cluster', ScopeDefSample);
-    expect(groups).toEqual(['none']);
+    expect(groups).toEqual(['none', 'auto']);
 
     groups = getGroupsForScope('host', ScopeDefSample);
-    expect(groups).toEqual(['none', 'clusters', 'zones', 'clusters+zones']);
+    expect(groups).toEqual(['none', 'auto', 'clusters', 'zones', 'clusters+zones']);
 
     groups = getGroupsForScope('owner', ScopeDefSample);
     expect(groups).toEqual([
       'none',
+      'auto',
       'clusters',
       'clusters+zones',
       'clusters+hosts',
@@ -30,6 +31,23 @@ describe('Check enabled groups', () => {
     ]);
   });
 
+  it('should resolve auto group', () => {
+    let group = resolveGroupTypes('auto', 'resource', ScopeDefSample);
+    expect(group).toEqual('namespaces');
+
+    group = resolveGroupTypes('auto', 'owner', ScopeDefSample);
+    expect(group).toEqual('namespaces');
+
+    group = resolveGroupTypes('auto', 'namespace', ScopeDefSample);
+    expect(group).toEqual('none');
+
+    group = resolveGroupTypes('auto', 'host', ScopeDefSample);
+    expect(group).toEqual('none');
+
+    group = resolveGroupTypes('hosts', 'resource', ScopeDefSample);
+    expect(group).toEqual('hosts');
+  });
+
   it('should get group name', () => {
     let name = getGroupName('hosts', ScopeDefSample, (s: string) => s);
     expect(name).toEqual('Node');

web/src/model/scope.ts

@@ -31,7 +31,11 @@ export const getGroupsForScope = (scopeId: FlowScope, scopes: ScopeConfigDef[]):
   return ['none', 'auto'];
 };
 
-export const resolveGroupTypes = (inGroupTypes: TopologyGroupTypes, scopeId: FlowScope, scopes: ScopeConfigDef[]): TopologyGroupTypes => {
+export const resolveGroupTypes = (
+  inGroupTypes: TopologyGroupTypes,
+  scopeId: FlowScope,
+  scopes: ScopeConfigDef[]
+): TopologyGroupTypes => {
   if (inGroupTypes === 'auto') {
     const groups = getGroupsForScope(scopeId, scopes);
     if (groups.includes('namespaces')) {