You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2021/09/15 15:27:46 UTC

[brooklyn-ui] 01/03: ensuring that tosca post processors are not applied if type is camp

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

commit 0f925b3276a2481637755546d23286605d0eae56
Author: zan-mateusz <ma...@cloudsoftcorp.com>
AuthorDate: Wed Sep 15 13:25:39 2021 +0100

    ensuring that tosca post processors are not applied if type is camp
---
 ui-modules/catalog/app/views/bundle/type/type.state.js | 1 +
 ui-modules/utils/quick-launch/quick-launch.js          | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ui-modules/catalog/app/views/bundle/type/type.state.js b/ui-modules/catalog/app/views/bundle/type/type.state.js
index ddf67e6..b65f99f 100644
--- a/ui-modules/catalog/app/views/bundle/type/type.state.js
+++ b/ui-modules/catalog/app/views/bundle/type/type.state.js
@@ -126,6 +126,7 @@ export function typeController($scope, $state, $stateParams, $q, $uibModal, brBr
         $scope.type = responses[1];
         this.specItem = $scope.type.specList[0];
         $scope.typeFormat = this.specItem.format ? 'format=' + this.specItem.format + '&' : '';
+        $scope.type.plan.format = this.specItem.format;
         $scope.versions = responses[2].map(typeVersion => ({
             bundleSymbolicName: typeVersion.containingBundle.split(':')[0],
             bundleVersion: typeVersion.containingBundle.split(':')[1],
diff --git a/ui-modules/utils/quick-launch/quick-launch.js b/ui-modules/utils/quick-launch/quick-launch.js
index 962c4bf..5540988 100644
--- a/ui-modules/utils/quick-launch/quick-launch.js
+++ b/ui-modules/utils/quick-launch/quick-launch.js
@@ -150,8 +150,8 @@ export function quickLaunchDirective() {
 
         function deployApp() {
             $scope.deploying = true;
-
-            Promise.resolve(quickLaunch.buildYaml())
+            let useExtensions = $scope.app.plan.format.includes('camp') ? false : true;
+            Promise.resolve(quickLaunch.buildYaml(useExtensions))
                 .then(appYaml => {
                     quickLaunch.planSender(appYaml)
                         .then((response) => {