Merge branch 'master' into develop/2.3

docker/README.md

@@ -1,4 +1,4 @@
-# Docker configuration for ThingsBoard Microservices 
+# Docker configuration for ThingsBoard Microservices
 
 This folder containing scripts and Docker Compose configurations to run ThingsBoard in Microservices mode.
 
@@ -9,19 +9,19 @@ Before starting please make sure [Docker CE](https://docs.docker.com/install/) a
 
 ## Installation
 
-Before performing initial installation you can configure the type of database to be used with ThinsBoard.
+Before performing initial installation you can configure the type of database to be used with ThingsBoard.
 In order 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 docker service will be deployed (see `docker-compose.postgres.yml`, `docker-compose.cassandra.yml` for details).  
+**NOTE**: According to the database type corresponding docker service will be deployed (see `docker-compose.postgres.yml`, `docker-compose.cassandra.yml` for details).
 
 Execute the following command to run installation:
 
-` 
+`
 $ ./docker-install-tb.sh --loadDemo
-` 
+`
 
 Where:
 
@@ -31,56 +31,56 @@ Where:
 
 Execute the following command to start services:
 
-` 
+`
 $ ./docker-start-services.sh
-` 
+`
 
 After a while when all services will be successfully started you can open `http://{your-host-ip}` in you browser (for ex. `http://localhost`).
 You should see ThingsBoard login page.
 
 Use the following default credentials:
 
-- **Systen Administrator**: sysadmin@thingsboard.org / sysadmin
+- **System Administrator**: sysadmin@thingsboard.org / sysadmin
 
 If you installed DataBase with demo data (using `--loadDemo` flag) you can also use the following credentials:
 
 - **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 command:
 
-` 
+`
 $ docker-compose logs -f tb1
-` 
+`
 
 Or use `docker-compose ps` to see the state of all the containers.
 Use `docker-compose logs --f` to inspect the logs of all running services.
-See [docker-compose logs](https://docs.docker.com/compose/reference/logs/) command reference for details.  
+See [docker-compose logs](https://docs.docker.com/compose/reference/logs/) command reference for details.
 
 Execute the following command to stop services:
 
-` 
+`
 $ ./docker-stop-services.sh
-` 
+`
 
 Execute the following command to stop and completely remove deployed docker containers:
 
-` 
+`
 $ ./docker-remove-services.sh
-` 
+`
 
 Execute the following command to update particular or all services (pull newer docker image and rebuild container):
 
-` 
+`
 $ ./docker-update-service.sh [SERVICE...]
-` 
+`
 
 Where:
 
-- `[SERVICE...]` - list of services to update (defined in docker-compose configurations). If not specified all services will be updated. 
+- `[SERVICE...]` - list of services to update (defined in docker-compose configurations). If not specified all services will be updated.
 
-## Upgrading 
+## Upgrading
 
 In case when database upgrade is needed, execute the following commands:
 

ui/src/app/extension/extensions-forms/extension-form-mqtt.tpl.html

@@ -241,14 +241,14 @@
                                                                                 </md-input-container>
                                                                                 <md-input-container ng-if="map.converter.typeExp == 'deviceTypeJsonExpression'" flex="60" class="md-block" md-is-error="theForm['mqttJsonTypeExp_' + brokerIndex + mapIndex].$touched && theForm['mqttJsonTypeExp_' + brokerIndex + mapIndex].$invalid">
                                                                                     <label translate>extension.json-type-expression</label>
-                                                                                    <input required name="mqttJsonTypeExp_{{brokerIndex}}{{mapIndex}}" ng-model="map.converter.deviceTypeJsonExpression">
+                                                                                    <input name="mqttJsonTypeExp_{{brokerIndex}}{{mapIndex}}" ng-model="map.converter.deviceTypeJsonExpression">
                                                                                     <div ng-messages="theForm['mqttJsonTypeExp_' + brokerIndex + mapIndex].$error">
                                                                                         <div translate ng-message="required">extension.field-required</div>
                                                                                     </div>
                                                                                 </md-input-container>
                                                                                 <md-input-container ng-if="map.converter.typeExp == 'deviceTypeTopicExpression'" flex="60" class="md-block" md-is-error="theForm['mqttTopicTypeExp_' + brokerIndex + mapIndex].$touched && theForm['mqttTopicTypeExp_' + brokerIndex + mapIndex].$invalid">
                                                                                     <label translate>extension.topic-type-expression</label>
-                                                                                    <input required name="mqttTopicTypeExp_{{brokerIndex}}{{mapIndex}}" ng-model="map.converter.deviceTypeTopicExpression">
+                                                                                    <input name="mqttTopicTypeExp_{{brokerIndex}}{{mapIndex}}" ng-model="map.converter.deviceTypeTopicExpression">
                                                                                     <div ng-messages="theForm['mqttTopicTypeExp_' + brokerIndex + mapIndex].$error">
                                                                                         <div translate ng-message="required">extension.field-required</div>
                                                                                     </div>