fix: Fix memory format in nodes list

Signed-off-by: leoliu <leoliu@yunify.com>
kubesphere · Jul 19, 2020 · d250ecb · d250ecb
1 parent 7c7d51d
commit d250ecb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/components/Modals/InviteMember/index.jsx b/src/components/Modals/InviteMember/index.jsx
@@ -77,7 +77,7 @@ export default class InviteMemberModal extends React.Component {
   fetchData = (params = {}) => {
     const { workspace, namespace, devops } = this.props
     this.userStore.fetchList({
-      name: this.state.keyword,
+      name: this.state.name,
       workspace: namespace || devops ? workspace : undefined,
       ...params,
     })

diff --git a/src/pages/clusters/containers/Nodes/index.jsx b/src/pages/clusters/containers/Nodes/index.jsx
@@ -20,7 +20,7 @@ import React from 'react'
 import { isEmpty, get } from 'lodash'
 import { Tooltip, Icon } from '@pitrix/lego-ui'
 
-import { cpuFormat } from 'utils'
+import { cpuFormat, memoryFormat } from 'utils'
 import { ICON_TYPES, NODE_STATUS } from 'utils/constants'
 import { getNodeStatus } from 'utils/node'
 import { getValueByUnit } from 'utils/monitoring'
@@ -371,7 +371,7 @@ export default class Nodes extends React.Component {
         <div className="tooltip-title">{t('Resource Usage')}</div>
         <p>
           {t('Memory Requests')}:{' '}
-          {getValueByUnit(
+          {memoryFormat(
             get(record, 'annotations["node.kubesphere.io/memory-requests"]'),
             'Gi'
           )}{' '}
@@ -384,7 +384,7 @@ export default class Nodes extends React.Component {
         </p>
         <p>
           {t('Memory Limits')}:{' '}
-          {getValueByUnit(
+          {memoryFormat(
             get(record, 'annotations["node.kubesphere.io/memory-limits"]'),
             'Gi'
           )}{' '}