This is an automated email from the ASF dual-hosted git repository.
heneveld 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 c47f371 support `brooklyn.tags` from blueprint in catalog saver, for
consistency
c47f371 is described below
commit c47f37135b58b4882ba15d52cc080b8c72d18738
Author: Alex Heneveld <[email protected]>
AuthorDate: Wed Sep 22 10:45:11 2021 +0100
support `brooklyn.tags` from blueprint in catalog saver, for consistency
---
.../app/components/catalog-saver/catalog-saver.directive.js | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git
a/ui-modules/blueprint-composer/app/components/catalog-saver/catalog-saver.directive.js
b/ui-modules/blueprint-composer/app/components/catalog-saver/catalog-saver.directive.js
index c7b6bdc..6b1c67d 100644
---
a/ui-modules/blueprint-composer/app/components/catalog-saver/catalog-saver.directive.js
+++
b/ui-modules/blueprint-composer/app/components/catalog-saver/catalog-saver.directive.js
@@ -215,10 +215,14 @@ export function CatalogItemModalController($scope,
$filter, blueprintService, pa
};
// tags can now be added to a blueprint created in the YAML Editor
let tags = [];
- if(blueprint.tags) {
- tags = blueprint.tags;
+ if (blueprint.tags) {
+ tags = tags.concat(blueprint.tags);
delete blueprint['tags'];
}
+ if (blueprint['brooklyn.tags']) {
+ tags = [].concat(blueprint['brooklyn.tags']).concat(tags);
+ }
+ blueprint['brooklyn.tags'] = tags;
let bomCatalogYaml = {
bundle: `catalog-bom-${bundleBase}`,
version: $scope.config.version,
