Merge branch 'develop/2.5.2' of github.com:thingsboard/thingsboard into develop/2.5.2

Andrii Shvaika
2 parents 0fbe40c2 c290fea3
Showing 4 changed files with 35 additions and 29 deletions
k8s/README.md
ui/src/app/widget/lib/alarms-table-widget.js
ui/src/app/widget/widget-editor.scss
ui/src/app/widget/widget-editor.tpl.html
--- a/k8s/README.md
View file @f572f47
+++ b/k8s/README.md
View file @f572f47
@@ -4,15 +4,15 @@ This folder containing scripts and Kubernetes resources configurations to run Th
 ## Prerequisites
-ThingsBoard Microservices are running on Kubernetes cluster.
+ThingsBoard Microservices run on the Kubernetes cluster.
 You need to have a Kubernetes cluster, and the kubectl command-line tool must be configured to communicate with your cluster.
-If you do not already have a cluster, you can create one by using [Minikube](https://kubernetes.io/docs/setup/minikube), 
+If you do not have a cluster already, you can create one by using [Minikube](https://kubernetes.io/docs/setup/minikube), 
 or you can choose any other available [Kubernetes cluster deployment solutions](https://kubernetes.io/docs/setup/pick-right-solution/).
 ### Enable ingress addon
-By default ingress addon is disable in the Minikube, and available only in cluster providers.
-To enable ingress, please execute next command:
+By default ingress addon is disabled in the Minikube, and available only in cluster providers.
+To enable ingress, please execute the following command:
 `
 $ minikube addons enable ingress
@@ -21,21 +21,21 @@ $ minikube addons enable ingress
 ## Installation
 Before performing initial installation you can configure the type of database to be used with ThingsBoard and the type of deployment.
-In order to set database type change the value of `DATABASE` variable in `.env` file to one of the following:
+To set database type change the value of `DATABASE` variable in `.env` file to one of the following:
 - `postgres` - use PostgreSQL database;
 - `cassandra` - use Cassandra database;
 **NOTE**: According to the database type corresponding kubernetes resources will be deployed (see `postgres.yml`, `cassandra.yml` for details).
-In order to set deployment type change the value of `DEPLOYMENT_TYPE` variable in `.env` file to one of the following:
+To set deployment type change the value of `DEPLOYMENT_TYPE` variable in `.env` file to one of the following:
-- `basic` - start up with single instance of Zookeeper, Kafka and Redis;
-- `high-availability` - start up with Zookeeper, Kafka and Redis in cluster modes;
+- `basic` - startup with a single instance of Zookeeper, Kafka and Redis;
+- `high-availability` - startup with Zookeeper, Kafka, and Redis in cluster modes;
-**NOTE**: According to the deployment type corresponding kubernetes resources will be deployed (see content of the directories `./basic` and `./high-availability` for details).
+**NOTE**: According to the deployment type corresponding kubernetes resources will be deployed (see the content of the directories `./basic` and `./high-availability` for details).
-Execute the following command to run installation:
+Execute the following command to run the installation:
 `
 $ ./k8s-install-tb.sh --loadDemo
@@ -47,7 +47,7 @@ Where:
 ## Running
-Execute the following command to deploy thirdparty resources:
+Execute the following command to deploy third-party resources:
 `
 $ ./k8s-deploy-thirdparty.sh
@@ -61,8 +61,8 @@ Execute the following command to deploy resources:
 $ ./k8s-deploy-resources.sh
 `
-After a while when all resources will be successfully started you can open `http://{your-cluster-ip}` in you browser (for ex. `http://192.168.99.101`).
-You should see ThingsBoard login page.
+After a while when all resources will be successfully started you can open `http://{your-cluster-ip}` in your browser (for ex. `http://192.168.99.101`).
+You should see the ThingsBoard login page.
 Use the following default credentials:
@@ -73,16 +73,16 @@ If you installed DataBase with demo data (using `--loadDemo` flag) you can also 
 - **Tenant Administrator**: tenant@thingsboard.org / tenant
 - **Customer User**: customer@thingsboard.org / customer
-In case of any issues you can examine service logs for errors.
+In case of any issues, you can examine service logs for errors.
 For example to see ThingsBoard node logs execute the following commands:
-1) Get list of the running tb-node pods:
+1) Get the list of the running tb-node pods:
 `
 $ kubectl get pods -l app=tb-node
 `
-2) Fetch logs of tb-node pod:
+2) Fetch logs of the tb-node pod:
 `
 $ kubectl logs -f [tb-node-pod-name]
@@ -103,7 +103,7 @@ Execute the following command to delete all ThingsBoard microservices:
 $ ./k8s-delete-resources.sh
 `
-Execute the following command to delete all thirdparty microservices:
+Execute the following command to delete all third-party microservices:
 `
 $ ./k8s-delete-thirdparty.sh
--- a/ui/src/app/widget/lib/alarms-table-widget.js
View file @f572f47
+++ b/ui/src/app/widget/lib/alarms-table-widget.js
View file @f572f47
@@ -404,6 +404,9 @@ function AlarmsTableWidgetController($element, $scope, $filter, $mdMedia, $mdDia
     }
     function openAlarmDetails($event, alarm) {
+        if ($event) {
+            $event.stopPropagation();
+        }
         if (alarm && alarm.id) {
             var onShowingCallback = {
                 onShowing: function(){}
--- a/ui/src/app/widget/widget-editor.scss
View file @f572f47
+++ b/ui/src/app/widget/widget-editor.scss
View file @f572f47
@@ -62,6 +62,11 @@ $edit-toolbar-height: 40px !default;
       height: 100%;
     }
   }
+
+  .container{
+    width: 100%;
+    height: 100%;
+  }
 }
 .tb-split-vertical {
--- a/ui/src/app/widget/widget-editor.tpl.html
View file @f572f47
+++ b/ui/src/app/widget/widget-editor.tpl.html
View file @f572f47
@@ -114,18 +114,18 @@
             </div>
         </md-toolbar>
         <div flex style="position: relative;">
-            <div class="tb-editor tb-absolute-fill" style="">
+            <div class="tb-editor tb-absolute-fill">
                 <div id="top_panel" class="tb-split tb-split-vertical">
                     <div id="top_left_panel" class="tb-split tb-content">
-                        <md-tabs md-selected="1" md-dynamic-height md-border-bottom style="width: 100%; height: 100%;">
-                            <md-tab label="{{ 'widget.resources' | translate }}" style="width: 100%; height: 100%;">
+                        <md-tabs md-selected="1" md-dynamic-height md-border-bottom class="container">
+                            <md-tab label="{{ 'widget.resources' | translate }}">
                                 <div class="tb-resize-container" style="background-color: #fff;">
                                     <div class="md-padding">
                                         <div flex layout="row"
                                              ng-repeat="resource in vm.widget.resources track by $index"
                                              style="max-height: 40px;" layout-align="start center">
                                             <md-input-container flex md-no-float class="md-block"
-                                                                style="margin: 10px 0px 0px 0px; max-height: 40px;">
+                                                                style="margin: 10px 0 0; max-height: 40px;">
                                                 <input placeholder="{{ 'widget.resource-url' | translate }}"
                                                        ng-required="true" name="resource" ng-model="resource.url">
                                             </md-input-container>
@@ -154,7 +154,7 @@
                                     </div>
                                 </div>
                             </md-tab>
-                            <md-tab label="{{ 'widget.html' | translate }}" style="width: 100%; height: 100%;">
+                            <md-tab label="{{ 'widget.html' | translate }}">
                                 <div class="tb-resize-container" tb-expand-fullscreen expand-button-id="expand-button">
                                     <div class="tb-editor-area-title-panel">
                                         <md-button aria-label="{{ 'widget.tidy' | translate }}"
@@ -168,7 +168,7 @@
                                          ng-model="vm.widget.templateHtml"></div>
                                 </div>
                             </md-tab>
-                            <md-tab label="{{ 'widget.css' | translate }}" style="width: 100%; height: 100%;">
+                            <md-tab label="{{ 'widget.css' | translate }}">
                                 <div class="tb-resize-container" tb-expand-fullscreen expand-button-id="expand-button">
                                     <div class="tb-editor-area-title-panel">
                                         <md-button aria-label="{{ 'widget.tidy' | translate }}"
@@ -185,9 +185,8 @@
                         </md-tabs>
                     </div>
                     <div id="top_right_panel" class="tb-split tb-content">
-                        <md-tabs md-dynamic-height md-border-bottom style="width: 100%; height: 100%;">
-                            <md-tab label="{{ 'widget.settings-schema' | translate }}"
-                                    style="width: 100%; height: 100%;">
+                        <md-tabs md-dynamic-height md-border-bottom class="container">
+                            <md-tab label="{{ 'widget.settings-schema' | translate }}">
                                 <div class="tb-resize-container" tb-expand-fullscreen expand-button-id="expand-button">
                                     <div class="tb-editor-area-title-panel">
                                         <md-button aria-label="{{ 'widget.tidy' | translate }}"
@@ -201,8 +200,7 @@
                                          ng-model="vm.widget.settingsSchema"></div>
                                 </div>
                             </md-tab>
-                            <md-tab label="{{ 'widget.datakey-settings-schema' | translate }}"
-                                    style="width: 100%; height: 100%;">
+                            <md-tab label="{{ 'widget.datakey-settings-schema' | translate }}">
                                 <div class="tb-resize-container" tb-expand-fullscreen expand-button-id="expand-button">
                                     <div class="tb-editor-area-title-panel">
                                         <md-button aria-label="{{ 'widget.tidy' | translate }}"
@@ -240,7 +238,7 @@
                             <md-progress-circular ng-disabled="vm.iframeWidgetEditModeInited" md-mode="indeterminate" class="md-warn"
                                                   md-diameter="100"></md-progress-circular>
                         </md-content>
-                        <div tb-expand-fullscreen expand-button-id="expand-button" style="width: 100%; height: 100%;">
+                        <div tb-expand-fullscreen expand-button-id="expand-button" class="container">
                             <iframe frameborder="0" height="100%" width="100%"></iframe>
                             <md-button id="expand-button" aria-label="Fullscreen"
                                        class="md-icon-button tb-fullscreen-button-style"