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

81 Commits

Author SHA1 Message Date
Volodymyr Babak
e96452cdcf Merge remote-tracking branch 'upstream/develop/3.3' into develop/3.3-edge 2021-03-03 15:18:38 +02:00
nickAS21
d2469420ad Lwm2m: front add validator json for security config device 2021-02-22 14:36:33 +02:00
Volodymyr Babak
b58c831343 Merge remote-tracking branch 'upstream/develop/3.3' into develop/3.3-edge 2021-02-12 13:10:06 +02:00
nickAS21
9552ab0589 Lwm2m: front: fix bug PR 2021-02-08 17:21:36 +02:00
Volodymyr Babak
499eb1aef4 Merge remote-tracking branch 'upstream/develop/3.3' into develop/3.3-edge 2021-01-27 15:12:58 +02:00
Vladyslav_Prykhodko
2b47fe9202 Updated license header 2021-01-27 13:38:12 +02:00
Vladyslav_Prykhodko
d5c3f4c997 Merge master in develop/3.3 2021-01-27 13:31:46 +02:00
Igor Kulikov
4e3a7ed897 Add overwriteActivityTime checkbox to device wizard. Update rule node ui. 2021-01-22 18:34:16 +02:00
Andrii Shvaika
d06ce5555c Simplified implementation of the overwrite activity time flag 2021-01-22 16:06:48 +02:00
Vladyslav_Prykhodko
15abe85b74 UI: Refactoring LwM2M 2021-01-21 18:21:55 +02:00
nickAS21
6cfc792156 Lwm2m: front: refactoring <mat-expansion-panel-header> 2021-01-20 09:12:05 +02:00
nickAS21
cfa9a5778a Lwm2m: front: refactoring 2021-01-19 16:24:58 +02:00
Volodymyr Babak
bc3008ad7b Merge remote-tracking branch 'upstream/master' into develop/3.3-edge 2021-01-17 01:47:49 +02:00
zbeacon
1bdd7d69bf Fix for lastActivityTime in devices created by gateway 2021-01-15 18:55:35 +02:00
Vladyslav
cd6a76de86
Improvement/lwm2m/refactoring 1 (#3956) 
UI: Refactoring lwm2m
 2021-01-15 13:06:39 +02:00
Artem Babak
ede0df0d6b Code restyle: single instead of double quotes, deleted unused imports 2021-01-12 22:01:32 +02:00
Igor Kulikov
d31358b2ea Update license header - set 2021 year 2021-01-11 13:42:16 +02:00
Volodymyr Babak
eb24519772 Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge 2020-12-29 16:55:07 +02:00
Volodymyr Babak
b2de96fbff Merge remote-tracking branch 'upstream/develop/3.3' into develop/3.3-edge 2020-12-24 15:13:57 +02:00
Volodymyr Babak
e761f53dd0 Hide entity type edge if disabled. Renaming edge rule chain to rule chain templates. Minor fixes after demo 2020-12-21 19:14:22 +02:00
Volodymyr Babak
846f5ba86b Merge remote-tracking branch 'deaflynx/develop/3.3-edge' into develop/3.3-edge 2020-12-14 12:55:07 +02:00
Artem Babak
3ffa7e3592 Added button unassignFromEdge for entities. Added findAssetsByTenantIdAndEdgeIdAndType() 2020-12-10 16:59:15 +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
Volodymyr Babak
d79d00aa87 Merge remote-tracking branch 'upstream/master' into develop/3.3-edge 2020-12-07 10:46:15 +02:00
Igor Kulikov
9ac8722212 Fix copy device credentials 2020-11-24 17:11:19 +02:00
Vladyslav_Prykhodko
5436316d1e Fixed updated button 2020-11-23 13:02:10 +02:00
Vladyslav_Prykhodko
e1b9124ee4 Refactoring 2020-11-23 12:17:20 +02:00
Vladyslav_Prykhodko
205be4e5ce UI: Added new component copy-device-credentials 2020-11-23 12:13:05 +02:00
Artem Babak
02f6b9bda0 added 'edge' scope to dashboard, device, entityView 2020-11-05 16:02:10 +02:00
Artem Babak
2aa50f8cbc Refactored edgeId entity table-resolvers 2020-11-05 14:58:20 +02:00
Artem Babak
0be81ae7fe Refactored method get edge name for title in edge's assigned entities 2020-11-05 12:18:46 +02:00
Igor Kulikov
ed090b3e6c UI: Improve dialog actions style 2020-10-14 12:32:07 +03:00
Volodymyr Babak
dd780d05df Merge remote-tracking branch 'origin/master' into feature/3.0-edge 2020-10-12 12:00:54 +03:00
Igor Kulikov
20c90c8a6f Improve device/device profile components, remove unnecessary transport configurations 2020-10-12 10:12:42 +03:00
Igor Kulikov
c7b57ca543 Add Device Wizard improvements 2020-10-09 17:19:51 +03:00
Vladyslav_Prykhodko
f2af7d0831 UI add device wizard 2020-09-29 15:47:17 +03:00
Vladyslav_Prykhodko
4f30678554 UI Moved device credentials for new component 2020-09-29 10:33:29 +03:00
Vladyslav_Prykhodko
6e492c78d1 Change device credentials value type 2020-09-10 15:37:25 +03:00
Vladyslav_Prykhodko
44b0a1100f Add new device credentials MQTT_BASIC 2020-09-10 15:14:37 +03:00
Igor Kulikov
83ea3f0836 Move from device type to device profile 2020-09-07 14:45:41 +03:00
Igor Kulikov
06573211b3 UI: Improve device profile/data 2020-09-03 17:43:53 +03:00
Igor Kulikov
1e87c72818 UI: Device profile autocomplete. Device profile data. 2020-09-03 14:14:46 +03:00
Igor Kulikov
868234f13d Tenant, device profiles UI 2020-08-26 15:00:11 +03:00
deaflynx
c242446a86 Fixed Edge entity view page 2020-06-22 12:37:36 +03:00
deaflynx
3a48b90d84 Fixed Edge devices page 2020-06-22 12:08:31 +03:00
Vladyslav_Prykhodko
7951080be0 Fix validators access token 2020-06-17 12:00:49 +03:00
Igor Kulikov
0289b0c1a2 UI: Get rid of 'multiple directives with 'exportAs' set to ngForm' 2020-04-27 10:39:18 +03:00
Vladyslav
e3e860fe3f
[3.0] Improvement code style (#2670) 
* Clear code and styles

* Clear import
 2020-04-27 09:27:14 +03:00