ui - display all domains that reference current user #2789
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
ArtjomsPorss
commented
Nov 1, 2024
ui/src/api.js
Outdated
Comment on lines
38
to
44
|
|
||
| listUserDomains(roleName) { | ||
| listUserDomains() { | ||
| return new Promise((resolve, reject) => { | ||
| fetchr | ||
| .read('domain-list') | ||
| .params({ roleName }) | ||
| .read('domain-role-member') | ||
| .params({ expand: true }) | ||
| .end((err, data) => { |
There was a problem hiding this comment.
using different api to obtain domain details. not passing principal as it is picked up from the request context
ArtjomsPorss
commented
Nov 1, 2024
ArtjomsPorss
force-pushed
the
ui-display-all-domains-for-principal
branch
2 times, most recently
from
930d5ca
to
fdd4fe9
Compare
ArtjomsPorss
commented
Nov 1, 2024
Signed-off-by: aporss <[email protected]>
ArtjomsPorss
force-pushed
the
ui-display-all-domains-for-principal
branch
from
fdd4fe9
to
f0d2cee
Compare
ArtjomsPorss
commented
Nov 5, 2024
ui/src/redux/thunks/domains.js
Outdated
Comment on lines
270
to
313
|
|
||
|
|
||
| const transformDomainListResult = (domainsData) => { | ||
| let domainsToReturn = []; | ||
|
|
||
| // 'prefix' is a list of unique domain names for given principal | ||
| if (!domainsData || !domainsData.memberRoles || !domainsData['prefix']) { | ||
| return domainsToReturn; | ||
| } | ||
|
|
||
| let adminDomains = new Set(); | ||
| let nonAdminDomains = domainsData['prefix'].slice(); // list of all unique domain names | ||
|
|
||
| // processing non-admin domains separately because user can be an admin of same domain only once | ||
| // but can be non-admin member of same domain via multiple roles/groups | ||
| domainsData.memberRoles.forEach(role => { | ||
| if (role.roleName === 'admin') { | ||
| // create admin domain object | ||
| adminDomains.add({ | ||
| name: role.domainName, | ||
| adminDomain: true | ||
| }); | ||
| // remove admin domain from list of non admin domains | ||
| const adminDomainIndex = nonAdminDomains.indexOf(role.domainName); | ||
| nonAdminDomains.splice(adminDomainIndex, 1); | ||
| } | ||
| }); | ||
|
|
||
| // add admin domains | ||
| domainsToReturn.push(...adminDomains); | ||
|
|
||
| // create and add non admin domains | ||
| nonAdminDomains.forEach(domain => { | ||
| domainsToReturn.push({ | ||
| name: domain, | ||
| adminDomain: false | ||
| }) | ||
| }) | ||
|
|
||
| // sorting domains alphabetically | ||
| domainsToReturn.sort((a, b) => a.name.localeCompare(b.name)); | ||
|
|
||
| return domainsToReturn; | ||
| }; |
There was a problem hiding this comment.
according to docs thunks is the preferred location for data transformation, not the reducers
ArtjomsPorss
commented
Nov 5, 2024
Comment on lines
+54
to
56
| const domainsData = await API().listUserDomains(); | ||
| const domainsList = transformDomainListResult(domainsData); | ||
| dispatch(loadUserDomainList(domainsList)); |
There was a problem hiding this comment.
transforming data returned by fetchr
|
By changing API call - the returned data format was changed thus breaking the snapshot generation. |
Signed-off-by: aporss <[email protected]>
|
js file reformatting was done on some files unrelated to pr because these files were failing github build |
ArtjomsPorss
commented
Nov 6, 2024
There was a problem hiding this comment.
only formatting change
ArtjomsPorss
commented
Nov 6, 2024
There was a problem hiding this comment.
only formatting change
ArtjomsPorss
commented
Nov 6, 2024
There was a problem hiding this comment.
only formatting change
ArtjomsPorss
commented
Nov 6, 2024
ui/src/pages/workflow/domain.js
Outdated
There was a problem hiding this comment.
only formatting change
Signed-off-by: Artjoms Porss <[email protected]>
chandrasekhar1996
approved these changes
Nov 20, 2024
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.
Description
Change to UI domains list for current user to include domains with indirect membership, e.g. domains that assume delegated roles.
Contribution Checklist: