Skip to content

GitLab

Unverified Commit 92738382 authored by Lijiaoa's avatar Lijiaoa Committed by GitHub
Browse files

[webui v1.9 bug bash] fix bugs in v1.9 (#2989)

parent 30d29116
Hide whitespace changes
Inline Side-by-side
Showing with 199 additions and 130 deletions
src/webui/src/static/const.ts
View file @ 92738382
...@@ -57,6 +57,9 @@ const SUPPORTED_SEARCH_SPACE_TYPE = [ ...@@ -57,6 +57,9 @@ const SUPPORTED_SEARCH_SPACE_TYPE = [
'qlognormal' 'qlognormal'
]; ];
const TOOLTIP_BACKGROUND_COLOR = '#484848';
const MAX_TRIAL_NUMBERS = 'Max trial No.';
export { export {
MANAGER_IP, MANAGER_IP,
DOWNLOAD_IP, DOWNLOAD_IP,
...@@ -71,5 +74,7 @@ export { ...@@ -71,5 +74,7 @@ export {
METRIC_GROUP_UPDATE_THRESHOLD, METRIC_GROUP_UPDATE_THRESHOLD,
METRIC_GROUP_UPDATE_SIZE, METRIC_GROUP_UPDATE_SIZE,
CONCURRENCYTOOLTIP, CONCURRENCYTOOLTIP,
SUPPORTED_SEARCH_SPACE_TYPE SUPPORTED_SEARCH_SPACE_TYPE,
TOOLTIP_BACKGROUND_COLOR,
MAX_TRIAL_NUMBERS
}; };
src/webui/src/static/function.ts
View file @ 92738382
...@@ -29,27 +29,6 @@ const convertTime = (num: number): string => { ...@@ -29,27 +29,6 @@ const convertTime = (num: number): string => {
} }
}; };
const convertTimeToSecond = (str: string): number => {
let seconds = 0;
let d, h, m;
if (str.includes('d')) {
[d, str] = str.split('d');
seconds += parseInt(d) * 24 * 3600;
}
if (str.includes('h')) {
[h, str] = str.split('h');
seconds += parseInt(h) * 3600;
}
if (str.includes('m')) {
[m, str] = str.split('m');
seconds += parseInt(m) * 60;
}
if (str) {
seconds += parseInt(str.split('s')[0]);
}
return seconds;
};
// trial's duration, accurate to seconds for example 10min 30s // trial's duration, accurate to seconds for example 10min 30s
const convertDuration = (seconds: number): string => { const convertDuration = (seconds: number): string => {
let str = ''; let str = '';
...@@ -78,6 +57,18 @@ const convertDuration = (seconds: number): string => { ...@@ -78,6 +57,18 @@ const convertDuration = (seconds: number): string => {
return str ? str : '0s'; return str ? str : '0s';
}; };
// according the unit(d,h,m) to convert duration
function convertTimeAsUnit(unit: string, value: number): number {
let divisor = 1;
if (unit === 'h') {
divisor = 3600;
} else if (unit === 'm') {
divisor = 60;
} else {
divisor = 24 * 3600;
}
return value / divisor;
}
function parseMetrics(metricData: string): any { function parseMetrics(metricData: string): any {
if (metricData.includes('NaN') || metricData.includes('Infinity')) { if (metricData.includes('NaN') || metricData.includes('Infinity')) {
return JSON5.parse(JSON5.parse(metricData)); return JSON5.parse(JSON5.parse(metricData));
...@@ -274,7 +265,7 @@ function formatComplexTypeValue(value: any): string | number { ...@@ -274,7 +265,7 @@ function formatComplexTypeValue(value: any): string | number {
export { export {
convertTime, convertTime,
convertDuration, convertDuration,
convertTimeToSecond, convertTimeAsUnit,
getFinalResult, getFinalResult,
getFinal, getFinal,
downFile, downFile,
......
src/webui/src/static/style/overview/command.scss
View file @ 92738382
.command { .command {
width: 100%; p {
margin-top: 0;
>div {
display: inline-block;
}
.command1 {
width: 46%;
p {
margin-top: 0;
}
}
.command2 {
width: 54%;
p {
margin-top: 0;
}
} }
.command1, .lineMargin {
.command2 { margin-top: 20px;
.lineMargin {
margin-top: 20px;
}
} }
} }
src/webui/src/static/style/overview/config.scss
View file @ 92738382
...@@ -4,15 +4,20 @@ ...@@ -4,15 +4,20 @@
z-index: 1000; z-index: 1000;
.ms-Button--default { .ms-Button--default {
padding: 0; padding: 0 8px;
margin: 0 0 15px 0; margin: 0 0 12px 0;
border-radius: 18px 0 0 18px;
border: 1px solid #ccc; border: 1px solid #ccc;
color: #0573bc; border-radius: 18px 0 0 18px;
font-size: 12px;
text-align: left;
.ms-Button-label {
font-weight: normal;
}
} }
.ms-Button--default:hover { .ms-Button--default:hover {
background-color: orangered; background-color: #0071bc;
color: #fff; color: #fff;
} }
} }
......
src/webui/src/static/style/overview/count.scss
View file @ 92738382
$seriesIconMargin: 13px; $seriesIconMargin: 8px;
.ExpDuration { .ExpDuration {
margin-top: 28px; margin-top: 28px;
...@@ -6,23 +6,74 @@ $seriesIconMargin: 13px; ...@@ -6,23 +6,74 @@ $seriesIconMargin: 13px;
span:hover { span:hover {
cursor: pointer; cursor: pointer;
} }
.maxTrialNum {
margin-bottom: 10px;
}
} }
.durationInput { .exp-progress {
width: 42px; margin-top: 10px;
height: 32px;
padding-right: 5px; .bold {
text-align: right; font-weight: 500;
outline: none; }
border: none;
border-bottom: 1px solid #ccc; .joiner {
padding: 0 3px;
}
}
.maxTrialNum {
.editparam {
position: relative;
top: -7px;
}
}
.noEditDuration {
position: relative;
top: -7px;
}
.editDuration {
position: relative;
top: -17px;
} }
.maxExecDuration { .editparam {
width: 74px; &-Input {
width: 42px;
height: 32px;
padding-right: 5px;
text-align: right;
outline: none;
border: none;
border-bottom: 1px solid #ccc;
}
.maxExecDuration {
width: 36px;
}
&-dropdown {
width: 48px;
display: inline-block;
position: relative;
top: 13px;
left: 4px;
margin-right: 3px;
}
}
.ExpDuration .series .confirm {
margin: 0 6px;
} }
.series { .series {
position: relative;
top: 5px;
i { i {
font-size: 20px; font-size: 20px;
font-weight: 700; font-weight: 700;
...@@ -39,6 +90,7 @@ $seriesIconMargin: 13px; ...@@ -39,6 +90,7 @@ $seriesIconMargin: 13px;
.cancel i { .cancel i {
color: red; color: red;
font-size: 16px;
} }
.edit i { .edit i {
...@@ -55,3 +107,11 @@ $seriesIconMargin: 13px; ...@@ -55,3 +107,11 @@ $seriesIconMargin: 13px;
z-index: 999; z-index: 999;
left: 0; left: 0;
} }
.mess {
margin-top: 20px;
.basic p {
margin-top: 0;
}
}
src/webui/src/static/style/overview/overview.scss
View file @ 92738382
$boxPadding: 20px 42px; $boxPadding: 20px;
$boxBorderRadius: 5px;
$boxGapPadding: 10px;
.wrapper { .wrapper {
display: grid; display: grid;
grid-template-columns: repeat(8, 1fr); grid-template-columns: repeat(9, 1fr);
grid-auto-rows: 82px; grid-auto-rows: 97px;
grid-gap: 18px;
>div { > div {
background: #fff; background: #fff;
padding: $boxPadding; padding: $boxPadding;
border-radius: 20px; border-radius: $boxBorderRadius;
box-sizing: border-box; box-sizing: border-box;
} }
.overviewProgress { .overviewProgress {
grid-column: 2 / 5; grid-column: 2 / 6;
grid-row: 1 / 5; grid-row: 1 / 5;
display: grid; display: grid;
grid-auto-rows: 70px; grid-auto-rows: 70px;
margin: 0 $boxGapPadding;
padding: 0; padding: 0;
background: transparent; background: transparent;
...@@ -25,7 +27,7 @@ $boxPadding: 20px 42px; ...@@ -25,7 +27,7 @@ $boxPadding: 20px 42px;
.trialCount { .trialCount {
background: #fff; background: #fff;
padding: $boxPadding; padding: $boxPadding;
border-radius: 20px; border-radius: $boxBorderRadius;
box-sizing: border-box; box-sizing: border-box;
/* for alert message tooltip position */ /* for alert message tooltip position */
...@@ -34,14 +36,31 @@ $boxPadding: 20px 42px; ...@@ -34,14 +36,31 @@ $boxPadding: 20px 42px;
.duration { .duration {
// grid-row: 1 / 3; // grid-row: 1 / 3;
height: 136px; height: 139px;
} }
.trialCount { .trialCount {
margin-top: 14px; margin-top: 79px;
height: 228px; height: 239px;
} }
} }
.overviewCommand1,
.overviewCommand2 {
border-radius: 0;
}
.overviewCommand1 {
grid-column-start: 1;
border-radius: $boxBorderRadius 0 0 $boxBorderRadius;
}
.overviewCommand2 {
grid-column: 2 / 6;
margin-right: 10px;
padding-left: 30px;
border-radius: 0 $boxBorderRadius $boxBorderRadius 0;
}
} }
.overviewBasicInfo { .overviewBasicInfo {
...@@ -58,10 +77,15 @@ $boxPadding: 20px 42px; ...@@ -58,10 +77,15 @@ $boxPadding: 20px 42px;
font-size: 14px; font-size: 14px;
color: #8f8f8f; color: #8f8f8f;
margin-top: 20px; margin-top: 20px;
span {
color: #484848;
}
} }
div { div {
font-size: 16px; font-size: 16px;
font-weight: 500;
color: #484848; color: #484848;
} }
...@@ -73,8 +97,8 @@ $boxPadding: 20px 42px; ...@@ -73,8 +97,8 @@ $boxPadding: 20px 42px;
} }
.overviewTable { .overviewTable {
grid-column: 5 / 9; grid-column: 6 / 10;
grid-row: 1 / 10; grid-row: 1 / 11;
overflow: hidden; overflow: hidden;
.topTrialTitle { .topTrialTitle {
...@@ -82,7 +106,7 @@ $boxPadding: 20px 42px; ...@@ -82,7 +106,7 @@ $boxPadding: 20px 42px;
} }
.active { .active {
background: #f3f2f1; background: #d2d0ce;
} }
.max { .max {
...@@ -99,21 +123,21 @@ $boxPadding: 20px 42px; ...@@ -99,21 +123,21 @@ $boxPadding: 20px 42px;
} }
} }
.overviewCommand, .overviewCommand1,
.overviewChart { .overviewCommand2 {
grid-column: 1 / 5;
}
.overviewCommand {
height: 144px; height: 144px;
overflow: hidden; overflow: hidden;
margin-top: 10px;
} }
$circle: 10px; $circle: 10px;
$bgblue: #0071bc; $bgblue: #0071bc;
.overviewChart { .overviewChart {
grid-column: 1 / 6;
grid-row: 7 / 11; grid-row: 7 / 11;
margin-top: -38px; margin-right: $boxGapPadding;
margin-top: -29px;
.circle { .circle {
width: $circle; width: $circle;
...@@ -124,3 +148,9 @@ $bgblue: #0071bc; ...@@ -124,3 +148,9 @@ $bgblue: #0071bc;
margin-right: 18px; margin-right: 18px;
} }
} }
.showMess {
position: absolute;
top: 42%;
left: 48%;
}
src/webui/src/static/style/progress/probar.scss
View file @ 92738382
/* status: 'INITIALIZED' | 'RUNNING' | 'ERROR' | 'STOPPING' | 'STOPPED' | 'DONE' */ /* status: 'INITIALIZED' | 'RUNNING' | 'ERROR' | 'STOPPING' | 'STOPPED' | 'DONE' */
$running: #0071bc;
$done: #00ad56;
$error: #a4262c;
/* status: 'TUNER_NO_MORE_TRIAL' | 'NO_MORE_TRIAL' */ /* status: 'TUNER_NO_MORE_TRIAL' | 'NO_MORE_TRIAL' */
.RUNNING, .RUNNING,
...@@ -7,27 +10,46 @@ ...@@ -7,27 +10,46 @@
.NO_MORE_TRIAL, .NO_MORE_TRIAL,
.TUNER_NO_MORE_TRIAL { .TUNER_NO_MORE_TRIAL {
/* specific status color */ /* specific status color */
color: #0071bc; color: $running;
/* progress- duration & trial numbers span */ /* progress- duration & trial numbers span */
.ms-ProgressIndicator-progressBar { .ms-ProgressIndicator-progressBar {
background-color: #0071bc; background-color: $running;
} }
} }
.DONE, .DONE,
.STOPPED { .STOPPED {
color: #009245; color: $done;
.ms-ProgressIndicator-progressBar { .ms-ProgressIndicator-progressBar {
background-color: #009245; background-color: $done;
} }
} }
.ERROR { .ERROR {
color: #eb0716; color: $error;
.ms-ProgressIndicator-progressBar { .ms-ProgressIndicator-progressBar {
background-color: #eb0716; background-color: $error;
}
}
.bestMetric {
.DONE,
.STOPPED {
color: $done;
}
.ERROR {
color: $error;
}
.RUNNING,
.STOPPING,
.INITIALIZED,
.NO_MORE_TRIAL,
.TUNER_NO_MORE_TRIAL {
color: $running;
} }
} }
src/webui/src/static/style/progress/progress.scss
View file @ 92738382
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
color: #0573bc; color: #0573bc;
font-size: 20px; font-size: 20px;
font-weight: 600; font-weight: 600;
margin-top: 5px;
.status-text { .status-text {
display: inline-block; display: inline-block;
......
src/webui/src/static/style/succTable.scss
View file @ 92738382
...@@ -18,4 +18,9 @@ ...@@ -18,4 +18,9 @@
} }
} }
} }
.succeed-padding {
padding-left: 6px;
box-sizing: border-box;
}
} }
src/webui/src/static/style/tableStatus.css
View file @ 92738382
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
} }
.FAILED { .FAILED {
color: #dd4b39; color: #a4262c;
} }
.SUCCEEDED { .SUCCEEDED {
color: #00a445; color: #00ad56;
} }
.UNKNOWN { .UNKNOWN {
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
} }
.WAITING { .WAITING {
color: #fdc401; color: #d29200;
} }
.EARLY_STOPPED { .EARLY_STOPPED {
......
src/webui/yarn.lock
View file @ 92738382
...@@ -4551,7 +4551,7 @@ debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: ...@@ -4551,7 +4551,7 @@ debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
dependencies: dependencies:
ms "2.1.2" ms "2.1.2"
   
debuglog@*, debuglog@^1.0.1: debuglog@^1.0.1:
version "1.0.1" version "1.0.1"
resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI= integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
...@@ -5106,6 +5106,11 @@ es6-promisify@^5.0.0: ...@@ -5106,6 +5106,11 @@ es6-promisify@^5.0.0:
dependencies: dependencies:
es6-promise "^4.0.3" es6-promise "^4.0.3"
   
escalade@^3.0.2:
version "3.1.1"
resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
escalade@^3.1.0: escalade@^3.1.0:
version "3.1.0" version "3.1.0"
resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.0.tgz#e8e2d7c7a8b76f6ee64c2181d6b8151441602d4e" resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.0.tgz#e8e2d7c7a8b76f6ee64c2181d6b8151441602d4e"
...@@ -6692,7 +6697,7 @@ import-local@^2.0.0: ...@@ -6692,7 +6697,7 @@ import-local@^2.0.0:
pkg-dir "^3.0.0" pkg-dir "^3.0.0"
resolve-cwd "^2.0.0" resolve-cwd "^2.0.0"
   
imurmurhash@*, imurmurhash@^0.1.4: imurmurhash@^0.1.4:
version "0.1.4" version "0.1.4"
resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
...@@ -8267,11 +8272,6 @@ lockfile@^1.0.4: ...@@ -8267,11 +8272,6 @@ lockfile@^1.0.4:
dependencies: dependencies:
signal-exit "^3.0.2" signal-exit "^3.0.2"
   
lodash._baseindexof@*:
version "3.1.0"
resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c"
integrity sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw=
lodash._baseuniq@~4.6.0: lodash._baseuniq@~4.6.0:
version "4.6.0" version "4.6.0"
resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8" resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8"
...@@ -8280,33 +8280,11 @@ lodash._baseuniq@~4.6.0: ...@@ -8280,33 +8280,11 @@ lodash._baseuniq@~4.6.0:
lodash._createset "~4.0.0" lodash._createset "~4.0.0"
lodash._root "~3.0.0" lodash._root "~3.0.0"
   
lodash._bindcallback@*:
version "3.0.1"
resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4=
lodash._cacheindexof@*:
version "3.0.2"
resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92"
integrity sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI=
lodash._createcache@*:
version "3.1.2"
resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093"
integrity sha1-VtagZAF2JeeevKa4AY4XRAvc8JM=
dependencies:
lodash._getnative "^3.0.0"
lodash._createset@~4.0.0: lodash._createset@~4.0.0:
version "4.0.3" version "4.0.3"
resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26" resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26"
integrity sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY= integrity sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY=
   
lodash._getnative@*, lodash._getnative@^3.0.0:
version "3.9.1"
resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=
lodash._reinterpolate@^3.0.0: lodash._reinterpolate@^3.0.0:
version "3.0.0" version "3.0.0"
resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
...@@ -8337,11 +8315,6 @@ lodash.memoize@^4.1.2: ...@@ -8337,11 +8315,6 @@ lodash.memoize@^4.1.2:
resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
   
lodash.restparam@*:
version "3.6.1"
resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=
lodash.sortby@^4.7.0: lodash.sortby@^4.7.0:
version "4.7.0" version "4.7.0"
resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
...@@ -11919,7 +11892,7 @@ selfsigned@^1.9.1: ...@@ -11919,7 +11892,7 @@ selfsigned@^1.9.1:
resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.8.tgz#0d17208b7d12c33f8eac85c41835f27fc3d81a30" resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.8.tgz#0d17208b7d12c33f8eac85c41835f27fc3d81a30"
integrity sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w== integrity sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w==
dependencies: dependencies:
node-forge "0.9.0" node-forge "^0.10.0"
   
semver-diff@^2.0.0: semver-diff@^2.0.0:
version "2.1.0" version "2.1.0"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment