From 317cf9e4ce6a0ecf7b68a59b64723316055ff125 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Thu, 19 Jan 2012 22:10:18 +0000
Subject: [PATCH] [MRM-1574] display repo stats

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1233596 13f79535-47bb-0310-9956-ffa450edef68
---
 .../model/ArchivaRepositoryStatistics.java    |  12 +++
 .../DefaultManagedRepositoriesService.java    |   3 +-
 .../images/utilities-system-monitor.png       | Bin 0 -> 611 bytes
 .../main/webapp/js/archiva/repositories.js    |  90 +++++++++++++++++-
 .../js/archiva/templates/repositories.html    |  21 +++-
 5 files changed, 120 insertions(+), 6 deletions(-)
 create mode 100644 archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/utilities-system-monitor.png

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ArchivaRepositoryStatistics.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ArchivaRepositoryStatistics.java
index 7b55e64ff..92c2fb00d 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ArchivaRepositoryStatistics.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ArchivaRepositoryStatistics.java
@@ -44,6 +44,8 @@ public class ArchivaRepositoryStatistics
 
     private long newFileCount;
 
+    private long duration;
+
     public ArchivaRepositoryStatistics()
     {
         // no op
@@ -129,6 +131,16 @@ public class ArchivaRepositoryStatistics
         this.newFileCount = newFileCount;
     }
 
+    public void setDuration( long duration )
+    {
+        this.duration = duration;
+    }
+
+    public long getDuration()
+    {
+        return duration;
+    }
+
     @Override
     public String toString()
     {
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java
index 87f589179..4860a3c32 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java
@@ -181,7 +181,8 @@ public class DefaultManagedRepositoriesService
             {
                 ArchivaRepositoryStatistics archivaRepositoryStatistics =
                     new BeanReplicator().replicateBean( stats, ArchivaRepositoryStatistics.class );
-
+                archivaRepositoryStatistics.setDuration( archivaRepositoryStatistics.getScanEndTime().getTime()
+                                                             - archivaRepositoryStatistics.getScanStartTime().getTime() );
                 return archivaRepositoryStatistics;
             }
 
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/utilities-system-monitor.png b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/utilities-system-monitor.png
new file mode 100644
index 0000000000000000000000000000000000000000..8734e777a1799c9a9d0293d692b3549f2506f418
GIT binary patch
literal 611
zcmV-p0-XJcP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)d~|4Iy9fcBxe8s0q{vg
zK~y-)rIS5q6hRn<pWT_A-MzvTA`;O{VGKghNCE*NU}1A$5hQA~5mH!*!A21eE`_A9
zvN3{{R)&*Eh*+FLDjPvWJxR0)f(P-=Gzx-uJAW22F(D^PeBoufXP)8vCMcDP4}f!Q
zBi{RIN~NN2wVJ-!YWly$Ip;H-t+!MvdbviMxI0g|QvIi!M+=9!aH0nQ2@pk!a;1vu
z03~CH6labuLl83irVE@0JQ#~MhH|CK_~||X!i{7Vr$lMW*`YcYhX)Z#k|qghE=46N
zBA1XP2>{lZ-v(<DDn=wR{XKgKa|Qal8>r|Lj~5OgyaOZ2LJfeicB?^@C`JZr?Az7B
z%cTZg`BR8Uk|Z%vq7ZR}iq)SDP7c%v1Bu8L;M*)gFoKYRtH+<SP~VNS4(lvaZv%{N
z1GqeToq&LkwHe+oe<i;c4&`@pq|-3iH;(rJo~iq{+5>LS+(amWlo3J-J~!s*-9O61
z*EP)dJ6L0}#{PPO-3oZ}uA3-Ts8|uj3L!smu=5$dStASro-Xy${E-2R?G0dc-WEsb
z9nLu}J?g;u9cXRPR%3Ci1{(odXN(OGaBuF_CfwpYz>Bt<xbkIXv%!_~LtGm>hSnKb
xD?=NN)@$d68cm~7Ux!IxdUEo{_J8C5<|lAN08`nh^nm~X002ovPDHLkV1lX$`TPI?

literal 0
HcmV?d00001

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
index fd7c0a1f4..550399286 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
@@ -92,6 +92,37 @@ $(function() {
 
   }
 
+  ArchivaRepositoryStatistics=function(scanEndTime,scanStartTime,totalArtifactCount,totalArtifactFileSize,totalFileCount,
+                                       totalGroupCount,totalProjectCount,newFileCount,duration,managedRepository){
+    //private Date scanEndTime;
+    this.scanEndTime = ko.observable(scanEndTime);
+
+    //private Date scanStartTime;
+    this.scanStartTime = ko.observable(scanStartTime);
+
+    //private long totalArtifactCount;
+    this.totalArtifactCount = ko.observable(totalArtifactCount);
+
+    //private long totalArtifactFileSize;
+    this.totalArtifactFileSize = ko.observable(totalArtifactFileSize);
+
+    //private long totalFileCount;
+    this.totalFileCount = ko.observable(totalFileCount);
+
+    //private long totalGroupCount;
+    this.totalGroupCount = ko.observable(totalGroupCount);
+
+    //private long totalProjectCount;
+    this.totalProjectCount = ko.observable(totalProjectCount);
+
+    //private long newFileCount;
+    this.newFileCount = ko.observable(newFileCount);
+
+    this.duration = ko.observable(duration);
+
+    this.managedRepository = managedRepository;
+  }
+
   ManagedRepositoryViewModel=function(managedRepository, update, managedRepositoriesViewModel){
     this.managedRepository=managedRepository;
     this.managedRepositoriesViewModel = managedRepositoriesViewModel;
@@ -296,7 +327,53 @@ $(function() {
           $("#managed-repository-delete-warning-tmpl").tmpl(managedRepository));
     }
 
+    showStats=function(managedRepository){
+      if ($(calculatePopoverId(managedRepository)).html()){
+        // we ask stats all the time ? if yes uncomment return
+        return;
+        //$(calculatePopoverId(managedRepository)).html("");
+      }
+      var curRepo=managedRepository;
+      var url = "restServices/archivaServices/managedRepositoriesService/getManagedRepositoryStatistics/"+managedRepository.id();
+      $.ajax(url,
+        {
+          type: "GET",
+          dataType: 'json',
+          success: function(data) {
+            if (data.archivaRepositoryStatistics==null){
+              return;
+            }
+            var archivaRepositoryStatistics=mapArchivaRepositoryStatistics(data.archivaRepositoryStatistics);
+            archivaRepositoryStatistics.managedRepository=curRepo;
+            $("#managedrepository-stats-"+curRepo.id()).append($("#managed-repository-stats-tmpl").tmpl(archivaRepositoryStatistics));
+            $("#managedrepository-stats-img-"+curRepo.id()).attr("data-content",$(calculatePopoverId(curRepo)).html());
+            $("#managedrepository-stats-img-"+curRepo.id()).popover(
+                {
+                  placement: "left",
+                  html: true
+                }
+            );
+            //$(calculatePopoverId(managedRepository)).show();
+            $("#managedrepository-stats-img-"+curRepo.id()).popover('show')
 
+          },
+          error: function(data) {
+            var res = $.parseJSON(data.responseText);
+            displayRestError(res);
+          },
+          complete: function(){
+           }
+        }
+      );
+    }
+
+    hideStats=function(managedRepository){
+
+    }
+
+    calculatePopoverId=function(managedRepository){
+      return "#managedrepository-stats-"+managedRepository.id() + " #managedrepository-stats-"+managedRepository.id()+"-popover";
+    }
 
   }
 
@@ -369,12 +446,23 @@ $(function() {
     return mappedManagedRepositories;
   }
   mapManagedRepository=function(data){
-
+    if (data==null){
+      return null;
+    }
     return new ManagedRepository(data.id,data.name,data.layout,data.indexDirectory,data.location,data.snapshots,data.releases,
                                  data.blockRedeployments,data.cronExpression,
                                  data.scanned,data.daysOlder,data.retentionCount,data.deleteReleasedSnapshots,data.stageRepoNeeded);
   }
 
+  mapArchivaRepositoryStatistics=function(data){
+    if (data==null){
+      return null;
+    }
+    return new ArchivaRepositoryStatistics(data.scanEndTime,data.scanStartTime,data.totalArtifactCount,data.totalArtifactFileSize,
+                                           data.totalFileCount,data.totalGroupCount,data.totalProjectCount,data.newFileCount,
+                                           data.duration,data.managedRepository)
+  }
+
   activateManagedRepositoriesGridTab=function(){
     $("#main-content #managed-repository-edit-li").removeClass("active");
     $("#main-content #managed-repository-edit").removeClass("active");
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html
index 4dad39121..2d3618d9f 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html
@@ -67,6 +67,7 @@
         <th>Releases</th>
         <th>Snapshots</th>
         <th>Scan</th>
+        <th>Stats</th>
         <th>${$.i18n.prop('edit')}</th>
         <th>${$.i18n.prop('delete')}</th>
       </tr>
@@ -97,6 +98,11 @@
                 <img src="images/view-refresh.png" title="${$.i18n.prop('managedrepository.scan.now')}"/>
               </a>
             </td>
+            <td id="managedrepository-stats-${row.id()}">
+              <img src="images/utilities-system-monitor.png" title="${$.i18n.prop('managedrepository.stats')}"
+                   data-bind="event: { mouseover: function(){ showStats(row) }, mouseout: function(){ hideStats(row) },}"
+                   id="managedrepository-stats-img-${row.id()}"/>
+            </td>
             <td><a href="#" data-bind="click: function(){ editManagedRepository(row) }">${$.i18n.prop('edit')}</a></td>
             <td>
               <a href="#" data-bind="click: function(){ removeManagedRepository(row) }">
@@ -244,8 +250,15 @@
   </div>
 </script>
 <script id="managed-repository-scan-now-modal-tmpl" type='text/x-jquery-tmpl'>
-      <div>
-        ${$.i18n.prop('managedrepository.scan.all')}: <input type="checkbox" id="managed-repository-scan-now-all">
-      </div>
-
+  <div>
+    ${$.i18n.prop('managedrepository.scan.all')}: <input type="checkbox" id="managed-repository-scan-now-all">
+  </div>
+</script>
+<script id="managed-repository-stats-tmpl" type='text/x-jquery-tmpl'>
+  <div id="managedrepository-stats-${managedRepository.id()}-popover" style="display:none">
+    <div>${$.i18n.prop('managedrepository.stats.endTime')}: ${scanEndTime()}</div>
+    <div>${$.i18n.prop('managedrepository.stats.duration')}: ${duration()}</div>
+    <div>${$.i18n.prop('managedrepository.stats.totalFileCount')}: ${totalFileCount()}</div>
+    <div>${$.i18n.prop('managedrepository.stats.newFileCount')}: ${newFileCount()}</div>
+  </div>
 </script>
\ No newline at end of file