thingsboard-aplcache

Help links improvements

5/25/2018 10:27:43 AM

Details

diff --git a/ui/src/app/help/help.directive.js b/ui/src/app/help/help.directive.js
index bc7e84f..9227d44 100644
--- a/ui/src/app/help/help.directive.js
+++ b/ui/src/app/help/help.directive.js
@@ -35,6 +35,10 @@ function Help($compile, $window, helpLinks) {
                 $event.stopPropagation();
             }
             var helpUrl = helpLinks.linksMap[scope.helpLinkId];
+            if (!helpUrl && scope.helpLinkId &&
+                    (scope.helpLinkId.startsWith('http://') || scope.helpLinkId.startsWith('https://'))) {
+                helpUrl = scope.helpLinkId;
+            }
             if (helpUrl) {
                 $window.open(helpUrl, '_blank');
             }
diff --git a/ui/src/app/help/help-links.constant.js b/ui/src/app/help/help-links.constant.js
index 7e77c22..8d22eeb 100644
--- a/ui/src/app/help/help-links.constant.js
+++ b/ui/src/app/help/help-links.constant.js
@@ -99,19 +99,18 @@ export default angular.module('thingsboard.help', [])
                 widgetsConfigStatic: helpBaseUrl +  "/docs/user-guide/ui/dashboards#static",
             },
             getRuleNodeLink: function(ruleNode) {
-                var link = 'ruleEngine';
                 if (ruleNode && ruleNode.component) {
                     if (ruleNode.component.configurationDescriptor &&
                         ruleNode.component.configurationDescriptor.nodeDefinition &&
                         ruleNode.component.configurationDescriptor.nodeDefinition.docUrl) {
-                        link = ruleNode.component.configurationDescriptor.nodeDefinition.docUrl;
-                    } else if (ruleNode && ruleNode.component && ruleNode.component.clazz) {
+                        return ruleNode.component.configurationDescriptor.nodeDefinition.docUrl;
+                    } else if (ruleNode.component.clazz) {
                         if (ruleNodeClazzHelpLinkMap[ruleNode.component.clazz]) {
-                            link = ruleNodeClazzHelpLinkMap[ruleNode.component.clazz];
+                            return ruleNodeClazzHelpLinkMap[ruleNode.component.clazz];
                         }
                     }
                 }
-                return link;
+                return 'ruleEngine';
             }
         }
     ).name;