This repository has been archived by the owner on Mar 25, 2023. It is now read-only.
feat(listAll): add listAll and account filter #535
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
# Conflicts: # src/app/shared/shared.module.ts # src/app/spare-drive/spare-drive-filter/spare-drive-filter.component.ts # src/app/vm/vm-filter/vm-filter.component.ts
zolotyx
suggested changes
Sep 21, 2017
| @@ -40,6 +40,7 @@ export abstract class BaseBackendService<M extends BaseModel> { | |||
| } | |||
|
|
|||
| public getList(params?: {}, customApiFormat?: ApiFormat): Observable<Array<M>> { | |||
| params = Object.assign(params || {}, { 'listAll': 'true' }); | |||
There was a problem hiding this comment.
params equal to {} by default. no need to check params || {}
use Object.assign({}, params, {listall...})
| @@ -90,10 +91,20 @@ export class VmListComponent implements OnInit { | |||
| this.outputs = { | |||
| onClick: this.showDetail | |||
| }; | |||
|
|
|||
| if (this.authService.isAdmin()) { | |||
There was a problem hiding this comment.
I think it's better to add this item to groupings and then filter out
| return user ? user.name: account; | ||
| } | ||
|
|
||
| private sortByAccount(accounts) { |
There was a problem hiding this comment.
I think this function should take volumes list and accounts
There was a problem hiding this comment.
Use accounts = [] by default
| private sortByAccount(accounts) { | ||
| let result: Array<Volume> = []; | ||
| if (accounts && accounts.length != 0) { | ||
| accounts.forEach(account => { |
There was a problem hiding this comment.
do return visibleVolumes.filter(volume=> accounts.find(a=>a.name === volume.account)
|
@ksendart |
zolotyx
suggested changes
Sep 26, 2017
# Conflicts: # src/app/shared/shared.module.ts
zolotyx
approved these changes
Sep 29, 2017
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.
#305