mandatory fields

Author: jpinsonneau

web/src/components/drawer/element/element-fields.tsx

@@ -2,7 +2,7 @@ import { Text, TextContent, TextVariants } from '@patternfly/react-core';
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import { Filter, FilterDefinition } from '../../../model/filters';
-import { getCustomScopes, getScopeName } from '../../../model/scope';
+import { getCustomScopes } from '../../../model/scope';
 import { NodeData } from '../../../model/topology';
 import { createPeer } from '../../../utils/metrics';
 import { ElementField } from './element-field';
@@ -69,7 +69,7 @@ export const ElementFields: React.FC<ElementFieldsProps> = ({
         <ElementField
           id={`${id}-${sc}`}
           key={`${id}-${sc}`}
-          label={forceLabel || getScopeName(sc, t)}
+          label={forceLabel || sc.name}
           forcedText={forceAsText ? value : undefined}
           activeFilters={activeFilters}
           filterType={sc.id}

web/src/components/dropdowns/scope-dropdown.tsx

@@ -2,7 +2,7 @@ import { Dropdown, DropdownItem, DropdownPosition, DropdownToggle } from '@patte
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import { FlowScope } from '../../model/flow-query';
-import { getScopeName, ScopeConfigDef } from '../../model/scope';
+import { ScopeConfigDef } from '../../model/scope';
 
 export interface ScopeDropdownProps {
   selected: FlowScope;
@@ -26,10 +26,7 @@ export const ScopeDropdown: React.FC<ScopeDropdownProps> = ({ selected, setScope
           id={`${id}-dropdown`}
           onToggle={() => setScopeDropdownOpen(!scopeDropdownOpen)}
         >
-          {getScopeName(
-            scopes.find(sc => sc.id === selected),
-            t
-          )}
+          {scopes.find(sc => sc.id === selected)?.name || t('n/a')}
         </DropdownToggle>
       }
       isOpen={scopeDropdownOpen}
@@ -43,7 +40,7 @@ export const ScopeDropdown: React.FC<ScopeDropdownProps> = ({ selected, setScope
             setScopeType(sc.id);
           }}
         >
-          {getScopeName(sc, t)}
+          {sc.name}
         </DropdownItem>
       ))}
     />

web/src/components/slider/scope-slider.tsx

@@ -1,9 +1,8 @@
 import * as React from 'react';
-import { useTranslation } from 'react-i18next';
 import { FlowScope } from '../../model/flow-query';
 import { Slider, SliderStepObject } from './slider';
 
-import { getScopeName, getScopeShortName, ScopeConfigDef } from '../../model/scope';
+import { ScopeConfigDef } from '../../model/scope';
 import './scope-slider.css';
 
 export interface ScopeSliderProps {
@@ -14,8 +13,6 @@ export interface ScopeSliderProps {
 }
 
 export const ScopeSlider: React.FC<ScopeSliderProps> = ({ scope, setScope, scopeDefs, sizePx }) => {
-  const { t } = useTranslation('plugin__netobserv-plugin');
-
   /* TODO: refactor vertical slider
    * In between the display is block to working dimensions managing two cases
    * Non supported dimensions simply hide the slider from the view
@@ -33,7 +30,7 @@ export const ScopeSlider: React.FC<ScopeSliderProps> = ({ scope, setScope, scope
         sd.id,
         {
           value: idx,
-          label: sizePx > 450 ? getScopeName(sd, t) : getScopeShortName(sd, t),
+          label: sizePx > 450 ? sd.name : sd.shortName,
           tooltip: sd.description
         }
       ];

web/src/model/scope.ts

@@ -5,9 +5,9 @@ import { TopologyGroupTypes } from './topology';
 
 export type ScopeConfigDef = {
   id: FlowScope;
-  name?: string;
-  shortName?: string;
-  description?: string;
+  name: string;
+  shortName: string;
+  description: string;
   labels: string[];
   feature?: Feature;
   groups?: string[];
@@ -49,7 +49,7 @@ export const getGroupName = (group: TopologyGroupTypes, scopes: ScopeConfigDef[]
   } else {
     const found = scopes.find(sc => `${sc.id}s` === group);
     if (found) {
-      return getScopeName(found, t);
+      return found.name;
     } else {
       return `invalid ${group}`;
     }

web/src/utils/metrics.ts

@@ -12,7 +12,7 @@ import {
   TopologyMetrics
 } from '../api/loki';
 import { FlowScope, MetricFunction, MetricType } from '../model/flow-query';
-import { getCustomScopes, getScopeName } from '../model/scope';
+import { getCustomScopes } from '../model/scope';
 import { NodeData } from '../model/topology';
 import { roundTwoDigits } from './count';
 import { computeStepInterval, rangeToSeconds, TimeRange } from './datetime';
@@ -141,7 +141,7 @@ export const createPeer = (fields: Partial<TopologyMetricPeer>): TopologyMetricP
     .forEach(sc => {
       newPeer[sc.id] = fields[sc.id] as string;
       if (!newPeer.resourceKind && newPeer[sc.id]) {
-        newPeer.resourceKind = getScopeName(sc, v => v);
+        newPeer.resourceKind = sc.name;
         newPeer.getDisplayName = () => newPeer[sc.id] as string;
       }
     });