-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: refactor machine dashboard detail panel logic (#244)
- Loading branch information
1 parent
d0eb2ec
commit 23085e5
Showing
14 changed files
with
119 additions
and
646 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,14 @@ | ||
| import { connect } from 'react-redux'; | ||
| import React from 'react'; | ||
| import Detail from '.'; | ||
| import { IDispatch, IRootState } from '@/store'; | ||
| import { SUPPORT_METRICS } from '@/utils/promQL'; | ||
| import { getMetricsUniqName } from '@/utils/dashboard'; | ||
| import { MetricScene } from '@/utils/interface'; | ||
|
|
||
| const mapState = (state: IRootState) => ({ | ||
| type: 'cpu', | ||
| metricOptions: SUPPORT_METRICS.cpu, | ||
| dataTypeObj: getMetricsUniqName(MetricScene.CPU), | ||
| loading: !!state.loading.effects.machine.asyncGetCPUStatByRange, | ||
| }); | ||
|
|
||
| const mapDispatch: any = (dispatch: IDispatch) => ({ | ||
| asyncGetDataSourceByRange: dispatch.machine.asyncGetCPUStatByRange, | ||
| }); | ||
|
|
||
| export default connect(mapState, mapDispatch)(Detail); | ||
| export default () => ( | ||
| <Detail | ||
| // @ts-ignore | ||
| type="cpu" | ||
| metricOptions={SUPPORT_METRICS.cpu} | ||
| dataTypeObj={getMetricsUniqName(MetricScene.CPU)} | ||
| /> | ||
| ); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,14 @@ | ||
| // export default connect(mapState, mapDispatch)(Detail); | ||
| import { connect } from 'react-redux'; | ||
| import React from 'react'; | ||
| import Detail from '.'; | ||
| import { IDispatch, IRootState } from '@/store'; | ||
| import { SUPPORT_METRICS } from '@/utils/promQL'; | ||
| import { getMetricsUniqName } from '@/utils/dashboard'; | ||
| import { MetricScene } from '@/utils/interface'; | ||
|
|
||
| const mapState = (state: IRootState) => ({ | ||
| type: 'disk', | ||
| instances: state.machine.instanceList, | ||
| metricOptions: SUPPORT_METRICS.disk, | ||
| dataTypeObj: getMetricsUniqName(MetricScene.DISK), | ||
| metricsFilterValues: state.machine.metricsFilterValues, | ||
| loading: state.loading.effects.machine.asyncGetDiskStatByRange, | ||
| }); | ||
|
|
||
| const mapDispatch: any = (dispatch: IDispatch) => ({ | ||
| asyncGetDataSourceByRange: dispatch.machine.asyncGetDiskStatByRange, | ||
| }); | ||
|
|
||
| export default connect(mapState, mapDispatch)(Detail); | ||
| export default () => ( | ||
| <Detail | ||
| // @ts-ignore | ||
| type="disk" | ||
| metricOptions={SUPPORT_METRICS.disk} | ||
| dataTypeObj={getMetricsUniqName(MetricScene.DISK)} | ||
| /> | ||
| ); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,14 @@ | ||
| // export default connect(mapState, mapDispatch)(MemoryDetail); | ||
| import { connect } from 'react-redux'; | ||
| import React from 'react'; | ||
| import Detail from '.'; | ||
| import { IDispatch, IRootState } from '@/store'; | ||
| import { SUPPORT_METRICS } from '@/utils/promQL'; | ||
| import { getMetricsUniqName } from '@/utils/dashboard'; | ||
| import { MetricScene } from '@/utils/interface'; | ||
|
|
||
| const mapState = (state: IRootState) => ({ | ||
| type: 'load', | ||
| instances: state.machine.instanceList, | ||
| metricOptions: SUPPORT_METRICS.load, | ||
| dataTypeObj: getMetricsUniqName(MetricScene.LOAD), | ||
| metricsFilterValues: state.machine.metricsFilterValues, | ||
| loading: state.loading.effects.machine.asyncGetLoadByRange, | ||
| }); | ||
|
|
||
| const mapDispatch: any = (dispatch: IDispatch) => ({ | ||
| asyncGetDataSourceByRange: dispatch.machine.asyncGetLoadByRange, | ||
| }); | ||
|
|
||
| export default connect(mapState, mapDispatch)(Detail); | ||
| export default () => ( | ||
| <Detail | ||
| // @ts-ignore | ||
| type="load" | ||
| metricOptions={SUPPORT_METRICS.load} | ||
| dataTypeObj={getMetricsUniqName(MetricScene.LOAD)} | ||
| /> | ||
| ); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,14 @@ | ||
| // export default connect(mapState, mapDispatch)(MemoryDetail); | ||
| import { connect } from 'react-redux'; | ||
| import React from 'react'; | ||
| import Detail from '.'; | ||
| import { IDispatch, IRootState } from '@/store'; | ||
| import { SUPPORT_METRICS } from '@/utils/promQL'; | ||
| import { getMetricsUniqName } from '@/utils/dashboard'; | ||
| import { MetricScene } from '@/utils/interface'; | ||
|
|
||
| const mapState = (state: IRootState) => ({ | ||
| type: 'memory', | ||
| metricOptions: SUPPORT_METRICS.memory, | ||
| dataTypeObj: getMetricsUniqName(MetricScene.MEMORY), | ||
| loading: state.loading.effects.machine.asyncGetMemoryStatByRange, | ||
| }); | ||
|
|
||
| const mapDispatch: any = (dispatch: IDispatch) => ({ | ||
| asyncGetDataSourceByRange: dispatch.machine.asyncGetMemoryStatByRange, | ||
| }); | ||
|
|
||
| export default connect(mapState, mapDispatch)(Detail); | ||
| export default () => ( | ||
| <Detail | ||
| // @ts-ignore | ||
| type="memory" | ||
| metricOptions={SUPPORT_METRICS.memory} | ||
| dataTypeObj={getMetricsUniqName(MetricScene.MEMORY)} | ||
| /> | ||
| ); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,14 @@ | ||
| import { connect } from 'react-redux'; | ||
| import React from 'react'; | ||
| import Detail from '.'; | ||
| import { IDispatch, IRootState } from '@/store'; | ||
| import { SUPPORT_METRICS } from '@/utils/promQL'; | ||
| import { getMetricsUniqName } from '@/utils/dashboard'; | ||
| import { MetricScene } from '@/utils/interface'; | ||
|
|
||
| const mapState = (state: IRootState) => ({ | ||
| type: 'network', | ||
| metricOptions: SUPPORT_METRICS.network, | ||
| dataTypeObj: getMetricsUniqName(MetricScene.NETWORK), | ||
| loading: state.loading.effects.machine.asyncGetNetworkStatByRange, | ||
| }); | ||
|
|
||
| const mapDispatch: any = (dispatch: IDispatch) => ({ | ||
| asyncGetDataSourceByRange: dispatch.machine.asyncGetNetworkStatByRange, | ||
| }); | ||
|
|
||
| export default connect(mapState, mapDispatch)(Detail); | ||
| export default () => ( | ||
| <Detail | ||
| // @ts-ignore | ||
| type="network" | ||
| metricOptions={SUPPORT_METRICS.network} | ||
| dataTypeObj={getMetricsUniqName(MetricScene.NETWORK)} | ||
| /> | ||
| ); |
Oops, something went wrong.