13621 Commits

Author SHA1 Message Date
dashevchenko
a0f46e2e24 fixed test 2023-03-15 18:37:42 +02:00
YevhenBondarenko
4cb2a304ee added getSystemInfo to the rest client 2023-03-15 17:06:05 +01:00
YevhenBondarenko
8ede0b2822 added ability to send system info throw ZK 2023-03-15 16:54:23 +01:00
Vladyslav_Prykhodko
ec11d4174b UI: Improvement rule notification alarm 2023-03-15 17:26:50 +02:00
Andrew Shvayka
444c05a76c
Merge pull request #8220 from smatvienko-tb/fix/tests-awaitForDeviceActorToReceiveSubscription
[3.5] Fix tests - await for device actor to receive subscription
2023-03-15 17:24:29 +02:00
Seraphym-Tuhai
40874d1ee3 fix test 'remove root rule chain from details view' 2023-03-15 17:19:22 +02:00
Vladyslav_Prykhodko
e69970b09f UI: Fix notification escalation table 2023-03-15 16:15:53 +02:00
Andrew Shvayka
c4e0586265
Merge pull request #7833 from smatvienko-tb/fix/logNode-isStandardForTBEL
[3.5] Custom TBEL script ignored fix for TbLogNode
2023-03-15 15:11:28 +02:00
nickAS21
8236e26e5c sparkplug: delete isSparkplug from transport proto 2023-03-15 14:53:03 +02:00
Vladyslav_Prykhodko
a39db0a1cf UI: Fix notification after change API 2023-03-15 13:28:31 +02:00
Artem Dzhereleiko
da4d0f93a3 UI: Fix horizontal stepper scroll 2023-03-15 13:26:19 +02:00
Seraphym-Tuhai
d9369feef0 refactoring 2023-03-15 13:23:10 +02:00
Serafym
bf7fc25957
Merge branch 'develop/3.5' into allure 2023-03-15 12:43:11 +02:00
ViacheslavKlimov
0d07d70818 Merge remote-tracking branch 'origin/feature/notification-system' into feature/notification-system 2023-03-15 12:32:43 +02:00
ViacheslavKlimov
ba8f27fa76 Notification system refactoring and improvements 2023-03-15 12:32:23 +02:00
Sergey Matvienko
13b59bf85f tests: awaitForDeviceActorToReceiveSubscription 2023-03-15 11:27:12 +01:00
Artem Dzhereleiko
8c64b76b14 UI: fix ui 2023-03-15 12:06:47 +02:00
Seraphym-Tuhai
5b620ffec3 add message in assertions of tests on redirect to documentation page 2023-03-14 18:15:52 +02:00
YevhenBondarenko
eea8f977b1 added tenant profile type to the entityTableMap (EntityQuery) 2023-03-14 16:44:31 +01:00
Andrew Shvayka
410042e1dc
Merge pull request #8185 from Seraphym-Tuhai/fix-ui-tests
[3.5] fix tests after update on UI
2023-03-14 17:42:54 +02:00
Andrew Shvayka
519afb47a8
Merge pull request #8217 from thingsboard/fix_bug_sparkplug_device_offline
[fix bug][3.4.5] failed_close_session_of_device
2023-03-14 17:39:45 +02:00
YevhenBondarenko
0be3c0b5bb removed countEntitiesByTypes and added ability to use Entity count query for sysadmin 2023-03-14 16:26:55 +01:00
Seraphym-Tuhai
bd0e768983 attached epic, feature and description to UI tests 2023-03-14 17:26:49 +02:00
Vladyslav_Prykhodko
88128640e9 Merge branch 'feature/notification-system' of github.com:thingsboard/thingsboard into feature/notification-system 2023-03-14 16:37:50 +02:00
Vladyslav_Prykhodko
c6230a48b8 UI: Fix notification after change API 2023-03-14 16:37:05 +02:00
nickAS21
2a6000d8ce fix bug close session of device: sessionMetaData.setOverwriteActivityTime(true); 2023-03-14 15:13:55 +02:00
YevhenBondarenko
76c92c9070 Merge branch 'feature/notification-system' of github.com:thingsboard/thingsboard into feature/home-page 2023-03-14 13:59:01 +01:00
Sergey Matvienko
175492d6a7 Merge remote-tracking branch 'ce/develop/3.5' into fix/logNode-isStandardForTBEL 2023-03-14 13:51:26 +01:00
Sergey Matvienko
b00f5d26ae log node refactored and tests improved 2023-03-14 13:48:34 +01:00
dashevchenko
210aae6a86 updated alarm comment deletion 2023-03-14 14:15:37 +02:00
Andrii Shvaika
d5177f5bbf Fix attribute/RPC subscription tests 2023-03-14 13:52:21 +02:00
Igor Kulikov
18d04cfd2a UI: Fix home active component changed raise condition 2023-03-14 13:37:09 +02:00
Andrew Shvayka
806aefdd0b
Merge pull request #8206 from zzzeebra/feature/test_dependency_refactor
[3.5] Feature/test dependency refactor
2023-03-14 13:05:19 +02:00
Seraphym-Tuhai
80c331705f small refactoring 2023-03-14 12:27:17 +02:00
Seraphym-Tuhai
12041ee6e2 return Assertions.fail() in catch block of custom waiters method 2023-03-14 12:20:18 +02:00
dashevchenko
d9b1e97bbb Merge remote-tracking branch 'upstream/develop/3.5' into alarmCommentFix 2023-03-14 12:19:57 +02:00
dashevchenko
2f59a74b65 added methods for RestClient, added system comment after comment deletion 2023-03-14 12:16:04 +02:00
Vladyslav_Prykhodko
10e34cc1ad Merge remote-tracking branch 'klimov/feature/notification-system' into feature/notification-system 2023-03-14 12:08:04 +02:00
Seraphym-Tuhai
16061ec4fc rename openLocalhost() method 2023-03-14 11:48:10 +02:00
Oleksandra Matviienko
c73fc3e0fc Merge remote-tracking branch 'upstream/develop/3.5' into feature/test_dependency_refactor
# Conflicts:
#	dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceServiceTest.java
#	dao/src/test/java/org/thingsboard/server/dao/service/BaseOtaPackageServiceTest.java
2023-03-14 10:34:46 +01:00
Andrew Shvayka
7229b7bfd8
Merge pull request #8203 from volodymyr-babak/edge-test-fix
sendUpdateSharedAttributeToCloudAndValidateDeviceSubscription - timeo…
2023-03-14 10:59:55 +02:00
Andrew Shvayka
167fb722fa
Merge pull request #8210 from zzzeebra/feature/assertJ_exception_assertions
[3.5] Rule ExpectedException refactored with AssertJ Exception Assertions
2023-03-14 10:58:01 +02:00
Oleksandra Matviienko
3841deae24 BaseTbResourceServiceTest, BaseDeviceServiceTest: Rule ExpectedException refactored with AssertJ Exception Assertions 2023-03-13 23:08:19 +01:00
Oleksandra Matviienko
5cb1b7d275 BaseOtaPackageServiceTest: Rule ExpectedException refactored with AssertJ Exception Assertions 2023-03-13 22:09:16 +01:00
YevhenBondarenko
7cd949edb2 implemented system info 2023-03-13 20:05:49 +01:00
Sergey Matvienko
7a0c58a18e revert entityDaoServicesMap = new HashMap<>() 2023-03-13 18:52:17 +01:00
Igor Kulikov
8c2046853d UI: Router tabs improvements 2023-03-13 16:38:14 +02:00
Andrii Shvaika
ab5769a252 Merge with develop/3.5 2023-03-13 15:52:06 +02:00
Andrew Shvayka
494296996e
Merge pull request #8200 from smatvienko-tb/fix/lwm2m-lifecycle-refactor
[3.5] lwm2m lifecycle refactor
2023-03-13 15:20:53 +02:00
Sergey Matvienko
2f207d5a26 Merge remote-tracking branch 'ce/develop/3.5' into fix/logNode-isStandardForTBEL 2023-03-13 13:06:08 +01:00