IGNITE-10609 Web Console: Fixed removing cache from service on "Configuration" screen.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c7fe467f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c7fe467f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c7fe467f Branch: refs/heads/ignite-10189 Commit: c7fe467fb235e3669f3ba4fb3007abb98dbb1e47 Parents: 86f92d9 Author: Vasiliy Sisko <[email protected]> Authored: Mon Dec 10 09:17:48 2018 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Mon Dec 10 09:17:48 2018 +0700 ---------------------------------------------------------------------- .../components/cluster-edit-form/controller.js | 7 ++++++- .../components/cluster-edit-form/templates/service.pug | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c7fe467f/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/controller.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/controller.js b/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/controller.js index 881e543..5020d7b 100644 --- a/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/controller.js +++ b/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/controller.js @@ -25,6 +25,8 @@ export default class ClusterEditFormController { caches; /** @type {ig.menu<string>} */ cachesMenu; + /** @type {ig.menu<string>} */ + servicesCachesMenu; /** @type {ng.ICompiledExpression} */ onSave; @@ -108,8 +110,11 @@ export default class ClusterEditFormController { this.$scope.ui.inputForm.$setUntouched(); } } - if ('caches' in changes) + + if ('caches' in changes) { this.cachesMenu = (changes.caches.currentValue || []).map((c) => ({label: c.name, value: c._id})); + this.servicesCachesMenu = [{label: 'Key-affinity not used', value: null}].concat(this.cachesMenu); + } } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/c7fe467f/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/service.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/service.pug b/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/service.pug index 10b5dd8..6a2f8a6 100644 --- a/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/service.pug +++ b/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/service.pug @@ -83,9 +83,9 @@ panel-collapsible(ng-form=form on-open=`ui.loadPanel('${form}')`) label: 'Cache:', model: '$item.cache', name: '"serviceCache"', - placeholder: 'Choose cache', + placeholder: 'Key-affinity not used', placeholderEmpty: 'No caches configured for current cluster', - options: '$ctrl.cachesMenu', + options: '$ctrl.servicesCachesMenu', tip: 'Cache name used for key-to-node affinity calculation' })( pc-is-in-collection='$ctrl.clonedCluster.caches'
