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 24ccee00c3f8d80fa0b7508ccacd9b3be21f8fdb Author: Alex Heneveld <[email protected]> AuthorDate: Sun Aug 13 08:56:18 2023 +0100 summary problems show as yaml not json --- .../app/views/main/inspect/summary/summary.controller.js | 4 ++++ .../app/views/main/inspect/summary/summary.less | 15 +++++++++++++++ .../app/views/main/inspect/summary/summary.template.html | 5 ++++- 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/ui-modules/app-inspector/app/views/main/inspect/summary/summary.controller.js b/ui-modules/app-inspector/app/views/main/inspect/summary/summary.controller.js index 1eb69a26..c9b6e5b3 100644 --- a/ui-modules/app-inspector/app/views/main/inspect/summary/summary.controller.js +++ b/ui-modules/app-inspector/app/views/main/inspect/summary/summary.controller.js @@ -22,6 +22,7 @@ import {HIDE_INTERSTITIAL_SPINNER_EVENT} from 'brooklyn-ui-utils/interstitial-sp import template from "./summary.template.html"; import { isSensitiveFieldName } from 'brooklyn-ui-utils/sensitive-field/sensitive-field'; import { stringify as stringifyForQuery } from 'query-string'; +import jsyaml from 'js-yaml'; export const summaryState = { name: 'main.inspect.summary', @@ -261,6 +262,9 @@ export function summaryController($scope, $state, $stateParams, $q, $http, $http this.isObject = function(item) { return angular.isObject(item); }; + this.yaml = function(item) { + return jsyaml.dump(item); + }; this.isEmpty = function(item) { if (angular.isObject(item)) { diff --git a/ui-modules/app-inspector/app/views/main/inspect/summary/summary.less b/ui-modules/app-inspector/app/views/main/inspect/summary/summary.less index 2724753f..d9207491 100644 --- a/ui-modules/app-inspector/app/views/main/inspect/summary/summary.less +++ b/ui-modules/app-inspector/app/views/main/inspect/summary/summary.less @@ -148,4 +148,19 @@ a.blueprint-button { } } +.status .multiline-code { + .monospace(); + white-space: pre; +} + +.status .scroll-cell { + // undo padding from td + margin: -10px; + padding: 10px; + max-height: 120pt; + overflow: auto; +} + + + .modal-dialog .modal-header .text-danger:extend(.text-danger) {} diff --git a/ui-modules/app-inspector/app/views/main/inspect/summary/summary.template.html b/ui-modules/app-inspector/app/views/main/inspect/summary/summary.template.html index 21fdbaa4..6e5bb29b 100644 --- a/ui-modules/app-inspector/app/views/main/inspect/summary/summary.template.html +++ b/ui-modules/app-inspector/app/views/main/inspect/summary/summary.template.html @@ -52,7 +52,10 @@ <tbody> <tr ng-repeat="(itemKey, itemValue) in vm.sensors[key] track by itemKey"> <td>{{itemKey}}</td> - <td sensitive-field field-name="itemValue">{{itemValue}}</td> + <td sensitive-field field-name="itemValue"> + <div ng-if="!vm.isObject(itemValue)">{{itemValue}}</div> + <div class="multiline-code scroll-cell" ng-if="vm.isObject(itemValue)">{{vm.yaml(itemValue)}}</div> + </td> </tr> </tbody> </table>
