-
Notifications
You must be signed in to change notification settings - Fork 269
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
AAE-15221 Allow multiple roles when fetching deployed applications #10503
Merged
DavidOlson-Hyland
merged 1 commit into
develop
from
fix/AAE-15221-app-get-multiple-roles
Jan 8, 2025
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -36,11 +36,11 @@ export class AppsProcessCloudService { | |
* Gets a list of deployed apps for this user by status. | ||
* | ||
* @param status Required status value | ||
* @param role to filter the apps | ||
* @param roles to filter the apps | ||
* @returns The list of deployed apps | ||
*/ | ||
getDeployedApplicationsByStatus(status: string, role?: string): Observable<ApplicationInstanceModel[]> { | ||
return this.hasDeployedApps() ? of(this.deployedApps) : this.getApplicationsByStatus(status, role); | ||
getDeployedApplicationsByStatus(status: string, roles?: string | string[]): Observable<ApplicationInstanceModel[]> { | ||
return this.hasDeployedApps() ? of(this.deployedApps) : this.getApplicationsByStatus(status, roles); | ||
} | ||
|
||
hasDeployedApps(): boolean { | ||
|
@@ -66,13 +66,13 @@ export class AppsProcessCloudService { | |
} | ||
} | ||
|
||
private getApplicationsByStatus(status: string, role?: string): Observable<ApplicationInstanceModel[]> { | ||
private getApplicationsByStatus(status: string, roles?: string | string[]): Observable<ApplicationInstanceModel[]> { | ||
if (status === '') { | ||
return of([]); | ||
} | ||
const path = this.getApplicationUrl(); | ||
const pathParams = {}; | ||
const queryParams = { status, roles: role, sort: 'name' }; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. for arrays, does it need to be formatted somehow, i.e. comma-separated list? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. No. Angular's HttpParams class is designed to accept an array. |
||
const queryParams = { status, roles, sort: 'name' }; | ||
const httpMethod = 'GET'; | ||
const headerParams = {}; | ||
const formParams = {}; | ||
|
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If I'm reading it right, roles can be either a string or a string array, or is this casting a string as a string array?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Roles can be either a string or a string array.