don't append ip to topology ids when not needed (#587)

jpinsonneau · web-flow · commit 576ec0f8da34 · 2024-09-20T14:13:57.000+02:00
diff --git a/web/src/utils/ids.ts b/web/src/utils/ids.ts
@@ -40,10 +40,11 @@ export const getPeerId = (fields: Partial<TopologyMetricPeer>): string => {
   if (fields.owner) {
     parts.push('o=' + fields.owner.type + '.' + fields.owner.name);
   }
+  // add either resource info or address but not both
+  // as some items can have multiple IPs
   if (fields.resource) {
     parts.push('r=' + fields.resource.type + '.' + fields.resource.name);
-  }
-  if (fields.addr) {
+  } else if (fields.addr) {
     parts.push('a=' + fields.addr);
   }
   return parts.length > 0 ? parts.join(',') : idUnknown;

Original file line number	Diff line number	Diff line change
`@@ -40,10 +40,11 @@ export const getPeerId = (fields: Partial<TopologyMetricPeer>): string => {`
`40`	`40`	`if (fields.owner) {`
`41`	`41`	`parts.push('o=' + fields.owner.type + '.' + fields.owner.name);`
`42`	`42`	`}`
	`43`	`+ // add either resource info or address but not both`
	`44`	`+ // as some items can have multiple IPs`
`43`	`45`	`if (fields.resource) {`
`44`	`46`	`parts.push('r=' + fields.resource.type + '.' + fields.resource.name);`
`45`		`- }`
`46`		`- if (fields.addr) {`
	`47`	`+ } else if (fields.addr) {`
`47`	`48`	`parts.push('a=' + fields.addr);`
`48`	`49`	`}`
`49`	`50`	`return parts.length > 0 ? parts.join(',') : idUnknown;`