Skip to content
This repository has been archived by the owner on Sep 18, 2024. It is now read-only.

[WebUI] fix issue#1489: Enhancement to trial duration display #2523

Merged
merged 3 commits into from
Jun 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/webui/src/App.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@
width: 90%;
margin: 0 auto;
}

.contentBox{
width: 100%;
}

.content{
width: 89%;
min-width: 1024px;
Expand Down
18 changes: 15 additions & 3 deletions src/webui/src/components/trial-detail/Duration.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import ReactEcharts from 'echarts-for-react';
import { TableObj, EventMap } from '../../static/interface'; // eslint-disable-line no-unused-vars
import { filterDuration } from '../../static/function';
import { filterDuration, convertDuration } from '../../static/function';
import 'echarts/lib/chart/bar';
import 'echarts/lib/component/tooltip';
import 'echarts/lib/component/title';
Expand Down Expand Up @@ -49,7 +49,13 @@ class Duration extends React.Component<DurationProps, DurationState> {
trigger: 'axis',
axisPointer: {
type: 'shadow'
}
},
formatter: (data: any): React.ReactNode => (
'<div>' +
'<div>Trial No.: ' + data[0].dataIndex + '</div>' +
'<div>Duration: ' + convertDuration(data[0].data) + '</div>' +
'</div>'
),
},
grid: {
bottom: '3%',
Expand Down Expand Up @@ -93,7 +99,13 @@ class Duration extends React.Component<DurationProps, DurationState> {
trigger: 'axis',
axisPointer: {
type: 'shadow'
}
},
formatter: (data: any): React.ReactNode => (
'<div>' +
'<div>Trial No.: ' + data[0].dataIndex + '</div>' +
'<div>Duration: ' + convertDuration(data[0].data) + '</div>' +
'</div>'
),
},
grid: {
bottom: '3%',
Expand Down
2 changes: 1 addition & 1 deletion src/webui/src/static/function.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import axios from 'axios';
import { MANAGER_IP } from './const';
import { MetricDataRecord, FinalType, TableObj } from './interface';

async function requestAxios(url: string) {
async function requestAxios(url: string): Promise<any> {
const response = await axios.get(url);
if (response.status === 200) {
if (response.data.error !== undefined) {
Expand Down
1 change: 0 additions & 1 deletion src/webui/src/static/model/experiment.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import axios from 'axios';
import { MANAGER_IP } from '../const';
import { ExperimentProfile, NNIManagerStatus } from '../interface';
import { requestAxios } from '../function';
Expand Down
1 change: 0 additions & 1 deletion src/webui/src/static/model/trialmanager.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import axios from 'axios';
import { MANAGER_IP, METRIC_GROUP_UPDATE_THRESHOLD, METRIC_GROUP_UPDATE_SIZE } from '../const';
import { MetricDataRecord, TableRecord, TrialJobInfo } from '../interface';
import { Trial } from './trial';
Expand Down