From 70c6fe1d63d57d590a36d0e3502e9f04ce450ae2 Mon Sep 17 00:00:00 2001
From: Ilya Shakhat <ishakhat@mirantis.com>
Date: Fri, 31 Jul 2015 18:49:31 +0300
Subject: [PATCH] Do not re-index items in KPI report scripts

Use index returned ny Stackalytics API instead of re-indexing
items. Also remove unused filtering code that prevents implementation
from being simple.

Change-Id: Ifc2451d24134d1c05aa45165b2571bbc151c198f
---
 .../dashboard/static/js/stackalytics-kpi.js        | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/stackalytics/dashboard/static/js/stackalytics-kpi.js b/stackalytics/dashboard/static/js/stackalytics-kpi.js
index bb979a987..d066d08c5 100644
--- a/stackalytics/dashboard/static/js/stackalytics-kpi.js
+++ b/stackalytics/dashboard/static/js/stackalytics-kpi.js
@@ -32,24 +32,18 @@ function appendKpiBlock(container_id, kpi_block) {
     }
 }
 
-function processStats(container_id, url, query_options, item_id, metric, text_goal, comparator, data_filter) {
+function processStats(container_id, url, query_options, item_id, metric, text_goal, comparator) {
     $.ajax({
         url: makeURI(url, query_options),
         dataType: "jsonp",
         success: function (data) {
             data = data["stats"];
             var position = -1;
-            var index = 0;
             var sum = 0;
 
             for (var i = 0; i < data.length; i++) {
-                if (data_filter) {
-                    if (!data_filter(data[i])) {
-                        continue;
-                    }
-                }
                 sum += data[i][metric];
-                data[i].index = ++index;  // re-index
+                data[i].index = data[i]["index"];
                 if (data[i].id == item_id) {
                     position = i;
                 }
@@ -73,7 +67,7 @@ function processStats(container_id, url, query_options, item_id, metric, text_go
     });
 }
 
-function goalPositionInTop(container_id, query_options, item_type, item_id, position, text_goal, data_filter) {
+function goalPositionInTop(container_id, query_options, item_type, item_id, position, text_goal) {
     $(document).ready(function () {
         processStats(container_id, "/api/1.0/stats/" + item_type, query_options, item_id, "metric", text_goal,
             function (item, sum) {
@@ -84,7 +78,7 @@ function goalPositionInTop(container_id, query_options, item_type, item_id, posi
                         "Position " + item.index + " is worse than the goal position " + position,
                     value: item.index
                 }
-            }, data_filter);
+            });
     });
 }