From 468b84d01cd1bce1787a6df61f1552b761329df3 Mon Sep 17 00:00:00 2001
From: Matej Baco <matejbacocom@gmail.com>
Date: Fri, 7 Jan 2022 11:15:20 +0100
Subject: [PATCH] Added sum to request, added format to realtime

---
 app/views/console/home/index.phtml | 4 ++--
 public/dist/scripts/app-all.js     | 3 ++-
 public/dist/scripts/app.js         | 3 ++-
 public/scripts/filters.js          | 7 +++++++
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/views/console/home/index.phtml b/app/views/console/home/index.phtml
index 02b9fe294..40ec64cea 100644
--- a/app/views/console/home/index.phtml
+++ b/app/views/console/home/index.phtml
@@ -97,13 +97,13 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled', true);
                         </div>
 
                         <div class="chart-metric">
-                            <div class="value margin-bottom-small"><span class="sum" data-ls-bind="{{usage.requests|statsGetLast|statsTotal}}">N/A</span></div>
+                            <div class="value margin-bottom-small"><span class="sum" data-ls-bind="{{usage.requests|statsGetSum|statsTotal}}">N/A</span></div>
                             <div class="unit margin-start-no margin-bottom-small">Requests</div>
                         </div>
                     </div>
                     <div class="col span-3">
                         <div class="value margin-bottom-small">
-                            <span class="sum" data-ls-bind="{{realtime.current|accessProject}}" data-default="0">0</span>
+                            <span class="sum" data-ls-bind="{{realtime.current|accessProject|statsTotal}}" data-default="0">0</span>
                         </div>
                         <div class="unit margin-start-no margin-bottom-small">Connections</div>
                         <div class="chart-bar margin-top-small margin-bottom-small" data-ls-attrs="data-history={{realtime.history|accessProject}}" data-forms-chart-bars="{{realtime.history|accessProject}}"></div>
diff --git a/public/dist/scripts/app-all.js b/public/dist/scripts/app-all.js
index 9fb064cbd..3f687fb85 100644
--- a/public/dist/scripts/app-all.js
+++ b/public/dist/scripts/app-all.js
@@ -3647,7 +3647,8 @@ let units=["kB","MB","GB","TB","PB","EB","ZB","YB"];let u=-1;do{$value/=thresh;+
 let thresh=1000;if(Math.abs($value)<thresh){return'B';}
 let units=["kB","MB","GB","TB","PB","EB","ZB","YB"];let u=-1;do{$value/=thresh;++u;}while(Math.abs($value)>=thresh&&u<units.length-1);return units[u];}).add("statsTotal",function($value){if(!$value){return 0;}
 $value=abbreviate($value,0,false,false);return $value??"N/A";}).add("statsGetLast",function($value){if(!$value||$value.length<1){return 0;}
-return $value[$value.length-1].value;}).add("isEmpty",function($value){return(!!$value);}).add("isEmptyObject",function($value){return((Object.keys($value).length===0&&$value.constructor===Object)||$value.length===0)}).add("activeDomainsCount",function($value){let result=[];if(Array.isArray($value)){result=$value.filter(function(node){return(node.verification&&node.certificateId);});}
+return $value[$value.length-1].value;}).add("statsGetSum",function($value){if(!$value||$value.length<1){return 0;}
+return $value.reduce(function(value,object){return value+object.value},0);}).add("isEmpty",function($value){return(!!$value);}).add("isEmptyObject",function($value){return((Object.keys($value).length===0&&$value.constructor===Object)||$value.length===0)}).add("activeDomainsCount",function($value){let result=[];if(Array.isArray($value)){result=$value.filter(function(node){return(node.verification&&node.certificateId);});}
 return result.length;}).add("documentAction",function(container){let collection=container.get('project-collection');let document=container.get('project-document');if(collection&&document&&!document.$id){return'database.createDocument';}
 return'database.updateDocument';}).add("documentSuccess",function(container){let document=container.get('project-document');if(document&&!document.$id){return',redirect';}
 return'';}).add("firstElement",function($value){if($value&&$value[0]){return $value[0];}
diff --git a/public/dist/scripts/app.js b/public/dist/scripts/app.js
index afbe025bd..e1f2c232a 100644
--- a/public/dist/scripts/app.js
+++ b/public/dist/scripts/app.js
@@ -668,7 +668,8 @@ let units=["kB","MB","GB","TB","PB","EB","ZB","YB"];let u=-1;do{$value/=thresh;+
 let thresh=1000;if(Math.abs($value)<thresh){return'B';}
 let units=["kB","MB","GB","TB","PB","EB","ZB","YB"];let u=-1;do{$value/=thresh;++u;}while(Math.abs($value)>=thresh&&u<units.length-1);return units[u];}).add("statsTotal",function($value){if(!$value){return 0;}
 $value=abbreviate($value,0,false,false);return $value??"N/A";}).add("statsGetLast",function($value){if(!$value||$value.length<1){return 0;}
-return $value[$value.length-1].value;}).add("isEmpty",function($value){return(!!$value);}).add("isEmptyObject",function($value){return((Object.keys($value).length===0&&$value.constructor===Object)||$value.length===0)}).add("activeDomainsCount",function($value){let result=[];if(Array.isArray($value)){result=$value.filter(function(node){return(node.verification&&node.certificateId);});}
+return $value[$value.length-1].value;}).add("statsGetSum",function($value){if(!$value||$value.length<1){return 0;}
+return $value.reduce(function(value,object){return value+object.value},0);}).add("isEmpty",function($value){return(!!$value);}).add("isEmptyObject",function($value){return((Object.keys($value).length===0&&$value.constructor===Object)||$value.length===0)}).add("activeDomainsCount",function($value){let result=[];if(Array.isArray($value)){result=$value.filter(function(node){return(node.verification&&node.certificateId);});}
 return result.length;}).add("documentAction",function(container){let collection=container.get('project-collection');let document=container.get('project-document');if(collection&&document&&!document.$id){return'database.createDocument';}
 return'database.updateDocument';}).add("documentSuccess",function(container){let document=container.get('project-document');if(document&&!document.$id){return',redirect';}
 return'';}).add("firstElement",function($value){if($value&&$value[0]){return $value[0];}
diff --git a/public/scripts/filters.js b/public/scripts/filters.js
index ee99586e7..0e776ff09 100644
--- a/public/scripts/filters.js
+++ b/public/scripts/filters.js
@@ -183,6 +183,13 @@ window.ls.filter
 
     return $value[$value.length - 1].value;
   })
+  .add("statsGetSum", function ($value) {
+    if (!$value || $value.length < 1) {
+      return 0;
+    }
+
+    return $value.reduce(function(value, object) { return value + object.value }, 0);
+  })
   .add("isEmpty", function ($value) {
     return (!!$value);
   })