From 0faa3e93e1bae28ff04e1bfcb87d385a569676a3 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 27 Dec 2018 22:57:53 +0100
Subject: [PATCH] summary: don't load size on container expand, only on manual
 action.

- this is too heavy to open without explicit action
- increase locking timeout to 15min
- expose basic info on summary page without expand.
---
 rhodecode/lib/rc_cache/backends.py          |  2 +-
 rhodecode/public/js/src/rhodecode.js        |  1 +
 rhodecode/templates/summary/components.mako | 40 ++++++++++++++-------
 rhodecode/templates/summary/summary.mako    | 12 +++----
 4 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/rhodecode/lib/rc_cache/backends.py b/rhodecode/lib/rc_cache/backends.py
index d7baac19..aa6cbb40 100644
--- a/rhodecode/lib/rc_cache/backends.py
+++ b/rhodecode/lib/rc_cache/backends.py
@@ -96,7 +96,7 @@ class CustomLockFactory(FileLock):
             # set non-blocking, this will cause an exception if we cannot acquire a lock
             operation |= fcntl.LOCK_NB
             start_lock_time = time.time()
-            timeout = 60 * 5  # 5min
+            timeout = 60 * 15  # 15min
             while True:
                 try:
                     flock_org(fd, operation)
diff --git a/rhodecode/public/js/src/rhodecode.js b/rhodecode/public/js/src/rhodecode.js
index b0ca809b..67de7fb3 100644
--- a/rhodecode/public/js/src/rhodecode.js
+++ b/rhodecode/public/js/src/rhodecode.js
@@ -76,6 +76,7 @@ var showRepoSize = function(target, repo_name, commit_id, callback) {
     var url = pyroutes.url('repo_stats',
       {"repo_name": repo_name, "commit_id": commit_id});
 
+    container.show();
     if (!container.hasClass('loaded')) {
         $.ajax({url: url})
             .complete(function (data) {
diff --git a/rhodecode/templates/summary/components.mako b/rhodecode/templates/summary/components.mako
index 9a67ea15..bde86b97 100644
--- a/rhodecode/templates/summary/components.mako
+++ b/rhodecode/templates/summary/components.mako
@@ -83,9 +83,9 @@
             </div>
         </div>
 
-        <div class="fieldset collapsable-content" data-toggle="summary-details" style="display: none;">
+        <div class="fieldset">
           <div class="left-label-summary">
-            ${_('Information')}:
+            &nbsp;
           </div>
           <div class="right-content">
             <div class="commit-info">
@@ -105,28 +105,42 @@
                 ## commits
                 <span class="tag">
                   % if commit_rev == -1:
-                      ${_ungettext('%(num)s Commit', '%(num)s Commits', 0) % {'num': 0}},
+                      ${_ungettext('%(num)s Commit', '%(num)s Commits', 0) % {'num': 0}}
                   % else:
                       <a href="${h.route_path('repo_changelog', repo_name=c.repo_name)}">
-                        ${_ungettext('%(num)s Commit', '%(num)s Commits', commit_rev) % {'num': commit_rev}}</a>,
+                        ${_ungettext('%(num)s Commit', '%(num)s Commits', commit_rev) % {'num': commit_rev}}</a>
                   % endif
                 </span>
 
                 ## forks
                 <span class="tag">
                   <a title="${_('Number of Repository Forks')}" href="${h.route_path('repo_forks_show_all', repo_name=c.repo_name)}">
-                     ${c.repository_forks} ${_ungettext('Fork', 'Forks', c.repository_forks)}</a>,
+                     ${c.repository_forks} ${_ungettext('Fork', 'Forks', c.repository_forks)}</a>
                 </span>
 
-                ## repo size
-                % if commit_rev == -1:
-                      <span class="stats-bullet">0 B</span>
-                % else:
-                      <span class="stats-bullet" id="repo_size_container">
-                          ${_('Calculating Repository Size...')}
-                      </span>
-                % endif
+                </div>
+            </div>
+          </div>
+        </div>
 
+        <div class="fieldset collapsable-content" data-toggle="summary-details" style="display: none;">
+          <div class="left-label-summary">
+            ${_('Repository size')}:
+          </div>
+          <div class="right-content">
+            <div class="commit-info">
+                <div class="tags">
+                   ## repo size
+                    % if commit_rev == -1:
+                          <span class="stats-bullet">0 B</span>
+                    % else:
+                          <span>
+                              <a href="#showSize" onclick="calculateSize(); $(this).hide(); return false" id="show-repo-size">Show repository size</a>
+                          </span>
+                          <span class="stats-bullet" id="repo_size_container" style="display:none">
+                              ${_('Calculating Repository Size...')}
+                          </span>
+                    % endif
                 </div>
             </div>
           </div>
diff --git a/rhodecode/templates/summary/summary.mako b/rhodecode/templates/summary/summary.mako
index 66eff118..51f67947 100644
--- a/rhodecode/templates/summary/summary.mako
+++ b/rhodecode/templates/summary/summary.mako
@@ -106,8 +106,8 @@ $(document).ready(function(){
     });
 
 
-    // load details on summary page expand
-    $('#summary_details_expand').on('click', function() {
+    // calculate size of repository
+    calculateSize = function () {
 
         var callback = function (data) {
             % if c.show_stats:
@@ -115,13 +115,9 @@ $(document).ready(function(){
             % endif
         };
 
-        showRepoSize(
-            'repo_size_container',
-            templateContext.repo_name,
-            templateContext.repo_landing_commit,
-            callback);
+        showRepoSize('repo_size_container', templateContext.repo_name, templateContext.repo_landing_commit, callback);
 
-    })
+    }
 
 })
 </script>