From cc3d5782717755ea8c2f7fc8cdde79dade72632c Mon Sep 17 00:00:00 2001 From: John Cowen Date: Tue, 19 Jun 2018 14:54:57 +0100 Subject: [PATCH] Filter Source and Destination menus by Kind --- ui-v2/app/models/service.js | 1 + ui-v2/app/routes/dc/intentions/create.js | 4 +++- ui-v2/app/routes/dc/intentions/edit.js | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ui-v2/app/models/service.js b/ui-v2/app/models/service.js index 81aaab38c2..b3e4d540d2 100644 --- a/ui-v2/app/models/service.js +++ b/ui-v2/app/models/service.js @@ -13,6 +13,7 @@ export default Model.extend({ return []; }, }), + Kind: attr('string'), Address: attr('string'), Port: attr('number'), EnableTagOverride: attr('boolean'), diff --git a/ui-v2/app/routes/dc/intentions/create.js b/ui-v2/app/routes/dc/intentions/create.js index 0d6bc72989..9de6897872 100644 --- a/ui-v2/app/routes/dc/intentions/create.js +++ b/ui-v2/app/routes/dc/intentions/create.js @@ -24,7 +24,9 @@ export default Route.extend(WithIntentionActions, { return { ...model, ...{ - items: [{ Name: '*' }].concat(model.items.toArray()), + items: [{ Name: '*' }].concat( + model.items.toArray().filter(item => get(item, 'Kind') === 'consul') + ), }, }; }); diff --git a/ui-v2/app/routes/dc/intentions/edit.js b/ui-v2/app/routes/dc/intentions/edit.js index 49c30e6aba..50cc4b9660 100644 --- a/ui-v2/app/routes/dc/intentions/edit.js +++ b/ui-v2/app/routes/dc/intentions/edit.js @@ -18,7 +18,9 @@ export default Route.extend(WithAclActions, { return { ...model, ...{ - items: [{ Name: '*' }].concat(model.items.toArray()), + items: [{ Name: '*' }].concat( + model.items.toArray().filter(item => get(item, 'Kind') === 'consul') + ), }, }; });