This repository has been archived by the owner on Sep 18, 2024. It is now read-only.
[webui] add basename in router #3625
Merged
Conversation
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
ultmaster
reviewed
May 17, 2021
ts/webui/src/static/function.ts
Outdated
| const pathName = window.location.pathname; | ||
| let newPathName = pathName; | ||
|
|
||
| if (pathName.endsWith('/oview' || '/detail' || '/experiment')) { |
There was a problem hiding this comment.
Shouldn't it be:
pathName.endsWith('/oview') || pathName.endsWith('/detail') || pathName.endsWith('/experiment')
There was a problem hiding this comment.
will change it at once! it's my oversight. Thanks!
| @@ -2,19 +2,19 @@ import * as React from 'react'; | |||
| import { NavLink } from 'react-router-dom'; | |||
|
|
|||
| const OVERVIEWTABS = ( | |||
| <NavLink to={'/oview'} activeClassName='selected' className='common-tabs'> | |||
| <NavLink to='/oview' activeClassName='selected' className='common-tabs'> | |||
There was a problem hiding this comment.
What's the difference here?
There was a problem hiding this comment.
{} 配合变量使用，这里直接写字符串就行
| let newPathName = pathName; | ||
|
|
||
| if (pathName.endsWith('/oview' || '/detail' || '/experiment')) { | ||
| newPathName = pathName.replace('/oview' || '/detail' || '/experiment', ''); |
There was a problem hiding this comment.
What if the prefix is /experiment-number-1? Will it be mistakenly replaced?
There was a problem hiding this comment.
it doesn't support prefix with '/' on the head.
acured
approved these changes
May 17, 2021
ts/webui/src/static/const.ts
Outdated
| const MANAGER_IP = `/api/v1/nni`; | ||
| const prefix = getPrefix(); | ||
|
|
||
| const MANAGER_IP = prefix === undefined ? '/api/v1/nni' : `/api/v1/nni${prefix}`; |
There was a problem hiding this comment.
According to here,
Better change this to
const MANAGER_IP = prefix === undefined ? '/api/v1/nni' : /${prefix};
ultmaster
approved these changes
May 18, 2021
QuanluZhang
approved these changes
May 19, 2021
49 tasks
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
related issue: #2771
With this PR merged, you could run an experiment with command
nnictl create --config xx.yml --url_prefix customURLopen webui website look like this :ip:port/customURL/oview/api/v1/nni${prefix}, 如果用户未设置prefix，api/v1/nni/logs apineeds prefix? -> no need to add prefix for /logs api测试用例
（1）
nnictl create --config xx.yml起一个实验，观察 ip:port/oview、 /detail、 /experiment 页面是否正常（2）
nnictl create --config xx.yml --url_prefix customPrefix起一个实验，观察 ip:port/customPrefix/oview、/detail、 /experiment 页面是否正常（3）
nnictl create --config xx.yml --url_prefix /customerURL起一个实验，此时会提醒不能以/开头，路径无效（4）
nnictl create --config xx.yml --url_prefix customer/xxx起一个实验，观察 ip:port/customPrefix/oview、/detail、 /experiment 页面是否正常