scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 14:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Enable leave for team owners for yourself [SCI-9957]

Browse source
This commit is contained in:
Andrej 2024-04-04 16:15:18 +02:00 committed by Anton
parent 4110e966c8
commit d2ace74d75
7 changed files with 68 additions and 131 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/assets/javascripts/users/settings/teams/show.js
View file

@ -110,10 +110,9 @@
function(e, data) {
// Populate the modal heading & body
var modal = $('#destroy-user-team-modal');
var modalHeading = modal.find('.modal-header').find('.modal-title');
var modalBody = modal.find('.modal-body');
modalHeading.text($('<div>').html(data.heading).text());
modalBody.html(data.html);
const modalContent = modal.find('.modal-content');
modalContent.html(data.html);
// Show the modal
modal.modal('show');
@ -122,13 +121,14 @@
'ajax:error',
"[data-action='destroy-user-team']",
function() {
// TODO
HelperModule.flashAlertMsg(I18n.t('users.settings.user_teams.general_error'), 'danger');
}
);
// Also, bind the click action on the modal
$('#destroy-user-team-modal')
.on('click', "[data-action='submit']", function() {
animateSpinner();
var btn = $(this);
var form = btn
.closest('.modal')
@ -154,14 +154,16 @@
// Hide the modal
modal.modal('hide');
animateSpinner(null, false);
// Reload the whole table
usersDatatable.ajax.reload();
location.reload();
}
).on(
'ajax:error',
"[data-id='destroy-user-team-form']",
function() {
// TODO
animateSpinner(null, false);
HelperModule.flashAlertMsg(I18n.t('users.settings.user_teams.general_error'), 'danger');
}
);
}

86
app/controllers/users/settings/user_teams_controller.rb
View file

@ -48,14 +48,9 @@ module Users
render json: {
html: render_to_string(
partial: 'users/settings/user_teams/' \
'destroy_user_team_modal_body',
'destroy_user_team_modal_body',
locals: { user_assignment: @user_assignment },
formats: :html
),
heading: I18n.t(
'users.settings.user_teams.destroy_uo_heading',
user: escape_input(@user_assignment.user.full_name),
team: escape_input(@user_assignment.assignable.name)
)
}
end
@ -63,29 +58,12 @@ module Users
def destroy
# If user is last administrator of team,
# he/she cannot be deleted from it.
invalid =
managing_team_user_roles_collection.include?(@user_assignment.user_role) &&
@user_assignment
.assignable
.user_assignments
.where(user_role: managing_team_user_roles_collection)
.count <= 1
invalid = @user_assignment.last_with_permission?(TeamPermissions::USERS_MANAGE)
unless invalid
begin
@user_assignment.transaction do
# If user leaves on his/her own accord,
# new owner for projects is the first
# administrator of team
if params[:leave]
new_owner =
@user_assignment
.assignable
.user_assignments
.where(user_role: managing_team_user_roles_collection)
.where.not(id: @user_assignment.id)
.first
.user
Activities::CreateActivityService
.call(activity_type: :user_leave_team,
owner: current_user,
@ -95,10 +73,6 @@ module Users
team: @user_assignment.assignable.id
})
else
# Otherwise, the new owner for projects is
# the current user (= an administrator removing
# the user from the team)
new_owner = current_user
Activities::CreateActivityService
.call(activity_type: :remove_user_from_team,
owner: current_user,
@ -110,8 +84,7 @@ module Users
})
end
reset_user_current_team(@user_assignment)
remove_user_from_team!(@user_assignment, new_owner)
@user_assignment.destroy!
end
rescue StandardError => e
Rails.logger.error e.message
@ -119,21 +92,27 @@ module Users
end
end
if !invalid
if params[:leave]
flash[:notice] = I18n.t(
'users.settings.user_teams.leave_flash',
team: @user_assignment.assignable.name
)
flash.keep(:notice)
end
if invalid
render json: @user_assignment.errors, status: :unprocessable_entity
else
flash[:success] = if params[:leave]
I18n.t(
'users.settings.user_teams.leave_flash',
team: @user_assignment.assignable.name
)
else
I18n.t(
'users.settings.user_teams.remove_flash',
user: @user_assignment.user.full_name,
team: @user_assignment.assignable.name
)
end
generate_notification(current_user,
@user_assignment.user,
@user_assignment.assignable,
false)
render json: { status: :ok }
else
render json: @user_assignment.errors, status: :unprocessable_entity
end
end
@ -165,33 +144,6 @@ module Users
user_assignment.user.current_team_id = ids.first
user_assignment.user.save
end
def remove_user_from_team!(user_assignment, new_owner)
return user_assignment.destroy! unless new_owner
# Also, make new owner author of all protocols that belong
# to the departing user and belong to this team.
p_ids = user_assignment.user.added_protocols.where(team: user_assignment.assignable).pluck(:id)
Protocol.where(id: p_ids).find_each do |protocol|
protocol.record_timestamps = false
protocol.added_by = new_owner
protocol.archived_by = new_owner if protocol.archived_by == user_assignment.user
protocol.restored_by = new_owner if protocol.restored_by == user_assignment.user
protocol.save!(validate: false)
protocol.user_assignments.find_by(user: new_owner)&.destroy!
protocol.user_assignments.create!(
user: new_owner,
user_role: UserRole.find_predefined_owner_role,
assigned: :manually
)
end
# Make new owner author of all inventory items that were added
# by departing user and belong to this team.
RepositoryRow.change_owner(user_assignment.assignable, user_assignment.user, new_owner)
user_assignment.destroy!
end
end
end
end

2
app/views/users/settings/teams/_user_dropdown.html.erb
View file

@ -1,5 +1,5 @@
<% if user_assignment.user == user %>
<button class="btn btn-light btn-xs icon-btn" type="button" disabled="disabled">
<button class="btn btn-light btn-xs icon-btn" id="leave-team-btn" type="button" disabled="disabled">
<span class="sn-icon sn-icon-down"></span>
</button>
<% else %>

12
app/views/users/settings/user_teams/_destroy_user_team_modal.html.erb
View file

@ -5,18 +5,6 @@
aria-labelledby="destroy-user-team-modal-label">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="sn-icon sn-icon-close"></i></button>
<h4 class="modal-title" id="destroy-user-team-modal-label">
</h4>
</div>
<div class="modal-body"></div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%=t 'general.cancel' %></button>
<button type="button"
class="btn btn-danger"
data-action="submit"><%=t 'users.settings.user_teams.destroy_uo_confirm' %></button>
</div>
</div>
</div>
</div>

43
app/views/users/settings/user_teams/_destroy_user_team_modal_body.html.erb
View file

@ -1,21 +1,28 @@
<%= form_with model: user_assignment,
url: destroy_user_team_path(user_assignment, format: :json),
data: { remote: true, id: 'destroy-user-team-form' },
method: :delete do |f| %>
<p><%= t("users.settings.user_teams.destroy_uo_message",
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="sn-icon sn-icon-close"></i></button>
<h4 class="modal-title" id="destroy-user-team-modal-label">
<%= t('users.settings.user_teams.destroy_uo_heading',
user: user_assignment.user.full_name,
team: user_assignment.assignable.name) %></p>
<% if user_assignment.user.confirmed? %>
<div class="alert alert-danger" role="alert">
<span class="fas fa-exclamation-triangle"></span>
&nbsp;
<%= t("users.settings.user_teams.destroy_uo_alert_heading") %>
<ul>
<li><%= t("users.settings.user_teams.destroy_uo_alert_line_1") %></li>
<li><%= t("users.settings.user_teams.destroy_uo_alert_line_2").html_safe %></li>
<li><%= t("users.settings.user_teams.destroy_uo_alert_line_3") %></li>
<li><%= t("users.settings.user_teams.destroy_uo_alert_line_4") %></li>
</ul>
team: user_assignment.assignable.name,
role: user_assignment.user_role.name.downcase) %>
</h4>
</div>
<div class="modal-body">
<%= form_with model: user_assignment,
url: destroy_user_team_path(user_assignment, format: :json),
data: { remote: true, id: 'destroy-user-team-form' },
method: :delete do |f| %>
<div class='flex flex-col gap-6'>
<div><%= t("users.settings.user_teams.destroy_message", role: user_assignment.user_role.name.downcase) %></div>
<div><%= t("users.settings.user_teams.message_owner") %></div>
<div><%= t("users.settings.user_teams.message_alert") %></div>
</div>
<% end %>
<% end %>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%=t 'general.cancel' %></button>
<button type="button"
class="btn btn-danger"
data-action="submit"><%=t 'users.settings.user_teams.destroy_uo_confirm' %>
</button>
</div>

15
app/views/users/settings/user_teams/_leave_user_team_modal_body.html.erb
View file

@ -4,16 +4,9 @@
method: :delete,
data: { id: 'leave-user-team-form' } do |f| %>
<%= hidden_field_tag :leave, true %>
<p><%= t("users.settings.user_teams.leave_uo_message", team: @user_assignment.team.name) %></p>
<div class="alert alert-danger" role="alert">
<span class="fas fa-exclamation-triangle"></span>
&nbsp;
<%= t("users.settings.user_teams.leave_uo_alert_heading") %>
<ul>
<li><%= t("users.settings.user_teams.leave_uo_alert_line_1") %></li>
<li><%= t("users.settings.user_teams.leave_uo_alert_line_2").html_safe %></li>
<li><%= t("users.settings.user_teams.leave_uo_alert_line_3")%></li>
<li><%= t("users.settings.user_teams.leave_uo_alert_line_4")%></li>
</ul>
<div class='flex flex-col gap-6'>
<div><%= t("users.settings.user_teams.leave_message") %></div>
<div><%= t("users.settings.user_teams.message_owner") %></div>
<div><%= t("users.settings.user_teams.message_alert") %></div>
</div>
<% end %>

25
config/locales/en.yml
View file

@ -2973,22 +2973,17 @@ en:
flash_success: "Team %{team} was successfully deleted."
user_teams:
leave_uo_heading: "Leave team %{team}"
leave_uo_message: "Are you sure you wish to leave team %{team}? This action is irreversible."
leave_uo_alert_heading: "Leaving team has following consequences:"
leave_uo_alert_line_1: "you will lose access to all content belonging to the team (including projects, tasks, protocols and activities);"
leave_uo_alert_line_2: "all projects in the team where you were the sole <b>Owner</b> will receive a new owner from the team administrators;"
leave_uo_alert_line_3: "all repository protocols in the team belonging to you will be reassigned onto a new owner from team administrators;"
leave_uo_alert_line_4: "all inventory items in the team added by you will be reassigned onto a new owner from team administrators."
leave_uo_confirm: "Leave"
destroy_uo_heading: "Remove user %{user} from team %{team}"
destroy_uo_message: "Are you sure you wish to remove user %{user} from team %{team}?"
destroy_uo_alert_heading: "Removing user from team has following consequences:"
destroy_uo_alert_line_1: "user will lose access to all content belonging to the team (including projects, tasks, protocols and activities);"
destroy_uo_alert_line_2: "all projects in the team where user was the sole <b>Owner</b> will be reassigned onto you as a new owner;"
destroy_uo_alert_line_3: "all repository protocols in the team belonging to user will be reassigned onto you;"
destroy_uo_alert_line_4: "all inventory items in the team added by user will be reassigned onto you."
leave_message: "You will lose access to all content associated with the team, including projects, inventories, and protocol templates."
destroy_message: 'Removing a team %{role} will revoke their access to all content associated with the team, including projects, inventories, and protocol templates.'
leave_uo_confirm: "Leave team"
destroy_uo_heading: "Remove team %{role} %{user} from team %{team}"
message_owner: "Other team owner(s) will be able to view and manage access to the content."
message_alert: "This action cannot be undone."
destroy_uo_alert_line_3: "This action cannot be undone."
destroy_uo_confirm: "Remove"
leave_flash: "Successfully left team %{team}."
leave_flash: "You have left %{team}."
remove_flash: "%{user} has been successfully removed from the team %{team}"
general_error: "Something went wrong"
user_roles:
predefined: