updates per review comments

openshift · Apr 17, 2020 · 2b011fc · 2b011fc
1 parent 34cc4b9
commit 2b011fc
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 30 deletions.
diff --git a/frontend/packages/dev-console/src/components/topology/Topology.tsx b/frontend/packages/dev-console/src/components/topology/Topology.tsx
@@ -100,26 +100,34 @@ const Topology: React.FC<ComponentProps> = ({
   const visRef = React.useRef<Visualization | null>(null);
   const applicationRef = React.useRef<string>(null);
   const displayFiltersRef = React.useRef<DisplayFilters>(null);
-  const componentFactoryRef = React.useRef<ComponentFactory>(new ComponentFactory(serviceBinding));
-  const knativeComponentFactoryRef = React.useRef<KnativeComponentFactory>(
-    new KnativeComponentFactory(serviceBinding),
-  );
-  const helmComponentFactoryRef = React.useRef<HelmComponentFactory>(
-    new HelmComponentFactory(serviceBinding),
-  );
-  const operatorsComponentFactoryRef = React.useRef<OperatorsComponentFactory>(
-    new OperatorsComponentFactory(serviceBinding),
-  );
-  const vmsComponentFactoryRef = React.useRef<KubevirtComponentFactory>(
-    new KubevirtComponentFactory(serviceBinding),
-  );
+  const componentFactoryRef = React.useRef<ComponentFactory | null>(null);
+  const knativeComponentFactoryRef = React.useRef<KnativeComponentFactory | null>(null);
+  const helmComponentFactoryRef = React.useRef<HelmComponentFactory | null>(null);
+  const operatorsComponentFactoryRef = React.useRef<OperatorsComponentFactory | null>(null);
+  const vmsComponentFactoryRef = React.useRef<KubevirtComponentFactory | null>(null);
   const [layout, setLayout] = React.useState<string>(graphModel.graph.layout);
   const [model, setModel] = React.useState<Model>();
   const [graphData, setGraphData] = React.useState<GraphData>();
   const [selectedIds, setSelectedIds] = React.useState<string[]>([]);
   const createResourceAccess: string[] = useAddToProjectAccess(namespace);
   const [dragHint, setDragHint] = React.useState<string>('');
 
+  if (!componentFactoryRef.current) {
+    componentFactoryRef.current = new ComponentFactory(serviceBinding);
+  }
+  if (!knativeComponentFactoryRef.current) {
+    knativeComponentFactoryRef.current = new KnativeComponentFactory(serviceBinding);
+  }
+  if (!helmComponentFactoryRef.current) {
+    helmComponentFactoryRef.current = new HelmComponentFactory(serviceBinding);
+  }
+  if (!operatorsComponentFactoryRef.current) {
+    operatorsComponentFactoryRef.current = new OperatorsComponentFactory(serviceBinding);
+  }
+  if (!vmsComponentFactoryRef.current) {
+    vmsComponentFactoryRef.current = new KubevirtComponentFactory(serviceBinding);
+  }
+
   if (!visRef.current) {
     visRef.current = new Visualization();
     visRef.current.registerLayoutFactory(layoutFactory);

diff --git a/frontend/packages/kubevirt-plugin/src/plugin.tsx b/frontend/packages/kubevirt-plugin/src/plugin.tsx
@@ -23,8 +23,6 @@ import { TemplateModel, PodModel } from '@console/internal/models';
 import { getName } from '@console/shared/src/selectors/common';
 import { AddAction } from '@console/dev-console/src/extensions/add-actions';
 import { FirehoseResource } from '@console/internal/components/utils';
-import { K8sResourceKind } from '@console/internal/module/k8s';
-import { OverviewMainContentProps } from '@console/internal/components/overview';
 import * as models from './models';
 import { VMTemplateYAMLTemplates, VirtualMachineYAMLTemplates } from './models/templates';
 import { getKubevirtHealthState } from './components/dashboards-page/overview-dashboard/health';
@@ -57,7 +55,7 @@ type ConsumedExtensions =
 
 export const FLAG_KUBEVIRT = 'KUBEVIRT';
 
-export const virtualMachineConfigurations = (namespace: string): FirehoseResource[] => {
+const virtualMachineConfigurations = (namespace: string): FirehoseResource[] => {
   const virtualMachineResource = [
     {
       isList: true,
@@ -89,11 +87,6 @@ export const virtualMachineConfigurations = (namespace: string): FirehoseResourc
   return virtualMachineResource;
 };
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-export const getVirtualMachines = (dc: K8sResourceKind, props: OverviewMainContentProps) => {
-  return {};
-};
-
 const plugin: Plugin<ConsumedExtensions> = [
   {
     type: 'ModelDefinition',
@@ -113,7 +106,7 @@ const plugin: Plugin<ConsumedExtensions> = [
     properties: {
       resources: virtualMachineConfigurations,
       required: FLAG_KUBEVIRT,
-      utils: getVirtualMachines,
+      utils: () => null,
     },
   },
   {

diff --git a/frontend/packages/kubevirt-plugin/src/topology/TopologyVmDetailsPanel.tsx b/frontend/packages/kubevirt-plugin/src/topology/TopologyVmDetailsPanel.tsx
@@ -1,4 +1,5 @@
 import * as React from 'react';
+import { Grid, GridItem } from '@patternfly/react-core';
 import {
   Firehose,
   FirehoseResult,
@@ -8,8 +9,8 @@ import {
 } from '@console/internal/components/utils';
 import { Node } from '@console/topology';
 import { TemplateKind } from '@console/internal/module/k8s';
-import { VirtualMachineModel } from '../models';
 import { TemplateModel } from '@console/internal/models';
+import { VirtualMachineModel } from '../models';
 import { TEMPLATE_TYPE_LABEL, TEMPLATE_TYPE_VM } from '../constants/vm';
 import { VMDetailsList, VMResourceSummary } from '../components/vms/vm-resource';
 
@@ -37,17 +38,17 @@ export const LoadedTopologyVmDetailsPanel: React.FC<LoadedTopologyVmDetailsPanel
     return <LoadingBox />;
   }
   return (
-    <div className="row">
-      <div className="col-sm-6">
+    <Grid gutter="md">
+      <GridItem span={6}>
         <VMResourceSummary
           canUpdateVM={canUpdate}
           vm={vmObj}
           vmi={vmi}
           templates={templates.data}
           kindObj={VirtualMachineModel}
         />
-      </div>
-      <div className="col-sm-6">
+      </GridItem>
+      <GridItem span={6}>
         <VMDetailsList
           canUpdateVM={canUpdate}
           vm={vmObj}
@@ -56,8 +57,8 @@ export const LoadedTopologyVmDetailsPanel: React.FC<LoadedTopologyVmDetailsPanel
           kindObj={VirtualMachineModel}
           vmStatusBundle={statusDetail}
         />
-      </div>
-    </div>
+      </GridItem>
+    </Grid>
   );
 };
 
@@ -78,7 +79,7 @@ export const TopologyVmDetailsPanel: React.FC<TopologyVmDetailsPanelProps> = ({
     },
   ];
   return (
-    <div className="co-m-pane__body">
+    <div className="overview__sidebar-pane-body resource-overview__body">
       <Firehose resources={resources}>
         <LoadedTopologyVmDetailsPanel vm={vm} />
       </Firehose>