From f622542ce7a30f081ab112878033eae8e5795199 Mon Sep 17 00:00:00 2001 From: John Cowen Date: Fri, 5 Jun 2020 14:44:57 +0100 Subject: [PATCH] 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 --- ui-v2/app/routes/dc/intentions/create.js | 3 --- ui-v2/app/services/repository/intention.js | 7 +++++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ui-v2/app/routes/dc/intentions/create.js b/ui-v2/app/routes/dc/intentions/create.js index 05edabf226..640713040d 100644 --- a/ui-v2/app/routes/dc/intentions/create.js +++ b/ui-v2/app/routes/dc/intentions/create.js @@ -10,9 +10,6 @@ export default Route.extend(WithIntentionActions, { repo: service('repository/intention'), servicesRepo: service('repository/service'), nspacesRepo: service('repository/nspace/disabled'), - beforeModel: function() { - this.repo.invalidate(); - }, model: function(params) { const dc = this.modelFor('dc').dc.Name; const nspace = '*'; diff --git a/ui-v2/app/services/repository/intention.js b/ui-v2/app/services/repository/intention.js index 6cceccd293..bc2e0bae26 100644 --- a/ui-v2/app/services/repository/intention.js +++ b/ui-v2/app/services/repository/intention.js @@ -8,6 +8,13 @@ export default RepositoryService.extend({ getPrimaryKey: function() { return PRIMARY_KEY; }, + shouldReconcile: function(method) { + switch (method) { + case 'findByService': + return false; + } + return this._super(...arguments); + }, findByService: function(slug, dc, nspace, configuration = {}) { const query = { dc: dc,