fix case mismatch in relationship name

Signed-off-by: Brian Phillips <28457+brianphillips@users.noreply.github.com>
This commit is contained in:
Brian Phillips
2024-05-29 14:37:35 -05:00
parent 2644eeccb9
commit 05ad87ed3a
3 changed files with 16 additions and 11 deletions
@@ -119,7 +119,7 @@ describe('MemberTab Test', () => {
expect(getEntitiesSpy).toHaveBeenCalledWith({
filter: {
kind: 'User',
'relations.memberOf': ['group:default/team-d'],
'relations.memberof': ['group:default/team-d'],
},
});
@@ -174,7 +174,7 @@ describe('MemberTab Test', () => {
expect(getEntitiesSpy).toHaveBeenCalledWith({
filter: {
kind: 'User',
'relations.leaderOf': ['group:default/team-d'],
'relations.leaderof': ['group:default/team-d'],
},
});
});
@@ -145,7 +145,7 @@ export const MembersListCard = (props: {
memberDisplayTitle = 'Members',
pageSize = 50,
showAggregateMembersToggle,
relationship = 'memberOf',
relationship = 'memberof',
relationsType = 'direct',
} = props;
const classes = useListStyles();
@@ -179,6 +179,7 @@ export const MembersListCard = (props: {
return await getAllDesendantMembersForGroupEntity(
groupEntity,
catalogApi,
relationship,
);
}, [catalogApi, groupEntity, showAggregateMembers]);
const {
@@ -189,7 +190,7 @@ export const MembersListCard = (props: {
const membersList = await catalogApi.getEntities({
filter: {
kind: 'User',
[`relations.${relationship}`]: [
[`relations.${relationship.toLocaleLowerCase('en-US')}`]: [
stringifyEntityRef({
kind: 'group',
namespace: groupNamespace.toLocaleLowerCase('en-US'),
+11 -7
View File
@@ -31,6 +31,7 @@ import {
export const getMembersFromGroups = async (
groups: CompoundEntityRef[],
catalogApi: CatalogApi,
relationship = 'memberof',
) => {
const membersList =
groups.length === 0
@@ -38,13 +39,14 @@ export const getMembersFromGroups = async (
: await catalogApi.getEntities({
filter: {
kind: 'User',
'relations.memberof': groups.map(group =>
stringifyEntityRef({
kind: 'group',
namespace: group.namespace.toLocaleLowerCase('en-US'),
name: group.name.toLocaleLowerCase('en-US'),
}),
),
[`relations.${relationship.toLocaleLowerCase('en-US')}`]:
groups.map(group =>
stringifyEntityRef({
kind: 'group',
namespace: group.namespace.toLocaleLowerCase('en-US'),
name: group.name.toLocaleLowerCase('en-US'),
}),
),
},
});
@@ -99,10 +101,12 @@ export const getDescendantGroupsFromGroup = async (
export const getAllDesendantMembersForGroupEntity = async (
groupEntity: GroupEntity,
catalogApi: CatalogApi,
relationship = 'memberof',
) =>
getMembersFromGroups(
await getDescendantGroupsFromGroup(groupEntity, catalogApi),
catalogApi,
relationship,
);
export const removeDuplicateEntitiesFrom = (entityArray: Entity[]) => {