12939 Commits

Author SHA1 Message Date
ViacheslavKlimov
3f531d8235 Fix default notification configs creation; refactoring 2023-03-20 11:09:28 +02:00
Vladyslav_Prykhodko
14b05a57bd UI: Add new notification template/rule RULE_ENGINE_COMPONENT_LIFECYCLE_EVENT 2023-03-17 18:53:03 +02:00
ViacheslavKlimov
c34b6623ce Default notification configs; improvements 2023-03-17 17:17:34 +02:00
ViacheslavKlimov
e71da72360 Merge remote-tracking branch 'origin/feature/notification-system' into feature/notification-system 2023-03-17 17:09:15 +02:00
Vladyslav_Prykhodko
615e4a2865 UI: Add new notiifcation target 2023-03-17 16:35:34 +02:00
ViacheslavKlimov
6c40e2e40e Merge remote-tracking branch 'origin/feature/notification-system' into feature/notification-system 2023-03-17 15:04:00 +02:00
Vladyslav_Prykhodko
e6a56d0099 Merge remote-tracking branch 'klimov/feature/notification-system' into feature/notification-system 2023-03-17 14:41:09 +02:00
ViacheslavKlimov
3b8ed5fae6 Notification rules improvements; new platform users filters 2023-03-17 14:03:03 +02:00
Vladyslav_Prykhodko
ca2fac4b9d UI: Add new notification rule settings 2023-03-16 15:45:34 +02:00
ViacheslavKlimov
1e7c1a8a5a Merge branch 'develop/3.5' into feature/notification-system 2023-03-16 13:12:35 +02:00
ViacheslavKlimov
4a20adc62e Alarm related notification rules 2023-03-16 13:12:04 +02:00
Vladyslav_Prykhodko
c7dbf6be89 UI: Add new notification type alarm assignment 2023-03-15 18:39:06 +02: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
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
Vladyslav_Prykhodko
a39db0a1cf UI: Fix notification after change API 2023-03-15 13:28:31 +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
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
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
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
Andrii Shvaika
d5177f5bbf Fix attribute/RPC subscription tests 2023-03-14 13:52:21 +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
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
Sergey Matvienko
7a0c58a18e revert entityDaoServicesMap = new HashMap<>() 2023-03-13 18:52:17 +01: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
Seraphym-Tuhai
738fbda60b fix test on assigned dashboard 2023-03-13 12:16:15 +02:00
ViacheslavKlimov
361cc80a37 Merge remote-tracking branch 'origin/feature/notification-system' into feature/notification-system 2023-03-13 10:41:55 +02:00
ViacheslavKlimov
378ae47acb Alarm comments rule trigger config, NotificationInfo stateEntityId 2023-03-13 10:41:40 +02:00
OleksandraMatviienko
67b0d24910 the creation and deletion of a tenant moved to the AbstractServiceTest 2023-03-10 21:16:18 +01:00
Oleksandra Matviienko
9904c9ccc2 uncommon dependency refactoring in AbstractServiceTest in dao package 2023-03-10 18:00:16 +01:00
Vladyslav_Prykhodko
75e0f335b9 UI: Change notification style and send notification error 2023-03-10 18:23:25 +02:00
Sergey Matvienko
add0a342c4 EntityRegistryService: PostConstrust replaced with event listener ContextRefreshedEvent. This will guarantee that all EntityDaoService's beans created. Otherwise, the Bean may discover beans that not created yet (reproducible on dao tests) 2023-03-10 16:38:53 +01:00
Volodymyr Babak
0e01f1c74d sendUpdateSharedAttributeToCloudAndValidateDeviceSubscription - timeout increased for run test stable on slow (busy) environments 2023-03-10 15:53:47 +02:00