Merge pull request #8395 from aignatov-bio/ai-sci-11734-remove-perfect-scrollbar-from-dashboard-activties

Remove perfect scroll bar from dashboard and activities [SCI-11734]

app/assets/javascripts/dashboard/current_tasks.js

@@ -117,7 +117,6 @@ var DasboardCurrentTasksWidget = (function() {
         }
       }
       appendTasksList(result, '.current-tasks-list-wrapper');
-      PerfectSb().update_all();
 
       InfiniteScroll.init('.current-tasks-list-wrapper', {
         url: $currentTasksList.data('tasksListUrl'),

app/assets/javascripts/dashboard/recent_work.js

@@ -32,8 +32,6 @@ var DasboardRecentWorkWidget = (function() {
       } else {
         container.append($('#recent-work-no-results-template').html());
       }
-
-      PerfectSb().update_all();
     });
   }
 

app/assets/javascripts/sitewide/dropdown_selector.js

@@ -1,4 +1,4 @@
-/* global PerfectScrollbar activePSB PerfectSb I18n */
+/* global I18n */
 /* eslint-disable no-unused-vars, no-use-before-define */
 
 /*
@@ -301,7 +301,6 @@ var dropdownSelector = (function() {
   function generateDropdown(selector, config = {}) {
     var selectElement = $(selector);
     var optionContainer;
-    var perfectScroll;
     var dropdownContainer;
     var toggleElement;
 
@@ -410,10 +409,6 @@ var dropdownSelector = (function() {
         }
       });
 
-    // Initialize scroll bar inside options container
-    perfectScroll = new PerfectScrollbar(dropdownContainer.find('.dropdown-container')[0]);
-    activePSB.push(perfectScroll);
-
     // Select options container
     optionContainer = dropdownContainer.find('.dropdown-container');
 
@@ -450,7 +445,6 @@ var dropdownSelector = (function() {
       if (dropdownContainer.hasClass('open')) {
         // Each time we open option container we must scroll it
         dropdownContainer.find('.dropdown-container').scrollTop(0);
-        PerfectSb().update_all();
 
         // on Open we load new data
         loadData(selectElement, dropdownContainer);
@@ -652,9 +646,6 @@ var dropdownSelector = (function() {
       $(`<div class="empty-dropdown">${I18n.t('dropdown_selector.nothing_found')}</div>`).appendTo(container.find('.dropdown-container'));
     }
 
-    // Update scrollbar
-    PerfectSb().update_all();
-
     // Check position of option dropdown
     refreshDropdownSelection(selector, container);
 
@@ -865,7 +856,6 @@ var dropdownSelector = (function() {
           }].concat(optionsAjax);
         }
         loadData(selector, container, optionsAjax);
-        PerfectSb().update_all();
       });
     // For local options we convert options element from select to correct array
     } else if (selector.data('select-by-group')) {

app/assets/stylesheets/dashboard/recent_work.scss

@@ -8,6 +8,7 @@
 
   .recent-work-container {
     height: 100%;
+    overflow-y: auto;
     padding: 0 8px;
     position: relative;
 

app/assets/stylesheets/global_activities.scss

@@ -155,6 +155,7 @@
 
     .activities-container {
       height: 100%;
+      overflow-y: auto;
       padding-top: 10px;
       position: absolute;
       width: 100%;
@@ -284,6 +285,7 @@
   .filters-container {
     height: 100%;
     margin-bottom: 60px;
+    overflow-y: auto;
     padding: 15px 20px;
     position: absolute;
   }

app/assets/stylesheets/shared/dropdown_selector.scss

@@ -135,7 +135,7 @@
     bottom: calc(100% - 30px);
     box-shadow: $flyout-shadow;
     display: none;
-    overflow: hidden;
+    overflow-y: auto;
     position: fixed;
     transition: .2s;
     transition-property: top, bottom, box-shadow;

app/views/dashboards/_current_tasks.html.erb

@@ -76,7 +76,7 @@
   </div>
 
   <div class="widget-body">
-    <div class="current-tasks-list-wrapper perfect-scrollbar">
+    <div class="current-tasks-list-wrapper">
       <div class="current-tasks-list "
            data-tasks-list-url="<%= dashboard_current_tasks_path %>">
       </div>

app/views/dashboards/_recent_work.html.erb

@@ -12,7 +12,7 @@
     </div>
   </div>
   <div class="widget-body">
-    <div class="recent-work-container perfect-scrollbar" data-url="<%= dashboard_recent_works_path %>" data-e2e="e2e-CO-dashboard-recentWork"></div>
+    <div class="recent-work-container" data-url="<%= dashboard_recent_works_path %>" data-e2e="e2e-CO-dashboard-recentWork"></div>
   </div>
 </div>
 

app/views/global_activities/index.html.erb

@@ -7,7 +7,7 @@
   </div>
   <div class="ga-bottom">
     <div class="ga-main">
-      <div class="activities-container perfect-scrollbar">
+      <div class="activities-container">
         <div class="no-activities-message text-center <%= 'hidden' if @grouped_activities.keys.any? %>">
           <p><%= t('activities.index.no_activities_message') %></p>
         </div>
@@ -24,7 +24,7 @@
       </div>
     </div>
     <div class="ga-side">
-      <div class="filters-container perfect-scrollbar">
+      <div class="filters-container">
         <%= render partial: "side_filters" %>
       </div>
     </div>