8a6423737c
Merge pull request #15369 from thingsboard/fix/openapi-spec
Fix duplicate OpenAPI schemas for discriminated types
6 months ago
ac600848e6
Fix duplicate OpenAPI schemas for discriminated types
Springdoc creates duplicate schemas with an "Object" suffix when a
discriminated type is resolved through multiple paths. Remove identical
duplicates and replace inline oneOf in additionalProperties.items with
base type $ref for Map<K, List<PolymorphicType>> fields.
6 months ago
a2d9b0b602
Merge pull request #15365 from thingsboard/rc
Merge rc into master
6 months ago
c75238a55f
Merge remote-tracking branch 'origin/lts-4.3' into rc
6 months ago
7f0415d6d1
Merge remote-tracking branch 'origin/lts-4.2' into lts-4.3
6 months ago
5527382cbb
Merge pull request #15326 from thingsboard/feature/alarm-rules-api
Added dedicated alarm rules API
6 months ago
7ab9b931a7
Address PR review: restore private visibility, keep @Valid , fix test script dialog
- Restore private on TEST_SCRIPT_EXPRESSION in CalculatedFieldController
- Restore @Valid on deprecated alarms field in DeviceProfileData
- Remove broken type guard in getTestScriptDialog (AlarmRuleDefinition
DTO has no type field, causing the dialog to never open)
6 months ago
d4b8fa0312
Add type guard for alarm rule updates and defensive cast in fromCalculatedField
6 months ago
6628858e82
Address PR review: deduplicate checkReferencedEntities, fix return→noop, fix NPE, add expression validation
6 months ago
d44538bda0
Merge pull request #15361 from thingsboard/fix/rulechain-details-detach
Detach RuleChainDetailsEntity after findById to prevent stale version conflict
6 months ago
bbf47434fd
Simplify RuleChainDetailsDao interface and refactor save to doSave
6 months ago
fee9c28b24
Merge pull request #15343 from dashevchenko/openApiResponsesImpr
[Openapi] Response schema improvements
6 months ago
430588d991
updated Device.deviceProfileId openapi description, update AssetProfileInfo.id openapi implementation
6 months ago
572d2b5019
Merge remote-tracking branch 'refs/remotes/origin/feature/alarm-rules-api' into feature/alarm-rules-api
6 months ago
856b462fdf
Remove deprecated device profile alarm rules from API docs
6 months ago
def602902a
Detach RuleChainDetailsEntity after findById to prevent stale version conflict
RuleChainEntity and RuleChainDetailsEntity map to the same DB table.
When RuleChainDetailsEntity is loaded into the persistence context
(e.g. during isUpdateNeeded metadata comparison) and then the same row
is updated via RuleChainEntity (during saveRuleChain), the cached
RuleChainDetailsEntity becomes stale. Subsequent save via
RuleChainDetailsEntity fails with OptimisticLockException.
Fix: detach the entity immediately after loading in findById so it
does not linger in the persistence context.
6 months ago
13825bddea
Merge pull request #15330 from thingsboard/update-node-version
Bump Node.js version from 22.18.0 to 22.22.2
6 months ago
b234948d14
Fix AlarmRuleControllerTest deserialization failures
6 months ago
12f0094a64
deleted redundant required mode for some entity fields, added appropriate mediaType for some api request body
7 months ago
ff8152395e
added missed response schemas
7 months ago
1dc1b35ef1
Use specific CalculatedFieldAlarmRule types in alarm rules UI components
7 months ago
253f70d789
Refactor alarm rule controller to remove cross-controller dependency
Move test script execution logic from controllers to TbCalculatedFieldService,
eliminating the dependency of AlarmRuleController on CalculatedFieldController.
Simplify entity type filtering in getAlarmRules. Add AlarmRuleControllerTest
covering all endpoints.
7 months ago
c271aa5535
Merge pull request #15306 from mtsymbarov-del/feat/new-control-syntax
Migrated Angular templates to new control flow syntax
7 months ago
a9681b9a81
Bump Node.js version from 22.18.0 to 22.22.2
7 months ago
2eb04831e8
Merge pull request #15329 from thingsboard/master-rc-merge
Merge rc into master
7 months ago
e6771bb9d3
Add missing EdgeVersion entries V_4_2_2_2 and V_4_3_1_2
7 months ago
9c5a363f1e
Merge remote-tracking branch 'origin/rc' into master-rc-merge
# Conflicts:
# application/pom.xml
# common/actor/pom.xml
# common/cache/pom.xml
# common/cluster-api/pom.xml
# common/coap-server/pom.xml
# common/dao-api/pom.xml
# common/data/pom.xml
# common/discovery-api/pom.xml
# common/edge-api/pom.xml
# common/edge-api/src/main/proto/edge.proto
# common/edqs/pom.xml
# common/message/pom.xml
# common/pom.xml
# common/proto/pom.xml
# common/queue/pom.xml
# common/script/pom.xml
# common/script/remote-js-client/pom.xml
# common/script/script-api/pom.xml
# common/stats/pom.xml
# common/transport/coap/pom.xml
# common/transport/http/pom.xml
# common/transport/lwm2m/pom.xml
# common/transport/mqtt/pom.xml
# common/transport/pom.xml
# common/transport/snmp/pom.xml
# common/transport/transport-api/pom.xml
# common/util/pom.xml
# common/version-control/pom.xml
# dao/pom.xml
# edqs/pom.xml
# monitoring/pom.xml
# msa/black-box-tests/pom.xml
# msa/edqs/pom.xml
# msa/js-executor/package.json
# msa/js-executor/pom.xml
# msa/monitoring/pom.xml
# msa/pom.xml
# msa/tb-node/pom.xml
# msa/tb/pom.xml
# msa/transport/coap/pom.xml
# msa/transport/http/pom.xml
# msa/transport/lwm2m/pom.xml
# msa/transport/mqtt/pom.xml
# msa/transport/pom.xml
# msa/transport/snmp/pom.xml
# msa/vc-executor-docker/pom.xml
# msa/vc-executor/pom.xml
# msa/web-ui/package.json
# msa/web-ui/pom.xml
# netty-mqtt/pom.xml
# pom.xml
# rest-client/pom.xml
# rule-engine/pom.xml
# rule-engine/rule-engine-api/pom.xml
# rule-engine/rule-engine-components/pom.xml
# tools/pom.xml
# transport/coap/pom.xml
# transport/http/pom.xml
# transport/lwm2m/pom.xml
# transport/mqtt/pom.xml
# transport/pom.xml
# transport/snmp/pom.xml
# ui-ngx/package.json
# ui-ngx/pom.xml
7 months ago
00424373fe
Merge remote-tracking branch 'origin/lts-4.3' into rc
7 months ago
ee975cf386
Version set to 4.3.1.2-SNAPSHOT
7 months ago
1e8e9d5d68
Merge remote-tracking branch 'origin/lts-4.2' into lts-4.3
# Conflicts:
# application/pom.xml
# common/actor/pom.xml
# common/cache/pom.xml
# common/cluster-api/pom.xml
# common/coap-server/pom.xml
# common/dao-api/pom.xml
# common/data/pom.xml
# common/discovery-api/pom.xml
# common/edge-api/pom.xml
# common/edge-api/src/main/proto/edge.proto
# common/edqs/pom.xml
# common/message/pom.xml
# common/pom.xml
# common/proto/pom.xml
# common/queue/pom.xml
# common/script/pom.xml
# common/script/remote-js-client/pom.xml
# common/script/script-api/pom.xml
# common/stats/pom.xml
# common/transport/coap/pom.xml
# common/transport/http/pom.xml
# common/transport/lwm2m/pom.xml
# common/transport/mqtt/pom.xml
# common/transport/pom.xml
# common/transport/snmp/pom.xml
# common/transport/transport-api/pom.xml
# common/util/pom.xml
# common/version-control/pom.xml
# dao/pom.xml
# edqs/pom.xml
# monitoring/pom.xml
# msa/black-box-tests/pom.xml
# msa/edqs/pom.xml
# msa/js-executor/package.json
# msa/js-executor/pom.xml
# msa/monitoring/pom.xml
# msa/pom.xml
# msa/tb-node/pom.xml
# msa/tb/pom.xml
# msa/transport/coap/pom.xml
# msa/transport/http/pom.xml
# msa/transport/lwm2m/pom.xml
# msa/transport/mqtt/pom.xml
# msa/transport/pom.xml
# msa/transport/snmp/pom.xml
# msa/vc-executor-docker/pom.xml
# msa/vc-executor/pom.xml
# msa/web-ui/package.json
# msa/web-ui/pom.xml
# netty-mqtt/pom.xml
# pom.xml
# rest-client/pom.xml
# rule-engine/pom.xml
# rule-engine/rule-engine-api/pom.xml
# rule-engine/rule-engine-components/pom.xml
# tools/pom.xml
# transport/coap/pom.xml
# transport/http/pom.xml
# transport/lwm2m/pom.xml
# transport/mqtt/pom.xml
# transport/pom.xml
# transport/snmp/pom.xml
# ui-ngx/package.json
# ui-ngx/pom.xml
7 months ago
2a7eab3db5
Version set to 4.2.2.2-SNAPSHOT
7 months ago
6028288e32
Address PR review: add type guard, null checks, and input validation
7 months ago
d2b0cd049f
Use plural path for alarm rules by entity endpoint
7 months ago
8f8296e63b
if block fix
7 months ago
fba53d602e
Additional fixes
7 months ago
0ef8dd513d
Refactor alarm rule controller and fix swagger docs
7 months ago
5768bbefe1
Add separate alarm rules API
7 months ago
1fb979600a
Merge pull request #15324 from thingsboard/rc
Merge rc into master
7 months ago
11c2deffdc
Merge remote-tracking branch 'origin/lts-4.3' into rc
7 months ago
8f57542f81
Merge remote-tracking branch 'origin/lts-4.2' into lts-4.3
7 months ago
aad0b2adee
Merge pull request #15323 from vvlladd28/fix/vulnerability/30-03-26-lts-4.3
Fixed CVE-2026-33895, CVE-2026-33894, CVE-2026-33896, CVE-2026-33750, CVE-2026-4923, CVE-2026-33671
7 months ago
d805fa96e9
Merge pull request #15322 from vvlladd28/fix/vulnerability/30-03-26
Fixed CVE-2026-33895, CVE-2026-33894, CVE-2026-33896, CVE-2026-33750, CVE-2026-4923, CVE-2026-33671
7 months ago
d7853ec14f
Merge branch 'fix/vulnerability/30-03-26' into fix/vulnerability/30-03-26-lts-4.3
7 months ago
d5d86dcce5
Fixed CVE-2026-33671
7 months ago
e24f0cbaa5
Fixed CVE-2026-4923
7 months ago
0f6eab38fa
Fixed CVE-2026-33750
7 months ago
479141141e
Fixed CVE-2026-33895, CVE-2026-33894, CVE-2026-33896
7 months ago
5a514af0b8
Merge pull request #15316 from thingsboard/rc
Merge rc into master
7 months ago
d02ed15a31
Merge remote-tracking branch 'origin/lts-4.3' into rc
7 months ago
1cb4df5dd1
Merge remote-tracking branch 'origin/lts-4.2' into lts-4.3
7 months ago
Viacheslav Klimov
dashevchenko
Vladyslav_Prykhodko
Maksym Tsymbarov