Edge license key tooltip. Code icon changed to settings_ethernet

Artem Babak
1 parent 314f5a7c
Showing 7 changed files with 24 additions and 14 deletions
ui/src/app/edge/edge-fieldset.tpl.html
ui/src/app/edge/edge.controller.js
ui/src/app/edge/edge.directive.js
ui/src/app/edge/edge.routes.js
ui/src/app/locale/locale.constant-en_US.json
ui/src/app/rulechain/rulechain.routes.js
ui/src/app/services/menu.service.js
--- a/ui/src/app/edge/edge-fieldset.tpl.html
View file @6ce3a75
+++ b/ui/src/app/edge/edge-fieldset.tpl.html
View file @6ce3a75
@@ -100,15 +100,24 @@
                 tb-required="true"
                 the-form="theForm"
                 ng-model="edge.type"
-                entity-type="types.entityType.edge">
+                entity-type="types.entityType.edge"
+                ng-value="defaultType">
         </tb-entity-subtype-autocomplete>
-        <md-input-container class="md-block">
+    <div layout="row">
+        <md-input-container class="md-block" flex>
             <label translate>edge.edge-license-key</label>
             <input required name="edgeLicenseKey" ng-model="edge.edgeLicenseKey">
             <div ng-messages="theForm.edgeLicenseKey.$error">
                 <div translate ng-message="required">edge.edge-license-key-required</div>
             </div>
         </md-input-container>
+        <md-button class="md-icon-button" style="margin-top: 14px;">
+            <md-tooltip md-direction="left">
+                {{ 'edge.license-key-tooltip' | translate }}
+            </md-tooltip>
+            <md-icon md-svg-icon="mdi:help"></md-icon>
+        </md-button>
+    </div>
         <md-input-container class="md-block">
             <label translate>edge.cloud-endpoint</label>
             <input required name="cloudEndpoint" ng-model="edge.cloudEndpoint">
@@ -147,7 +156,7 @@
             </md-tooltip>
         </md-button>
     </div>
-    <div layout="row">
+    <fieldset ng-disabled="$root.loading || !isEdit">
         <md-input-container class="md-block">
             <label translate>edge.label</label>
             <input name="label" ng-model="edge.label">
@@ -156,5 +165,5 @@
             <label translate>edge.description</label>
             <textarea ng-model="edge.additionalInfo.description" rows="2"></textarea>
         </md-input-container>
-    </div>
+    </fieldset>
 </md-content>
--- a/ui/src/app/edge/edge.controller.js
View file @6ce3a75
+++ b/ui/src/app/edge/edge.controller.js
View file @6ce3a75
@@ -283,7 +283,7 @@ export function EdgeController($rootScope, userService, edgeService, customerSer
                     details: function() {
                         return $translate.instant('edge.manage-edge-rulechains');
                     },
-                    icon: "code"
+                    icon: "settings_ethernet"
                 }
             );
--- a/ui/src/app/edge/edge.directive.js
View file @6ce3a75
+++ b/ui/src/app/edge/edge.directive.js
View file @6ce3a75
@@ -29,6 +29,7 @@ export default function EdgeDirective($compile, $templateCache, $translate, $mdD
         scope.isAssignedToCustomer = false;
         scope.isPublic = false;
         scope.assignedCustomer = null;
+        scope.defaultType = 'default';
         scope.$watch('edge', function(newVal) {
             if (newVal) {
@@ -36,7 +37,6 @@ export default function EdgeDirective($compile, $templateCache, $translate, $mdD
                     scope.edge.routingKey = utils.guid('');
                     scope.edge.secret = generateSecret(20);
                     scope.edge.cloudEndpoint = utils.baseUrl();
-                    scope.edge.type = 'default';
                 }
                 if (scope.edge.customerId && scope.edge.customerId.id !== types.id.nullUid) {
                     scope.isAssignedToCustomer = true;
--- a/ui/src/app/edge/edge.routes.js
View file @6ce3a75
+++ b/ui/src/app/edge/edge.routes.js
View file @6ce3a75
@@ -198,7 +198,7 @@ export default function EdgeRoutes($stateProvider, types) {
                 ruleChainsType: 'edge'
             },
             ncyBreadcrumb: {
-                label: '{"icon": "code", "label": "edge.rulechain-templates"}'
+                label: '{"icon": "settings_ethernet", "label": "edge.rulechain-templates"}'
             }
         }).state('home.edges.ruleChains.ruleChain', {
             url: '/:ruleChainId',
@@ -235,7 +235,7 @@ export default function EdgeRoutes($stateProvider, types) {
                 pageTitle: 'edge.rulechain-templates'
             },
             ncyBreadcrumb: {
-                label: '{"icon": "code", "label": "{{ vm.ruleChain.name }}", "translate": "false"}'
+                label: '{"icon": "settings_ethernet", "label": "{{ vm.ruleChain.name }}", "translate": "false"}'
             }
         });
 }
--- a/ui/src/app/locale/locale.constant-en_US.json
View file @6ce3a75
+++ b/ui/src/app/locale/locale.constant-en_US.json
View file @6ce3a75
@@ -852,7 +852,8 @@
         "enter-edge-type": "Enter edge type",
         "no-edge-types-matching": "No edge types matching '{{entitySubtype}}' were found.",
         "edge-type-list-empty": "No edge types selected.",
-        "edge-types": "Edge types"
+        "edge-types": "Edge types",
+        "license-key-tooltip": "To get license key please visit www.thingsboard.io/edge"
     },
     "error": {
         "unable-to-connect": "Unable to connect to the server! Please check your internet connection.",
--- a/ui/src/app/rulechain/rulechain.routes.js
View file @6ce3a75
+++ b/ui/src/app/rulechain/rulechain.routes.js
View file @6ce3a75
@@ -143,7 +143,7 @@ export default function RuleChainRoutes($stateProvider, NodeTemplatePathProvider
             ruleChainsType: 'edges'
         },
         ncyBreadcrumb: {
-            label: '{"icon": "code", "label": "edge.rulechain-templates"}'
+            label: '{"icon": "settings_ethernet", "label": "edge.rulechain-templates"}'
         }
     }).state('home.edges.edgeRuleChains.ruleChain', {
         url: '/:ruleChainId',
@@ -180,7 +180,7 @@ export default function RuleChainRoutes($stateProvider, NodeTemplatePathProvider
             pageTitle: 'edge.rulechain-template'
         },
         ncyBreadcrumb: {
-            label: '{"icon": "code", "label": "{{ vm.ruleChain.name }}", "translate": "false"}'
+            label: '{"icon": "settings_ethernet", "label": "{{ vm.ruleChain.name }}", "translate": "false"}'
         }
     }).state('home.edges.edgeRuleChains.importRuleChain', {
         url: '/edges/ruleChains/import',
@@ -221,7 +221,7 @@ export default function RuleChainRoutes($stateProvider, NodeTemplatePathProvider
             pageTitle: 'edge.rulechain-template'
         },
         ncyBreadcrumb: {
-            label: '{"icon": "code", "label": "{{ (\'rulechain.import\' | translate) + \': \'+ vm.ruleChain.name }}", "translate": "false"}'
+            label: '{"icon": "settings_ethernet", "label": "{{ (\'rulechain.import\' | translate) + \': \'+ vm.ruleChain.name }}", "translate": "false"}'
         }
     });
 }
--- a/ui/src/app/services/menu.service.js
View file @6ce3a75
+++ b/ui/src/app/services/menu.service.js
View file @6ce3a75
@@ -203,7 +203,7 @@ function Menu(userService, $state, $rootScope) {
                                         name: 'edge.rulechain-templates',
                                         type: 'link',
                                         state: 'home.edges.edgeRuleChains',
-                                        icon: 'code'
+                                        icon: 'settings_ethernet'
                                     }
                                 ]
                             }
@@ -292,7 +292,7 @@ function Menu(userService, $state, $rootScope) {
                                 },
                                 {
                                     name: 'edge.rulechain-templates',
-                                    icon: 'code',
+                                    icon: 'settings_ethernet',
                                     state: 'home.edges.edgeRuleChains'
                                 }
                             ]