12467 Commits

Author SHA1 Message Date
Andrii Shvaika
6c160f5930 Backward compatibility of the alarm save call 2023-02-28 11:37:47 +02:00
Andrew Shvayka
b93e34f79f
Merge pull request #7942 from rusikv/alarmCommentsUI
[3.5] UI: Alarm comments feature
2023-02-27 18:12:01 +02:00
rusikv
b1e33b4be0 Added assignee coulumn and comments action button to load demo and default alarm table widgets 2023-02-27 15:56:14 +02:00
rusikv
36b987cb5f Added ability to reassing alarm in alarm details dialog 2023-02-27 13:05:05 +02:00
rusikv
bae2cbf78a User or unassigned option is not displayed in available options if it is in use 2023-02-25 14:02:12 +02:00
rusikv
d5d2b043a2 Merge branch 'alarmCommentsUI' of github.com:rusikv/thingsboard into alarmCommentsUI 2023-02-24 16:23:16 +02:00
Andrii Shvaika
655a45cd3d Index improvement 2023-02-24 15:12:21 +02:00
Andrii Shvaika
c4a64a98d3 Fix soem tests and added upgrade script 2023-02-24 14:58:13 +02:00
Andrii Shvaika
38b2cf41c4 Fix soem tests and added upgrade script 2023-02-24 14:56:06 +02:00
Andrii Shvaika
69b5a5f425 Alarm Service refactoring 2023-02-23 19:03:04 +02:00
Andrii Shvaika
c922bbb989 Alarm service refactroing 2023-02-23 12:31:07 +02:00
Andrii Shvaika
1906dd44a3 Separate function to acknowledge alarm in one API call 2023-02-20 18:58:31 +02:00
Andrew Shvayka
3d97371ac5
Merge pull request #8105 from rusikv/alarm-assign-ui-dev
User search by email, first name and last name, disabling of alarm assignment setting
2023-02-20 17:12:16 +02:00
Andrii Shvaika
feb84ace48 Deprecation of the alarm status 2023-02-20 17:11:49 +02:00
rusikv
80ec4d85e2 Amendments due to backend changes, added ability to search users by name and email, added setting to disable reassignment of alarm to alarm widget 2023-02-20 14:13:41 +02:00
Andrew Shvayka
7f642f5415
Merge pull request #8102 from imbeacon/feature/alarm-assign 2023-02-18 18:42:01 +02:00
zbeacon
0427eeea9d Added check - does assigned information available 2023-02-18 13:07:32 +02:00
zbeacon
aa18dde0dc Refactored method name 2023-02-18 12:15:01 +02:00
Andrii Shvaika
c16dfd4407 Alarm query updates 2023-02-17 16:15:17 +02:00
Andrii Shvaika
d77e8f0cba Merge branch 'develop/3.5' of github.com:thingsboard/thingsboard into feature/alarm-assign 2023-02-17 12:44:36 +02:00
Andrew Shvayka
a1bc7533de
Merge pull request #8094 from dashevchenko/findUsersByQuery
Find users by query
2023-02-17 12:43:57 +02:00
Andrii Shvaika
b9f5e45fa0 Assignee query keys 2023-02-17 12:43:02 +02:00
Andrii Shvaika
f877fdef3f Alarm assignee as an object 2023-02-17 12:37:30 +02:00
Andrii Shvaika
8b6950031e Alarm asignee updates 2023-02-17 12:14:59 +02:00
dashevchenko
b261cb2ab1 renamed UserData to UserEmailInfo 2023-02-17 11:12:46 +02:00
dashevchenko
5dec719947 minor improvements to tests 2023-02-17 10:45:42 +02:00
dashevchenko
a111473a8f minor improvement 2023-02-17 00:12:11 +02:00
dashevchenko
bbbea0fc31 added tests, refactoring 2023-02-17 00:01:50 +02:00
Andrew Shvayka
33ecbb238b
Merge pull request #8097 from rusikv/alarm-assign-ui-dev
[WIP][3.5] UI: Alarm assignment
2023-02-16 18:48:15 +02:00
Andrii Shvaika
04eb8c989a Revert the AlarmInfo items. We will update the assignee via separate message 2023-02-16 18:47:51 +02:00
dashevchenko
a613e1dbc6 refactoring 2023-02-16 17:46:24 +02:00
rusikv
994971a5cd UI alarm assignment implementation 2023-02-16 14:51:24 +02:00
Andrii Shvaika
c392df2b8f Alarm Query to fetch onloy assigned alarms 2023-02-16 14:10:50 +02:00
zbeacon
dda627b63e Added getting NameLabelAndCustomerDetails to EntityService 2023-02-16 14:03:20 +02:00
dashevchenko
4470ae9a05 added tests 2023-02-16 13:45:01 +02:00
dashevchenko
39070ead53 refactoring 2023-02-16 12:23:22 +02:00
dashevchenko
559b741749 added REST method in UserController to get users by query 2023-02-16 00:37:10 +02:00
Andrii Shvaika
74fca60cd2 License header 2023-02-15 19:17:27 +02:00
Andrii Shvaika
3932993b58 Alarm assignment improvements 2023-02-15 19:14:11 +02:00
Andrew Shvayka
c4f5d43618
Merge pull request #8090 from imbeacon/feature-alarm-assigning-with-revert
Feature alarm assigning with revert
2023-02-15 19:13:24 +02:00
zbeacon
0eff914d69 Fix for test 2023-02-15 15:44:23 +02:00
Andrii Shvaika
75e9bb220d Rule node description update 2023-02-15 13:28:58 +02:00
zbeacon
9250af1904 Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning 2023-02-13 19:55:24 +02:00
Andrew Shvayka
42c7a59f27
Merge pull request #8068 from dashevchenko/ignoredUnstableTests
Ignored unstable integration tests
2023-02-13 13:57:52 +02:00
Andrii Shvaika
a62a28a77f Minor improvement 2023-02-13 13:53:56 +02:00
Andrew Shvayka
84957614eb
Merge pull request #8075 from dashevchenko/user-settings
[WIP] Added controller methods for saving/updating/deleting user settings in UserController
2023-02-13 13:19:07 +02:00
dashevchenko
f812e02920 added possibility to specify non existing elements 2023-02-12 23:40:12 +02:00
dashevchenko
f9e3b63594 unignored tests 2023-02-12 21:04:02 +02:00
dashevchenko
4a9c4cc614 updated test 2023-02-12 20:59:52 +02:00
dashevchenko
683dee03da refactoring 2023-02-12 20:52:18 +02:00