From 6412a65d7e5c5635c6a0b7399bd722209388faa1 Mon Sep 17 00:00:00 2001
From: Martin Artnik <martin@scinote.net>
Date: Tue, 28 Mar 2023 16:22:38 +0200
Subject: [PATCH] Fix new protocol default role, fix reload of protocol access
 modal [SCI-8217]

---
 .../javascripts/access_permissions/user_assignments.js       | 5 ++---
 app/assets/javascripts/protocols/new_protocol.js             | 4 +++-
 .../partials/_new_assignments_form.html.erb                  | 2 +-
 app/views/protocols/index/_new_protocol_modal.html.erb       | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/access_permissions/user_assignments.js b/app/assets/javascripts/access_permissions/user_assignments.js
index 162947a5c..7b957595d 100644
--- a/app/assets/javascripts/access_permissions/user_assignments.js
+++ b/app/assets/javascripts/access_permissions/user_assignments.js
@@ -43,9 +43,8 @@
     });
 
     $(document).on('ajax:success', 'form#new-user-assignment-form', function(_e, data) {
-      $('.modal-backdrop').remove();
-      $('.user-assignments-modal').replaceWith(data.html);
-      $('.user-assignments-modal').modal('show');
+      $('#user_assignments_modal').replaceWith($(data.html).find('#user_assignments_modal'));
+      HelperModule.flashAlertMsg(data.flash, 'success');
     });
 
     $(document).on('ajax:error', 'form.member-item', function(_e, data) {
diff --git a/app/assets/javascripts/protocols/new_protocol.js b/app/assets/javascripts/protocols/new_protocol.js
index 7d27af997..3ef39fbb2 100644
--- a/app/assets/javascripts/protocols/new_protocol.js
+++ b/app/assets/javascripts/protocols/new_protocol.js
@@ -3,7 +3,9 @@
   const protocolModal = '#newProtocolModal';
   $(protocolModal)
     .on('change', '#protocol_visibility', function() {
-      $('#roleSelectWrapper').toggleClass('hidden', !$(this)[0].checked);
+      let checked = $(this)[0].checked;
+      $('#roleSelectWrapper').toggleClass('hidden', !checked);
+      $('#protocol_default_public_user_role_id').prop('disabled', !checked);
     })
     .on('show.bs.modal', function() {
       $(`${protocolModal} #protocol_name`).parent().removeClass('error');
diff --git a/app/views/access_permissions/partials/_new_assignments_form.html.erb b/app/views/access_permissions/partials/_new_assignments_form.html.erb
index 74e41a444..9cd8ff5d9 100644
--- a/app/views/access_permissions/partials/_new_assignments_form.html.erb
+++ b/app/views/access_permissions/partials/_new_assignments_form.html.erb
@@ -10,7 +10,7 @@
       <%= t '.title', resource_name: assignable.name %>
     </h4>
   </div>
-  <%= form_with(url: create_path, method: :post, remote: true, html: { id: 'new-user-assignment-form', data: { action: 'replace-form', target: '#user_assignments_modal', object_type: assignable.class.to_s.downcase} }) do |f| %>
+  <%= form_with(url: create_path, method: :post, remote: true, html: { id: 'new-user-assignment-form', data: { object_type: assignable.class.to_s.downcase } }) do |f| %>
     <div class="modal-body">
       <div class="sci-input-container left-icon">
         <%= text_field_tag :search_users, '',
diff --git a/app/views/protocols/index/_new_protocol_modal.html.erb b/app/views/protocols/index/_new_protocol_modal.html.erb
index 95ef69563..5dc3af264 100644
--- a/app/views/protocols/index/_new_protocol_modal.html.erb
+++ b/app/views/protocols/index/_new_protocol_modal.html.erb
@@ -31,7 +31,7 @@
             <div class="sci-input-container">
               <%= f.label :default_public_user_role_id, t("protocols.new_protocol_modal.role_label") %>
               <% default_role = UserRole.find_by(name: I18n.t('user_roles.predefined.viewer')).id %>
-              <%= f.hidden_field :default_public_user_role_id, value: default_role %>
+              <%= f.hidden_field :default_public_user_role_id, value: nil, disabled: true %>
               <%= f.select :role_selector, options_for_select(team_user_roles_for_select, default_role) %>
             </div>
           </div>