Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
nni
Commits
9caf5215
Unverified
Commit
9caf5215
authored
Feb 23, 2021
by
Lijiaoa
Committed by
GitHub
Feb 23, 2021
Browse files
Hybrid show trial platforms in webui (#3391)
parent
28c486c4
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
432 additions
and
413 deletions
+432
-413
ts/webui/src/App.scss
ts/webui/src/App.scss
+1
-1
ts/webui/src/components/trial-detail/TableList.tsx
ts/webui/src/components/trial-detail/TableList.tsx
+25
-0
ts/webui/src/static/const.ts
ts/webui/src/static/const.ts
+0
-13
ts/webui/src/static/interface.ts
ts/webui/src/static/interface.ts
+2
-0
ts/webui/src/static/model/trial.ts
ts/webui/src/static/model/trial.ts
+1
-0
ts/webui/src/static/style/common.scss
ts/webui/src/static/style/common.scss
+20
-19
ts/webui/src/static/style/experiment/experiment.scss
ts/webui/src/static/style/experiment/experiment.scss
+77
-74
ts/webui/src/static/style/nav/nav.scss
ts/webui/src/static/style/nav/nav.scss
+86
-85
ts/webui/src/static/style/overview/count.scss
ts/webui/src/static/style/overview/count.scss
+81
-80
ts/webui/src/static/style/overview/overview.scss
ts/webui/src/static/style/overview/overview.scss
+79
-80
ts/webui/src/static/style/overview/panel.scss
ts/webui/src/static/style/overview/panel.scss
+60
-61
No files found.
ts/webui/src/App.scss
View file @
9caf5215
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
.content
{
.content
{
width
:
87%
;
width
:
87%
;
min-height
:
calc
(
100vh
-
56
);
min-height
:
calc
(
100vh
-
56
px
);
margin
:
0
auto
;
margin
:
0
auto
;
min-width
:
1200px
;
min-width
:
1200px
;
max-width
:
1490px
;
max-width
:
1490px
;
...
...
ts/webui/src/components/trial-detail/TableList.tsx
View file @
9caf5215
...
@@ -56,6 +56,8 @@ function _inferColumnTitle(columnKey: string): string {
...
@@ -56,6 +56,8 @@ function _inferColumnTitle(columnKey: string): string {
return
'
ID
'
;
return
'
ID
'
;
}
else
if
(
columnKey
===
'
intermediateCount
'
)
{
}
else
if
(
columnKey
===
'
intermediateCount
'
)
{
return
'
Intermediate results (#)
'
;
return
'
Intermediate results (#)
'
;
}
else
if
(
columnKey
===
'
message
'
)
{
return
'
Message
'
;
}
else
if
(
columnKey
.
startsWith
(
'
space/
'
))
{
}
else
if
(
columnKey
.
startsWith
(
'
space/
'
))
{
return
columnKey
.
split
(
'
/
'
,
2
)[
1
]
+
'
(space)
'
;
return
columnKey
.
split
(
'
/
'
,
2
)[
1
]
+
'
(space)
'
;
}
else
if
(
columnKey
===
'
latestAccuracy
'
)
{
}
else
if
(
columnKey
===
'
latestAccuracy
'
)
{
...
@@ -185,6 +187,7 @@ class TableList extends React.Component<TableListProps, TableListState> {
...
@@ -185,6 +187,7 @@ class TableList extends React.Component<TableListProps, TableListState> {
endTime
:
(
trial
as
Trial
).
info
.
endTime
,
endTime
:
(
trial
as
Trial
).
info
.
endTime
,
duration
:
trial
.
duration
,
duration
:
trial
.
duration
,
status
:
trial
.
status
,
status
:
trial
.
status
,
message
:
(
trial
as
Trial
).
info
.
message
||
'
--
'
,
intermediateCount
:
trial
.
intermediates
.
length
,
intermediateCount
:
trial
.
intermediates
.
length
,
_expandDetails
:
this
.
_expandedTrialIds
.
has
(
trial
.
id
)
// hidden field names should start with `_`
_expandDetails
:
this
.
_expandedTrialIds
.
has
(
trial
.
id
)
// hidden field names should start with `_`
};
};
...
@@ -280,6 +283,28 @@ class TableList extends React.Component<TableListProps, TableListState> {
...
@@ -280,6 +283,28 @@ class TableList extends React.Component<TableListProps, TableListState> {
<
span
className
=
{
`
${
record
.
status
}
commonStyle`
}
>
{
record
.
status
}
</
span
>
<
span
className
=
{
`
${
record
.
status
}
commonStyle`
}
>
{
record
.
status
}
</
span
>
)
)
}),
}),
...(
k
===
'
message
'
&&
{
onRender
:
(
record
):
React
.
ReactNode
=>
record
.
message
.
length
>
15
?
(
<
TooltipHost
content
=
{
record
.
message
}
directionalHint
=
{
DirectionalHint
.
bottomCenter
}
tooltipProps
=
{
{
calloutProps
:
{
styles
:
{
beak
:
{
background
:
TOOLTIP_BACKGROUND_COLOR
},
beakCurtain
:
{
background
:
TOOLTIP_BACKGROUND_COLOR
},
calloutMain
:
{
background
:
TOOLTIP_BACKGROUND_COLOR
}
}
}
}
}
>
<
div
>
{
record
.
message
}
</
div
>
</
TooltipHost
>
)
:
(
<
div
>
{
record
.
message
}
</
div
>
)
}),
...((
k
.
startsWith
(
'
metric/
'
)
||
k
.
startsWith
(
'
space/
'
))
&&
{
...((
k
.
startsWith
(
'
metric/
'
)
||
k
.
startsWith
(
'
space/
'
))
&&
{
// show tooltip
// show tooltip
onRender
:
(
record
):
React
.
ReactNode
=>
(
onRender
:
(
record
):
React
.
ReactNode
=>
(
...
...
ts/webui/src/static/const.ts
View file @
9caf5215
...
@@ -39,18 +39,6 @@ const DRAWEROPTION = {
...
@@ -39,18 +39,6 @@ const DRAWEROPTION = {
const
OPERATION
=
'
Operation
'
;
const
OPERATION
=
'
Operation
'
;
// defatult selected column
// defatult selected column
const
COLUMN
=
[
'
Trial No.
'
,
'
ID
'
,
'
Duration
'
,
'
Status
'
,
'
Default
'
,
OPERATION
];
const
COLUMN
=
[
'
Trial No.
'
,
'
ID
'
,
'
Duration
'
,
'
Status
'
,
'
Default
'
,
OPERATION
];
// all choice column !dictory final
const
COLUMNPro
=
[
'
Trial No.
'
,
'
ID
'
,
'
Start time
'
,
'
End time
'
,
'
Duration
'
,
'
Status
'
,
'
Intermediate result
'
,
'
Default
'
,
OPERATION
];
const
CONCURRENCYTOOLTIP
=
'
Trial concurrency is the number of trials running concurrently.
'
;
const
CONCURRENCYTOOLTIP
=
'
Trial concurrency is the number of trials running concurrently.
'
;
const
SUPPORTED_SEARCH_SPACE_TYPE
=
[
const
SUPPORTED_SEARCH_SPACE_TYPE
=
[
'
choice
'
,
'
choice
'
,
...
@@ -75,7 +63,6 @@ export {
...
@@ -75,7 +63,6 @@ export {
DOWNLOAD_IP
,
DOWNLOAD_IP
,
trialJobStatus
,
trialJobStatus
,
EXPERIMENTSTATUS
,
EXPERIMENTSTATUS
,
COLUMNPro
,
WEBUIDOC
,
WEBUIDOC
,
CONTROLTYPE
,
CONTROLTYPE
,
MONACO
,
MONACO
,
...
...
ts/webui/src/static/interface.ts
View file @
9caf5215
...
@@ -46,6 +46,7 @@ interface TableRecord {
...
@@ -46,6 +46,7 @@ interface TableRecord {
id
:
string
;
id
:
string
;
duration
:
number
;
duration
:
number
;
status
:
string
;
status
:
string
;
message
:
string
;
intermediateCount
:
number
;
intermediateCount
:
number
;
accuracy
?:
number
|
any
;
accuracy
?:
number
|
any
;
latestAccuracy
:
number
|
undefined
;
latestAccuracy
:
number
|
undefined
;
...
@@ -135,6 +136,7 @@ interface TrialJobInfo {
...
@@ -135,6 +136,7 @@ interface TrialJobInfo {
trialJobId
:
string
;
trialJobId
:
string
;
sequenceId
:
number
;
sequenceId
:
number
;
status
:
string
;
status
:
string
;
message
:
string
;
startTime
?:
number
;
startTime
?:
number
;
endTime
?:
number
;
endTime
?:
number
;
hyperParameters
?:
string
[];
hyperParameters
?:
string
[];
...
...
ts/webui/src/static/model/trial.ts
View file @
9caf5215
...
@@ -152,6 +152,7 @@ class Trial implements TableObj {
...
@@ -152,6 +152,7 @@ class Trial implements TableObj {
endTime
:
this
.
info
.
endTime
,
endTime
:
this
.
info
.
endTime
,
duration
,
duration
,
status
:
this
.
info
.
status
,
status
:
this
.
info
.
status
,
message
:
this
.
info
.
message
||
'
--
'
,
intermediateCount
:
this
.
intermediates
.
length
,
intermediateCount
:
this
.
intermediates
.
length
,
accuracy
:
accuracy
,
accuracy
:
accuracy
,
latestAccuracy
:
this
.
latestAccuracy
,
latestAccuracy
:
this
.
latestAccuracy
,
...
...
ts/webui/src/static/style/common.scss
View file @
9caf5215
...
@@ -13,6 +13,7 @@
...
@@ -13,6 +13,7 @@
color
:
#0071bc
!
important
;
color
:
#0071bc
!
important
;
text-decoration
:
underline
;
text-decoration
:
underline
;
}
}
&
:active
,
&
:active
,
&
:visited
{
&
:visited
{
color
:
#0071bc
;
color
:
#0071bc
;
...
...
ts/webui/src/static/style/experiment/experiment.scss
View file @
9caf5215
...
@@ -16,8 +16,9 @@ $pageMargin: 24px;
...
@@ -16,8 +16,9 @@ $pageMargin: 24px;
padding
:
$pageMargin
42px
;
padding
:
$pageMargin
42px
;
.ms-DetailsRow
{
.ms-DetailsRow
{
&
:hover
,
&
:focus
{
&
:hover
,
background
:
#F3F2F1
!
important
;
&
:focus
{
background
:
#f3f2f1
!
important
;
}
}
}
}
...
@@ -44,6 +45,7 @@ $pageMargin: 24px;
...
@@ -44,6 +45,7 @@ $pageMargin: 24px;
.filter-condition
{
.filter-condition
{
margin-top
:
26px
;
margin-top
:
26px
;
.reset
{
.reset
{
width
:
80px
;
width
:
80px
;
position
:
relative
;
position
:
relative
;
...
@@ -53,6 +55,7 @@ $pageMargin: 24px;
...
@@ -53,6 +55,7 @@ $pageMargin: 24px;
&
-status
{
&
-status
{
width
:
194px
;
width
:
194px
;
}
}
&
-platform
{
&
-platform
{
width
:
150px
;
width
:
150px
;
}
}
...
...
ts/webui/src/static/style/nav/nav.scss
View file @
9caf5215
...
@@ -102,6 +102,7 @@ a.common-tabs {
...
@@ -102,6 +102,7 @@ a.common-tabs {
position
:
relative
;
position
:
relative
;
top
:
-4px
;
top
:
-4px
;
}
}
i
{
i
{
color
:
#fff
;
color
:
#fff
;
font-size
:
12px
;
font-size
:
12px
;
...
...
ts/webui/src/static/style/overview/count.scss
View file @
9caf5215
...
@@ -61,6 +61,7 @@ $margin: 24px;
...
@@ -61,6 +61,7 @@ $margin: 24px;
position
:
relative
;
position
:
relative
;
}
}
}
}
.editparam
{
.editparam
{
&
-Input
{
&
-Input
{
width
:
42px
;
width
:
42px
;
...
...
ts/webui/src/static/style/overview/overview.scss
View file @
9caf5215
...
@@ -79,7 +79,6 @@ $boxGapPadding: 10px;
...
@@ -79,7 +79,6 @@ $boxGapPadding: 10px;
font-weight
:
500
;
font-weight
:
500
;
color
:
#484848
;
color
:
#484848
;
}
}
}
}
.overviewBestMetric
{
.overviewBestMetric
{
...
...
ts/webui/src/static/style/overview/panel.scss
View file @
9caf5215
...
@@ -26,7 +26,6 @@ $buttonBorderRadius: 23px;
...
@@ -26,7 +26,6 @@ $buttonBorderRadius: 23px;
.margin
{
.margin
{
margin-left
:
10px
;
margin-left
:
10px
;
}
}
}
}
.container
{
.container
{
...
@@ -50,7 +49,7 @@ $buttonBorderRadius: 23px;
...
@@ -50,7 +49,7 @@ $buttonBorderRadius: 23px;
}
}
}
}
.configBtn
i
{
.configBtn
i
{
margin-left
:
-40px
;
margin-left
:
-40px
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment