Repository: ignite Updated Branches: refs/heads/master 947962f78 -> 53f59f5d4
IGNITE-9528 Web Console: Fixed handling of "LOAD_COMPLETE_CONFIGURATION_ERR" action in PageConfigure service. Previous implementation used to throw a complete store message instead of an error it wraps. Also updated clusterServiceConfiguration generator to fail gracefully if some of caches do not exist. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/53f59f5d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/53f59f5d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/53f59f5d Branch: refs/heads/master Commit: 53f59f5d485ad99953d1d6378360b69d249c8a99 Parents: 947962f Author: Ilya Borisov <[email protected]> Authored: Tue Sep 11 10:05:07 2018 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Tue Sep 11 10:05:07 2018 +0700 ---------------------------------------------------------------------- .../app/components/page-configure/services/PageConfigure.js | 2 +- .../app/modules/configuration/generator/ConfigurationGenerator.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/53f59f5d/modules/web-console/frontend/app/components/page-configure/services/PageConfigure.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-configure/services/PageConfigure.js b/modules/web-console/frontend/app/components/page-configure/services/PageConfigure.js index 10200be..35c1c01 100644 --- a/modules/web-console/frontend/app/components/page-configure/services/PageConfigure.js +++ b/modules/web-console/frontend/app/components/page-configure/services/PageConfigure.js @@ -55,7 +55,7 @@ export default class PageConfigure { .take(1) .do(() => this.ConfigureState.dispatchAction({type: 'LOAD_COMPLETE_CONFIGURATION', clusterID, isDemo})) .ignoreElements(), - this.ConfigureState.actions$.let(ofType('LOAD_COMPLETE_CONFIGURATION_ERR')).take(1).map((e) => {throw e;}), + this.ConfigureState.actions$.let(ofType('LOAD_COMPLETE_CONFIGURATION_ERR')).take(1).pluck('error').map((e) => Promise.reject(e)), this.ConfigureState.state$ .let(this.ConfigSelectors.selectCompleteClusterConfiguration({clusterID, isDemo})) .filter((c) => c.__isComplete) http://git-wip-us.apache.org/repos/asf/ignite/blob/53f59f5d/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js b/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js index c3efea5..2a1a506 100644 --- a/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js +++ b/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js @@ -1698,7 +1698,7 @@ export default class IgniteConfigurationGenerator { .emptyBeanProperty('service') .intProperty('maxPerNodeCount') .intProperty('totalCount') - .stringProperty('cache', 'cacheName', (_id) => _id ? _.find(caches, {_id}).name : null) + .stringProperty('cache', 'cacheName', (_id) => _id ? _.get(_.find(caches, {_id}), 'name', null) : null) .stringProperty('affinityKey'); srvBeans.push(bean);
