fix: some issues (#193)

vesoft-inc · Jan 11, 2023 · 365c063 · 365c063
1 parent f5b281f
commit 365c063
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 23 deletions.
diff --git a/src/components/MetricsFilterPanel/index.module.less b/src/components/MetricsFilterPanel/index.module.less
@@ -18,6 +18,9 @@
       display: flex !important;
       align-items: center;
     }
+    .ant-tree-select-dropdown  {
+      text-align: left;
+    }
   }
 }
 

diff --git a/src/components/MetricsFilterPanel/index.tsx b/src/components/MetricsFilterPanel/index.tsx
@@ -122,6 +122,7 @@ const MetricsFilterPanel = (props: IProps, ref) => {
             <TreeSelect
               style={{ width: '220px', maxWidth: '500px' }}
               treeData={treeData} treeCheckable
+              treeDefaultExpandAll
               showCheckedStrategy={TreeSelect.SHOW_PARENT}
               getPopupContainer={triggerNode => triggerNode.parentElement}
               onChange={handleInstanceChange}

diff --git a/src/pages/MachineDashboard/Cards/DiskCard.tsx b/src/pages/MachineDashboard/Cards/DiskCard.tsx
@@ -35,7 +35,7 @@ const mapState = (state: IRootState) => {
         if (instanceList.includes('all')) {
           return true;
         }
-        return instanceList.includes(item.name)
+        return instanceList.some(instance => item.name.includes(instance))
       }),
   };
 };

diff --git a/src/pages/MachineDashboard/index.tsx b/src/pages/MachineDashboard/index.tsx
@@ -51,7 +51,7 @@ function MachineDashboard(props: IProps) {
   const { asyncGetMemorySizeStat, asyncGetDiskSizeStat, cluster, metricsFilterValues,
     asyncGetCPUStatByRange, asyncGetMemoryStatByRange, asyncGetDiskStatByRange,
     asyncGetLoadByRange, asyncGetNetworkStatByRange, updateMetricsFiltervalues, instanceList,
-    loading,
+    loading
   } = props;
 
   const [showLoading, setShowLoading] = useState<boolean>(false);
@@ -200,7 +200,7 @@ function MachineDashboard(props: IProps) {
         <Row>
           <Col span={12}>
             <DashboardCard
-              title={<> {intl.get('device.cpu')} <span>{SUPPORT_METRICS.cpu[0].metric}</span></>} 
+              title={<> {intl.get('device.cpu')} <span>{SUPPORT_METRICS.cpu[0].metric}</span></>}
               viewPath={getViewPath("/machine/cpu")}
               onConfigPanel={() => handleConfigPanel(MACHINE_TYPE.cpu)}
             >

diff --git a/src/pages/ServiceDashboard/ServiceOverview/index.tsx b/src/pages/ServiceDashboard/ServiceOverview/index.tsx
@@ -5,7 +5,6 @@ import _ from 'lodash';
 import CustomServiceQueryPanel from './CustomServiceQueryPanel';
 import ServiceHeader from '@/components/Service/ServiceHeader';
 import { IServicePanelConfig, ServiceName } from '@/utils/interface';
-import StatusPanel from '@/components/StatusPanel';
 import Icon from '@/components/Icon';
 import { trackPageView } from '@/utils/stat';
 import './index.less';
@@ -26,7 +25,7 @@ class ServiceOverview extends React.Component<IProps> {
   };
 
   render() {
-    const { serviceType, configs, getStatus } = this.props;
+    const { serviceType, configs } = this.props;
     return (
       <div className="service-table-item">
         <ServiceHeader serviceType={serviceType} title={`${serviceType} ${intl.get('common.service')}`}>

diff --git a/src/pages/ServiceDashboard/index.tsx b/src/pages/ServiceDashboard/index.tsx
@@ -43,7 +43,9 @@ interface IProps
 
 function ServiceDashboard(props: IProps) {
 
-  const { panelConfig, serviceMetric, updatePanelConfig, asyncGetStatus, onView, instanceList, updateMetricsFiltervalues, metricsFilterValues, asyncGetSpaces, cluster } = props;
+  const { panelConfig, serviceMetric, updatePanelConfig, asyncGetStatus,
+    onView, instanceList, updateMetricsFiltervalues, metricsFilterValues,
+    asyncGetSpaces, cluster } = props;
 
   const [editPanelType, setEditPanelType] = useState<ServiceName>();
   const [editPanelIndex, setEditPanelIndex] = useState(0)
@@ -97,7 +99,8 @@ function ServiceDashboard(props: IProps) {
   return (
     <>
       <div className="service-table">
-        <div className='common-header' >
+        <div
+         className='common-header' >
           <MetricsFilterPanel
             onChange={handleMetricsChange}
             instanceList={instanceList}

diff --git a/src/store/models/machine.ts b/src/store/models/machine.ts
@@ -4,7 +4,7 @@ import serviceApi from '@/config/service';
 import { NEED_ADD_SUM_QUERYS, getProperStep, getMetricsUniqName } from '@/utils/dashboard';
 import { LINUX } from '@/utils/promQL';
 import { IStatRangeItem, IStatSingleItem, MetricScene, MetricsPanelValue } from '@/utils/interface';
-import { unique } from '@/utils';
+import { isCommunityVersion, unique } from '@/utils';
 import { InitMachineMetricsFilterValues } from '@/utils/metric';
 
 const PROMQL = LINUX;
@@ -18,7 +18,7 @@ export interface IState {
   networkStat: IStatRangeItem[];
   memorySizeStat: IStatSingleItem[];
   diskSizeStat: IStatSingleItem[];
-  instanceList: any[];
+  instanceList: string[];
   metricsFilterValues: MetricsPanelValue;
 }
 
@@ -34,7 +34,7 @@ export function MachineModelWrapper(service,) {
       loadStat: [] as IStatRangeItem[],
       memorySizeStat: [] as IStatSingleItem[],
       diskSizeStat: [] as IStatSingleItem[],
-      instanceList: [],
+      instanceList: [] as string[],
       metricsFilterValues: InitMachineMetricsFilterValues,
     },
     reducers: {
@@ -92,8 +92,10 @@ export function MachineModelWrapper(service,) {
             result = data.result;
           }
         }
-        const instanceList = result.map(item => item.metric.instance).filter(instance => instance !== 'total');
-        this.updateInstanceList(instanceList);
+        if (isCommunityVersion()) {
+          const instanceList = result.map(item => item.metric.instance).filter(instance => instance !== 'total' );
+          this.updateInstanceList(instanceList);
+        }
         return result;
       },
 

diff --git a/src/store/models/service.ts b/src/store/models/service.ts
@@ -4,7 +4,7 @@ import serviceApi from '@/config/service';
 import { IPanelConfig, ServiceMetricsPanelValue } from '@/utils/interface';
 import { DEFAULT_SERVICE_PANEL_CONFIG } from '@/utils/service';
 import { AggregationType, getProperStep } from '@/utils/dashboard';
-import { unique } from '@/utils';
+import { isCommunityVersion, unique } from '@/utils';
 import { getClusterPrefix } from '@/utils/promQL';
 import { InitMetricsFilterValues } from '@/utils/metric';
 
@@ -127,11 +127,13 @@ export function SereviceModelWrapper(serviceApi) {
         if (code === 0 && data.result.length !== 0) {
           stat = data.result;
         }
-        const list = stat.map(item => {
-          const instanceName = item.metric.instanceName || item.metric.instance;
-          return instanceName.slice(0, instanceName.indexOf('-'))
-        });
-        this.updateInstanceList(list)
+        if (isCommunityVersion()) {
+          const list = stat.map(item => {
+            const instanceName = item.metric.instanceName || item.metric.instance;
+            return instanceName.slice(0, instanceName.indexOf('-'))
+          });
+          this.updateInstanceList(list)
+        }
         return stat;
       },
 

diff --git a/src/utils/promQL.ts b/src/utils/promQL.ts
@@ -40,14 +40,14 @@ export let SUPPORT_METRICS =
     //   metric: 'memory_utilization',
     //   valueType: VALUE_TYPE.percentage,
     // },
-    {
-      metric: 'memory_used',
-      valueType: VALUE_TYPE.byte,
-    },
     {
       metric: 'memory_used_percentage',
       valueType: VALUE_TYPE.percentage,
     },
+    {
+      metric: 'memory_used',
+      valueType: VALUE_TYPE.byte,
+    },
     {
       metric: 'memory_actual_used_percentage',
       valueType: VALUE_TYPE.percentage,
@@ -175,8 +175,8 @@ export let LINUX = (cluster?, device?: string): any => {
 
     // memory relative:
     // memory_utilization: `(1 - node_memory_MemFree_bytes${clusterSuffix2} / node_memory_MemTotal_bytes${clusterSuffix2} )* 100`,
-    memory_used: `node_memory_MemTotal_bytes${clusterSuffix2} - node_memory_MemFree_bytes${clusterSuffix2}`,
     memory_used_percentage: `((node_memory_MemTotal_bytes${clusterSuffix2} - node_memory_MemFree_bytes${clusterSuffix2}) / node_memory_MemTotal_bytes${clusterSuffix2} )* 100`,
+    memory_used: `node_memory_MemTotal_bytes${clusterSuffix2} - node_memory_MemFree_bytes${clusterSuffix2}`,
     memory_actual_used: `node_memory_MemTotal_bytes${clusterSuffix2} - node_memory_MemFree_bytes${clusterSuffix2} - node_memory_Buffers_bytes${clusterSuffix2} - node_memory_Cached_bytes${clusterSuffix2}`,
     memory_actual_used_percentage: `((node_memory_MemTotal_bytes${clusterSuffix2} - node_memory_MemFree_bytes${clusterSuffix2} - node_memory_Buffers_bytes${clusterSuffix2} - node_memory_Cached_bytes${clusterSuffix2}) / node_memory_MemTotal_bytes${clusterSuffix2} )* 100`,
     memory_free: `node_memory_MemFree_bytes${clusterSuffix2}`,