Allow to resolve different virtual type according to the entity config - Add entity config as a third parameter of paletteApi.getBundleType method for consistency
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/77d0ce9d Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/77d0ce9d Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/77d0ce9d Branch: refs/heads/master Commit: 77d0ce9d8c8707734f274d4cc9bde5bdd275bc09 Parents: f0a3530 Author: Ludovic Plantin <[email protected]> Authored: Wed Oct 24 12:58:33 2018 +0200 Committer: Ludovic Plantin <[email protected]> Committed: Wed Oct 24 12:58:33 2018 +0200 ---------------------------------------------------------------------- .../app/components/providers/blueprint-service.provider.js | 2 +- .../blueprint-composer/app/components/providers/palette-api.js | 2 +- .../app/components/providers/palette-api.provider.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/77d0ce9d/ui-modules/blueprint-composer/app/components/providers/blueprint-service.provider.js ---------------------------------------------------------------------- diff --git a/ui-modules/blueprint-composer/app/components/providers/blueprint-service.provider.js b/ui-modules/blueprint-composer/app/components/providers/blueprint-service.provider.js index 391d983..ab06dff 100644 --- a/ui-modules/blueprint-composer/app/components/providers/blueprint-service.provider.js +++ b/ui-modules/blueprint-composer/app/components/providers/blueprint-service.provider.js @@ -231,7 +231,7 @@ function BlueprintService($log, $q, $sce, paletteApi, iconGenerator, dslService) entity.family = family; let promise = entity.miscData.has('bundle') - ? paletteApi.getBundleType(entity.miscData.get('bundle').symbolicName, entity.miscData.get('bundle').version, entity.type, entity.version) + ? paletteApi.getBundleType(entity.miscData.get('bundle').symbolicName, entity.miscData.get('bundle').version, entity.type, entity.version, entity.config) : paletteApi.getType(entity.type, entity.version, entity.config); promise.then((data)=> { http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/77d0ce9d/ui-modules/blueprint-composer/app/components/providers/palette-api.js ---------------------------------------------------------------------- diff --git a/ui-modules/blueprint-composer/app/components/providers/palette-api.js b/ui-modules/blueprint-composer/app/components/providers/palette-api.js index 49f2be5..9fc4017 100644 --- a/ui-modules/blueprint-composer/app/components/providers/palette-api.js +++ b/ui-modules/blueprint-composer/app/components/providers/palette-api.js @@ -43,7 +43,7 @@ export class PaletteApi { return Promise.resolve(); } - getBundleType(bundleSymbolicName, bundleVersion, typeSymbolicName, typeVersion) { + getBundleType(bundleSymbolicName, bundleVersion, typeSymbolicName, typeVersion, config) { // no-op return Promise.resolve(); } http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/77d0ce9d/ui-modules/blueprint-composer/app/components/providers/palette-api.provider.js ---------------------------------------------------------------------- diff --git a/ui-modules/blueprint-composer/app/components/providers/palette-api.provider.js b/ui-modules/blueprint-composer/app/components/providers/palette-api.provider.js index 78d0be4..17bca9b 100644 --- a/ui-modules/blueprint-composer/app/components/providers/palette-api.provider.js +++ b/ui-modules/blueprint-composer/app/components/providers/palette-api.provider.js @@ -66,7 +66,7 @@ class PaletteApiProvider extends PaletteApi { return this.catalogApi.getBundle(bundleSymbolicName, bundleVersion); } - getBundleType(bundleSymbolicName, bundleVersion, typeSymbolicName, typeVersion) { + getBundleType(bundleSymbolicName, bundleVersion, typeSymbolicName, typeVersion, config) { return this.catalogApi.getBundleType(bundleSymbolicName, bundleVersion, typeSymbolicName, typeVersion); }
