3d topology feature gate (#241)

Author: jpinsonneau

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

@@ -1,6 +1,7 @@
 import { Dropdown, DropdownItem, DropdownToggle } from '@patternfly/react-core';
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
+import { Feature, isAllowed } from '../../utils/features-gate';
 import { LayoutName } from '../../model/topology';
 
 export const LayoutDropdown: React.FC<{
@@ -13,6 +14,8 @@ export const LayoutDropdown: React.FC<{
 
   const getLayoutDisplay = (layoutName: LayoutName) => {
     switch (layoutName) {
+      case LayoutName.ThreeD:
+        return t('3D');
       case LayoutName.BreadthFirst:
         return t('BreadthFirst');
       case LayoutName.Cola:
@@ -48,19 +51,21 @@ export const LayoutDropdown: React.FC<{
         </DropdownToggle>
       }
       isOpen={layoutDropdownOpen}
-      dropdownItems={Object.values(LayoutName).map(v => (
-        <DropdownItem
-          data-test={v}
-          id={v}
-          key={v}
-          onClick={() => {
-            setLayoutDropdownOpen(false);
-            setLayout(v);
-          }}
-        >
-          {getLayoutDisplay(v)}
-        </DropdownItem>
-      ))}
+      dropdownItems={Object.values(LayoutName)
+        .filter(v => v != LayoutName.ThreeD || isAllowed(Feature.ThreeD))
+        .map(v => (
+          <DropdownItem
+            data-test={v}
+            id={v}
+            key={v}
+            onClick={() => {
+              setLayoutDropdownOpen(false);
+              setLayout(v);
+            }}
+          >
+            {getLayoutDisplay(v)}
+          </DropdownItem>
+        ))}
     />
   );
 };

web/src/components/netflow-topology/componentFactories/componentFactory.ts renamed to web/src/components/netflow-topology/2d/componentFactories/componentFactory.ts

@@ -7,7 +7,7 @@ import {
   ModelKind
 } from '@patternfly/react-topology';
 import { ComponentType } from 'react';
-import { GraphElementPeer } from '../../../model/topology';
+import { GraphElementPeer } from '../../../../model/topology';
 
 export const componentFactory: ComponentFactory = (
   kind: ModelKind,

web/src/components/netflow-topology/componentFactories/shapesComponentFactory.ts renamed to web/src/components/netflow-topology/2d/componentFactories/shapesComponentFactory.ts

@@ -1,6 +1,6 @@
 import { ComponentType } from 'react';
 import { ComponentFactory, ModelKind, DefaultNode } from '@patternfly/react-topology';
-import { GraphElementPeer } from '../../../model/topology';
+import { GraphElementPeer } from '../../../../model/topology';
 
 export const shapesComponentFactory: ComponentFactory = (
   kind: ModelKind,

web/src/components/netflow-topology/componentFactories/stylesComponentFactory.tsx renamed to web/src/components/netflow-topology/2d/componentFactories/stylesComponentFactory.tsx

@@ -12,7 +12,7 @@ import {
   withSelection
 } from '@patternfly/react-topology';
 import * as React from 'react';
-import { GraphElementPeer } from '../../../model/topology';
+import { GraphElementPeer } from '../../../../model/topology';
 
 //keep default import here to use observers
 import StyleEdge from '../styles/styleEdge';

web/src/components/netflow-topology/components/edge.tsx renamed to web/src/components/netflow-topology/2d/components/edge.tsx

@@ -23,7 +23,7 @@ import {
 import DefaultConnectorTag from '@patternfly/react-topology/dist/esm/components/edges/DefaultConnectorTag';
 import { getConnectorStartPoint } from '@patternfly/react-topology/dist/esm/components/edges/terminals/terminalUtils';
 
-import { HOVER_EVENT } from '../netflow-topology';
+import { HOVER_EVENT } from '../topology-content';
 
 type BaseEdgeProps = {
   children?: React.ReactNode;

web/src/components/netflow-topology/components/node.tsx renamed to web/src/components/netflow-topology/2d/components/node.tsx

@@ -33,8 +33,8 @@ import {
   NODE_SHADOW_FILTER_ID_DANGER,
   NODE_SHADOW_FILTER_ID_HOVER
 } from '@patternfly/react-topology/dist/esm/components/nodes/NodeShadows';
-import { HOVER_EVENT } from '../netflow-topology';
-import { GraphElementPeer } from '../../../model/topology';
+import { HOVER_EVENT } from '../topology-content';
+import { GraphElementPeer } from '../../../../model/topology';
 
 const StatusQuadrant = TopologyQuadrant.upperLeft;
 

web/src/components/netflow-topology/layouts/layoutFactory.ts renamed to web/src/components/netflow-topology/2d/layouts/layoutFactory.ts

@@ -10,7 +10,7 @@ import {
   BreadthFirstLayout,
   ColaGroupsLayout
 } from '@patternfly/react-topology';
-import { LayoutName } from '../../../model/topology';
+import { LayoutName } from '../../../../model/topology';
 
 const layoutFactory: LayoutFactory = (type: LayoutName, graph: Graph): Layout | undefined => {
   switch (type) {

web/src/components/netflow-topology/styles/styleEdge.tsx renamed to web/src/components/netflow-topology/2d/styles/styleEdge.tsx

@@ -35,7 +35,7 @@ import { TFunction } from 'i18next';
 import * as _ from 'lodash';
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
-import { Decorated, NodeData } from '../../../model/topology';
+import { Decorated, NodeData } from '../../../../model/topology';
 import BaseNode from '../components/node';
 
 export const FILTER_EVENT = 'filter';