From cc645a938e9a44f582a82f699967d1deed695d66 Mon Sep 17 00:00:00 2001
From: deaflynx <artemio.babak@gmail.com>
Date: Thu, 13 Aug 2020 16:53:10 +0300
Subject: [PATCH 1/2] Code cleaning from PE comparison of master vs.
 develop/2.5.3

---
 ui/src/app/api/dashboard.service.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/ui/src/app/api/dashboard.service.js b/ui/src/app/api/dashboard.service.js
index 7280c9d06d..9d59e24ebc 100644
--- a/ui/src/app/api/dashboard.service.js
+++ b/ui/src/app/api/dashboard.service.js
@@ -284,13 +284,6 @@ function DashboardService($rootScope, $http, $q, $location, $filter) {
             }
             dashboard.assignedCustomersText = assignedCustomersTitles.join(', ');
         }
-        dashboard.assignedEdgesIds = [];
-        if (dashboard.assignedEdges && dashboard.assignedEdges.length) {
-            for (var j = 0; j < dashboard.assignedEdges.length; j++) {
-                var assignedEdge = dashboard.assignedEdges[j];
-                dashboard.assignedEdgesIds.push(assignedEdge.edgeId.id);
-            }
-        }
         return dashboard;
     }
 
@@ -298,7 +291,6 @@ function DashboardService($rootScope, $http, $q, $location, $filter) {
         delete dashboard.publicCustomerId;
         delete dashboard.assignedCustomersText;
         delete dashboard.assignedCustomersIds;
-        delete dashboard.assignedEdgesIds;
         return dashboard;
     }
 

From 4ac8c0675b61256926f4e2cad49378a6e52467ea Mon Sep 17 00:00:00 2001
From: deaflynx <artemio.babak@gmail.com>
Date: Thu, 27 Aug 2020 08:46:32 +0300
Subject: [PATCH 2/2] Fixed fetch edge rule chains

---
 ui/src/app/edge/edge.controller.js                         | 2 +-
 ui/src/app/edge/set-root-rule-chain-to-edges.controller.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/src/app/edge/edge.controller.js b/ui/src/app/edge/edge.controller.js
index 7e57fce6a6..94f076c1af 100644
--- a/ui/src/app/edge/edge.controller.js
+++ b/ui/src/app/edge/edge.controller.js
@@ -552,7 +552,7 @@ export function EdgeController($rootScope, userService, edgeService, customerSer
             $event.stopPropagation();
         }
         var pageSize = 10;
-        ruleChainService.getRuleChains({limit: pageSize, textSearch: ''}).then(
+        ruleChainService.getEdgesRuleChains({limit: pageSize, textSearch: ''}).then(
             function success(_ruleChains) {
                 var ruleChains = {
                     pageSize: pageSize,
diff --git a/ui/src/app/edge/set-root-rule-chain-to-edges.controller.js b/ui/src/app/edge/set-root-rule-chain-to-edges.controller.js
index a474fde6a7..a8d134b20e 100644
--- a/ui/src/app/edge/set-root-rule-chain-to-edges.controller.js
+++ b/ui/src/app/edge/set-root-rule-chain-to-edges.controller.js
@@ -53,7 +53,7 @@ export default function SetRootRuleChainToEdgesController(ruleChainService, edge
         fetchMoreItems_: function () {
             if (vm.ruleChains.hasNext && !vm.ruleChains.pending) {
                 vm.ruleChains.pending = true;
-                ruleChainService.getRuleChains(vm.ruleChains.nextPageLink).then(
+                ruleChainService.getEdgesRuleChains(vm.ruleChains.nextPageLink).then(
                     function success(ruleChains) {
                         vm.ruleChains.data = vm.ruleChains.data.concat(ruleChains.data);
                         vm.ruleChains.nextPageLink = ruleChains.nextPageLink;