Repository: brooklyn-ui Updated Branches: refs/heads/master 88c36c34e -> add0cd481
Allow to resolve different virtual type according to the entity config - Add entity config as a third parameter of paletteApi.getType method Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/f0a3530a Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/f0a3530a Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/f0a3530a Branch: refs/heads/master Commit: f0a3530ad39fd4a7ef60979e18c838518d3fe2a6 Parents: bac67a0 Author: Ludovic Plantin <[email protected]> Authored: Mon Oct 22 10:32:20 2018 +0200 Committer: Ludovic Plantin <[email protected]> Committed: Mon Oct 22 15:28:00 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/f0a3530a/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 4e5233c..391d983 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 @@ -232,7 +232,7 @@ function BlueprintService($log, $q, $sce, paletteApi, iconGenerator, dslService) let promise = entity.miscData.has('bundle') ? paletteApi.getBundleType(entity.miscData.get('bundle').symbolicName, entity.miscData.get('bundle').version, entity.type, entity.version) - : paletteApi.getType(entity.type, entity.version); + : paletteApi.getType(entity.type, entity.version, entity.config); promise.then((data)=> { deferred.resolve(populateEntityFromApiSuccess(entity, data)); http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/f0a3530a/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 a0d5748..49f2be5 100644 --- a/ui-modules/blueprint-composer/app/components/providers/palette-api.js +++ b/ui-modules/blueprint-composer/app/components/providers/palette-api.js @@ -28,7 +28,7 @@ export class PaletteApi { return Promise.resolve(); } - getType(typeSymbolicName, typeVersion) { + getType(typeSymbolicName, typeVersion, config) { // no-op return Promise.resolve(); } http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/f0a3530a/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 bb3960b..78d0be4 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 @@ -54,7 +54,7 @@ class PaletteApiProvider extends PaletteApi { return this.catalogApi.getTypes(params); } - getType(typeSymbolicName, typeVersion) { + getType(typeSymbolicName, typeVersion, config) { return this.catalogApi.getType(typeSymbolicName, typeVersion); }
