From 6ce3a7577f1e5e161286e9c3c4c9e66b03cf323d Mon Sep 17 00:00:00 2001 From: Artem Babak Date: Tue, 22 Dec 2020 22:01:22 +0200 Subject: [PATCH] Edge license key tooltip. Code icon changed to settings_ethernet --- ui/src/app/edge/edge-fieldset.tpl.html | 17 +++++++++++++---- ui/src/app/edge/edge.controller.js | 2 +- ui/src/app/edge/edge.directive.js | 2 +- ui/src/app/edge/edge.routes.js | 4 ++-- ui/src/app/locale/locale.constant-en_US.json | 3 ++- ui/src/app/rulechain/rulechain.routes.js | 6 +++--- ui/src/app/services/menu.service.js | 4 ++-- 7 files changed, 24 insertions(+), 14 deletions(-) diff --git a/ui/src/app/edge/edge-fieldset.tpl.html b/ui/src/app/edge/edge-fieldset.tpl.html index 42eee537b0..01728b0b9a 100644 --- a/ui/src/app/edge/edge-fieldset.tpl.html +++ b/ui/src/app/edge/edge-fieldset.tpl.html @@ -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"> - +
+
edge.edge-license-key-required
 + + + {{ 'edge.license-key-tooltip' | translate }} + + + +
@@ -147,7 +156,7 @@ -
+
@@ -156,5 +165,5 @@ -
+ diff --git a/ui/src/app/edge/edge.controller.js b/ui/src/app/edge/edge.controller.js index 0c9d42c584..6239789edc 100644 --- a/ui/src/app/edge/edge.controller.js +++ b/ui/src/app/edge/edge.controller.js @@ -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" } ); diff --git a/ui/src/app/edge/edge.directive.js b/ui/src/app/edge/edge.directive.js index a1efa67197..6a56cbcd87 100644 --- a/ui/src/app/edge/edge.directive.js +++ b/ui/src/app/edge/edge.directive.js @@ -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; diff --git a/ui/src/app/edge/edge.routes.js b/ui/src/app/edge/edge.routes.js index e4b0d72727..bed701009a 100644 --- a/ui/src/app/edge/edge.routes.js +++ b/ui/src/app/edge/edge.routes.js @@ -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"}' } }); } diff --git a/ui/src/app/locale/locale.constant-en_US.json b/ui/src/app/locale/locale.constant-en_US.json index 343ead0099..1849b6625a 100644 --- a/ui/src/app/locale/locale.constant-en_US.json +++ b/ui/src/app/locale/locale.constant-en_US.json @@ -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.", diff --git a/ui/src/app/rulechain/rulechain.routes.js b/ui/src/app/rulechain/rulechain.routes.js index 359579c9c8..9bdb5c2981 100644 --- a/ui/src/app/rulechain/rulechain.routes.js +++ b/ui/src/app/rulechain/rulechain.routes.js @@ -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"}' } }); } diff --git a/ui/src/app/services/menu.service.js b/ui/src/app/services/menu.service.js index 6b0337d0ab..2d01daccdf 100644 --- a/ui/src/app/services/menu.service.js +++ b/ui/src/app/services/menu.service.js @@ -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' } ]