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 58a984a3118a848ea878715674cd27f4129632b5 Author: Alex Heneveld <[email protected]> AuthorDate: Sat Jun 17 13:30:18 2023 +0100 better display large results from activity, resizable --- .../views/main/inspect/activities/detail/detail.controller.js | 7 +++++++ .../app/views/main/inspect/activities/detail/detail.less | 11 +++++++++-- .../views/main/inspect/activities/detail/detail.template.html | 9 +++++++-- 3 files changed, 23 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 e1ff5c0f..172c9f53 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 @@ -80,6 +80,13 @@ function DetailController($scope, $state, $stateParams, $location, $log, $uibMod .then(result => $state.go($state.current, {}, {reload: true}) ); } }; } + + if (vm.model.activity.result!=undefined) { + vm.model.activity.resultYaml = vm.yaml(vm.model.activity.result); + const lines = vm.model.activity.resultYaml.split('\n'); + vm.model.activity.resultLineCount = lines.length; + vm.model.activity.resultLineMaxLen = Math.max(...lines.map(x => x.length)); + } } function loadWorkflow(workflowTag, opts) { diff --git a/ui-modules/app-inspector/app/views/main/inspect/activities/detail/detail.less b/ui-modules/app-inspector/app/views/main/inspect/activities/detail/detail.less index 9ad5dd5b..30ca85f9 100644 --- a/ui-modules/app-inspector/app/views/main/inspect/activities/detail/detail.less +++ b/ui-modules/app-inspector/app/views/main/inspect/activities/detail/detail.less @@ -168,9 +168,16 @@ .monospace(); } - .result-parent.big-result { + .result-parent.very-big-result { + resize: vertical; + height: 96pt; + &.result-body { + max-height: max-content; + } + } + .result-parent.med-result, .result-parent.very-big-result { border: 1px solid @gray-lighter; - .result-body { + .result-body, &.result-body { white-space: pre; padding: 4px; } 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 75debe12..86f87c0e 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 @@ -97,9 +97,14 @@ <div class="summary-item-label">ID</div> <div class="summary-item-value monospace">{{::vm.model.activity.id}}</div> </div> - <div class="col-md-6 summary-item" ng-if="vm.model.activity.result!=undefined"> + <div class="col-md-6 summary-item" ng-if="vm.model.activity.result!=undefined && vm.model.activity.resultLineMaxLen < 36 && vm.model.activity.resultLineCount < 4"> <div class="summary-item-label">Result</div> - <div class="summary-item-value result-parent" ng-class="{ 'big-result': (''+vm.model.activity.result).length > 10 }"><div class="result-body">{{::vm.yaml(vm.model.activity.result)}}</div></div> + <div class="summary-item-value result-parent" ng-class="{ 'med-result': vm.model.activity.resultLineMaxLen > 10 || vm.model.activity.resultLineCount > 1 }"> + <div class="result-body">{{vm.model.activity.resultYaml}}</div></div> + </div> + <div class="col-md-12 summary-item" ng-if="vm.model.activity.result!=undefined && !(vm.model.activity.resultLineMaxLen < 36 && vm.model.activity.resultLineCount < 4)"> + <div class="summary-item-label">Result</div> + <div class="summary-item-value result-parent very-big-result result-body">{{vm.model.activity.resultYaml}}</div> </div> </div> </div>
