From e2dc2e31eec2482dd04df2c68f716c8ea3474cc5 Mon Sep 17 00:00:00 2001
From: artoscinote <85488244+artoscinote@users.noreply.github.com>
Date: Tue, 21 Mar 2023 15:24:40 +0100
Subject: [PATCH] Revert "Cursor position improvements, focused fields - part 2
 (more in addons) [SCI-8147]"

---
 app/assets/javascripts/reports/new.js                      | 5 -----
 app/assets/javascripts/repositories/index.js               | 6 ------
 .../javascripts/repositories/renderers/new_renderers.js    | 1 -
 .../javascripts/repositories/renderers/view_renderers.js   | 4 ++--
 .../javascripts/repositories/repository_datatable.js       | 1 -
 app/assets/javascripts/repository_columns/index.js         | 7 +++----
 app/assets/javascripts/sitewide/repository_helper.js       | 3 ---
 app/assets/javascripts/sitewide/two_factor_wizard.js       | 4 ----
 app/views/reports/new.html.erb                             | 2 +-
 9 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/app/assets/javascripts/reports/new.js b/app/assets/javascripts/reports/new.js
index 451afe395..963a6123b 100644
--- a/app/assets/javascripts/reports/new.js
+++ b/app/assets/javascripts/reports/new.js
@@ -1054,10 +1054,6 @@ function reportHandsonTableConverter() {
     return reportData;
   }
 
-  function initNameContainerFocus() {
-    $('#newReportNameContainer').focus()
-  }
-
   function initGenerateButton() {
     $('.reports-new').on('click', '.generate-button', function() {
       $.ajax({
@@ -1445,7 +1441,6 @@ function reportHandsonTableConverter() {
   $('#reportWizardEditWarning').modal('show');
   $('.experiment-contents').sortable();
 
-  initNameContainerFocus();
   initGenerateButton();
   initReportWizard();
   initDropdowns();
diff --git a/app/assets/javascripts/repositories/index.js b/app/assets/javascripts/repositories/index.js
index d33d23f94..e3c68b97c 100644
--- a/app/assets/javascripts/repositories/index.js
+++ b/app/assets/javascripts/repositories/index.js
@@ -197,12 +197,6 @@
     }
   });
 
-  $(document).on('shown.bs.modal', function() {
-    var inputField = $('#repository_name');
-    var value = inputField.val();
-    inputField.focus().val('').val(value);
-  });
-
   $('.create-new-repository').initSubmitModal('#create-repo-modal', 'repository');
   if (notTurbolinksPreview()) {
     initRepositoriesDataTable('#repositoriesList', $('.repositories-index').hasClass('archived'));
diff --git a/app/assets/javascripts/repositories/renderers/new_renderers.js b/app/assets/javascripts/repositories/renderers/new_renderers.js
index 672db7862..c626f98d0 100644
--- a/app/assets/javascripts/repositories/renderers/new_renderers.js
+++ b/app/assets/javascripts/repositories/renderers/new_renderers.js
@@ -7,7 +7,6 @@ $.fn.dataTable.render.newRowName = function(formId, $cell) {
   $cell.html(`
     <div class="sci-input-container text-field error-icon">
       <input class="sci-input-field"
-             id="newRepoNameField"
              form="${formId}"
              type="text"
              name="repository_row[name]"
diff --git a/app/assets/javascripts/repositories/renderers/view_renderers.js b/app/assets/javascripts/repositories/renderers/view_renderers.js
index 5eb9213bc..e16a2a135 100644
--- a/app/assets/javascripts/repositories/renderers/view_renderers.js
+++ b/app/assets/javascripts/repositories/renderers/view_renderers.js
@@ -183,8 +183,8 @@ $.fn.dataTable.render.AssignedTasksValue = function(data, row) {
                 data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">${data.tasks}</a>
               <div class="dropdown-menu" role="menu">
                 <div class="sci-input-container right-icon">
-                  <input id="searchAssignedTasks" type="text" class="sci-input-field search-tasks"
-                    placeholder="${I18n.t('repositories.table.assigned_search')}" ></input>
+                  <input type="text" class="sci-input-field search-tasks"
+                    placeholder="${I18n.t('repositories.table.assigned_search')}"></input>
                   <i class="fas fa-times-circle clear-search"></i>
                 </div>
                 <div class="tasks"></div>
diff --git a/app/assets/javascripts/repositories/repository_datatable.js b/app/assets/javascripts/repositories/repository_datatable.js
index b92e073f3..6fd47d74b 100644
--- a/app/assets/javascripts/repositories/repository_datatable.js
+++ b/app/assets/javascripts/repositories/repository_datatable.js
@@ -157,7 +157,6 @@ var RepositoryDatatable = (function(global) {
   }
 
   function changeToEditMode() {
-    $('#newRepoNameField').focus();
     currentMode = 'editMode';
 
     clearRowSelection();
diff --git a/app/assets/javascripts/repository_columns/index.js b/app/assets/javascripts/repository_columns/index.js
index 853cd58fb..0fe71a2d0 100644
--- a/app/assets/javascripts/repository_columns/index.js
+++ b/app/assets/javascripts/repository_columns/index.js
@@ -170,10 +170,9 @@ var RepositoryColumns = (function() {
         labelHTML: true
       };
       $.get(modalUrl, (data) => {
-        var inputField = $manageModal.find('.modal-content').html(data.html)
-          .find('#repository-column-name');
-        var value = inputField.val()
-        inputField.focus().val('').val(value);
+        $manageModal.find('.modal-content').html(data.html)
+          .find('#repository-column-name')
+          .focus();
 
         if (button.data('action') !== 'destroy') {
           columnType = $('#repository-column-data-type').val();
diff --git a/app/assets/javascripts/sitewide/repository_helper.js b/app/assets/javascripts/sitewide/repository_helper.js
index 286ea0ae2..0f62a45c3 100644
--- a/app/assets/javascripts/sitewide/repository_helper.js
+++ b/app/assets/javascripts/sitewide/repository_helper.js
@@ -9,9 +9,6 @@ function initAssignedTasksDropdown(table) {
   }
 
   $(table).on('show.bs.dropdown', '.assign-counter-container', function() {
-    $(document).on('shown.bs.dropdown', function() {
-      $('#searchAssignedTasks').focus();
-    });
     var cell = $(this);
     loadTasks(cell);
   });
diff --git a/app/assets/javascripts/sitewide/two_factor_wizard.js b/app/assets/javascripts/sitewide/two_factor_wizard.js
index 86df6601a..a627144f0 100644
--- a/app/assets/javascripts/sitewide/two_factor_wizard.js
+++ b/app/assets/javascripts/sitewide/two_factor_wizard.js
@@ -1,7 +1,6 @@
 $(document).on('turbolinks:load', function() {
   $(document).on('click', '#twoFactorAuthenticationDisable', function() {
     $('#twoFactorAuthenticationModal').modal('show');
-    $('#password').focus();
   });
 
   $(document).on('click', '#twoFactorAuthenticationEnable', function() {
@@ -34,9 +33,6 @@ $(document).on('turbolinks:load', function() {
   });
 
   $('#twoFactorAuthenticationModal').on('click', '.btn-next-step', function() {
-    setTimeout(() => {
-      $('#submit_code').focus();
-    }, 500);
     $('#twoFactorAuthenticationModal').find(`[href="${$(this).data('step')}"]`).tab('show');
   });
 });
diff --git a/app/views/reports/new.html.erb b/app/views/reports/new.html.erb
index 6175380b9..b7c3c24e1 100644
--- a/app/views/reports/new.html.erb
+++ b/app/views/reports/new.html.erb
@@ -1,7 +1,7 @@
 <div class="content-pane flexible reports-new">
   <div class="reports-new-header">
     <div class="sci-input-container report-name-container">
-      <input id="newReportNameContainer" type="text" class="sci-input-field report-name" placeholder="<%= t("projects.reports.new.report_name_placeholder") %>" value="<%= @report.name %>"></input>
+      <input type="text" class="sci-input-field report-name" placeholder="<%= t("projects.reports.new.report_name_placeholder") %>" value="<%= @report.name %>"></input>
 
     </div>
     <button class="btn btn-secondary cancel-button" data-toggle="modal" data-target="#reportWizardExitWarning">