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 2022/07/18 16:31:25 UTC

[brooklyn-ui] branch master updated: fix "Execute again" button

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 d6903df5 fix "Execute again" button
     new 2f5a4fa2 Merge branch 'master' of https://gitbox.apache.org/repos/asf/brooklyn-ui
d6903df5 is described below

commit d6903df510c9b3f1484227a67f289ab13c68415f
Author: Alex Heneveld <al...@cloudsoft.io>
AuthorDate: Mon Jul 18 17:31:10 2022 +0100

    fix "Execute again" button
---
 .../app/views/main/inspect/activities/detail/detail.controller.js    | 5 ++---
 .../app/views/main/inspect/activities/detail/detail.template.html    | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ui-modules/app-inspector/app/views/main/inspect/activities/detail/detail.controller.js b/ui-modules/app-inspector/app/views/main/inspect/activities/detail/detail.controller.js
index 92549d51..d0e29f35 100644
--- a/ui-modules/app-inspector/app/views/main/inspect/activities/detail/detail.controller.js
+++ b/ui-modules/app-inspector/app/views/main/inspect/activities/detail/detail.controller.js
@@ -24,10 +24,10 @@ export const detailState = {
     name: 'main.inspect.activities.detail',
     url: '/:activityId',
     template: template,
-    controller: ['$scope', '$state', '$stateParams', '$log', '$uibModal', '$timeout', '$sanitize', '$sce', 'activityApi', 'brUtilsGeneral', DetailController],
+    controller: ['$scope', '$state', '$stateParams', '$log', '$uibModal', '$timeout', '$sanitize', '$sce', 'activityApi', 'entityApi', 'brUtilsGeneral', DetailController],
     controllerAs: 'vm'
 }
-function DetailController($scope, $state, $stateParams, $log, $uibModal, $timeout, $sanitize, $sce, activityApi, Utils) {
+function DetailController($scope, $state, $stateParams, $log, $uibModal, $timeout, $sanitize, $sce, activityApi, entityApi, Utils) {
     $scope.$emit(HIDE_INTERSTITIAL_SPINNER_EVENT);
 
     const {
@@ -154,7 +154,6 @@ function DetailController($scope, $state, $stateParams, $log, $uibModal, $timeou
 
     vm.invokeEffector = (effectorName, effectorParams) => {
         entityApi.invokeEntityEffector(applicationId, entityId, effectorName, effectorParams).then((response) => {
-            $scope.$dismiss('Effector sent!');
             $state.go('main.inspect.activities.detail', {
                 applicationId: applicationId,
                 entityId: entityId,
diff --git a/ui-modules/app-inspector/app/views/main/inspect/activities/detail/detail.template.html b/ui-modules/app-inspector/app/views/main/inspect/activities/detail/detail.template.html
index 1c42d0d9..0598078c 100644
--- a/ui-modules/app-inspector/app/views/main/inspect/activities/detail/detail.template.html
+++ b/ui-modules/app-inspector/app/views/main/inspect/activities/detail/detail.template.html
@@ -125,7 +125,7 @@
                     </div>
 
                     <div class="activity-actions" ng-if="vm.actions">
-                        <br-button ng-if="vm.actions.invokeAgain" on-click="vm.actions.doAction()">Execute again</br-button>
+                        <br-button ng-if="vm.actions.invokeAgain" on-click="vm.actions.invokeAgain.doAction()">Execute again</br-button>
                         <br-button ng-if="vm.actions.effector" ui-sref="main.inspect.effectors({search: vm.actions.effector.effectorName})">Open effector tab</br-button>
                     </div>