From 8d5957c2a9a3c722d5b73c53fd2cddd403f6c621 Mon Sep 17 00:00:00 2001 From: deaflynx Date: Wed, 10 Feb 2021 10:36:05 +0200 Subject: [PATCH] fetchRuleChains refactored with promise chaining --- ui/src/app/rulechain/rulechains.controller.js | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/ui/src/app/rulechain/rulechains.controller.js b/ui/src/app/rulechain/rulechains.controller.js index a255d84869..41056e4627 100644 --- a/ui/src/app/rulechain/rulechains.controller.js +++ b/ui/src/app/rulechain/rulechains.controller.js @@ -354,12 +354,11 @@ export default function RuleChainsController(ruleChainService, userService, impo return ruleChain; }); ruleChains.data = data; - deferred.resolve(ruleChains); }, function fail() { deferred.reject(); } - ) + ); return deferred.promise; } @@ -368,19 +367,13 @@ export default function RuleChainsController(ruleChainService, userService, impo return ruleChainService.getRuleChains(pageLink, null, type); } else if (vm.ruleChainsScope === 'edges') { var deferred = $q.defer(); - ruleChainService.getRuleChains(pageLink, null, type).then( - function success(ruleChains) { - mapRuleChainsWithDefaultEdges(ruleChains).then( - function success(response) { - deferred.resolve(response); - }, function fail() { - deferred.reject(); - } - ); - }, function fail() { - deferred.reject(); - } - ); + ruleChainService.getRuleChains(pageLink, null, type) + .then(function (ruleChains) { + return mapRuleChainsWithDefaultEdges(ruleChains); + }) + .then(function (ruleChains) { + deferred.resolve(ruleChains); + }); return deferred.promise; } }