dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,883 Commits 106 Branches 71 Tags
Commit Graph

456 Commits

Author SHA1 Message Date
Dmitriymush
96ff9ddedd Fixes after review 2020-12-16 17:36:08 +02:00
Dmitriymush
749fbd68a5 Merge branch 'master' of https://github.com/thingsboard/thingsboard 2020-12-10 17:52:44 +02:00
Andrew Shvayka
7667afaeae
Develop/lwm2m (#3826) 
* LwM2M - Start transport

* LwM2M - Test endpoint

* LwM2M - Test endpoint

* LwM2M - Test add xml

* LwM2M device registration

* LwM2M - add get from client, add attributes and telemetry upgrade from registration client

* LwM2M - add get from client, add attributes and telemetry upgrade from registration client

* LwM2M implementation

* LwM2M - add to service telemetry and attribute

* LwM2M add to service attribute and telemetry

* LwM2M - add LWM2M_CREDENTIALS to DeviceCredentialsType

* LwM2M - add LWM2M_CREDENTIALS to DeviceCredentialsType

* LwM2M - add transport.process

* LwM2M - delete from yml tenantid, PSK -ok

* LwM2M - yml del tenantId

* LwM2M - add RPK

* LwM2M - add connect only x509 certificate. Crate certificates in serverKeyStore.jks and clientKeyStore.jks

* LwM2M - add no_sec

* LwM2M - add RPK & PSK integration test with app Client

* LwM2M - add RPK & PSK integration test with app Client

* LwM2M - add read JKS from file

* LwM2M - add read JKS from file

* LwM2M - add bootstrap cert

* LwM2M - add bootstrap RPK

* LwM2M - add bootstrap No_sec

* LwM2M - cleaned the code

* LwM2M - add to 3.0 in UI credentials lwm2m

* LwM2M - add to 3.0 in UI credentials lwm2m

* LwM2M - add to 3.0 in UI credentials lwm2m

* LwM2M - fix bug CoAP transport

* LwM2M: UI - add Json to credentials

* LwM2M: Back - add command "/3/0/5" - trigger client

* LwM2M: fix bug Json edit dialog

* LwM2M: fix bug Json edit dialog

* lwm2m: fix bug Json edit dialog: add validate

* lwm2m: UI add tabs

* lwm2m: UI add tabs (cleaner)

* lwm2m: add interface SecurityConfigModels

* lwm2m: add interface SecurityConfigModels2

* lwm2m: change html

* lwm2m: UI add bootstrap component

* lwm2m: UI add bootstrap component with FormControl

* lwm2m: UI add start Observe

* lwm2m: UI - correct

* lwm2m: UI - correct

* lwm2m: UI - add Validator: BS RPK, X509

* lwm2m: UI - add Observe

* lwm2m: UI - finish Observe

* lwm2m: UI - fix bug config-service update identity

* lwm2m: Bootstarp&Sewrver All config secure

* lwm2m: Bootstarp&Sewrver All config secure for new Front format

* lwm2m: Bootstarp&Sewrver Different config secure for new Front format

* lwm2m: Add attributes Gui and Backend

* lwm2m: Add attributes Gui and Backend final

* lwm2m: Add telemetrys to Gui

* lwm2m: Add Attribute & telemetry in Gui to instance

* lwm2m: Optimize Attr/Telemetry

* lwm2m: Optimize Attr/Telemetry

* lwm2m: Optimize Attr/Telemetry

* lwm2m: Optimize Attr/Telemetry for mobile

* lwm2m: Model folder

* lwm2m: Ok on AWS: NoSec, PSK, X509
bad registration - RPK

* lwm2m: KeyStore start only one

* lwm2m: Server observe ok

* lwm2m: Server fix bug finish session without remove

* lwm2m: Server add function installValue

* lwm2m: Server add function getAttrTelemetry to tingsboard

* lwm2m: Server add function installValue

* lwm2m: Server add function update Telemetry, Attr from observe

* lwm2m: Server add comments

* lwm2m: Server add session listener

* lwm2m: Server add onGetChangeCredentials with analyze

* lwm2m: Server add onGetChangeCredentials with analyze Onserve add

* lwm2m: Server: updated algorithm for analyzing dynamic changes in attributes / telemetry / observation

* lwm2m: fix bug:  "ngx-flowchart" compile

* lwm2m: get value resource OPAQUE - byte [] to HexString

* lwm2m: change path to base

* lwm2m: fix bug COAP & lwm2m

* Lwm2m_3_2: back: cleaner, test bootstrap-ok front: restore

* Lwm2m_3_2: back: del SynchronousRegistrationListener.java

* Lwm2m_3_2: front: start profile lwm2m UI

* Lwm2m_3_2: front&back: add to profile lwm2m (api, getModels...)

* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json

* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (2)

* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (3)

* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (4)

* Lwm2m_3_2: front: add update change bootstrapConfig and save to config json

* Lwm2m_3_2: update after merge master

* lwm2m: fix bug proto

* lwm2m: fix bug in yml keyStore.jks

* lwm2m: fix bug tests

* lwm2m: front: add nameThingsboard

* lwm2m: fix bug Autowired lwm2mContext, caseCamel

* lwm2m: back-end^ start api /lwm2m/deviceProfile/bootstrap

* lwm2m: back-end: add method read models from resources

* lwm2m: back-end/front: add and finish api bootstrapConfig

* lwm2m: back-end: add decode profile

* lwm2m: back-end: add new bin in transport api

* lwm2m: add microservice lwm2m and docker lwm2m.

* lwm2m: add microservice lwm2m and docker lwm2m (fix bug)

* lwm2m: front: start fix bug disabled resources

* lwm2m: master to lwm2m merge, front add change attribute, telemetry

* lwm2m: front PR

* lwm2m: front add sort keyName to Json on the start

* lwm2m: front add instances

* lwm2m: front add/del instances FormGrp Value

* lwm2m: Merge remote-tracking branch 'origin/master' into develop/lwm2m
# Conflicts:
#	common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
#	common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/SessionMsgListener.java
#	ui-ngx/src/app/modules/home/components/home-components.module.ts

* lwm2m: Merge remote-tracking branch 'origin/master' into develop/lwm2m

* lwm2m: Front: del sort after add/del instance

* lwm2m: Front: fix bug reindex FormArray after update

* Lwm2m: Front fix bug add/del instans

* Lwm2m: Front finish1 profile

* Lwm2m: Back add profile to ModelClient

* Lwm2m: Back add form profile sent thingsboard: attr/tel/observe

* Lwm2m: Back -> fix bug: serverKeyStore.jks] Unable to load KeyStore  files server

* Lwm2m: Back -> fix bug: onRegistered an unReg

* Lwm2m: Back -> add updateProfiles

* Lwm2m: Back -> add updateDevice and updateProfile dynamic

* Lwm2m: Back -> error if CoapCode not access

* Lwm2m: Front -> clear credential

* Lwm2m: Front ->  credential fix bug button "save"

* Lwm2m: Back ->  add telemetry logLwm2m

Co-authored-by: nickAS21 <nick@avalr.com.ua>
 2020-12-09 17:13:11 +02:00
Andrew Shvayka
24ccd2a2b5 Revert "[3.2.1] Develop/lwm2m (#3547)" 
This reverts commit df6151f5ae8d3b77a67318dbb774d55e3f297960.
 2020-12-09 17:11:50 +02:00
Andrew Shvayka
df6151f5ae
[3.2.1] Develop/lwm2m (#3547) 
* LwM2M - Start transport

* LwM2M - Test endpoint

* LwM2M - Test endpoint

* LwM2M - Test add xml

* LwM2M device registration

* LwM2M - add get from client, add attributes and telemetry upgrade from registration client

* LwM2M - add get from client, add attributes and telemetry upgrade from registration client

* LwM2M implementation

* LwM2M - add to service telemetry and attribute

* LwM2M add to service attribute and telemetry

* LwM2M - add LWM2M_CREDENTIALS to DeviceCredentialsType

* LwM2M - add LWM2M_CREDENTIALS to DeviceCredentialsType

* LwM2M - add transport.process

* LwM2M - delete from yml tenantid, PSK -ok

* LwM2M - yml del tenantId

* LwM2M - add RPK

* LwM2M - add connect only x509 certificate. Crate certificates in serverKeyStore.jks and clientKeyStore.jks

* LwM2M - add no_sec

* LwM2M - add RPK & PSK integration test with app Client

* LwM2M - add RPK & PSK integration test with app Client

* LwM2M - add read JKS from file

* LwM2M - add read JKS from file

* LwM2M - add bootstrap cert

* LwM2M - add bootstrap RPK

* LwM2M - add bootstrap No_sec

* LwM2M - cleaned the code

* LwM2M - add to 3.0 in UI credentials lwm2m

* LwM2M - add to 3.0 in UI credentials lwm2m

* LwM2M - add to 3.0 in UI credentials lwm2m

* LwM2M - fix bug CoAP transport

* LwM2M: UI - add Json to credentials

* LwM2M: Back - add command "/3/0/5" - trigger client

* LwM2M: fix bug Json edit dialog

* LwM2M: fix bug Json edit dialog

* lwm2m: fix bug Json edit dialog: add validate

* lwm2m: UI add tabs

* lwm2m: UI add tabs (cleaner)

* lwm2m: add interface SecurityConfigModels

* lwm2m: add interface SecurityConfigModels2

* lwm2m: change html

* lwm2m: UI add bootstrap component

* lwm2m: UI add bootstrap component with FormControl

* lwm2m: UI add start Observe

* lwm2m: UI - correct

* lwm2m: UI - correct

* lwm2m: UI - add Validator: BS RPK, X509

* lwm2m: UI - add Observe

* lwm2m: UI - finish Observe

* lwm2m: UI - fix bug config-service update identity

* lwm2m: Bootstarp&Sewrver All config secure

* lwm2m: Bootstarp&Sewrver All config secure for new Front format

* lwm2m: Bootstarp&Sewrver Different config secure for new Front format

* lwm2m: Add attributes Gui and Backend

* lwm2m: Add attributes Gui and Backend final

* lwm2m: Add telemetrys to Gui

* lwm2m: Add Attribute & telemetry in Gui to instance

* lwm2m: Optimize Attr/Telemetry

* lwm2m: Optimize Attr/Telemetry

* lwm2m: Optimize Attr/Telemetry

* lwm2m: Optimize Attr/Telemetry for mobile

* lwm2m: Model folder

* lwm2m: Ok on AWS: NoSec, PSK, X509
bad registration - RPK

* lwm2m: KeyStore start only one

* lwm2m: Server observe ok

* lwm2m: Server fix bug finish session without remove

* lwm2m: Server add function installValue

* lwm2m: Server add function getAttrTelemetry to tingsboard

* lwm2m: Server add function installValue

* lwm2m: Server add function update Telemetry, Attr from observe

* lwm2m: Server add comments

* lwm2m: Server add session listener

* lwm2m: Server add onGetChangeCredentials with analyze

* lwm2m: Server add onGetChangeCredentials with analyze Onserve add

* lwm2m: Server: updated algorithm for analyzing dynamic changes in attributes / telemetry / observation

* lwm2m: fix bug:  "ngx-flowchart" compile

* lwm2m: get value resource OPAQUE - byte [] to HexString

* lwm2m: change path to base

* lwm2m: fix bug COAP & lwm2m

* Lwm2m_3_2: back: cleaner, test bootstrap-ok front: restore

* Lwm2m_3_2: back: del SynchronousRegistrationListener.java

* Lwm2m_3_2: front: start profile lwm2m UI

* Lwm2m_3_2: front&back: add to profile lwm2m (api, getModels...)

* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json

* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (2)

* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (3)

* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (4)

* Lwm2m_3_2: front: add update change bootstrapConfig and save to config json

* Lwm2m_3_2: update after merge master

* lwm2m: fix bug proto

* lwm2m: fix bug in yml keyStore.jks

* lwm2m: fix bug tests

* lwm2m: front: add nameThingsboard

* lwm2m: fix bug Autowired lwm2mContext, caseCamel

* lwm2m: back-end^ start api /lwm2m/deviceProfile/bootstrap

* lwm2m: back-end: add method read models from resources

* lwm2m: back-end/front: add and finish api bootstrapConfig

* lwm2m: back-end: add decode profile

* lwm2m: back-end: add new bin in transport api

* lwm2m: add microservice lwm2m and docker lwm2m.

* lwm2m: add microservice lwm2m and docker lwm2m (fix bug)

* lwm2m: front: start fix bug disabled resources

* lwm2m: master to lwm2m merge, front add change attribute, telemetry

* lwm2m: front PR

* lwm2m: front add sort keyName to Json on the start

* lwm2m: front add instances

* lwm2m: front add/del instances FormGrp Value

* lwm2m: Merge remote-tracking branch 'origin/master' into develop/lwm2m
# Conflicts:
#	common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
#	common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/SessionMsgListener.java
#	ui-ngx/src/app/modules/home/components/home-components.module.ts

* lwm2m: Merge remote-tracking branch 'origin/master' into develop/lwm2m

* lwm2m: Front: del sort after add/del instance

* lwm2m: Front: fix bug reindex FormArray after update

* Lwm2m: Front fix bug add/del instans

* Lwm2m: Front finish1 profile

* Lwm2m: Back add profile to ModelClient

* Lwm2m: Back add form profile sent thingsboard: attr/tel/observe

* Lwm2m: Back -> fix bug: serverKeyStore.jks] Unable to load KeyStore  files server

* Lwm2m: Back -> fix bug: onRegistered an unReg

* Lwm2m: Back -> add updateProfiles

* Lwm2m: Back -> add updateDevice and updateProfile dynamic

* Lwm2m: Back -> error if CoapCode not access

* Lwm2m: Front -> clear credential

* Lwm2m: Front ->  credential fix bug button "save"

* Lwm2m: Back ->  add telemetry logLwm2m

Co-authored-by: nickAS21 <nick@avalr.com.ua>
 2020-12-09 17:09:16 +02:00
Vladyslav Prykhodko
f133551e98 UI: Fixed custom action (with HTML) template action order in dialog 2020-12-08 00:15:07 +02:00
Vladyslav_Prykhodko
8d82cec849 UI: Fixed first init webcamera in iOS device 2020-12-04 12:03:26 +02:00
Vladyslav_Prykhodko
d284d7ce5c UI: Added trackBy in table widget 2020-12-01 12:05:04 +02:00
Vladyslav_Prykhodko
2cf6de81c0 UI: Added trackBy in table widget 2020-12-01 10:16:58 +02:00
Igor Kulikov
d9a9690f6e Ability to embed dashboard page. Implement Api Usage page. 2020-11-27 17:35:19 +02:00
Vladyslav_Prykhodko
97ef261ad2 UI: fixed show alarm fields in data keys widget with unresolved alias 2020-11-24 10:57:59 +02:00
Vladyslav_Prykhodko
abb3c47239 UI: Fixed didn't show alarm detail key 2020-11-17 19:06:38 +02:00
Vladyslav_Prykhodko
34c8294e9d Fixed fit bounds marker is disabled covered all markers 2020-11-13 20:28:55 +02:00
Igor Kulikov
7c70eaa71d
Merge pull request #3705 from kalutkaz/MapMarker2 
Fix marker move and marker point
 2020-11-11 18:20:44 +02:00
Vladyslav_Prykhodko
724b6c5247 Refactoring 2020-11-11 18:14:56 +02:00
Kalutka Zhenya
60de89015a Refactoring 2020-11-11 18:14:24 +02:00
Kalutka Zhenya
a06c835497 Fix marker move and marker point 2020-11-11 18:14:14 +02:00
Kalutka Zhenya
2ccaa095cb Fix marker move 2020-11-11 18:14:04 +02:00
Dmitriymush
2e624994da additional fix to component html 2020-11-11 14:38:24 +02:00
Dmitriymush
33b1cee2d0 bug-fix: trip animation for multiple devices 2020-11-11 13:27:18 +02:00
Dmitriymush
643563ec6a bug-fix: trip animation for multiple devices 2020-11-11 13:24:10 +02:00
Igor Kulikov
1ba09a5006
Merge pull request #3627 from vvlladd28/improvement/legend-sort 
UI: Added new options for legend config (sort datakeys in legend)
 2020-11-11 09:02:26 +02:00
Igor Kulikov
130bbc51ad
Merge pull request #3626 from vvlladd28/improvement/camera-widget 
UI: Improvement photo camera input widget
 2020-11-11 09:01:49 +02:00
Vladyslav_Prykhodko
c40f6bf47c UI: Added new options for legend config (sort datakeys in legend) 2020-10-23 18:42:07 +03:00
Vladyslav_Prykhodko
0c1fd97850 UI: Improvement photo camera input widget 2020-10-23 17:50:15 +03:00
Vladyslav_Prykhodko
cbcb050e81 Refactoring 2020-10-20 09:14:58 +03:00
Vladyslav_Prykhodko
47d5aee3dc UI: Improvement alarm widget and fixed timeseries 2020-10-19 19:05:34 +03:00
Chantsova Ekaterina
c5459fe9e5 Entities table: fix data displaying and sorting, when labels with custom translations are used 2020-10-14 14:34:56 +03:00
Igor Kulikov
ed090b3e6c UI: Improve dialog actions style 2020-10-14 12:32:07 +03:00
Chantsova Ekaterina
df784db8a1 Refactoring 2020-10-12 19:31:42 +03:00
Chantsova Ekaterina
6d4245d603 Chart tooltips: fix wrong number of decimals after floating point 2020-10-12 15:34:02 +03:00
Chantsova Ekaterina
6de23fe365 Refactoring 2020-10-09 11:07:10 +03:00
Chantsova Ekaterina
db0b0dcb30 Merge remote-tracking branch 'upstream/master' into improvement/extend-multiple-input-settings 2020-10-08 20:05:29 +03:00
Chantsova Ekaterina
aa87ab024e Change widget json config 2020-10-08 16:21:04 +03:00
Igor Kulikov
69ec103588 UI: Completely remove letters capitalization in order to avoid issues in certain locales. 2020-10-07 11:58:43 +03:00
Chantsova Ekaterina
aa82a478cb Fix wrong number of digits after floating point in legend 2020-10-06 18:44:12 +03:00
Serhii Mikhnytskyi
0227234a6d removed test component property 2020-10-06 18:31:26 +03:00
Serhii Mikhnytskyi
762c6dae55 improved performance of table widgets - removed unused ngZone.run and detectChanges, changed functions trackByRowIndex - now is used index, not id, minor improvements for functions, used after data updating. 2020-10-06 18:31:26 +03:00
Vladyslav_Prykhodko
1eccfcc76a Fixed incorrect display of alarm table columns(AckTime, Cleared time), with no parameters specified 2020-10-06 18:29:35 +03:00
Kalutka Zhenya
e35e54a764 Fix resize switch control 2020-10-06 18:28:40 +03:00
kalutkaz
7347230ec4
Update knob control (#3501) 
* Epdate knob control

* Fix click function

* Refactoring

* Formatting

* Change 'mouseup'
 2020-10-06 18:28:26 +03:00
Serhii Mikhnytskyi
dbf8bf6733 set lib attribute "animatedValue" to "true" in analogue-gauge.models.ts 2020-10-06 18:25:58 +03:00
Chantsova Ekaterina
ed2920eddc Remove form reset when saving, add translatable error messages 2020-10-05 18:00:26 +03:00
Chantsova Ekaterina
bb06f5ebe0 Add min/max validation 2020-09-15 18:14:31 +03:00
Vladyslav_Prykhodko
f305cbbed0 Fixed show multiple draw routes 2020-09-15 17:00:05 +03:00
Vladyslav_Prykhodko
5e109228eb Fixed error disabled scroll zoom 2020-09-15 16:50:05 +03:00
Vladyslav_Prykhodko
903080f4f3 Add correct sort dataKey 2020-09-03 12:40:17 +03:00
Igor Kulikov
4753f2da6f
Merge pull request #3398 from vvlladd28/improvement/ctx/add-import-router 
Added widget context import Router module
 2020-09-01 14:51:35 +03:00
Vladyslav_Prykhodko
7349108111 Fixed not correct label text for weight font; Refactoring 2020-08-31 17:34:06 +03:00
Vladyslav_Prykhodko
01a5488032 Added widget context Router 2020-08-31 16:39:54 +03:00