From 0d7da90b15cde9e288de3044e7449977111efe1a Mon Sep 17 00:00:00 2001
From: aignatov-bio <47317017+aignatov-bio@users.noreply.github.com>
Date: Thu, 7 Jan 2021 17:02:25 +0100
Subject: [PATCH] Small fixes for projects folder cards [SCI-5345] (#3049)

---
 app/assets/stylesheets/projects.scss          |  6 +++++
 app/services/projects_overview_service.rb     |  8 +++++--
 .../projects/index/_folder_card.html.erb      | 24 ++++++++++---------
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/app/assets/stylesheets/projects.scss b/app/assets/stylesheets/projects.scss
index a1e34675a..c96ea5436 100644
--- a/app/assets/stylesheets/projects.scss
+++ b/app/assets/stylesheets/projects.scss
@@ -849,6 +849,12 @@ li.module-hover {
             color: $color-volcano;
             width: 100%;
           }
+
+          .project-folder-link {
+            color: $color-volcano;
+            display: contents;
+            text-decoration: none;
+          }
         }
 
         &.project-card {
diff --git a/app/services/projects_overview_service.rb b/app/services/projects_overview_service.rb
index c1ef78372..dc8da57c6 100644
--- a/app/services/projects_overview_service.rb
+++ b/app/services/projects_overview_service.rb
@@ -91,10 +91,14 @@ class ProjectsOverviewService
   end
 
   def fetch_project_folder_records
-    project_folders = @team.project_folders.preload(team: :user_teams).left_outer_joins(:projects, :project_folders)
+    project_folders = @team.project_folders
+                           .preload(team: :user_teams)
+                           .joins('LEFT OUTER JOIN project_folders child_folders
+                                   ON child_folders.parent_folder_id = project_folders.id')
+                           .left_outer_joins(:projects)
     project_folders.select('project_folders.*')
                    .select('COUNT(DISTINCT projects.id) AS projects_count')
-                   .select('COUNT(DISTINCT project_folders.id) AS folders_count')
+                   .select('COUNT(DISTINCT child_folders.id) AS folders_count')
                    .group('project_folders.id')
   end
 
diff --git a/app/views/projects/index/_folder_card.html.erb b/app/views/projects/index/_folder_card.html.erb
index a67fca950..903110c0e 100644
--- a/app/views/projects/index/_folder_card.html.erb
+++ b/app/views/projects/index/_folder_card.html.erb
@@ -10,17 +10,19 @@
       <span class="sci-checkbox-label"></span>
     </div>
   </div>
-  <div class="icon-folder">
-    <i class="fas fa-folder"></i>
-  </div>
-  <div class="name" title="<%= folder.name %>">
-    <%= link_to(folder.name,
-                project_folder_path(folder),
-                class: 'project-folder-link',
-                data: { projects_cards_url: project_folder_cards_url(folder),
-                        sidebar_url: sidebar_team_path(current_team, project_folder_id: folder.id),
-                      }) %>
-  </div>
+  <%= link_to project_folder_path(folder),
+              class: 'project-folder-link',
+              data: {
+                projects_cards_url: project_folder_cards_url(folder),
+                sidebar_url: sidebar_team_path(current_team, project_folder_id: folder.id)
+              } do %>
+    <div class="icon-folder">
+      <i class="fas fa-folder"></i>
+    </div>
+    <div class="name">
+      <%= folder.name %>
+    </div>
+  <% end %>
   <div class="description">
     <%= t('projects.index.folder.description', projects_count: folder.projects_count, folders_count: folder.folders_count) %>
   </div>