113 Commits

Author SHA1 Message Date
Igor Kulikov
cdec671b3c
Revert "Develop/3.0 (#2760)" (#2762)
This reverts commit 72c7002f619263d1ef1170eaac8105182248cca8.
2020-05-12 15:20:20 +03:00
Igor Kulikov
72c7002f61
Develop/3.0 (#2760)
* save position fix

* [3.0] Add support ticks to digital gauge (#2508)

* Add support ticks to digital gauge

* Add link code

* [3.0] Add inputs widgets (#2526)

* Add location widget

* Fix translate, clear code

* Fix translate

* Add date input widgets

* Add image input widgets

* Init web camera input widget

* Add functional web camera input widget

* Add styles to webcamera iputs widget

* Add link code

* Map/3.0 (#2535)

* add base map infrastructure

* add leaflet css

* add tencent map

* add google maps support

* added image map support

* refactor schemes

* here maps support && WIP on markers

* add simple marker suppor

* data update & polyline support

* map bouds support

* add some settings support

* add map provider select to settings

* labels support

* WIP on trip animation widget

* WIP on history control and route interpolation

* trip-animation map provider & custom markers

* comleted track marker & history controls

* add license headers

* label fix & tooltips support

* WIP on polygons

* marker dropping support

* add polygon support

* add label to trip animation

* WIP on tooltips

* lint anf typed leaflet AddMarker

* some typing and poly improvements

* add typing

* add marker creation

* update proxy

* save position fix

Co-authored-by: Artem Halushko <ahalushko@thingboards.io>
Co-authored-by: Adsumus <artemtv42@gmail.com>

* Fix UI budget

* add bounds padding

* update map widget bendle && bugfixes

* update marker placement widget

* add licenses

* reomove log

* Update packages

* fix sizes

* Map/3.0 (#2542)

* add base map infrastructure

* add leaflet css

* add tencent map

* add google maps support

* added image map support

* refactor schemes

* here maps support && WIP on markers

* add simple marker suppor

* data update & polyline support

* map bouds support

* add some settings support

* add map provider select to settings

* labels support

* WIP on trip animation widget

* WIP on history control and route interpolation

* trip-animation map provider & custom markers

* comleted track marker & history controls

* add license headers

* label fix & tooltips support

* WIP on polygons

* marker dropping support

* add polygon support

* add label to trip animation

* WIP on tooltips

* lint anf typed leaflet AddMarker

* some typing and poly improvements

* add typing

* add marker creation

* update proxy

* save position fix

* add bounds padding

* update map widget bendle && bugfixes

* update marker placement widget

* add licenses

* reomove log

* fix sizes

Co-authored-by: Artem Halushko <ahalushko@thingboards.io>
Co-authored-by: Adsumus <artemtv42@gmail.com>

* Update node and npm versions

* Minor fixes

* Update license

* entity and map fixes

* Map/3.0 (#2543)

* add base map infrastructure

* add leaflet css

* add tencent map

* add google maps support

* added image map support

* refactor schemes

* here maps support && WIP on markers

* add simple marker suppor

* data update & polyline support

* map bouds support

* add some settings support

* add map provider select to settings

* labels support

* WIP on trip animation widget

* WIP on history control and route interpolation

* trip-animation map provider & custom markers

* comleted track marker & history controls

* add license headers

* label fix & tooltips support

* WIP on polygons

* marker dropping support

* add polygon support

* add label to trip animation

* WIP on tooltips

* lint anf typed leaflet AddMarker

* some typing and poly improvements

* add typing

* add marker creation

* update proxy

* save position fix

* add bounds padding

* update map widget bendle && bugfixes

* update marker placement widget

* add licenses

* reomove log

* fix sizes

* entity and map fixes

Co-authored-by: Artem Halushko <ahalushko@thingboards.io>
Co-authored-by: Adsumus <artemtv42@gmail.com>

* Page not found rouring

* Fix tile server support  form OSM and zoom level fix

* Map/3.0 (#2544)

* add base map infrastructure

* add leaflet css

* add tencent map

* add google maps support

* added image map support

* refactor schemes

* here maps support && WIP on markers

* add simple marker suppor

* data update & polyline support

* map bouds support

* add some settings support

* add map provider select to settings

* labels support

* WIP on trip animation widget

* WIP on history control and route interpolation

* trip-animation map provider & custom markers

* comleted track marker & history controls

* add license headers

* label fix & tooltips support

* WIP on polygons

* marker dropping support

* add polygon support

* add label to trip animation

* WIP on tooltips

* lint anf typed leaflet AddMarker

* some typing and poly improvements

* add typing

* add marker creation

* update proxy

* save position fix

* add bounds padding

* update map widget bendle && bugfixes

* update marker placement widget

* add licenses

* reomove log

* fix sizes

* entity and map fixes

* Fix tile server support  form OSM and zoom level fix

Co-authored-by: Artem Halushko <ahalushko@thingboards.io>
Co-authored-by: Adsumus <artemtv42@gmail.com>

* Remove empty strings from Spanish translations (#2541)

* Remove empty string from Spanish translation

* Map widget types improvements

* Map widget types improvements

* Metadata improvements

* Update rule node config ui

* UI: Fix toast target for editor components

* UI: fix routing

* Fix Map fitBounds method

* [3.0] Add gateway widget (#2547)

* Create gateway widget

* Refacoring and add styled

* Update bundle

* Add model and refactoring

* [3.0] New samples for custom action with html (#2549)

* Update example custom action to new Angular

* Save settings to change type custom action

* Revert change

* UI: Import/export code improvements

* UI: minor improvements

* UI: Theme improvement

* Fix JSON object edit component

* Update styles

* [3.0] [WIP] Minor fixed to style (#2562)

* Added support Safari browser (not support DragEvent)

* Imporovement style login page

* Change flex responsive API breakpoint

* Add support long name menu item

* Home page add link to page

* Revert .mat-icon vertical-align to middle

* Revert .mat-icon vertical-align to middle

* Fix value input style

* Headline styles

* [3.0] Minor fix (#2571)

* Fix breadcrumb and breakroint api to header

* Fix layout profile

* Clear code and fix layout (admin and profile pages)

* Improvements import

* Fix entity table

* Fix rulenode tooltip header

* Clear import-export (Safari)

* Entities table actions improvement

* Improvement dialog and component style

* Ace based editors disabled state handling

* Improvement view on mobile device

* Fix widget library details

* Fix revert thingsboard.yml

* Add entity title function

* Remove unnecessary widgets bundle type

* UI: Entity table models improvements

* UI: dynamic annotation for abstract entity component

* UI: Entities table model improvements.

* add sendActivationEmail as request param (default -> true) to activate method in auth controller and login service

* UI: Model improvement, new entity table methods

* [3.0] Improvements import and tables for mobile view (#2594)

* Fix width table in Safari

* Improvement in mobile view

* Improvement attributes-table from mobile view

* Relation-table improvement for mobile view

* Improvement entity-table from mobile view

* UI: Attribute table disable edit for client side attributes

* [3.0] Added possibility to login by url params (#2592)

* Added possibility to login by url params

* Fixes after code review

* UI: Fix login url params

* UI: Fix assets import columns

* fix activate method for new UI

* UI: Fixed add user dialog

* Add new alias Current Tenant (#2604)

* fix error create dialog new dashboard (#2606)

* Minor fixes

* UI: Fix scss import to relative path

* UI: Fix scss import to relative path

* UI: Fix scss import to relative path

* UI: Revert entity.component annotation to directive

* UI: Minor improvements

* UI: Breadcrumb component improvements

* UI: Minor improvements

* UI: Improve page link default search function

* [3.0] Minor fix (#2615)

* Improvement tenant setting from mobile view

* Improvement timewindow setting from mobile view

* Improvement entity-view setting from mobile view

* Update license header and license config

* UI: Entity details panel improvements

* UI: Entities table improvements

* UI: Json React Form - textarea height fix

* UI: Entity autocomplete error handling

* UI: Entity autocomplete error handling

* Update rule nodes ui

* Rule node models improvements

* Add utils to public-api

* UI: Rule node ui external modules

* UI: Rule nodes ui api

* add support custom actions

* Cleanup

* [3.0] minor fix (#2645)

* Improvement layout-setting setting from mobile/tablet view

* Fix EntityView not show type in translate

* Clear code and update tablet/mobile view

* Update tablet/mobile view

* Fix hide title and text-overflow

* Add support Safari

* Minor fix

* Update package.json versions

* Angular update

* Angular update

* Fix issues after angular update

* Update rule nodes UI

* Fix toolbar and share buttons (#2646)

* Change resize events to observer (#2652)

* Remove javascript-detect-element-resize

* Update package.lock

* Improvement resize (#2654)

* Fix typo

* UI: Minor fixes

* Minor UI fixes

* Fix: reset entity table sort and pagination on entities specific filtering changes

* Update MSA docker readme

* map fixes

* Merge with master. AlarmRepository.findAlarms is failing (#2663)

* Merge with master. AlarmRepository.findAlarms is failing

* Fix Alarm repository. Add queue type list select.

Co-authored-by: Igor Kulikov <ikulikov@thingsboard.io>

* Map/3.0 (#2664)

* add base map infrastructure

* add leaflet css

* add tencent map

* add google maps support

* added image map support

* refactor schemes

* here maps support && WIP on markers

* add simple marker suppor

* data update & polyline support

* map bouds support

* add some settings support

* add map provider select to settings

* labels support

* WIP on trip animation widget

* WIP on history control and route interpolation

* trip-animation map provider & custom markers

* comleted track marker & history controls

* add license headers

* label fix & tooltips support

* WIP on polygons

* marker dropping support

* add polygon support

* add label to trip animation

* WIP on tooltips

* lint anf typed leaflet AddMarker

* some typing and poly improvements

* add typing

* add marker creation

* update proxy

* save position fix

* add bounds padding

* update map widget bendle && bugfixes

* update marker placement widget

* add licenses

* reomove log

* fix sizes

* entity and map fixes

* Fix tile server support  form OSM and zoom level fix

* add support custom actions

* map fixes

Co-authored-by: Artem Halushko <ahalushko@thingboards.io>
Co-authored-by: Adsumus <artemtv42@gmail.com>

* Add support Safari and improvement view (#2662)

* Update rule node core config.

* public api import fix

* Fix bundles budget

* IE11 fixes

* Revert "Merge with master. AlarmRepository.findAlarms is failing (#2663)"

This reverts commit 2c02406ee5f41b08e655b634dd9871403f67149d.

* wip on ie 11 fixes

* WIP on es support

* Fix Alarm repository. Add queue type list select.

* [3.0] Entity list not correct find index for model (#2668)

* Entity list not correct find index for model

* Clear import

* Revert change

* Revert change

* [3.0] Improvement code style (#2670)

* Clear code and styles

* Clear import

* Fix tenant isolated checkbox fields

* Update rule nodes ui

* UI: Get rid of 'multiple directives with 'exportAs' set to ngForm'

* map fixes

* update map bundles

* Remove redudant css import

* wip on image-map fixes

* image map alias image support

* Add gateway type and clear import (#2677)

* merge fixes

* saveEntity && minor fixes

* small css fix

* Minor fixes

* Add new widgetContext field currentUser

* entity save fix #2

* entity save fix#3

* Update dashboard (#2684)

* fix some ds problems

* UI: Migrate gateway widgets and gateways demo dashboard to 3.0

* tile layers and locations set fixes

* input bundles updates

* Update default dashboard thermostats (#2689)

* Dashboard page fixes and improvements

* Clear code (#2692)

* Improve database migration - create indexes after inserts

* Handle component_descriptor contraints during migration

* [3.0] Improved login by params to support nagivation to different dashboards (#2703)

* Improved login by params to support nagivation to different dashboards

* Refactorting

* Minor improvements

* bugfixes

* bugfixes (#2705)

* [3.0] Improvement map (#2706)

* Fix load custom marker image for Firefox

* Fix update polygon color

* [WIP] [3.0] Added OAuth2 Support (#2709)

* Added base impl for OAuth-2

* Added basic and custom OAuth2 user mappers

* Removed comment line

* Refactoring to review. Added tenantId and customerId. Added email tenant name strategy

* Revert debug logger

* Fixed compilation

* Test fixed

* Create UI for OAuthService

* Revert package-lock.json

* Add translate login es_ES

Co-authored-by: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>

* provide entity to custom actions

* Fix Manage dashboard customers

* remove image map zoom

* Fix docker hybrid db mode

* fix empty center position & fix entity id

* Minor refactoring

* Refactoring

* Minor fixes

* [3.0] Improvment image map (#2729)

* Add support setting position function

* Improved setting image map

* Add support setting offset marker

* Minor fixes

* Fix Auth guard

* Cassandra to SQL boolean column fix

* Fix entity state controller name resolution

* Fix oauth2 login button

* Improve OAuth buttons style

* OAuth button style improvement

* Update haproxy.cfg with oauth rules

* Introduce OAuth failure handling

* Fix tests

* [3.0] Improvement image map (#2740)

* Fixed not correct center image map
Fixed update position marker for image map

* Add support IE and clear code

* Fix not correct update image for datasource

* Update marker position

* Fix tests

* Fix error update websocket to change user (#2744)

* Map/3.0 (#2738)

* WIP on trip-animation settings

* trip-animation points & anchors

* fixes

Co-authored-by: Adsumus <artemtv42@gmail.com>
Co-authored-by: Igor Kulikov <ikulikov@thingsboard.io>

* Fix typo

* Improve table widgets mobile mode

* Update Cassandra Driver

* [3.0] Fixed polygon functionality (#2747)

* Add default setting and title for group

* Fix polygon: updateColor, functions tooltip and color polygon, update coordinate polygon

* Improvement code

* Refactoring code

* Improve Cassandra resultSet pagination

Co-authored-by: Artem Halushko <ahalushko@thingsboard.io>
Co-authored-by: Vladyslav <vprykhodko@thingsboard.io>
Co-authored-by: ArtemHalushko <61501795+ArtemHalushko@users.noreply.github.com>
Co-authored-by: Artem Halushko <ahalushko@thingboards.io>
Co-authored-by: Adsumus <artemtv42@gmail.com>
Co-authored-by: Chantsova Ekaterina <chantsova.ekaterina@gmail.com>
Co-authored-by: Dmytro Shvaika <dshvaika@thingsboard.io>
Co-authored-by: VoBa <volodymyr.babak@gmail.com>
Co-authored-by: Andrew Shvayka <ashvayka@thingsboard.io>
2020-05-12 14:11:26 +03:00
Yevhen Bondarenko
424d631a69
added extra properties to kafka consumer (#2751)
* added extra properties to kafka consumer

* added default values for kafka consumer properties in TbKafkaSettings

* Update TbKafkaSettings.java

* Update thingsboard.yml

Co-authored-by: Andrew Shvayka <ashvayka@thingsboard.io>
2020-05-08 14:38:04 +03:00
Andrii Shvaika
f07d7441b2 Change of the partition routing strategy 2020-05-05 16:11:10 +03:00
YevhenBondarenko
00e32ee8a3 merge with feature/queue-consumers-refactoring 2020-05-04 09:39:04 +03:00
YevhenBondarenko
06c3caf082 refactored 2020-05-02 13:34:11 +03:00
Andrii Shvaika
8d5c38b743 Queue refactoring 2020-05-01 17:43:13 +03:00
YevhenBondarenko
eedb383845 AWS improvements 2020-05-01 14:15:31 +03:00
Andrii Shvaika
c7f282d393 Refactoring of the Queue Consumers 2020-05-01 12:45:06 +03:00
Andrii Shvaika
09d8823205 Race condition fix 2020-04-30 20:38:53 +03:00
Andrii Shvaika
702a8b6139 Force unsubscribe from Kafka topics 2020-04-30 18:10:05 +03:00
Andrii Shvaika
beb5d1d0ba Merge branch 'develop/2.5-js-executor' of https://github.com/YevhenBondarenko/thingsboard 2020-04-30 15:08:05 +03:00
Andrew Shvayka
7a47cd503b Revert "Develop/2.5 js executor (#2685)"
This reverts commit 1599b24c3a748599a84f877987f452579c997ccf.
2020-04-30 11:19:50 +03:00
Yevhen Bondarenko
1599b24c3a
Develop/2.5 js executor (#2685)
* moved kafka from service.js to own module

* created awsSqs, pubSub, rabbitmq js-executors

* revert RemoteJsInvokeService

* revert thingsboard.yml

* added queue settings to js-executor

* refactored queue factories

* added queue params to pubsub js-executor

* azure service bus js-executor
2020-04-29 21:02:47 +03:00
YevhenBondarenko
43b2eedbd5 azure service bus js-executor 2020-04-29 18:27:53 +03:00
YevhenBondarenko
cce6a44adc refactored queue factories 2020-04-29 10:14:05 +03:00
Andrii Shvaika
eb3cc332d1 Fix gateway/device last activity time checks 2020-04-28 18:19:30 +03:00
YevhenBondarenko
6322da3d04 merge with master 2020-04-28 16:51:04 +03:00
YevhenBondarenko
0dc31fbdde created awsSqs, pubSub, rabbitmq js-executors 2020-04-28 16:13:16 +03:00
Andrii Shvaika
8abb718349 Merge with develop 2020-04-28 14:09:20 +03:00
Andrii Shvaika
86f21023fe Improved PartitionService and fixed startup order in docker-compose.yml 2020-04-27 14:44:29 +03:00
YevhenBondarenko
ba140644c7 added Azure Service Bus queue settings 2020-04-27 11:16:53 +03:00
Andrii Shvaika
53eb09bcb9 Improvements to tests due to new architecture 2020-04-21 22:31:25 +03:00
YevhenBondarenko
283ad27cb5 added rabbitmq queue arguments 2020-04-21 20:55:02 +03:00
YevhenBondarenko
2ad4ddf1fb pubsub improvements 2020-04-21 12:56:06 +03:00
YevhenBondarenko
1b9df18c45 created TbPubSubSubscriptionSettings 2020-04-21 12:56:06 +03:00
Andrii Shvaika
58d9c313a8 Fixed tests 2020-04-20 16:12:03 +03:00
YevhenBondarenko
12973cecf1 added method destroy to admins and aws sqs factories 2020-04-17 15:17:06 +03:00
YevhenBondarenko
9fa82078a0 created TbAwsSqsQueueAttributes and added queue properties to yml 2020-04-17 15:17:06 +03:00
Yevhen Bondarenko
d654e09d6a
kafka topic settings
* added topic-properties to kafka queue

* added topic-properties to kafka queue to transport

* kafka topic settings improvements
2020-04-15 17:47:46 +03:00
Andrii Shvaika
0c54f836b3 Fixed tests 2020-04-14 16:17:08 +03:00
Andrii Shvaika
63bac58ae8 Implementation of statistics counters 2020-04-14 08:27:44 +03:00
Andrii Shvaika
d380ac7106 Device -> Server RPC implementation and improvements 2020-04-13 18:33:11 +03:00
Andrii Shvaika
6c4b50a380 Implemented dedicated RE per tenant 2020-04-13 14:59:48 +03:00
Yevhen Bondarenko
8442159811
[2.5] vulnerabilities (#2608)
* Version updates

* added @Retention(RetentionPolicy.RUNTIME) for all custom Dao annotations.

* changed getId, setId to getUuid, setUuid from BaseEntity, improvement AbstractControllerTest

* fix rabbitmq

* fix RuleChainManagerActor

* refactored InMemory queue

Co-authored-by: Andrii Shvaika <ashvayka@thingsboard.io>
2020-04-13 09:34:35 +03:00
YevhenBondarenko
1dd3334825 moved jsinvoke.proto to queue, fixed js-executor, added createRemoteJsRequestTemplate to RuleEngine and Core factories 2020-04-10 12:52:05 +03:00
Yevhen Bondarenko
7b3d475267
[2.5] created rabbitmq queue (#2589)
* created main classes for RabbitMq queue

* created temp version rabbitmq

* Merge branch 'develop/2.5' of https://github.com/thingsboard/thingsboard into develop/2.5-rabbitmq

# Conflicts:
#	common/queue/pom.xml

* rabbit improvements
2020-04-09 18:41:37 +03:00
Andrii Shvaika
ca193239ba RE Submit Strategies 2020-04-09 18:33:44 +03:00
Andrii Shvaika
ec4e2c036f No more failures on missing RE queue 2020-04-09 13:09:54 +03:00
Andrii Shvaika
2f6c6ad1fe Merge with master 2020-04-08 18:24:52 +03:00
Andrii Shvaika
c7b428fbc7 Merge branch 'develop/2.5' of github.com:thingsboard/thingsboard into develop/2.5 2020-04-08 14:10:14 +03:00
Andrii Shvaika
3eaae1ef32 Statistics Implementation 2020-04-08 14:09:56 +03:00
Yevhen Bondarenko
45bd764e6f
Azure ServiceBus queue
* created event hubs queue

* created servicebus queue

* refactored

* refactored
2020-04-07 11:45:28 +03:00
Andrii Shvaika
638ca0e1d1 Refactoring to multiple queues for rule engine 2020-04-06 18:35:43 +03:00
Yevhen Bondarenko
b39328c989
[2.5]fix ConcurrentModificationException (#2560)
* fix ConcurrentModificationException

* kafka consumer improvements

* kafka consumer improvements

* refactored kafka consumer

* refactored kafka consumer
2020-03-31 16:47:43 +03:00
Yevhen Bondarenko
a6e090ef86
Develop/2.5 pubsub (#2566)
* created Aws Sqs Queue

* improvement AwsSqs providers

* created pubsub queue

* revert package-lock.json

* Aws sqs improvements

* Aws sqs improvements

* Aws sqs improvements

* Aws sqs improvements

* Created pubsub queue

* aws improvements

* aws improvements

* aws improvements

* added visibility timeout to aws queue

* pub sub improvements

* pub sub improvements

* aws sqs improvements

* pub sub improvements

* added comment to transport.yml about ack deadline
2020-03-31 16:39:41 +03:00
Yevhen Bondarenko
2553cf6b6f
created Aws Sqs Queue (#2534)
* created Aws Sqs Queue

* improvement AwsSqs providers

* revert package-lock.json

* Aws sqs improvements

* Aws sqs improvements

* Aws sqs improvements

* Aws sqs improvements

* aws improvements

* aws improvements

* aws improvements

* added visibility timeout to aws queue
2020-03-30 19:13:34 +03:00
Andrii Shvaika
c4269023dd Fixed Conditional annotations 2020-03-28 02:30:37 +02:00
Andrii Shvaika
6fe25a2ee2 Refactoring to support TB-Rule-Engine service 2020-03-28 01:42:17 +02:00
Andrii Shvaika
7531a26e61 Implementation of RPC Call support 2020-03-25 22:11:47 +02:00