Fetch Edge Rule Chains with this.route.url.includes('edges')

ui-ngx/src/app/core/http/entity.service.ts

@@ -70,8 +70,8 @@ import {
 import { alarmFields } from '@shared/models/alarm.models';
 
 import { EdgeService } from "@core/http/edge.service";
-import { EdgeSearchQuery } from "@shared/models/edge.models";
 import { ruleChainType } from "@shared/models/rule-chain.models";
+import { Router } from "@angular/router";
 
 @Injectable({
   providedIn: 'root'
@@ -92,7 +92,8 @@ export class EntityService {
     private dashboardService: DashboardService,
     private entityRelationService: EntityRelationService,
     private attributeService: AttributeService,
-    private utils: UtilsService
+    private utils: UtilsService,
+    private route: Router
   ) { }
 
   private getEntityObservable(entityType: EntityType, entityId: string,
@@ -322,7 +323,11 @@ export class EntityService {
         break;
       case EntityType.RULE_CHAIN:
         pageLink.sortOrder.property = 'name';
-        entitiesObservable = this.ruleChainService.getRuleChains(pageLink, subType, config);
+        if (this.route.url.includes('edges')) {
+          entitiesObservable = this.ruleChainService.getRuleChains(pageLink, ruleChainType.edge, config);
+        } else {
+          entitiesObservable = this.ruleChainService.getRuleChains(pageLink, ruleChainType.core, config);
+        }
         break;
       case EntityType.DASHBOARD:
         pageLink.sortOrder.property = 'title';

ui-ngx/src/app/core/http/rule-chain.service.ts

@@ -298,10 +298,6 @@ export class RuleChainService {
       defaultHttpOptionsFromConfig(config) )
   }
 
-  public getEdgesRuleChains(pageLink: PageLink, config?: RequestConfig): Observable<PageData<RuleChain>> {
-    return this.getRuleChains(pageLink, ruleChainType.edge, config);
-  }
-
   public assignRuleChainToEdge(edgeId: string, ruleChainId: string, config?: RequestConfig): Observable<RuleChain> {
     return this.http.post<RuleChain>(`/api/edge/${edgeId}/ruleChain/${ruleChainId}`, null,
       defaultHttpOptionsFromConfig(config));

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

@@ -497,12 +497,15 @@ export class RuleChainsTableConfigResolver implements Resolve<EntityTableConfig<
     this.ruleChainService.getDefaultEdgeRuleChains().pipe(
       map(ruleChains =>
         ruleChains.map(ruleChain =>
-          defaultEdgeRuleChainIds.push(ruleChain.id.id)))
+          defaultEdgeRuleChainIds.push(ruleChain.id.id)
+        )
+      )
     ).subscribe();
     return this.ruleChainService.getRuleChains(pageLink, ruleChainType.edge).pipe(
       map((response) => {
         response.data.map(ruleChain =>
-          ruleChain.isDefault = defaultEdgeRuleChainIds.some(id => ruleChain.id.id.includes(id)));
+          ruleChain.isDefault = defaultEdgeRuleChainIds.some(id => ruleChain.id.id.includes(id))
+        );
        return response;
      })
    );