From b46f29f1d2c0aedd27718c5fdcf382b1fb4a8b68 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Fri, 24 Apr 2026 13:07:35 +0300 Subject: [PATCH] feat(solutions): use edge-aware page link for installed rule chains Add CreatedRuleChainInfo extending CreatedEntityInfo that overrides getEntityPageLink to produce /edgeManagement/ruleChains/ for EDGE rule chains and /ruleChains/ otherwise. SolutionInstallContext now registers rule chains with this type-aware info. --- .../solutions/data/CreatedRuleChainInfo.java | 40 +++++++++++++++++++ .../data/SolutionInstallContext.java | 2 +- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/CreatedRuleChainInfo.java diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/CreatedRuleChainInfo.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/CreatedRuleChainInfo.java new file mode 100644 index 0000000000..9a785242b2 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/CreatedRuleChainInfo.java @@ -0,0 +1,40 @@ +/** + * Copyright © 2016-2026 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.service.solutions.data; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.thingsboard.server.common.data.EntityType; +import org.thingsboard.server.common.data.rule.RuleChainType; + +import java.util.UUID; + +@Data +@EqualsAndHashCode(callSuper = true) +public class CreatedRuleChainInfo extends CreatedEntityInfo { + + private RuleChainType ruleChainType; + + public CreatedRuleChainInfo(String name, RuleChainType ruleChainType, String owner) { + super(name, EntityType.RULE_CHAIN, owner); + this.ruleChainType = ruleChainType; + } + + @Override + public String getEntityPageLink(UUID id) { + return ruleChainType == RuleChainType.EDGE ? "/edgeManagement/ruleChains/" + id : "/ruleChains/" + id; + } +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/SolutionInstallContext.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/SolutionInstallContext.java index 9c4afc8b8c..e852f569a9 100644 --- a/application/src/main/java/org/thingsboard/server/service/solutions/data/SolutionInstallContext.java +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/SolutionInstallContext.java @@ -105,7 +105,7 @@ public class SolutionInstallContext { public void register(String referenceId, RuleChain ruleChain) { register(referenceId, ruleChain.getId()); - createdEntities.put(ruleChain.getUuidId(), new CreatedEntityInfo(ruleChain.getName(), EntityType.RULE_CHAIN, "Tenant")); + createdEntities.put(ruleChain.getUuidId(), new CreatedRuleChainInfo(ruleChain.getName(), ruleChain.getType(), "Tenant")); } public void register(DeviceProfileDefinition definition, DeviceProfile deviceProfile) {