github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ui: Blocking with filtering intentions amends (#8027) 

* ui: Now intentions use blocking queries invalidation isn't needed

* ui: Ensure reconciliation doesn't happen when filtering for intentions
pull/8029/head
John Cowen 2020-06-05 14:44:57 +01:00 committed by GitHub
parent 9cfa4a3fc9
commit 439ae6b4bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui-v2/app/routes/dc/intentions/create.js
View File

@ -10,9 +10,6 @@ export default Route.extend(WithIntentionActions, {
repo: service('repository/intention'), repo: service('repository/intention'),
servicesRepo: service('repository/service'), servicesRepo: service('repository/service'),
nspacesRepo: service('repository/nspace/disabled'), nspacesRepo: service('repository/nspace/disabled'),
beforeModel: function() {
this.repo.invalidate();
},
model: function(params) { model: function(params) {
const dc = this.modelFor('dc').dc.Name; const dc = this.modelFor('dc').dc.Name;
const nspace = '*'; const nspace = '*';

7
ui-v2/app/services/repository/intention.js
View File

@ -8,6 +8,13 @@ export default RepositoryService.extend({
getPrimaryKey: function() { getPrimaryKey: function() {
return PRIMARY_KEY; return PRIMARY_KEY;
}, },
shouldReconcile: function(method) {
switch (method) {
case 'findByService':
return false;
}
return this._super(...arguments);
},
findByService: function(slug, dc, nspace, configuration = {}) { findByService: function(slug, dc, nspace, configuration = {}) {
const query = { const query = {
dc: dc, dc: dc,