Update Number display to clientside formatting for stats pages. (#4602)

* Update Number display to clientside formatting. * Switch a test to number comparison. * Simplify html generation from js.
NuGet · Aug 30, 2017 · b0aff95 · b0aff95
1 parent 450fc6c
commit b0aff95
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 12 deletions.
diff --git a/src/NuGetGallery/Controllers/StatisticsController.cs b/src/NuGetGallery/Controllers/StatisticsController.cs
@@ -298,7 +298,7 @@ private void ProcessReport(StatisticsPackagesReport report, string[] groupby, st
 
             if (groupby != null)
             {
-                Tuple<StatisticsPivot.TableEntry[][], string> result = StatisticsPivot.GroupBy(report.Facts, pivot);
+                Tuple<StatisticsPivot.TableEntry[][], int> result = StatisticsPivot.GroupBy(report.Facts, pivot);
 
                 if (id != null)
                 {
@@ -355,7 +355,7 @@ private void ProcessReport(StatisticsPackagesReport report, string[] groupby, st
                 }
 
                 report.Table = null;
-                report.Total = report.Facts.Sum(fact => fact.Amount).ToNuGetNumberString();
+                report.Total = report.Facts.Sum(fact => fact.Amount);
             }
         }
 

diff --git a/src/NuGetGallery/Scripts/gallery/stats-dimensions.js b/src/NuGetGallery/Scripts/gallery/stats-dimensions.js
@@ -122,12 +122,14 @@ var setupHiddenRows = function (data) {
                 if (item.Uri != null) {
                     content = $(document.createElement("a"));
                     content.attr("href", item.Uri);
+                    content.text(item.Data);
                 } else {
+                    var textValue = item.IsNumeric ? parseInt(item.Data).toLocaleString() : item.Data;
                     content = $(document.createElement("span"));
-                    content.attr("aria-label", item.Data);
+                    content.attr("aria-label", textValue);
+                    content.text(textValue);
                 }
 
-                content.text(item.Data);
                 tempTd.append(content);
                 tdArr.push(tempTd);
             }

diff --git a/src/NuGetGallery/ViewModels/StatisticsPackagesReport.cs b/src/NuGetGallery/ViewModels/StatisticsPackagesReport.cs
@@ -10,7 +10,7 @@ namespace NuGetGallery
     public class StatisticsPackagesReport
     {
         public IList<StatisticsPackagesItemViewModel> Rows { get; private set; }
-        public string Total { get; set; }
+        public int Total { get; set; }
 
         public IList<StatisticsDimension> Dimensions { get; private set; }
         public IList<StatisticsFact> Facts { get; set; }
@@ -24,7 +24,7 @@ public class StatisticsPackagesReport
 
         public StatisticsPackagesReport()
         {
-            Total = String.Empty;
+            Total = 0;
             Id = String.Empty;
             Columns = Enumerable.Empty<string>();
             Facts = new List<StatisticsFact>();

diff --git a/src/NuGetGallery/ViewModels/StatisticsPivot.cs b/src/NuGetGallery/ViewModels/StatisticsPivot.cs
@@ -14,7 +14,7 @@ namespace NuGetGallery
 {
     public class StatisticsPivot
     {
-        public static Tuple<TableEntry[][], string> GroupBy(IList<StatisticsFact> facts, string[] pivot)
+        public static Tuple<TableEntry[][], int> GroupBy(IList<StatisticsFact> facts, string[] pivot)
         {
             // Firstly take the facts and the pivot vector and produce a tree structure
 
@@ -36,7 +36,7 @@ public static Tuple<TableEntry[][], string> GroupBy(IList<StatisticsFact> facts,
 
             PopulateTable(level, table);
 
-            return new Tuple<TableEntry[][], string>(table, level.Total.ToNuGetNumberString());
+            return new Tuple<TableEntry[][], int>(table, level.Total);
         }
 
         private static void AddOrderedNext(Level level)
@@ -61,7 +61,7 @@ private static void InnerPopulateTable(Level level, TableEntry[][] table, ref in
                 if (item.Value.Next == null)
                 {
                     table[row][col] = new TableEntry { Data = item.Key };
-                    table[row][col + 1] = new TableEntry { Data = item.Value.Amount.ToNuGetNumberString(), IsNumeric = true };
+                    table[row][col + 1] = new TableEntry { Data = item.Value.Amount.ToString(), IsNumeric = true };
                     row++;
                 }
                 else

diff --git a/src/NuGetGallery/Views/Statistics/_PivotTable.cshtml b/src/NuGetGallery/Views/Statistics/_PivotTable.cshtml
@@ -10,8 +10,13 @@
         <a data-bind="attr: { href: Uri }, text: Data"></a>
         <!-- /ko -->
         <!-- ko ifnot: Uri -->
+        <!-- ko if: IsNumeric -->
+        <span data-bind="attr: { 'aria-label': Data }, text: parseInt(Data).toLocaleString()" tabindex="0"></span>
+        <!-- /ko -->
+        <!-- ko ifnot: IsNumeric -->
         <span data-bind="attr: { 'aria-label': Data }, text: Data" tabindex="0"></span>
         <!-- /ko -->
+        <!-- /ko -->
     </td>
     <!-- /ko -->
 </script>

diff --git a/tests/NuGetGallery.Facts/Controllers/StatisticsControllerFacts.cs b/tests/NuGetGallery.Facts/Controllers/StatisticsControllerFacts.cs
@@ -434,7 +434,7 @@ public async Task StatisticsHomePage_Per_Package_ValidateReportStructureAndAvail
             }
 
             Assert.Equal(603, sum);
-            Assert.Equal("603", actualReport.Total);
+            Assert.Equal(603, actualReport.Total);
             Assert.True(actualReport.LastUpdatedUtc.HasValue);
             Assert.Equal(updatedUtc, actualReport.LastUpdatedUtc.Value);
         }
@@ -518,7 +518,7 @@ public async Task StatisticsHomePage_Per_Package_ValidateReportStructureAndAvail
             }
 
             Assert.Equal(603, sum);
-            Assert.Equal("603", actualReport.Total);
+            Assert.Equal(603, actualReport.Total);
             Assert.True(actualReport.LastUpdatedUtc.HasValue);
             Assert.Equal(updatedUtc, actualReport.LastUpdatedUtc.Value);
             Assert.DoesNotContain(invalidDimension, actualReport.Columns);
@@ -620,7 +620,7 @@ public async Task Statistics_By_Client_Operation_ValidateReportStructureAndAvail
             }
 
             Assert.Equal(502, sum);
-            Assert.Equal("502", actualReport.Total);
+            Assert.Equal(502, actualReport.Total);
             Assert.True(actualReport.LastUpdatedUtc.HasValue);
             Assert.Equal(updatedUtc, actualReport.LastUpdatedUtc.Value);
         }