Browse Source

Set new URL for ruleChains

pull/7911/head
Vladyslav_Prykhodko 4 years ago
parent
commit
b8c1085c62
  1. 2
      dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationSettingsService.java
  2. 2
      ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.component.ts
  3. 2
      ui-ngx/src/app/modules/home/pages/rulechain/rulechains-table-config.resolver.ts

2
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, NotificationTemplate ruleEngineComponentLifecycleFailureNotificationTemplate = createTemplate(tenantId, "Rule chain/node lifecycle failure notification", NotificationType.RULE_ENGINE_COMPONENT_LIFECYCLE_EVENT,
"${componentType} '${componentName}' failed to ${action}", "${componentType} '${componentName}' failed to ${action}",
"Rule chain '${ruleChainName}' - ${action} failure:<br/>${error}", "Rule chain '${ruleChainName}' - ${action} failure:<br/>${error}",
"warning", "Go to Rule chain", "/features/ruleChains/${ruleChainId}"); "warning", "Go to Rule chain", "/ruleChains/${ruleChainId}");
RuleEngineComponentLifecycleEventNotificationRuleTriggerConfig ruleEngineComponentLifecycleEventRuleTriggerConfig = new RuleEngineComponentLifecycleEventNotificationRuleTriggerConfig(); RuleEngineComponentLifecycleEventNotificationRuleTriggerConfig ruleEngineComponentLifecycleEventRuleTriggerConfig = new RuleEngineComponentLifecycleEventNotificationRuleTriggerConfig();
ruleEngineComponentLifecycleEventRuleTriggerConfig.setRuleChains(null); ruleEngineComponentLifecycleEventRuleTriggerConfig.setRuleChains(null);
ruleEngineComponentLifecycleEventRuleTriggerConfig.setRuleChainEvents(Set.of(ComponentLifecycleEvent.STARTED, ComponentLifecycleEvent.UPDATED, ComponentLifecycleEvent.STOPPED)); ruleEngineComponentLifecycleEventRuleTriggerConfig.setRuleChainEvents(Set.of(ComponentLifecycleEvent.STARTED, ComponentLifecycleEvent.UPDATED, ComponentLifecycleEvent.STOPPED));

2
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.isDirtyValue = false;
this.isImport = false; this.isImport = false;
if (this.ruleChainType !== RuleChainType.EDGE) { if (this.ruleChainType !== RuleChainType.EDGE) {
this.router.navigateByUrl(`features/ruleChains/${this.ruleChain.id.id}`); this.router.navigateByUrl(`ruleChains/${this.ruleChain.id.id}`);
} else { } else {
this.router.navigateByUrl(`edgeManagement/ruleChains/${this.ruleChain.id.id}`); this.router.navigateByUrl(`edgeManagement/ruleChains/${this.ruleChain.id.id}`);
} }

2
ui-ngx/src/app/modules/home/pages/rulechain/rulechains-table-config.resolver.ts

@ -301,7 +301,7 @@ export class RuleChainsTableConfigResolver implements Resolve<EntityTableConfig<
if (this.config.componentsData.ruleChainScope === 'edges') { if (this.config.componentsData.ruleChainScope === 'edges') {
this.router.navigateByUrl(`edgeManagement/ruleChains/ruleChain/import`); this.router.navigateByUrl(`edgeManagement/ruleChains/ruleChain/import`);
} else { } else {
this.router.navigateByUrl(`features/ruleChains/ruleChain/import`); this.router.navigateByUrl(`ruleChains/ruleChain/import`);
} }
} }
}); });

Loading…
Cancel
Save