This is an automated email from the ASF dual-hosted git repository.
iuliana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
The following commit(s) were added to refs/heads/master by this push:
new b8d798bf support custom URLs in composer
new a7a6c62b Merge pull request #320 from
ahgittin/show-custom-icon-in-composer
b8d798bf is described below
commit b8d798bfaad1cd806787a5565dd6980be2d1313c
Author: Alex Heneveld <[email protected]>
AuthorDate: Wed May 4 11:50:26 2022 +0100
support custom URLs in composer
requires https://github.com/apache/brooklyn-server/pull/1311
---
.../app/components/providers/blueprint-service.provider.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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 9336d0fb..b645a1b3 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
@@ -750,7 +750,9 @@ function BlueprintService($log, $q, $sce, paletteApi,
iconGenerator, dslService,
entity.clearIssues({group: 'type'});
entity.version = data.version;
entity.type = data.symbolicName;
- entity.icon = data.iconUrl || iconGenerator(data.symbolicName);
+ entity.icon = entity.metadata.get('iconUrl')
+ ? (data.iconUrl ||
'/v1/catalog/types/'+entity.type+'/'+(entity.version ||
'latest')+'/icon')+'?iconUrl='+entity.metadata.get('iconUrl')
+ : data.iconUrl || iconGenerator(data.symbolicName);
entity.miscData.set('important', !!data.iconUrl);
entity.miscData.set('bundle', {
symbolicName: data.containingBundle.split(':')[0],
