fix: TopNav switch link in different portals #692
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
Codecov Report
@@ Coverage Diff @@
## feat/portal-url #692 +/- ##
===================================================
+ Coverage 31.57% 31.97% +0.39%
===================================================
Files 103 103
Lines 1387 1373 -14
Branches 361 356 -5
===================================================
+ Hits 438 439 +1
+ Misses 918 903 -15
Partials 31 31
Continue to review full report at Codecov.
|
liiil825
reviewed
Jan 22, 2019
src/stores/app/version.js
Outdated
| @@ -99,6 +101,10 @@ export default class AppVersionStore extends Store { | |||
| return this.getStore('user'); | |||
| } | |||
|
|
|||
| get describeVersionName() { | |||
| return isUserPortal ? 'active_app_versions' : 'app_versions'; | |||
There was a problem hiding this comment.
isUserPortal 是个 function 吧
There was a problem hiding this comment.
这里有问题，如果你想这么调用，可以把 isUserPortal写在 user provider里，用es6 getter
sunnywx
reviewed
Jan 22, 2019
src/components/MenuLayer/index.jsx
Outdated
|
|
||
| import styles from './index.scss'; | ||
|
|
||
| const roleToProtal = { |
sunnywx
reviewed
Jan 22, 2019
src/components/MenuLayer/index.jsx
Outdated
| const changeWord = isNormal ? t('Develop Center') : t('App Center'); | ||
| const isDeveloper = user.role === 'developer'; | ||
| const { isNormal, role } = user; | ||
| const protal = isUserPortal() ? roleToProtal[role] || {} : roleToProtal.user; |
sunnywx
reviewed
Jan 22, 2019
src/routes/index.js
Outdated
| @@ -50,6 +50,7 @@ export const getPortalFromPath = (path = location.pathname) => { | |||
| return ''; | |||
| }; | |||
|
|
|||
| export const isUserPortal = () => (getPortalFromPath() || 'user') === 'user'; | |||
There was a problem hiding this comment.
改为
isUserPortal=> ['', 'user'].includes(getPortalFromPath())
There was a problem hiding this comment.
这里不用 function 可能会有问题吧，这样会在初始化时就决定了，后面切换了 url 可能不会变
sunnywx
changed the title
sunnywx
approved these changes
Jan 22, 2019
sunnywx
added a commit
that referenced
this pull request
Jan 22, 2019
* Add user, dev, isv, admin portal routes * feat: Portal architecture * chore: Admin portal (#690) * chore: Developer portal (#691) * fix: TopNav switch link in different portals (#692) * feat: Add cluster, cluster detail to user portal * Refine entry file * Refine Layout comp, remove socket listen * feat: Add runtimes, runtime create page for user portal * Fix all routes links * Refactor: Cluster, runtime pages suit user and non-user portal
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.