Commit 0ea054c6ae2fbd34b701fb79a33b86982fcdb12d

Authored by Igor Kulikov
1 parent 9a3df628

Help links improvements

@@ -99,19 +99,18 @@ export default angular.module('thingsboard.help', []) @@ -99,19 +99,18 @@ export default angular.module('thingsboard.help', [])
99 widgetsConfigStatic: helpBaseUrl + "/docs/user-guide/ui/dashboards#static", 99 widgetsConfigStatic: helpBaseUrl + "/docs/user-guide/ui/dashboards#static",
100 }, 100 },
101 getRuleNodeLink: function(ruleNode) { 101 getRuleNodeLink: function(ruleNode) {
102 - var link = 'ruleEngine';  
103 if (ruleNode && ruleNode.component) { 102 if (ruleNode && ruleNode.component) {
104 if (ruleNode.component.configurationDescriptor && 103 if (ruleNode.component.configurationDescriptor &&
105 ruleNode.component.configurationDescriptor.nodeDefinition && 104 ruleNode.component.configurationDescriptor.nodeDefinition &&
106 ruleNode.component.configurationDescriptor.nodeDefinition.docUrl) { 105 ruleNode.component.configurationDescriptor.nodeDefinition.docUrl) {
107 - link = ruleNode.component.configurationDescriptor.nodeDefinition.docUrl;  
108 - } else if (ruleNode && ruleNode.component && ruleNode.component.clazz) { 106 + return ruleNode.component.configurationDescriptor.nodeDefinition.docUrl;
  107 + } else if (ruleNode.component.clazz) {
109 if (ruleNodeClazzHelpLinkMap[ruleNode.component.clazz]) { 108 if (ruleNodeClazzHelpLinkMap[ruleNode.component.clazz]) {
110 - link = ruleNodeClazzHelpLinkMap[ruleNode.component.clazz]; 109 + return ruleNodeClazzHelpLinkMap[ruleNode.component.clazz];
111 } 110 }
112 } 111 }
113 } 112 }
114 - return link; 113 + return 'ruleEngine';
115 } 114 }
116 } 115 }
117 ).name; 116 ).name;
@@ -35,6 +35,10 @@ function Help($compile, $window, helpLinks) { @@ -35,6 +35,10 @@ function Help($compile, $window, helpLinks) {
35 $event.stopPropagation(); 35 $event.stopPropagation();
36 } 36 }
37 var helpUrl = helpLinks.linksMap[scope.helpLinkId]; 37 var helpUrl = helpLinks.linksMap[scope.helpLinkId];
  38 + if (!helpUrl && scope.helpLinkId &&
  39 + (scope.helpLinkId.startsWith('http://') || scope.helpLinkId.startsWith('https://'))) {
  40 + helpUrl = scope.helpLinkId;
  41 + }
38 if (helpUrl) { 42 if (helpUrl) {
39 $window.open(helpUrl, '_blank'); 43 $window.open(helpUrl, '_blank');
40 } 44 }