From 132f46b1367caf3c37fb62ccbd89ab04e5a706b3 Mon Sep 17 00:00:00 2001
From: Oleksii Kriuchykhin <okriuchykhin@biosistemika.com>
Date: Thu, 10 Jan 2019 21:11:20 +0100
Subject: [PATCH] Improve error handling in task inventories dropdown
 [SCI-2776]

---
 app/assets/javascripts/secondary_navigation.js       |  9 ++++++---
 app/controllers/my_modules_controller.rb             |  5 ++++-
 app/views/my_modules/_repositories_dropdown.html.erb | 10 ++++++++--
 app/views/shared/_secondary_navigation.html.erb      |  4 +++-
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/secondary_navigation.js b/app/assets/javascripts/secondary_navigation.js
index 5c870fa77..9da8f176b 100644
--- a/app/assets/javascripts/secondary_navigation.js
+++ b/app/assets/javascripts/secondary_navigation.js
@@ -5,15 +5,18 @@
     var dropDown = $('.repositories-dropdown');
     var dropDownMenu = $('.repositories-dropdown-menu');
     dropDown.on('show.bs.dropdown', function() {
-      dropDownMenu.html(
-        '<div class="text-center"><i class="fas fa-spinner fa-spin"></i></div>'
-      );
+      dropDownMenu
+        .find('.assigned-items-counter')
+        .html('<i class="fas fa-spinner fa-spin"></i>');
       $.ajax({
         url: dropDown.data('url'),
         type: 'GET',
         dataType: 'json',
         success: function(data) {
           dropDownMenu.html(data.html);
+        },
+        error: function() {
+          dropDownMenu.find('.assigned-items-counter').html('');
         }
       });
     });
diff --git a/app/controllers/my_modules_controller.rb b/app/controllers/my_modules_controller.rb
index b2edcafbf..3a2123332 100644
--- a/app/controllers/my_modules_controller.rb
+++ b/app/controllers/my_modules_controller.rb
@@ -409,7 +409,10 @@ class MyModulesController < ApplicationController
     respond_to do |format|
       format.json do
         render json: {
-          html: render_to_string(partial: 'repositories_dropdown.html.erb')
+          html: render_to_string(
+            partial: 'repositories_dropdown.html.erb',
+            locals: { enable_counters: true }
+          )
         }
       end
     end
diff --git a/app/views/my_modules/_repositories_dropdown.html.erb b/app/views/my_modules/_repositories_dropdown.html.erb
index f31da3fdc..00146bb1f 100644
--- a/app/views/my_modules/_repositories_dropdown.html.erb
+++ b/app/views/my_modules/_repositories_dropdown.html.erb
@@ -5,8 +5,14 @@
        data-tooltipcontent="<%= I18n.t('tooltips.text.protocol.inventories') %>"
        href="<%= repository_my_module_url(id: @my_module, repository_id: repository) %>"
        title="<%= repository.name %>">
-      <% cache [current_user, repository] do %>
-        <%= truncate(repository.name) + " (#{@my_module.repository_rows_count(repository)})" %>
+      <% if enable_counters %>
+        <% cache [current_user, repository] do %>
+          <%= truncate(repository.name) %>
+          <span class="assigned-items-counter"><%= "(#{@my_module.repository_rows_count(repository)})" %></span>
+        <% end %>
+      <% else %>
+        <%= truncate(repository.name) %>
+        <span class="assigned-items-counter"><i class="fas fa-spinner fa-spin"></i></span>
       <% end %>
     </a>
   </li>
diff --git a/app/views/shared/_secondary_navigation.html.erb b/app/views/shared/_secondary_navigation.html.erb
index 1b098503a..3ff0a346d 100644
--- a/app/views/shared/_secondary_navigation.html.erb
+++ b/app/views/shared/_secondary_navigation.html.erb
@@ -131,7 +131,9 @@
                 <span class="hidden-xs hidden-lg fas fa-list-alt"></span>
                 <span class="caret"></span>
               </a>
-              <ul class="dropdown-menu repositories-dropdown-menu" aria-labelledby="repositoriesDropdownMenuLink"></ul>
+              <ul class="dropdown-menu repositories-dropdown-menu" aria-labelledby="repositoriesDropdownMenuLink">
+                <%= render partial: "repositories_dropdown.html.erb", locals: { enable_counters: false } %>
+              </ul>
             </li>
           <% end %>
           <% if can_read_experiment?(@my_module.experiment) then %>