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

Merge pull request #29895 from grantila/grantila/fix-missing-catalog-graph-relations

Browse Source 
Fix missing edges in the catalog-graph plugin
This commit is contained in:
Patrik Oldsberg
2025-05-20 09:37:53 +02:00
committed by GitHub
parent 4bebcf7431 1307f007f5
commit 07f82f26c2
3 changed files with 89 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.changeset/some-horses-ask.md
+5
View File
@@ -0,0 +1,5 @@
---
'@backstage/plugin-catalog-graph': patch
---
Fix rendering of missing relations
plugins/catalog-graph/src/components/EntityRelationsGraph/useEntityRelationNodesAndEdges.test.ts
+53
View File
@@ -34,6 +34,17 @@ const useEntityRelationGraph = useEntityRelationGraphMocked as jest.Mock<
ReturnType<typeof useEntityRelationGraphMocked>
>;
/*
This is the full test graph:
- b:d/c -> k:d/a1 (ownerOf)
- b:d/c -> b:d/c1 (hasPart)
- k:d/a1 -> b:d/c (ownedBy)
- k:d/a1 -> b:d/c1 (ownedBy)
- b:d/c1 -> b:d/c (partOf)
- b:d/c1 -> k:d/a1 (ownerOf)
- b:d/c1 -> b:d/c2 (hasPart)
- b:d/c2 -> b:d/c1 (partOf)
*/
const entities: { [ref: string]: Entity } = {
'b:d/c': {
apiVersion: 'a',
@@ -233,6 +244,12 @@ describe('useEntityRelationNodesAndEdges', () => {
relations: [RELATION_HAS_PART, RELATION_PART_OF],
to: 'b:d/c1',
},
{
from: 'b:d/c1',
label: 'visible',
relations: [RELATION_OWNER_OF, RELATION_OWNED_BY],
to: 'k:d/a1',
},
{
from: 'b:d/c1',
label: 'visible',
@@ -302,12 +319,42 @@ describe('useEntityRelationNodesAndEdges', () => {
relations: [RELATION_HAS_PART],
to: 'b:d/c1',
},
{
from: 'b:d/c1',
label: 'visible',
relations: [RELATION_PART_OF],
to: 'b:d/c',
},
{
from: 'b:d/c1',
label: 'visible',
relations: [RELATION_OWNER_OF],
to: 'k:d/a1',
},
{
from: 'b:d/c1',
label: 'visible',
relations: [RELATION_HAS_PART],
to: 'b:d/c2',
},
{
from: 'b:d/c2',
label: 'visible',
relations: [RELATION_PART_OF],
to: 'b:d/c1',
},
{
from: 'k:d/a1',
label: 'visible',
relations: [RELATION_OWNED_BY],
to: 'b:d/c',
},
{
from: 'k:d/a1',
label: 'visible',
relations: [RELATION_OWNED_BY],
to: 'b:d/c1',
},
]);
});
@@ -549,6 +596,12 @@ describe('useEntityRelationNodesAndEdges', () => {
relations: ['ownerOf', 'ownedBy'],
to: 'k:d/a1',
},
{
from: 'b:d/c',
label: 'visible',
relations: ['ownerOf', 'ownedBy'],
to: 'k:d/a1',
},
]);
});
plugins/catalog-graph/src/components/EntityRelationsGraph/useEntityRelationNodesAndEdges.ts
+31 -10
View File
@@ -96,6 +96,21 @@ export function useEntityRelationNodesAndEdges({
const visitedNodes = new Set<string>();
const nodeQueue = [...rootEntityRefs];
const hasEdge = (
fromRef: string,
toRef: string,
relation: [string, string?],
): boolean => {
return edges.some(
edge =>
fromRef === edge.from &&
toRef === edge.to &&
edge.relations.some(
rel => rel[0] === relation[0] && rel[1] === relation[1],
),
);
};
while (nodeQueue.length > 0) {
const entityRef = nodeQueue.pop()!;
const entity = entities[entityRef];
@@ -122,20 +137,26 @@ export function useEntityRelationNodesAndEdges({
return;
}
if (!unidirectional || !visitedNodes.has(rel.targetRef)) {
if (mergeRelations) {
const pair = relationPairs.find(
([l, r]) => l === rel.type || r === rel.type,
) ?? [rel.type];
const [left] = pair;
if (mergeRelations) {
const pair = relationPairs.find(
([l, r]) => l === rel.type || r === rel.type,
) ?? [rel.type];
const [left] = pair;
const from = left === rel.type ? entityRef : rel.targetRef;
const to = left === rel.type ? rel.targetRef : entityRef;
if (!unidirectional || !hasEdge(from, to, pair)) {
edges.push({
from: left === rel.type ? entityRef : rel.targetRef,
to: left === rel.type ? rel.targetRef : entityRef,
from,
to,
relations: pair,
label: 'visible',
});
} else {
}
} else {
if (
!unidirectional ||
!hasEdge(entityRef, rel.targetRef, [rel.type])
) {
edges.push({
from: entityRef,
to: rel.targetRef,