From b8c1085c6255c13da43645602e2a55afc5221778 Mon Sep 17 00:00:00 2001 From: Vladyslav_Prykhodko Date: Fri, 24 Mar 2023 13:43:27 +0200 Subject: [PATCH] Set new URL for ruleChains --- .../dao/notification/DefaultNotificationSettingsService.java | 2 +- .../modules/home/pages/rulechain/rulechain-page.component.ts | 2 +- .../home/pages/rulechain/rulechains-table-config.resolver.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationSettingsService.java b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationSettingsService.java index 582e3fb981..46a7397351 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationSettingsService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationSettingsService.java @@ -205,7 +205,7 @@ public class DefaultNotificationSettingsService implements NotificationSettingsS NotificationTemplate ruleEngineComponentLifecycleFailureNotificationTemplate = createTemplate(tenantId, "Rule chain/node lifecycle failure notification", NotificationType.RULE_ENGINE_COMPONENT_LIFECYCLE_EVENT, "${componentType} '${componentName}' failed to ${action}", "Rule chain '${ruleChainName}' - ${action} failure:
${error}", - "warning", "Go to Rule chain", "/features/ruleChains/${ruleChainId}"); + "warning", "Go to Rule chain", "/ruleChains/${ruleChainId}"); RuleEngineComponentLifecycleEventNotificationRuleTriggerConfig ruleEngineComponentLifecycleEventRuleTriggerConfig = new RuleEngineComponentLifecycleEventNotificationRuleTriggerConfig(); ruleEngineComponentLifecycleEventRuleTriggerConfig.setRuleChains(null); ruleEngineComponentLifecycleEventRuleTriggerConfig.setRuleChainEvents(Set.of(ComponentLifecycleEvent.STARTED, ComponentLifecycleEvent.UPDATED, ComponentLifecycleEvent.STOPPED)); diff --git a/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.component.ts b/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.component.ts index 5efc23a85b..ab553793fc 100644 --- a/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.component.ts +++ b/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.component.ts @@ -1456,7 +1456,7 @@ export class RuleChainPageComponent extends PageComponent this.isDirtyValue = false; this.isImport = false; if (this.ruleChainType !== RuleChainType.EDGE) { - this.router.navigateByUrl(`features/ruleChains/${this.ruleChain.id.id}`); + this.router.navigateByUrl(`ruleChains/${this.ruleChain.id.id}`); } else { this.router.navigateByUrl(`edgeManagement/ruleChains/${this.ruleChain.id.id}`); } diff --git a/ui-ngx/src/app/modules/home/pages/rulechain/rulechains-table-config.resolver.ts b/ui-ngx/src/app/modules/home/pages/rulechain/rulechains-table-config.resolver.ts index d44fc67764..d6bde70f82 100644 --- a/ui-ngx/src/app/modules/home/pages/rulechain/rulechains-table-config.resolver.ts +++ b/ui-ngx/src/app/modules/home/pages/rulechain/rulechains-table-config.resolver.ts @@ -301,7 +301,7 @@ export class RuleChainsTableConfigResolver implements Resolve