Merge pull request #41 from deaflynx/feature/edge

Fix for fetch edge rule chains and deleted unused code

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;
     }
 

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,

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;