Refactor admin user page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

8 files changed, 245 insertions, 235 deletions

diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 06d6d61e907..a01eef74fb9 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -1,5 +1,5 @@
 class Admin::UsersController < Admin::ApplicationController
-  before_action :user, only: [:show, :edit, :update, :destroy]
+  before_action :user, except: [:index, :new, :create]
 
   def index
     @users = User.order_name_asc.filter(params[:filter])
@@ -9,8 +9,17 @@ class Admin::UsersController < Admin::ApplicationController
   end
 
   def show
+  end
+
+  def projects
     @personal_projects = user.personal_projects
     @joined_projects = user.projects.joined(@user)
+  end
+
+  def groups
+  end
+
+  def keys
     @keys = user.keys
   end
 
diff --git a/app/views/admin/identities/index.html.haml b/app/views/admin/identities/index.html.haml
index 76a0f6ca812..ae57e3adc4d 100644
--- a/app/views/admin/identities/index.html.haml
+++ b/app/views/admin/identities/index.html.haml
@@ -1,8 +1,6 @@
-%h3.page-title
-  Identities for
-  = link_to @user.name, [:admin, @user]
+- page_title "Identities", @user.name, "Users"
+= render 'admin/users/head'
 
-%hr
 - if @identities.present?
   %table.table
     %thead
diff --git a/app/views/admin/users/_head.html.haml b/app/views/admin/users/_head.html.haml
new file mode 100644
index 00000000000..c1ec1d48e17
--- /dev/null
+++ b/app/views/admin/users/_head.html.haml
@@ -0,0 +1,23 @@
+%h3.page-title
+  = @user.name
+  - if @user.blocked?
+    %span.cred (Blocked)
+  - if @user.admin
+    %span.cred (Admin)
+
+  .pull-right
+    = link_to edit_admin_user_path(@user), class: "btn btn-grouped" do
+      %i.fa.fa-pencil-square-o
+      Edit
+
+%ul.nav.nav-tabs
+  = nav_link(path: 'users#show') do
+    = link_to "Account", admin_user_path(@user)
+  = nav_link(path: 'users#groups') do
+    = link_to "Groups", groups_admin_user_path(@user)
+  = nav_link(path: 'users#projects') do
+    = link_to "Projects", projects_admin_user_path(@user)
+  = nav_link(path: 'users#keys') do
+    = link_to "SSH keys", keys_admin_user_path(@user)
+  = nav_link(controller: :identities) do
+    = link_to "Identities", admin_user_identities_path(@user)
diff --git a/app/views/admin/users/groups.html.haml b/app/views/admin/users/groups.html.haml
new file mode 100644
index 00000000000..dbecb7bbfd6
--- /dev/null
+++ b/app/views/admin/users/groups.html.haml
@@ -0,0 +1,19 @@
+- page_title "Groups", @user.name, "Users"
+= render 'admin/users/head'
+
+- if @user.group_members.present?
+  .panel.panel-default
+    .panel-heading Groups:
+    %ul.well-list
+      - @user.group_members.each do |group_member|
+        - group = group_member.group
+        %li.group_member
+          %span{class: ("list-item-name" unless group_member.owner?)}
+            %strong= link_to group.name, admin_group_path(group)
+          .pull-right
+            %span.light= group_member.human_access
+            - unless group_member.owner?
+              = link_to group_group_member_path(group, group_member), data: { confirm: remove_user_from_group_message(group, group_member) }, method: :delete, remote: true, class: "btn-xs btn btn-remove", title: 'Remove user from group' do
+                %i.fa.fa-times.fa-inverse
+- else
+  .nothing-here-block This user has no groups.
diff --git a/app/views/admin/users/keys.html.haml b/app/views/admin/users/keys.html.haml
new file mode 100644
index 00000000000..07110717082
--- /dev/null
+++ b/app/views/admin/users/keys.html.haml
@@ -0,0 +1,3 @@
+- page_title "Keys", @user.name, "Users"
+= render 'admin/users/head'
+= render 'profiles/keys/key_table', admin: true
diff --git a/app/views/admin/users/projects.html.haml b/app/views/admin/users/projects.html.haml
new file mode 100644
index 00000000000..0d7a1a25a80
--- /dev/null
+++ b/app/views/admin/users/projects.html.haml
@@ -0,0 +1,43 @@
+- page_title "Projects", @user.name, "Users"
+= render 'admin/users/head'
+
+- if @user.groups.any?
+  .panel.panel-default
+    .panel-heading Group projects
+    %ul.well-list
+      - @user.groups.each do |group|
+        %li
+          %strong= group.name
+          &ndash; access to
+          #{pluralize(group.projects.count, 'project')}
+
+.row
+  .col-md-6
+    - if @personal_projects.present?
+      = render 'users/projects', projects: @personal_projects
+    - else
+      .nothing-here-block This user has no personal projects.
+
+
+  .col-md-6
+    .panel.panel-default
+      .panel-heading Joined projects (#{@joined_projects.count})
+      %ul.well-list
+        - @joined_projects.sort_by(&:name_with_namespace).each do |project|
+          - member = project.team.find_member(@user.id)
+          %li.project_member
+            .list-item-name
+              = link_to admin_namespace_project_path(project.namespace, project), class: dom_class(project) do
+                = project.name_with_namespace
+
+            - if member
+              .pull-right
+                - if member.owner?
+                  %span.light Owner
+                - else
+                  %span.light= member.human_access
+
+                  - if member.respond_to? :project
+                    = link_to namespace_project_project_member_path(project.namespace, project, member), data: { confirm: remove_from_project_team_message(project, member) }, remote: true, method: :delete, class: "btn-xs btn btn-remove", title: 'Remove user from project' do
+                      %i.fa.fa-times
+
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml
index 278102d5d4d..69918193e8a 100644
--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
@@ -1,234 +1,146 @@
 - page_title @user.name, "Users"
-%h3.page-title
-  User:
-  = @user.name
-  - if @user.blocked?
-    %span.cred (Blocked)
-  - if @user.admin
-    %span.cred (Admin)
-
-  .pull-right
-    = link_to edit_admin_user_path(@user), class: "btn btn-grouped" do
-      %i.fa.fa-pencil-square-o
-      Edit
-%hr
-%ul.nav.nav-tabs
-  %li.active
-    %a{"data-toggle" => "tab", href: "#account"} Account
-  %li
-    %a{"data-toggle" => "tab", href: "#profile"} Profile
-  %li
-    %a{"data-toggle" => "tab", href: "#groups"} Groups
-  %li
-    %a{"data-toggle" => "tab", href: "#projects"} Projects
-  %li
-    %a{"data-toggle" => "tab", href: "#ssh-keys"} SSH keys
-  %li
-    = link_to "Identities", admin_user_identities_path(@user)
-
-.tab-content
-  #account.tab-pane.active
-    .row
-      .col-md-6
-        .panel.panel-default
-          .panel-heading
-            Account:
-          %ul.well-list
-            %li
-              %span.light Name:
-              %strong= @user.name
-            %li
-              %span.light Username:
-              %strong
-                = @user.username
-            %li
-              %span.light Email:
-              %strong
-                = mail_to @user.email
-            - @user.emails.each do |email|
-              %li
-                %span.light Secondary email:
-                %strong= email.email
-                = link_to remove_email_admin_user_path(@user, email), data: { confirm: "Are you sure you want to remove #{email.email}?" }, method: :delete, class: "btn-xs btn btn-remove pull-right", title: 'Remove secondary email', id: "remove_email_#{email.id}" do
-                  %i.fa.fa-times
-
-            %li
-              %span.light Can create groups:
-              %strong
-                = @user.can_create_group ? "Yes" : "No"
-            %li
-              %span.light Personal projects limit:
-              %strong
-                = @user.projects_limit
-            %li
-              %span.light Member since:
-              %strong
-                = @user.created_at.stamp("Nov 12, 2031")
-            - if @user.confirmed_at
-              %li
-                %span.light Confirmed at:
-                %strong
-                  = @user.confirmed_at.stamp("Nov 12, 2031")
+= render 'admin/users/head', page_name: 'Account'
+
+.row
+  .col-md-6
+    .panel.panel-default
+      .panel-heading
+        = @user.name
+      %ul.well-list
+        %li
+          = image_tag avatar_icon(@user.email, 60), class: "avatar s60"
+        %li
+          %span.light Profile page:
+          %strong
+            = link_to user_path(@user) do
+              = @user.username
+    = render 'users/profile', user: @user
+
+    .panel.panel-default
+      .panel-heading
+        Account:
+      %ul.well-list
+        %li
+          %span.light Name:
+          %strong= @user.name
+        %li
+          %span.light Username:
+          %strong
+            = @user.username
+        %li
+          %span.light Email:
+          %strong
+            = mail_to @user.email
+        - @user.emails.each do |email|
+          %li
+            %span.light Secondary email:
+            %strong= email.email
+            = link_to remove_email_admin_user_path(@user, email), data: { confirm: "Are you sure you want to remove #{email.email}?" }, method: :delete, class: "btn-xs btn btn-remove pull-right", title: 'Remove secondary email', id: "remove_email_#{email.id}" do
+              %i.fa.fa-times
+
+        %li
+          %span.light Can create groups:
+          %strong
+            = @user.can_create_group ? "Yes" : "No"
+        %li
+          %span.light Personal projects limit:
+          %strong
+            = @user.projects_limit
+        %li
+          %span.light Member since:
+          %strong
+            = @user.created_at.stamp("Nov 12, 2031")
+        - if @user.confirmed_at
+          %li
+            %span.light Confirmed at:
+            %strong
+              = @user.confirmed_at.stamp("Nov 12, 2031")
+        - else
+          %li
+            %span.light Confirmed:
+            %strong.cred
+              No
+
+        %li
+          %span.light Current sign-in at:
+          %strong
+            - if @user.current_sign_in_at
+              = @user.current_sign_in_at.stamp("Nov 12, 2031")
             - else
-              %li
-                %span.light Confirmed:
-                %strong.cred
-                  No
-
-            %li
-              %span.light Current sign-in at:
-              %strong
-                - if @user.current_sign_in_at
-                  = @user.current_sign_in_at.stamp("Nov 12, 2031")
-                - else
-                  never
-
-            %li
-              %span.light Last sign-in at:
-              %strong
-                - if @user.last_sign_in_at
-                  = @user.last_sign_in_at.stamp("Nov 12, 2031")
-                - else
-                  never
-
-            %li
-              %span.light Sign-in count:
-              %strong
-                = @user.sign_in_count
-
-            - if @user.ldap_user?
-              %li
-                %span.light LDAP uid:
-                %strong
-                  = @user.ldap_identity.extern_uid
-
-            - if @user.created_by
-              %li
-                %span.light Created by:
-                %strong
-                  = link_to @user.created_by.name, [:admin, @user.created_by]
-
-      .col-md-6
-        - unless @user == current_user
-          - if @user.blocked?
-            .panel.panel-info
-              .panel-heading
-                This user is blocked
-              .panel-body
-                %p Blocking user has the following effects:
-                %ul
-                  %li User will not be able to login
-                  %li User will not be able to access git repositories
-                  %li Personal projects will be left
-                  %li Owned groups will be left
-                %br
-                = link_to 'Unblock user', unblock_admin_user_path(@user), method: :put, class: "btn btn-info", data: { confirm: 'Are you sure?' }
-          - else
-            .panel.panel-warning
-              .panel-heading
-                Block this user
-              .panel-body
-                %p Blocking user has the following effects:
-                %ul
-                  %li User will not be able to login
-                  %li User will not be able to access git repositories
-                  %li User will be removed from joined projects and groups
-                  %li Personal projects will be left
-                  %li Owned groups will be left
-                %br
-                = link_to 'Block user', block_admin_user_path(@user), data: { confirm: 'USER WILL BE BLOCKED! Are you sure?' }, method: :put, class: "btn btn-warning"
+              never
 
-          .panel.panel-danger
-            .panel-heading
-              Remove user
-            .panel-body
-              - if @user.can_be_removed?
-                %p Deleting a user has the following effects:
-                %ul
-                  %li All user content like authored issues, snippets, comments will be removed
-                  - rp = @user.personal_projects.count
-                  - unless rp.zero?
-                    %li #{pluralize rp, 'personal project'} will be removed and cannot be restored
-                %br
-                = link_to 'Remove user', [:admin, @user], data: { confirm: "USER #{@user.name} WILL BE REMOVED! Are you sure?" }, method: :delete, class: "btn btn-remove"
-              - else
-                - if @user.solo_owned_groups.present?
-                  %p
-                    This user is currently an owner in these groups:
-                    %strong #{@user.solo_owned_groups.map(&:name).join(', ')}
-                  %p
-                    You must transfer ownership or delete these groups before you can delete this user.
-
-  #profile.tab-pane
-    .row
-      .col-md-6
-        .panel.panel-default
+        %li
+          %span.light Last sign-in at:
+          %strong
+            - if @user.last_sign_in_at
+              = @user.last_sign_in_at.stamp("Nov 12, 2031")
+            - else
+              never
+
+        %li
+          %span.light Sign-in count:
+          %strong
+            = @user.sign_in_count
+
+        - if @user.ldap_user?
+          %li
+            %span.light LDAP uid:
+            %strong
+              = @user.ldap_identity.extern_uid
+
+        - if @user.created_by
+          %li
+            %span.light Created by:
+            %strong
+              = link_to @user.created_by.name, [:admin, @user.created_by]
+
+  .col-md-6
+    - unless @user == current_user
+      - if @user.blocked?
+        .panel.panel-info
           .panel-heading
-            = @user.name
-          %ul.well-list
-            %li
-              = image_tag avatar_icon(@user.email, 60), class: "avatar s60"
-            %li
-              %span.light Profile page:
-              %strong
-                = link_to user_path(@user) do
-                  = @user.username
-      .col-md-6
-        = render 'users/profile', user: @user
-
-  #groups.tab-pane
-    - if @user.group_members.present?
-      .panel.panel-default
-        .panel-heading Groups:
-        %ul.well-list
-          - @user.group_members.each do |group_member|
-            - group = group_member.group
-            %li.group_member
-              %span{class: ("list-item-name" unless group_member.owner?)}
-                %strong= link_to group.name, admin_group_path(group)
-              .pull-right
-                %span.light= group_member.human_access
-                - unless group_member.owner?
-                  = link_to group_group_member_path(group, group_member), data: { confirm: remove_user_from_group_message(group, group_member) }, method: :delete, remote: true, class: "btn-xs btn btn-remove", title: 'Remove user from group' do
-                    %i.fa.fa-times.fa-inverse
-    - else
-      .nothing-here-block This user has no groups.
-
-  #projects.tab-pane
-    - if @user.groups.any?
-      .panel.panel-default
-        .panel-heading Group projects
-        %ul.well-list
-          - @user.groups.each do |group|
-            %li
-              %strong= group.name
-              &ndash; access to
-              #{pluralize(group.projects.count, 'project')}
-
-    .row
-      .col-md-6
-        = render 'users/projects', projects: @personal_projects
-
-      .col-md-6
-        .panel.panel-default
-          .panel-heading Joined projects (#{@joined_projects.count})
-          %ul.well-list
-            - @joined_projects.sort_by(&:name_with_namespace).each do |project|
-              - member = project.team.find_member(@user.id)
-              %li.project_member
-                .list-item-name
-                  = link_to admin_namespace_project_path(project.namespace, project), class: dom_class(project) do
-                    = project.name_with_namespace
-
-                - if member
-                  .pull-right
-                    - if member.owner?
-                      %span.light Owner
-                    - else
-                      %span.light= member.human_access
-
-                      - if member.respond_to? :project
-                        = link_to namespace_project_project_member_path(project.namespace, project, member), data: { confirm: remove_from_project_team_message(project, member) }, remote: true, method: :delete, class: "btn-xs btn btn-remove", title: 'Remove user from project' do
-                          %i.fa.fa-times
-  #ssh-keys.tab-pane
-    = render 'profiles/keys/key_table', admin: true
+            This user is blocked
+          .panel-body
+            %p Blocking user has the following effects:
+            %ul
+              %li User will not be able to login
+              %li User will not be able to access git repositories
+              %li Personal projects will be left
+              %li Owned groups will be left
+            %br
+            = link_to 'Unblock user', unblock_admin_user_path(@user), method: :put, class: "btn btn-info", data: { confirm: 'Are you sure?' }
+      - else
+        .panel.panel-warning
+          .panel-heading
+            Block this user
+          .panel-body
+            %p Blocking user has the following effects:
+            %ul
+              %li User will not be able to login
+              %li User will not be able to access git repositories
+              %li User will be removed from joined projects and groups
+              %li Personal projects will be left
+              %li Owned groups will be left
+            %br
+            = link_to 'Block user', block_admin_user_path(@user), data: { confirm: 'USER WILL BE BLOCKED! Are you sure?' }, method: :put, class: "btn btn-warning"
+
+      .panel.panel-danger
+        .panel-heading
+          Remove user
+        .panel-body
+          - if @user.can_be_removed?
+            %p Deleting a user has the following effects:
+            %ul
+              %li All user content like authored issues, snippets, comments will be removed
+              - rp = @user.personal_projects.count
+              - unless rp.zero?
+                %li #{pluralize rp, 'personal project'} will be removed and cannot be restored
+            %br
+            = link_to 'Remove user', [:admin, @user], data: { confirm: "USER #{@user.name} WILL BE REMOVED! Are you sure?" }, method: :delete, class: "btn btn-remove"
+          - else
+            - if @user.solo_owned_groups.present?
+              %p
+                This user is currently an owner in these groups:
+                %strong #{@user.solo_owned_groups.map(&:name).join(', ')}
+              %p
+                You must transfer ownership or delete these groups before you can delete this user.
diff --git a/config/routes.rb b/config/routes.rb
index 00a95a23edc..33f55dde476 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -152,6 +152,9 @@ Gitlab::Application.routes.draw do
       resources :identities, only: [:index, :edit, :update, :destroy]
 
       member do
+        get :projects
+        get :keys
+        get :groups
         put :team_update
         put :block
         put :unblock