Skip to content

Commit

Permalink
ui: Filter global intentions list by selected partition (#11475)
Browse files Browse the repository at this point in the history
* ui: Filter global intentions list by namespace and partition

Filters global intention listing by the current partition rather than trying to use a wildcard.
  • Loading branch information
johncowen authored Nov 9, 2021
1 parent 6c0bd05 commit 1515c3e
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
4 changes: 4 additions & 0 deletions .changelog/11475.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
```release-note:bug
ui: Filter the global intentions list by the currently selected parition rather
than a wildcard
```
8 changes: 4 additions & 4 deletions ui/packages/consul-ui/app/adapters/intention.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import { get } from '@ember/object';
// Listing of intentions still requires the `ns` query string parameter which
// will give us all the intentions that have the `ns` as either the SourceNS or
// the DestinationNS.
// We currently list intentions by the * wildcard namespace for back compat reasons
// TODO: Change the above so that we only list intentions with
// Source/Destination in the currently selected nspace

// TODO: Investigate the above to see if we should only list intentions with
// Source/Destination in the currently selected nspace or leave as is.
export default class IntentionAdapter extends Adapter {
requestForQuery(request, { dc, ns, partition, filter, index, uri }) {
return request`
Expand All @@ -21,7 +21,7 @@ export default class IntentionAdapter extends Adapter {
}
${{
partition: '*',
partition,
ns: '*',
index,
filter,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ module('Integration | Adapter | intention', function(hooks) {
filter: '*',
index: 1,
ns: '*',
partition: '*',
partition: 'partition-1',
},
{
filter: '*',
Expand Down

0 comments on commit 1515c3e

Please sign in to comment.