luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

ui: Make sure saving intentions from topology includes the partition (#12317)

This commit is contained in:
John Cowen 2022-02-11 13:58:01 +00:00 committed by GitHub
parent 72a10582d0
commit ab3b765a88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.changelog/12317.txt Normal file
View File

@ -0,0 +1,4 @@
```release-note:bug
ui: Include partition data when saving an intention from the topology
visualization
```

6
ui/packages/consul-ui/app/routes/dc/services/show/topology.js
View File

@ -20,8 +20,10 @@ export default class TopologyRoute extends Route {
item.Datacenter === source.Datacenter && item.Datacenter === source.Datacenter &&
item.SourceName === source.Name && item.SourceName === source.Name &&
item.SourceNS === source.Namespace && item.SourceNS === source.Namespace &&
item.SourcePartition === source.Partition &&
item.DestinationName === destination.Name && item.DestinationName === destination.Name &&
item.DestinationNS === destination.Namespace item.DestinationNS === destination.Namespace &&
item.DestinationPartition === destination.Partition
); );
}); });
if (typeof intention === 'undefined') { if (typeof intention === 'undefined') {
@ -29,8 +31,10 @@ export default class TopologyRoute extends Route {
Datacenter: source.Datacenter, Datacenter: source.Datacenter,
SourceName: source.Name, SourceName: source.Name,
SourceNS: source.Namespace || 'default', SourceNS: source.Namespace || 'default',
SourcePartition: source.Partition || 'default',
DestinationName: destination.Name, DestinationName: destination.Name,
DestinationNS: destination.Namespace || 'default', DestinationNS: destination.Namespace || 'default',
DestinationPartition: destination.Partition || 'default',
}); });
} else { } else {
// we found an intention in the find higher up, so we are updating // we found an intention in the find higher up, so we are updating