paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 48 Packages Projects Releases Wiki Activity

Merge pull request #24126 from drodil/notifications_owner_resolution

Browse Source 
fix: entity owner relation resolution in notifications
This commit is contained in:
Patrik Oldsberg
2024-04-13 16:08:12 +02:00
committed by GitHub
parent c6e7dfdd62 6206039bb1
commit 6f432a84c9
2 changed files with 22 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.changeset/weak-feet-whisper.md
+5
View File
@@ -0,0 +1,5 @@
---
'@backstage/plugin-notifications-backend': patch
---
Fix entity owner resolution in notifications
plugins/notifications-backend/src/service/router.ts
+17 -29
View File
@@ -28,6 +28,7 @@ import {
isGroupEntity,
isUserEntity,
RELATION_HAS_MEMBER,
RELATION_OWNED_BY,
RELATION_PARENT_OF,
stringifyEntityRef,
} from '@backstage/catalog-model';
@@ -103,17 +104,13 @@ export async function createRouter(
return [];
}
const fields = ['kind', 'metadata.name', 'metadata.namespace', 'relations'];
const refs = Array.isArray(entityRef) ? entityRef : [entityRef];
const entities = await catalogClient.getEntitiesByRefs(
{
entityRefs: refs,
fields: [
'kind',
'metadata.name',
'metadata.namespace',
'relations',
'spec.owner',
],
fields,
},
{ token },
);
@@ -126,29 +123,17 @@ export async function createRouter(
return [stringifyEntityRef(entity)];
} else if (isGroupEntity(entity) && entity.relations) {
const users = entity.relations
.filter(
relation =>
relation.type === RELATION_HAS_MEMBER && relation.targetRef,
)
.filter(relation => relation.type === RELATION_HAS_MEMBER)
.map(r => r.targetRef);
const childGroupRefs = entity.relations
.filter(
relation =>
relation.type === RELATION_PARENT_OF && relation.targetRef,
)
.filter(relation => relation.type === RELATION_PARENT_OF)
.map(r => r.targetRef);
const childGroups = await catalogClient.getEntitiesByRefs(
{
entityRefs: childGroupRefs,
fields: [
'kind',
'metadata.name',
'metadata.namespace',
'relations',
'spec.owner',
],
fields,
},
{ token },
);
@@ -156,13 +141,16 @@ export async function createRouter(
childGroups.items.map(mapEntity),
);
return [...users, ...childGroupUsers.flat(2)];
} else if (!isGroupEntity(entity) && entity.spec?.owner) {
const owner = await catalogClient.getEntityByRef(
entity.spec.owner as string,
{ token },
);
if (owner) {
return mapEntity(owner);
} else if (entity.relations) {
const ownerRef = entity.relations.find(
relation => relation.type === RELATION_OWNED_BY,
)?.targetRef;
if (ownerRef) {
const owner = await catalogClient.getEntityByRef(ownerRef, { token });
if (owner) {
return mapEntity(owner);
}
}
}