UI and copywriting improvements

+ Move 'Edit Project/Group' out of membership-related partial
+ Show the access request buttons only to logged-in users
+ Put the request access buttons out of in a more visible button
+ Improve the copy in the #remove_member_message helper

Signed-off-by: Rémy Coutable <remy@rymai.me>

1 files changed, 27 insertions, 99 deletions

diff --git a/app/helpers/members_helper.rb b/app/helpers/members_helper.rb
index bd84b8b239f..a53828ef4e7 100644
--- a/app/helpers/members_helper.rb
+++ b/app/helpers/members_helper.rb
@@ -1,117 +1,45 @@
 module MembersHelper
-  def member_class(member)
-    "#{member.source.class.to_s}Member".constantize
-  end
-
-  def members_association(entity)
-    "#{entity.class.to_s.underscore}_members".to_sym
-  end
-
+  # Returns a `<action>_<source>_member` association, e.g.:
+  # - admin_project_member, update_project_member, destroy_project_member
+  # - admin_group_member, update_group_member, destroy_group_member
   def action_member_permission(action, member)
-    "#{action}_#{member.source.class.to_s.underscore}_member".to_sym
+    "#{action}_#{member.type.underscore}".to_sym
   end
 
-  def can_see_entity_roles?(user, entity)
+  def can_see_member_roles?(source:, user: nil)
     return false unless user
 
-    user.is_admin? || entity.send(members_association(entity)).exists?(user_id: user.id)
-  end
-
-  def member_path(member)
-    case member.source
-    when Project
-      namespace_project_project_member_path(member.source.namespace, member.source, member)
-    when Group
-      group_group_member_path(member.source, member)
-    else
-      raise ArgumentError.new('Unknown object class')
-    end
+    user.is_admin? || source.members.exists?(user_id: user.id)
   end
 
-  def resend_invite_member_path(member)
-    case member.source
-    when Project
-      resend_invite_namespace_project_project_member_path(member.source.namespace, member.source, member)
-    when Group
-      resend_invite_group_group_member_path(member.source, member)
-    else
-      raise ArgumentError.new('Unknown object class')
-    end
-  end
+  def remove_member_message(member, user: nil)
+    user = current_user if defined?(current_user)
 
-  def request_access_path(entity)
-    case entity
-    when Project
-      request_access_namespace_project_project_members_path(entity.namespace, entity)
-    when Group
-      request_access_group_group_members_path(entity)
-    else
-      raise ArgumentError.new('Unknown object class')
-    end
-  end
-
-  def approve_request_member_path(member)
-    case member.source
-    when Project
-      approve_access_request_namespace_project_project_member_path(member.source.namespace, member.source, member)
-    when Group
-      approve_access_request_group_group_member_path(member.source, member)
-    else
-      raise ArgumentError.new('Unknown object class')
-    end
-  end
+    text = 'Are you sure you want to '
+    action =
+      if member.request?
+        if member.user == user
+          'withdraw your access request for'
+        else
+          "deny #{member.user.name}'s request to join"
+        end
+      elsif member.invite?
+        "revoke the invitation for #{member.invite_email} to join"
+      else
+        "remove #{member.user.name} from"
+      end
 
-  def leave_path(entity)
-    case entity
-    when Project
-      leave_namespace_project_project_members_path(entity.namespace, entity)
-    when Group
-      leave_group_group_members_path(entity)
-    else
-      raise ArgumentError.new('Unknown object class')
-    end
-  end
-
-  def withdraw_request_message(entity)
-    "Are you sure you want to withdraw your access request for the \"#{entity_name(entity)}\" #{entity_type(entity)}?"
-  end
-
-  def remove_member_message(member)
-    entity = member.source
-    entity_type = entity_type(entity)
-    entity_name = entity_name(entity)
-
-    if member.request?
-      "You are going to deny #{member.created_by.name}'s request to join the #{entity_name} #{entity_type}. Are you sure?"
-    elsif member.invite?
-      "You are going to revoke the invitation for #{member.invite_email} to join the #{entity_name} #{entity_type}. Are you sure?"
-    else
-      "You are going to remove #{member.user.name} from the #{entity_name} #{entity_type}. Are you sure?"
-    end
+    text << action << " the #{member.source.human_name} #{member.real_source_type.humanize(capitalize: false)}?"
   end
 
   def remove_member_title(member)
-    member.request? ? 'Deny access request' : 'Remove user'
-  end
-
-  def leave_confirmation_message(entity)
-    "Are you sure you want to leave \"#{entity_name(entity)}\" #{entity_type(entity)}?"
-  end
-
-  private
+    text = " from #{member.real_source_type.humanize(capitalize: false)}"
 
-  def entity_type(entity)
-    entity.class.to_s.underscore
+    text.prepend(member.request? ? 'Deny access request' : 'Remove user')
   end
 
-  def entity_name(entity)
-    case entity
-    when Project
-      entity.name_with_namespace
-    when Group
-      entity.name
-    else
-      raise ArgumentError.new('Unknown object class')
-    end
+  def leave_confirmation_message(member_source)
+    "Are you sure you want to leave the " \
+    "\"#{member_source.human_name}\" #{member_source.class.to_s.humanize(capitalize: false)}?"
   end
 end