[brooklyn-ui] branch master updated: corrected yaml initialization based on format

[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 02ce3a0  corrected yaml initialization based on format
02ce3a0 is described below

commit 02ce3a026e9acc23e7430607ecd0138da78622d5
Author: iuliana <iuli...@cloudsoft.io>
AuthorDate: Wed Jun 16 11:55:21 2021 +0100

    corrected yaml initialization based on format
---
 .../blueprint-composer/app/views/main/main.controller.js       | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/ui-modules/blueprint-composer/app/views/main/main.controller.js 
b/ui-modules/blueprint-composer/app/views/main/main.controller.js
index 03590d1..3e4520b 100644
--- a/ui-modules/blueprint-composer/app/views/main/main.controller.js
+++ b/ui-modules/blueprint-composer/app/views/main/main.controller.js
@@ -154,10 +154,11 @@ export function MainController($scope, $element, $log, 
$state, $stateParams, brB
             vm.saveToCatalogConfig = Object.assign(vm.saveToCatalogConfig, 
vm.saveToCatalogConfig.original); 
         }
 
-        $scope.initialYamlFormat = edit.type.plan.format;
+        $scope.initialYamlFormat = $stateParams.format;
         if($scope.initialYamlFormat && Array.isArray(edit.type.specList) && 
edit.type.specList.length > 0 && edit.type.specList[0].format === 
$scope.initialYamlFormat) {
-            yaml = edit.type.specList[0].contents;
+            yaml = edit.type.specList[0].contents; // for YAML editor
         }  else {
+            // for graphical editor
             yaml = edit.type.plan.data;
         }
     }
@@ -173,11 +174,6 @@ export function MainController($scope, $element, $log, 
$state, $stateParams, brB
     }
 
     if (yaml) {
-        $scope.initialYamlFormat = $stateParams.format;
-        if(Array.isArray(edit.type.specList) && edit.type.specList.length > 0 
&& edit.type.specList[0].format === $stateParams.format) {
-            yaml = edit.type.specList[0].contents;
-        }
-
         if (vm.isYamlMode()) {
             // don't set blueprint; yaml mode will take from "initial yaml" 
             blueprintService.reset();