From 986e817fdc0b5a264affc3088807e7742e2d8b89 Mon Sep 17 00:00:00 2001
From: ajugo <andrej.jugovic7@gmail.com>
Date: Fri, 8 Apr 2022 18:08:55 +0200
Subject: [PATCH] Removed autofocus clear on open reminder flyout [SCI-6690]
 (#4003)

* Removed clear autofocus on open reminder flyout [SCI-6690]

* Fix hound [SCI-6690]
---
 app/assets/javascripts/my_modules/repositories.js            | 3 ++-
 .../javascripts/repositories/renderers/view_renderers.js     | 5 +++--
 app/assets/javascripts/sitewide/repository_helper.js         | 4 +---
 app/assets/stylesheets/layouts/reminders.scss                | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/my_modules/repositories.js b/app/assets/javascripts/my_modules/repositories.js
index 85f4d4490..a83edb644 100644
--- a/app/assets/javascripts/my_modules/repositories.js
+++ b/app/assets/javascripts/my_modules/repositories.js
@@ -184,7 +184,8 @@ var MyModuleRepositories = (function() {
         var recordName = "<a href='" + row.recordInfoUrl + "'"
                          + "class='record-info-link'>" + data + '</a>';
         if (row.hasActiveReminders) {
-          recordName = `<div class="dropdown row-reminders-dropdown" data-row-reminders-url="${row.rowRemindersUrl}">
+          recordName = `<div class="dropdown row-reminders-dropdown" 
+                          data-row-reminders-url="${row.rowRemindersUrl}" tabindex='-1'>
                           <i class="fas fa-bell dropdown-toggle row-reminders-icon"
                              data-toggle="dropdown" id="rowReminders${row.DT_RowId}}"></i>
                           <ul class="dropdown-menu" role="menu" aria-labelledby="rowReminders${row.DT_RowId}">
diff --git a/app/assets/javascripts/repositories/renderers/view_renderers.js b/app/assets/javascripts/repositories/renderers/view_renderers.js
index 35760130c..4fb5c7da8 100644
--- a/app/assets/javascripts/repositories/renderers/view_renderers.js
+++ b/app/assets/javascripts/repositories/renderers/view_renderers.js
@@ -188,8 +188,9 @@ $.fn.dataTable.render.AssignedTasksValue = function(data, row) {
     tasksLinkHTML = "<div class='assign-counter-container'><span class='assign-counter'>0</span></div>";
   }
   if (row.hasActiveReminders) {
-    return `<div class="dropdown row-reminders-dropdown" data-row-reminders-url="${row.rowRemindersUrl}">
-              <i class="fas fa-bell dropdown-toggle row-reminders-icon" data-toggle="dropdown" id="rowReminders${row.DT_RowId}}"></i>
+    return `<div class="dropdown row-reminders-dropdown" data-row-reminders-url="${row.rowRemindersUrl}" tabindex='-1'>
+              <i class="fas fa-bell dropdown-toggle row-reminders-icon" data-toggle="dropdown" 
+                id="rowReminders${row.DT_RowId}}"></i>
               <ul class="dropdown-menu" role="menu" aria-labelledby="rowReminders${row.DT_RowId}">
               </ul>
             </div>`
diff --git a/app/assets/javascripts/sitewide/repository_helper.js b/app/assets/javascripts/sitewide/repository_helper.js
index 69328bb04..4ba1d2ca8 100644
--- a/app/assets/javascripts/sitewide/repository_helper.js
+++ b/app/assets/javascripts/sitewide/repository_helper.js
@@ -66,7 +66,7 @@ function prepareRepositoryHeaderForExport(th) {
 function initReminderDropdown(table) {
   $(table).on('keyup', '.row-reminders-dropdown', function(e) {
     if (e.key === 'Escape') {
-      $(this).dropdown('toggle');
+      $(this).children('.dropdown-menu').dropdown('toggle');
     }
   });
   $(table).on('show.bs.dropdown', '.row-reminders-dropdown', function() {
@@ -85,8 +85,6 @@ function initReminderDropdown(table) {
       dataType: 'json',
       success: function(data) {
         dropdownMenu.html(data.html);
-
-        dropdownMenu.find('.row-reminders-footer')[0].focus();
       }
     });
   });
diff --git a/app/assets/stylesheets/layouts/reminders.scss b/app/assets/stylesheets/layouts/reminders.scss
index e4733b3fb..69a0000b3 100644
--- a/app/assets/stylesheets/layouts/reminders.scss
+++ b/app/assets/stylesheets/layouts/reminders.scss
@@ -25,6 +25,6 @@
     background-color: $color-alto;
     border-width: 0;
     height: 1px;
-    margin: 0 16px 10px 0;
+    margin: 0 16px 10px;
     }
   }