removed short name

Author: jpinsonneau

config/sample-config.yaml

@@ -991,7 +991,6 @@ frontend:
   scopes:
     - id: cluster
       name: Cluster
-      shortName: Cl
       description: Cluster name or identifier
       labels:
         - K8S_ClusterName
@@ -1000,7 +999,6 @@ frontend:
       stepInto: zone
     - id: zone
       name: Zone
-      shortName: AZ
       description: Availability zone
       labels:
         - SrcK8S_Zone
@@ -1028,7 +1026,6 @@ frontend:
       stepInto: resource
     - id: namespace
       name: Namespace
-      shortName: NS
       description: Resource namespace
       labels: 
         - SrcK8S_Namespace
@@ -1046,7 +1043,6 @@ frontend:
       stepInto: owner
     - id: owner
       name: Owner
-      shortName: Own
       description: Controller owner, such as a Deployment
       labels: 
         - SrcK8S_OwnerName
@@ -1072,7 +1068,6 @@ frontend:
       stepInto: resource
     - id: resource
       name: Resource
-      shortName: Res
       description: Base resource, such as a Pod, a Service or a Node
       labels: 
         - SrcK8S_Name

pkg/config/config.go

@@ -95,7 +95,6 @@ type Filter struct {
 type Scope struct {
 	ID          string   `yaml:"id" json:"id"`
 	Name        string   `yaml:"name" json:"name"`
-	ShortName   string   `yaml:"shortName" json:"shortName"`
 	Description string   `yaml:"description" json:"description"`
 	Labels      []string `yaml:"labels" json:"labels"`
 	Feature     string   `yaml:"feature,omitempty" json:"feature,omitempty"`

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

@@ -4,7 +4,6 @@ export const ScopeDefSample: ScopeConfigDef[] = [
   {
     id: 'cluster',
     name: 'Cluster',
-    shortName: 'Cl',
     description: 'Cluster name or identifier',
     labels: ['K8S_ClusterName'],
     feature: 'multiCluster',
@@ -13,7 +12,6 @@ export const ScopeDefSample: ScopeConfigDef[] = [
   {
     id: 'zone',
     name: 'Zone',
-    shortName: 'AZ',
     description: 'Availability zone',
     labels: ['SrcK8S_Zone', 'DstK8S_Zone'],
     feature: 'zones',
@@ -23,7 +21,6 @@ export const ScopeDefSample: ScopeConfigDef[] = [
   {
     id: 'host',
     name: 'Node',
-    shortName: 'Nd',
     description: 'Node on which the resources are running',
     labels: ['SrcK8S_HostName', 'DstK8S_HostName'],
     groups: ['clusters', 'zones', 'clusters+zones'],
@@ -32,7 +29,6 @@ export const ScopeDefSample: ScopeConfigDef[] = [
   {
     id: 'namespace',
     name: 'Namespace',
-    shortName: 'NS',
     description: 'Resource namespace',
     labels: ['SrcK8S_Namespace', 'DstK8S_Namespace'],
     groups: ['clusters', 'clusters+zones', 'clusters+hosts', 'zones', 'zones+hosts', 'hosts'],
@@ -41,7 +37,6 @@ export const ScopeDefSample: ScopeConfigDef[] = [
   {
     id: 'owner',
     name: 'Owner',
-    shortName: 'Own',
     description: 'Controller owner, such as a Deployment',
     labels: [
       'SrcK8S_OwnerName',
@@ -68,7 +63,6 @@ export const ScopeDefSample: ScopeConfigDef[] = [
   {
     id: 'resource',
     name: 'Resource',
-    shortName: 'Res',
     description: 'Base resource, such as a Pod, a Service or a Node',
     labels: [
       'SrcK8S_Name',

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

@@ -10,10 +10,9 @@ export interface ScopeSliderProps {
   scope: FlowScope;
   setScope: (ms: FlowScope) => void;
   scopeDefs: ScopeConfigDef[];
-  sizePx: number;
 }
 
-export const ScopeSlider: React.FC<ScopeSliderProps> = ({ scope, setScope, scopeDefs, sizePx }) => {
+export const ScopeSlider: React.FC<ScopeSliderProps> = ({ scope, setScope, scopeDefs }) => {
   return (
     <ProgressStepper isVertical isCenterAligned>
       {scopeDefs.map((sd, i) => (
@@ -31,7 +30,7 @@ export const ScopeSlider: React.FC<ScopeSliderProps> = ({ scope, setScope, scope
             />
           )}
         >
-          {sizePx > 450 ? sd.name : sd.shortName}
+          {sd.name}
         </ProgressStep>
       ))}
     </ProgressStepper>

web/src/components/tabs/netflow-overview/netflow-overview.tsx

@@ -1151,12 +1151,7 @@ export const NetflowOverview: React.FC<NetflowOverviewProps> = React.forwardRef(
                 width: containerSize.width * 0.1
               }}
             >
-              <ScopeSlider
-                sizePx={containerSize?.height || 300}
-                scope={props.metricScope}
-                setScope={props.setMetricScope}
-                scopeDefs={props.scopes}
-              />
+              <ScopeSlider scope={props.metricScope} setScope={props.setMetricScope} scopeDefs={props.scopes} />
             </div>
           )}
           {allowFocus && selectedPanel && (

web/src/components/tabs/netflow-topology/netflow-topology.tsx

@@ -260,12 +260,7 @@ export const NetflowTopology: React.FC<NetflowTopologyProps> = React.forwardRef(
     return (
       <div id="topology-container-div" style={{ width: '100%', height: '100%' }} ref={containerRef}>
         <div id={'topology-scope-slider-div'}>
-          <ScopeSlider
-            sizePx={containerSize?.height || 300}
-            scope={props.metricScope}
-            setScope={props.setMetricScope}
-            scopeDefs={props.scopes}
-          />
+          <ScopeSlider scope={props.metricScope} setScope={props.setMetricScope} scopeDefs={props.scopes} />
         </div>
         <div id="topology-view-div">{getContent()}</div>
       </div>

web/src/model/scope.ts

@@ -6,7 +6,6 @@ import { TopologyGroupTypes } from './topology';
 export type ScopeConfigDef = {
   id: FlowScope;
   name: string;
-  shortName: string;
   description: string;
   labels: string[];
   feature?: Feature;
@@ -23,13 +22,6 @@ export const getScopeName = (sc: ScopeConfigDef | undefined, t: (k: string) => s
   return sc.name || sc.id;
 };
 
-export const getScopeShortName = (sc: ScopeConfigDef | undefined, t: (k: string) => string) => {
-  if (!sc) {
-    return t('n/a');
-  }
-  return sc.shortName || sc.id;
-};
-
 export const getGroupsForScope = (scopeId: FlowScope, scopes: ScopeConfigDef[]) => {
   const scope = scopes.find(sc => sc.id === scopeId);
   if (scope?.groups?.length) {