fix: Fix node conditions card

Signed-off-by: leoliu <leoliu@yunify.com>
kubesphere · Aug 20, 2020 · b952dd8 · b952dd8
1 parent c9f3f75
commit b952dd8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/src/pages/clusters/components/ResourceTable/index.jsx b/src/pages/clusters/components/ResourceTable/index.jsx
@@ -56,9 +56,10 @@ class ResourceTable extends BaseTable {
   }
 
   fetchProjects = (params = {}) => {
-    const { cluster } = this.props
-    return this.props.clusterStore.fetchProjects({
+    const { cluster, clusterStore } = this.props
+    return clusterStore.fetchProjects({
       cluster,
+      ...clusterStore.projects.filters,
       ...params,
     })
   }

diff --git a/src/pages/clusters/containers/Nodes/Detail/RunningStatus/ConditionCard/index.jsx b/src/pages/clusters/containers/Nodes/Detail/RunningStatus/ConditionCard/index.jsx
@@ -25,7 +25,11 @@ import { Text } from 'components/Base'
 
 import styles from './index.scss'
 
-const Chart = ({ data }) => {
+const ConditionCard = ({ data }) => {
+  if (!NODE_CONDITION_ICONS[data.type]) {
+    return null
+  }
+
   const statusType = getConditionsStatus(data)
 
   const content = (
@@ -69,4 +73,4 @@ const Chart = ({ data }) => {
   )
 }
 
-export default Chart
+export default ConditionCard
diff --git a/src/pages/clusters/containers/Nodes/Detail/RunningStatus/TaintCard/index.jsx b/src/pages/clusters/containers/Nodes/Detail/RunningStatus/TaintCard/index.jsx
@@ -22,7 +22,7 @@ import { Columns, Column } from '@pitrix/lego-ui'
 
 import styles from './index.scss'
 
-const Chart = ({ data }) => (
+const TaintCard = ({ data }) => (
   <div className={styles.card}>
     <Columns>
       <Column>
@@ -44,4 +44,4 @@ const Chart = ({ data }) => (
   </div>
 )
 
-export default Chart
+export default TaintCard