Modify the filter and graph function of k8s

snetsystems · Dec 10, 2021 · a17c0c6 · a17c0c6
1 parent 80d59c6
commit a17c0c6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/frontend/src/hosts/components/KubernetesContents.tsx b/frontend/src/hosts/components/KubernetesContents.tsx
@@ -31,7 +31,6 @@ import {Source, TimeRange, Cell, Template, RemoteDataState} from 'src/types'
 
 interface Props {
   handleOnSetActiveEditorTab: (tab: string) => void
-  handleOnClickPodName: () => void
   handleOnClickVisualizePod: (data: any) => void
   handleDBClick: (data: any) => void
   handleResize: (proportions: number[]) => void
@@ -118,7 +117,6 @@ class KubernetesContents extends PureComponent<Props, State> {
       kubernetesObject,
       kubernetesD3Data,
       handleDBClick,
-      handleOnClickPodName,
       handleOnClickVisualizePod,
       handleResize,
       handleOpenTooltip,
@@ -134,7 +132,6 @@ class KubernetesContents extends PureComponent<Props, State> {
             focuseNode={focuseNode}
             pinNode={pinNode}
             handleDBClick={handleDBClick}
-            handleOnClickPodName={handleOnClickPodName}
             handleOnClickVisualizePod={handleOnClickVisualizePod}
             handleResize={handleResize}
             handleOpenTooltip={handleOpenTooltip}

diff --git a/frontend/src/hosts/components/KubernetesHexagon.tsx b/frontend/src/hosts/components/KubernetesHexagon.tsx
@@ -19,7 +19,6 @@ import {D3K8sData, FocuseNode, KubernetesObject} from 'src/hosts/types'
 import {RemoteDataState} from 'src/types'
 
 interface Props {
-  handleOnClickPodName: () => void
   handleOnClickVisualizePod: (data: any) => void
   handleDBClick: (data: any) => void
   handleResize: (proportions: number[]) => void
@@ -202,7 +201,6 @@ class KubernetesHexagon extends PureComponent<Props, State> {
       .attr('r', d => d.r)
       .attr('fill', d => clusterTypeColorset[d.data.type])
       .attr('stroke', 'black')
-      .attr('pointer-events', d => (d.children ? 'all' : 'none'))
       .on('mouseover', function () {
         onMouseOver(this)
       })
@@ -280,7 +278,13 @@ class KubernetesHexagon extends PureComponent<Props, State> {
       .attr('transform', d => `translate(${d.x},${d.y})`)
 
     textNode
-      .filter(d => d.height > 0)
+      .filter(
+        d =>
+          !(
+            d.depth === 3 ||
+            (d.depth === 2 && (d.data.type === 'CR' || d.data.type === 'CRB'))
+          )
+      )
       .append('text')
       .attr('fill', 'white')
       .append('textPath')
@@ -430,16 +434,16 @@ class KubernetesHexagon extends PureComponent<Props, State> {
     this.clickedTarget = null
   }
 
-  private runOnDBClick = (target: SVGSVGElement, data: any) => {
+  private runOnDBClick = (data: any) => {
     this.clickedOnce = false
     this.clickedTarget = null
     clearTimeout(this.timeout)
-    this.onMouseDBClick(target, data)
+    this.onMouseDBClick(data)
   }
 
   private onMouseClick = (target: SVGSVGElement, data: D3K8sData) => {
     if (this.clickedTarget === target && this.clickedOnce) {
-      this.runOnDBClick(target, data)
+      this.runOnDBClick(data)
     } else if (
       (this.clickedTarget === null && !this.clickedOnce) ||
       (this.clickedTarget !== target && this.clickedOnce)
@@ -453,7 +457,7 @@ class KubernetesHexagon extends PureComponent<Props, State> {
     }
   }
 
-  private onMouseDBClick = (target: SVGSVGElement, data: any) => {
+  private onMouseDBClick = (data: any) => {
     this.props.handleDBClick(data)
     this.props.handleOnClickVisualizePod(data)
   }

diff --git a/frontend/src/hosts/containers/KubernetesPage.tsx b/frontend/src/hosts/containers/KubernetesPage.tsx
@@ -2786,6 +2786,7 @@ class KubernetesPage extends PureComponent<Props, State> {
       selectMinion,
       proportions,
       selectedAutoRefresh,
+      remoteDataState: RemoteDataState.Loading,
     })
   }
 
@@ -2964,7 +2965,6 @@ class KubernetesPage extends PureComponent<Props, State> {
           proportions={proportions}
           activeTab={activeEditorTab}
           handleOnSetActiveEditorTab={this.onSetActiveEditorTab}
-          handleOnClickPodName={this.onClickPodName}
           handleOnClickVisualizePod={this.onClickVisualizePod}
           handleResize={this.handleResize}
           focuseNode={focuseNode}
@@ -3193,10 +3193,6 @@ class KubernetesPage extends PureComponent<Props, State> {
     })
   }
 
-  private onClickPodName = (): void => {
-    console.log('onClick Pod Name')
-  }
-
   private onClickVisualizePod = async (data: any) => {
     const {selectMinion} = this.state
     const focuseNodeName = _.get(data, 'data.name')