[brooklyn-ui] branch master updated: WIP to allow version override

[iuliana]

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 4f12e70  WIP to allow version override
4f12e70 is described below

commit 4f12e70e72b52742a27ef901f14e1bdf673de904
Author: Alex Heneveld <alex.henev...@cloudsoftcorp.com>
AuthorDate: Mon Jun 7 11:23:17 2021 +0100

    WIP to allow version override
---
 .../app/components/catalog-saver/catalog-saver.directive.js    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 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 705e085..30980bb 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
@@ -62,6 +62,12 @@ export function saveToCatalogModalDirective($rootScope, 
$uibModal, $injector, $f
         link: link
     };
 
+    function getSuggestedVersionToSaveFromBlueprint(entity, metadata, scope) {
+        if (!scope.config.version && (entity.hasVersion() || 
metadata.has('version'))) {
+            scope.config.version = entity.version || metadata.get('version');
+        }
+    }
+
     function link($scope, $element) {
         if (!$scope.config.original) {
             // original if provided contains the original metadata, e.g. for 
use if coming from a template and switching between template and non-template
@@ -97,9 +103,7 @@ export function saveToCatalogModalDirective($rootScope, 
$uibModal, $injector, $f
                 if (!$scope.config.symbolicName && (entity.hasId() || 
metadata.has('id'))) {
                     $scope.config.symbolicName = entity.id || 
metadata.get('id');
                 }
-                if (!$scope.config.version && (entity.hasVersion() || 
metadata.has('version'))) {
-                    $scope.config.version = entity.version || 
metadata.get('version');
-                }
+                (composerOverrides.getSuggestedVersionToSaveFromBlueprint || 
getSuggestedVersionToSaveFromBlueprint)(entity, metadata, $scope);
                 if (!$scope.config.bundle) {
                     if ($scope.config.symbolicName) {
                         $scope.config.bundle = $scope.config.symbolicName;