diff --git a/awx/ui/static/js/system-tracking/compare-facts/flat.js b/awx/ui/static/js/system-tracking/compare-facts/flat.js index 0bf6a1b66f..1995caa33f 100644 --- a/awx/ui/static/js/system-tracking/compare-facts/flat.js +++ b/awx/ui/static/js/system-tracking/compare-facts/flat.js @@ -41,13 +41,13 @@ export default function flatCompare(basisFacts, comparatorFacts, nameKey, compareKeys, factTemplate) { - return basisFacts.reduce(function(arr, basisFact) { + return basisFacts.facts.reduce(function(arr, basisFact) { var searcher = {}; searcher[nameKey] = basisFact[nameKey]; var basisTemplate, comparatorTemplate, slottedValues, basisValue, comparatorValue; - var matchingFact = _.where(comparatorFacts, searcher); + var matchingFact = _.where(comparatorFacts.facts, searcher); var diffs; if (_.isEmpty(matchingFact)) { diff --git a/awx/ui/static/js/system-tracking/system-tracking.controller.js b/awx/ui/static/js/system-tracking/system-tracking.controller.js index 1ec6e9f069..369dddaed1 100644 --- a/awx/ui/static/js/system-tracking/system-tracking.controller.js +++ b/awx/ui/static/js/system-tracking/system-tracking.controller.js @@ -83,10 +83,15 @@ function controller($rootScope, // Save the position of the data so we // don't lose it later - facts[0].position = 'left'; - facts[1].position = 'right'; + var wrappedFacts = + facts.map(function(facts, index) { + return { position: index === 0 ? 'left' : 'right', + isEmpty: _.isEmpty(facts), + facts: facts + }; + }); - var splitFacts = _.partition(facts, _.isEmpty); + var splitFacts = _.partition(facts, 'isEmpty'); var emptyScans = splitFacts[0]; var nonEmptyScans = splitFacts[1]; var result; @@ -109,12 +114,9 @@ function controller($rootScope, dateValue: emptyScans[0].position === 'left' ? $scope.leftDate.clone() : $scope.rightDate.clone() }); } else { - result = _.promise(facts); + result = _.promise(wrappedFacts); } - delete facts[0].position; - delete facts[1].position; - // all scans have data, rejoice! return result;