dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3277 from mp-loki/feature/sorted-metadata-keys

Browse Source 
Display sorted metadata keys in rule nodes
This commit is contained in:
Igor Kulikov 2020-08-11 17:44:56 +03:00 committed by GitHub
commit 2202ef7814
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ui/src/app/common/utils.service.js
View File

@ -150,7 +150,8 @@ function Utils($mdColorPalette, $rootScope, $window, $translate, $q, $timeout, t
customTranslation: customTranslation,
objToBase64: objToBase64,
base64toObj: base64toObj,
loadImageAspect: loadImageAspect
loadImageAspect: loadImageAspect,
sortObjectKeys: sortObjectKeys
}
return service;
@ -605,4 +606,14 @@ function Utils($mdColorPalette, $rootScope, $window, $translate, $q, $timeout, t
return deferred.promise;
}
function sortObjectKeys(obj) {
var sortedObj = {};
var keys = Object.keys(obj).sort();
for (var i = 0; i < keys.length; i++) {
var key = keys[i];
sortedObj[key] = obj[key];
}
return sortedObj;
}
}

11
ui/src/app/event/event-row.directive.js
View File

@ -25,7 +25,7 @@ import eventRowDebugRuleNodeTemplate from './event-row-debug-rulenode.tpl.html';
/* eslint-enable import/no-unresolved, import/default */
/*@ngInject*/
export default function EventRowDirective($compile, $templateCache, $mdDialog, $document, types) {
export default function EventRowDirective($compile, $templateCache, $mdDialog, $document, types, utils) {
var linker = function (scope, element, attrs) {
@ -71,11 +71,18 @@ export default function EventRowDirective($compile, $templateCache, $mdDialog, $
if (!contentType) {
contentType = null;
}
var sortedContent;
try {
sortedContent = angular.toJson(utils.sortObjectKeys(angular.fromJson(content)));
}
catch(err) {
sortedContent = content;
}
$mdDialog.show({
controller: 'EventContentDialogController',
controllerAs: 'vm',
templateUrl: eventErrorDialogTemplate,
locals: {content: content, title: title, contentType: contentType, showingCallback: onShowingCallback},
locals: {content: sortedContent, title: title, contentType: contentType, showingCallback: onShowingCallback},
parent: angular.element($document[0].body),
fullscreen: true,
targetEvent: $event,

4
ui/src/app/rulechain/script/node-script-test.service.js
View File

@ -20,7 +20,7 @@ import nodeScriptTestTemplate from './node-script-test.tpl.html';
/* eslint-enable import/no-unresolved, import/default */
/*@ngInject*/
export default function NodeScriptTest($q, $mdDialog, $document, ruleChainService) {
export default function NodeScriptTest($q, $mdDialog, $document, ruleChainService, utils) {
var service = {
testNodeScript: testNodeScript
@ -89,6 +89,8 @@ export default function NodeScriptTest($q, $mdDialog, $document, ruleChainServic
deviceName: "Test Device",
ts: new Date().getTime() + ""
};
} else {
metadata = utils.sortObjectKeys(metadata);
}
if (!msgType) {
msgType = "POST_TELEMETRY_REQUEST";