Group public users in experiments and tasks [SCI-6332] (#3769)

* Group public users in experiments and tasks [SCI-6332]

* Add list of users to the public users group elements [SCI-6404]

app/views/access_permissions/experiments/edit.json.jbuilder

@@ -6,7 +6,7 @@ json.modal controller.render_to_string(
   locals: {
     experiment: @experiment,
     project: @project,
-    users: @experiment.users,
+    users: @project.manually_assigned_users,
     project_path: project_path(@project)
   },
   layout: false

app/views/access_permissions/experiments/modals/_edit_modal.html.erb

@@ -21,6 +21,7 @@
                         update_path: access_permissions_project_experiment_path(project, experiment)
                       } %>
         <% end %>
+        <%= render('access_permissions/partials/default_public_user_role_form', project: project, editable: false) if project.visible? %>
       </div>
     </div>
   </div>

app/views/access_permissions/experiments/modals/_show_modal.html.erb

@@ -12,6 +12,7 @@
           <% user_assignment = experiment.user_assignments.find_by(user: user) %>
           <%= render partial: 'access_permissions/partials/user_assignment', locals: { user_assignment: user_assignment, user: user, resource: experiment } %>
         <% end %>
+        <%= render('access_permissions/partials/default_public_user_role_form', project: project, editable: false) if project.visible? %>
       </div>
     </div>
   </div>

app/views/access_permissions/experiments/show.json.jbuilder

@@ -5,7 +5,7 @@ json.modal controller.render_to_string(
   formats: [:html],
   locals: {
     experiment: @experiment,
-    users: @project.users,
+    users: @project.manually_assigned_users,
     project_path: project_path(@project)
   },
   layout: false

app/views/access_permissions/my_modules/edit.json.jbuilder

@@ -7,7 +7,7 @@ json.modal controller.render_to_string(
     my_module: @my_module,
     experiment: @experiment,
     project: @project,
-    users: @my_module.users
+    users: @project.manually_assigned_users
   },
   layout: false
 )

app/views/access_permissions/my_modules/modals/_edit_modal.html.erb

@@ -22,6 +22,7 @@
                         update_path: access_permissions_project_experiment_my_module_path(project, experiment, my_module)
                       } %>
         <% end %>
+        <%= render('access_permissions/partials/default_public_user_role_form', project: project, editable: false) if project.visible? %>
       </div>
     </div>
   </div>

app/views/access_permissions/my_modules/modals/_show_modal.html.erb

@@ -12,6 +12,7 @@
           <% user_assignment = my_module.user_assignments.find_by(user: user) %>
           <%= render partial: 'access_permissions/partials/user_assignment', locals: { user_assignment: user_assignment, user: user, resource: my_module } %>
         <% end %>
+        <%= render('access_permissions/partials/default_public_user_role_form', project: project, editable: false) if project.visible? %>
       </div>
     </div>
   </div>

app/views/access_permissions/my_modules/show.json.jbuilder

@@ -6,7 +6,7 @@ json.modal controller.render_to_string(
   locals: {
     my_module: @my_module,
     experiment: @experiment,
-    users: @project.users
+    users: @project.manually_assigned_users
   },
   layout: false
 )

app/views/access_permissions/partials/_default_public_user_role_form.html.erb

@@ -5,6 +5,7 @@
     </div>
     <div>
       <%= t('access_permissions.everyone_else', team_name: f.object.team.name) %>
+      <%= render 'access_permissions/partials/public_members_dropdown', team: f.object.team, project: project %>
       <br>
       <small class="text-muted">
         <%= f.object.default_public_user_role.name %>
@@ -16,7 +17,9 @@
   </div>
   <div class="user-assignment-controls">
     <div class="user-assignment-role">
-      <%= f.select :default_public_user_role_id, options_for_select(user_roles_collection, selected: f.object.default_public_user_role_id), {}, class: 'form-control selectpicker', title: t('user_assignment.change_project_role'), data: { 'selected-text-format' => 'static' } %>
+      <% if editable %>
+        <%= f.select :default_public_user_role_id, options_for_select(user_roles_collection, selected: f.object.default_public_user_role_id), {}, class: 'form-control selectpicker', title: t('user_assignment.change_project_role'), data: { 'selected-text-format' => 'static' } %>
+      <% end %>
     </div>
     <div class="user-assignment-remove">
     </div>

app/views/access_permissions/partials/_edit_assignments_content.html.erb

@@ -9,7 +9,7 @@
     <% project.manually_assigned_users.each do |user| %>
       <%= render('access_permissions/partials/project_member_field', user: user, project: project, update_path: update_path) %>
     <% end %>
-    <%= render('access_permissions/partials/default_public_user_role_form', project: project) if project.visible? %>
+    <%= render('access_permissions/partials/default_public_user_role_form', project: project, editable: true) if project.visible? %>
   </div>
 
   <div class="modal-footer">

app/views/access_permissions/partials/_public_members_dropdown.html.erb

@@ -0,0 +1,15 @@
+<span class="dropdown group-members-dropdown-container">
+  <span id="groupMembersButton" class="fas block-icon fa-info-circle group-members-button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"></span>
+  <div class="dropdown-menu" aria-labelledby="groupMembersButton">
+    <div class="group-members-content">
+      <div class="title">
+        <%= t('.title', team: team.name) %>
+      </div>
+      <% team.users.where.not(id: project.manually_assigned_users.select(:id)).each do |user| %>
+        <div class="name">
+          <%= user.full_name %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+</span>

app/views/access_permissions/projects/update_default_public_user_role.json.jbuilder

@@ -4,7 +4,8 @@ json.form controller.render_to_string(
   partial: 'access_permissions/partials/default_public_user_role_form',
   formats: [:html],
   locals: {
-    project: @project
+    project: @project,
+    editable: true
   },
   layout: false
 )

config/locales/en.yml

@@ -2560,6 +2560,8 @@ en:
       experiment_tooltip_inherit: "This role was inherited from the experiment."
       mymodule: "Task"
       mymodule_tooltip: "This role was set on this task"
+      public_members_dropdown:
+        title: "Members of team %{team}"
 
     projects:
       modals: