Commit 9fffe077320bb60d4b24ca717f4838755222dea1
2022-01-27T19:06:35
[admin] sort user index by columns
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301
diff --git a/lib/kmxgit/user_manager.ex b/lib/kmxgit/user_manager.ex
index 1787026..33fb39e 100644
--- a/lib/kmxgit/user_manager.ex
+++ b/lib/kmxgit/user_manager.ex
@@ -9,10 +9,123 @@ defmodule Kmxgit.UserManager do
alias Kmxgit.SlugManager.Slug
alias Kmxgit.UserManager.{Avatar, User, UserToken, UserNotifier}
+ @list_preload [:owned_repositories,
+ :slug]
+
def list_users do
+ update_disk_usage()
+ Repo.all from user in User,
+ preload: ^@list_preload
+ end
+ def list_users(%{column: "id", reverse: true}) do
+ update_disk_usage()
+ Repo.all from user in User,
+ preload: ^@list_preload,
+ order_by: [desc: :id]
+ end
+ def list_users(%{column: "id"}) do
+ update_disk_usage()
+ Repo.all from user in User,
+ preload: ^@list_preload,
+ order_by: :id
+ end
+ def list_users(%{column: "name", reverse: true}) do
+ update_disk_usage()
+ Repo.all from user in User,
+ preload: ^@list_preload,
+ order_by: [desc: :name]
+ end
+ def list_users(%{column: "name"}) do
+ update_disk_usage()
+ Repo.all from user in User,
+ preload: ^@list_preload,
+ order_by: :name
+ end
+ def list_users(%{column: "email", reverse: true}) do
+ update_disk_usage()
+ Repo.all from user in User,
+ preload: ^@list_preload,
+ order_by: [desc: :email]
+ end
+ def list_users(%{column: "email"}) do
+ update_disk_usage()
+ Repo.all from user in User,
+ preload: ^@list_preload,
+ order_by: :email
+ end
+ def list_users(%{column: "login", reverse: true}) do
+ update_disk_usage()
+ Repo.all from user in User,
+ join: s in Slug,
+ on: s.user_id == user.id,
+ preload: ^@list_preload,
+ order_by: [desc: s.slug]
+ end
+ def list_users(%{column: "login"}) do
+ update_disk_usage()
+ Repo.all from user in User,
+ join: s in Slug,
+ on: s.user_id == user.id,
+ preload: ^@list_preload,
+ order_by: s.slug
+ end
+ def list_users(%{column: "du", reverse: true}) do
+ update_disk_usage()
+ Repo.all from user in User,
+ preload: ^@list_preload,
+ order_by: [desc: :disk_usage]
+ end
+ def list_users(%{column: "du"}) do
+ update_disk_usage()
+ Repo.all from user in User,
+ preload: ^@list_preload,
+ order_by: :disk_usage
+ end
+ def list_users(%{column: "mfa", reverse: true}) do
+ update_disk_usage()
+ Repo.all from user in User,
+ preload: ^@list_preload,
+ order_by: [desc: user.totp_last == 0]
+ end
+ def list_users(%{column: "mfa"}) do
+ update_disk_usage()
+ Repo.all from user in User,
+ preload: ^@list_preload,
+ order_by: user.totp_last == 0
+ end
+ def list_users(%{column: "admin", reverse: true}) do
+ update_disk_usage()
Repo.all from user in User,
- preload: [:owned_repositories,
- :slug]
+ preload: ^@list_preload,
+ order_by: [desc: :is_admin]
+ end
+ def list_users(%{column: "admin"}) do
+ update_disk_usage()
+ Repo.all from user in User,
+ preload: ^@list_preload,
+ order_by: :is_admin
+ end
+ def list_users(%{column: "deploy", reverse: true}) do
+ update_disk_usage()
+ Repo.all from user in User,
+ preload: ^@list_preload,
+ order_by: [desc: :deploy_only]
+ end
+ def list_users(%{column: "deploy"}) do
+ update_disk_usage()
+ Repo.all from user in User,
+ preload: ^@list_preload,
+ order_by: :deploy_only
+ end
+
+ def update_disk_usage() do
+ users = Repo.all(from user in User, preload: :slug)
+ |> Enum.map(fn user ->
+ user
+ |> Ecto.Changeset.cast(%{}, [])
+ |> Ecto.Changeset.put_change(:disk_usage, User.disk_usage(user))
+ |> Repo.update!()
+ end)
end
def put_disk_usage(user = %User{}) do
diff --git a/lib/kmxgit/user_manager/user.ex b/lib/kmxgit/user_manager/user.ex
index ed53e1d..d327d34 100644
--- a/lib/kmxgit/user_manager/user.ex
+++ b/lib/kmxgit/user_manager/user.ex
@@ -12,7 +12,7 @@ defmodule Kmxgit.UserManager.User do
field :confirmed_at, :utc_datetime
field :deploy_only, :boolean, null: false, default: false
field :description, :string, null: true
- field :disk_usage, :integer, virtual: true, default: 0
+ field :disk_usage, :integer, default: 0
field :email, :string
field :hashed_password, :string, redact: true
field :is_admin, :boolean, null: false, default: false
diff --git a/lib/kmxgit_web/controllers/admin/user_controller.ex b/lib/kmxgit_web/controllers/admin/user_controller.ex
index 2f6b4af..b527253 100644
--- a/lib/kmxgit_web/controllers/admin/user_controller.ex
+++ b/lib/kmxgit_web/controllers/admin/user_controller.ex
@@ -7,11 +7,12 @@ defmodule KmxgitWeb.Admin.UserController do
alias Kmxgit.UserManager.User
alias KmxgitWeb.ErrorView
- def index(conn, _params) do
- users = UserManager.list_users
- |> UserManager.put_disk_usage()
+ def index(conn, params) do
+ sort = KmxgitWeb.Admin.sort_param(params["sort"])
+ users = UserManager.list_users(sort)
conn
|> assign(:page_title, gettext("Users"))
+ |> assign(:sort, sort)
|> assign(:users, users)
|> render("index.html")
end
diff --git a/lib/kmxgit_web/templates/admin/repository/index.html.heex b/lib/kmxgit_web/templates/admin/repository/index.html.heex
index 6492d81..37d7480 100644
--- a/lib/kmxgit_web/templates/admin/repository/index.html.heex
+++ b/lib/kmxgit_web/templates/admin/repository/index.html.heex
@@ -2,30 +2,34 @@
<h1>Repositories</h1>
<table class="table admin-index">
- <tr>
- <th><%= link gettext("Id"), to: Routes.admin_repository_path(@conn, :index, sort: "id#{if @sort.column == "id" && !@sort.reverse, do: "-"}") %><%= if @sort.column == "id" do %><%= if @sort.reverse do %> <i class="fa fa-angle-down"></i><% else %> <i class="fa fa-angle-up"></i><% end %><% end %></th>
- <th><%= link gettext("Owner"), to: Routes.admin_repository_path(@conn, :index, sort: "owner#{if @sort.column == "owner" && !@sort.reverse, do: "-"}") %><%= if @sort.column == "owner" do %><%= if @sort.reverse do %> <i class="fa fa-angle-down"></i><% else %> <i class="fa fa-angle-up"></i><% end %><% end %></th>
- <th><%= link gettext("Slug"), to: Routes.admin_repository_path(@conn, :index, sort: "slug#{if @sort.column == "slug" && !@sort.reverse, do: "-"}") %><%= if @sort.column == "slug" do %><%= if @sort.reverse do %> <i class="fa fa-angle-down"></i><% else %> <i class="fa fa-angle-up"></i><% end %><% end %></th>
- <th><%= link gettext("Disk usage"), to: Routes.admin_repository_path(@conn, :index, sort: "du#{if @sort.column == "du" && !@sort.reverse, do: "-"}") %><%= if @sort.column == "du" do %><%= if @sort.reverse do %> <i class="fa fa-angle-down"></i><% else %> <i class="fa fa-angle-up"></i><% end %><% end %></th>
- <th><%= gettext("Actions") %></th>
- </tr>
- <%= Enum.map @repos, fn(repo) -> %>
+ <thead>
<tr>
- <td><%= link repo.id, to: Routes.admin_repository_path(@conn, :show, repo) %></td>
- <td>
- <%= case owner = Repository.owner(repo) do %>
- <% %Organisation{} -> %>
- <%= link owner.name || owner.slug.slug, to: Routes.admin_organisation_path(@conn, :show, owner) %>
- <% %User{} -> %>
- <%= link owner.slug.slug, to: Routes.admin_user_path(@conn, :show, owner) %>
- <% end %>
- </td>
- <td><%= link Repository.full_slug(repo), to: Routes.admin_repository_path(@conn, :show, repo) %></td>
- <td><%= disk_usage(repo.disk_usage) %></td>
- <td>
- <%= link gettext("Show"), to: Routes.repository_path(@conn, :show, Repository.owner_slug(repo), Repository.splat(repo)), class: "btn btn-sm btn-primary" %>
- </td>
+ <th><%= link gettext("Id"), to: Routes.admin_repository_path(@conn, :index, sort: "id#{if @sort.column == "id" && !@sort.reverse, do: "-"}") %><%= if @sort.column == "id" do %><%= if @sort.reverse do %> <i class="fa fa-angle-down"></i><% else %> <i class="fa fa-angle-up"></i><% end %><% end %></th>
+ <th><%= link gettext("Owner"), to: Routes.admin_repository_path(@conn, :index, sort: "owner#{if @sort.column == "owner" && !@sort.reverse, do: "-"}") %><%= if @sort.column == "owner" do %><%= if @sort.reverse do %> <i class="fa fa-angle-down"></i><% else %> <i class="fa fa-angle-up"></i><% end %><% end %></th>
+ <th><%= link gettext("Slug"), to: Routes.admin_repository_path(@conn, :index, sort: "slug#{if @sort.column == "slug" && !@sort.reverse, do: "-"}") %><%= if @sort.column == "slug" do %><%= if @sort.reverse do %> <i class="fa fa-angle-down"></i><% else %> <i class="fa fa-angle-up"></i><% end %><% end %></th>
+ <th><%= link gettext("Disk usage"), to: Routes.admin_repository_path(@conn, :index, sort: "du#{if @sort.column == "du" && !@sort.reverse, do: "-"}") %><%= if @sort.column == "du" do %><%= if @sort.reverse do %> <i class="fa fa-angle-down"></i><% else %> <i class="fa fa-angle-up"></i><% end %><% end %></th>
+ <th><%= gettext("Actions") %></th>
</tr>
- <% end %>
+ </thead>
+ <tbody>
+ <%= Enum.map @repos, fn(repo) -> %>
+ <tr>
+ <td><%= link repo.id, to: Routes.admin_repository_path(@conn, :show, repo) %></td>
+ <td>
+ <%= case owner = Repository.owner(repo) do %>
+ <% %Organisation{} -> %>
+ <%= link owner.name || owner.slug.slug, to: Routes.admin_organisation_path(@conn, :show, owner) %>
+ <% %User{} -> %>
+ <%= link owner.slug.slug, to: Routes.admin_user_path(@conn, :show, owner) %>
+ <% end %>
+ </td>
+ <td><%= link Repository.full_slug(repo), to: Routes.admin_repository_path(@conn, :show, repo) %></td>
+ <td><%= disk_usage(repo.disk_usage) %></td>
+ <td>
+ <%= link gettext("Show"), to: Routes.repository_path(@conn, :show, Repository.owner_slug(repo), Repository.splat(repo)), class: "btn btn-sm btn-primary" %>
+ </td>
+ </tr>
+ <% end %>
+ </tbody>
</table>
</div>
diff --git a/lib/kmxgit_web/templates/admin/user/index.html.heex b/lib/kmxgit_web/templates/admin/user/index.html.heex
index 5f9089b..9e88f77 100644
--- a/lib/kmxgit_web/templates/admin/user/index.html.heex
+++ b/lib/kmxgit_web/templates/admin/user/index.html.heex
@@ -9,30 +9,33 @@
</div>
<table class="table admin-index">
- <tr>
- <th><%= gettext "Id" %></th>
- <th><%= gettext "Name" %></th>
- <th><%= gettext "Email" %></th>
- <th><%= gettext "Login" %></th>
- <th><%= gettext "Disk usage" %></th>
- <th><%= gettext "2FA" %></th>
- <th><%= gettext "Admin" %></th>
- <th><%= gettext "Deploy" %></th>
- <th><%= gettext "Actions" %></th>
- </tr>
- <%= Enum.map @users, fn(user) -> %>
+ <thead>
<tr>
- <td><%= link user.id, to: Routes.admin_user_path(@conn, :show, user) %></td>
- <td><%= link user.name, to: Routes.admin_user_path(@conn, :show, user) %></td>
- <td><%= link user.email, to: "mailto:#{user.email}" %></td>
- <td><%= link User.login(user), to: Routes.admin_user_path(@conn, :show, user) %></td>
- <td><%= disk_usage(user.disk_usage) %></td>
- <td><%= if user.totp_last != 0, do: "TOTP", else: "none" %></td>
- <td><%= user.is_admin %></td>
- <td><%= user.deploy_only %></td>
- <td><%= link gettext("Show"), to: Routes.slug_path(@conn, :show, User.login(user) || ""), class: "btn btn-sm btn-primary" %></td>
+ <th><%= link gettext("Id"), to: Routes.admin_user_path(@conn, :index, sort: "id#{if @sort.column == "id" && !@sort.reverse, do: "-"}") %><%= if @sort.column == "id" do %><%= if @sort.reverse do %> <i class="fa fa-angle-down"></i><% else %> <i class="fa fa-angle-up"></i><% end %><% end %></th>
+ <th><%= link gettext("Name"), to: Routes.admin_user_path(@conn, :index, sort: "name#{if @sort.column == "name" && !@sort.reverse, do: "-"}") %><%= if @sort.column == "name" do %><%= if @sort.reverse do %> <i class="fa fa-angle-down"></i><% else %> <i class="fa fa-angle-up"></i><% end %><% end %></th>
+ <th><%= link gettext("Email"), to: Routes.admin_user_path(@conn, :index, sort: "email#{if @sort.column == "email" && !@sort.reverse, do: "-"}") %><%= if @sort.column == "email" do %><%= if @sort.reverse do %> <i class="fa fa-angle-down"></i><% else %> <i class="fa fa-angle-up"></i><% end %><% end %></th>
+ <th><%= link gettext("Login"), to: Routes.admin_user_path(@conn, :index, sort: "login#{if @sort.column == "login" && !@sort.reverse, do: "-"}") %><%= if @sort.column == "login" do %><%= if @sort.reverse do %> <i class="fa fa-angle-down"></i><% else %> <i class="fa fa-angle-up"></i><% end %><% end %></th>
+ <th><%= link gettext("Disk usage"), to: Routes.admin_user_path(@conn, :index, sort: "du#{if @sort.column == "du" && !@sort.reverse, do: "-"}") %><%= if @sort.column == "du" do %><%= if @sort.reverse do %> <i class="fa fa-angle-down"></i><% else %> <i class="fa fa-angle-up"></i><% end %><% end %></th>
+ <th><%= link gettext("2FA"), to: Routes.admin_user_path(@conn, :index, sort: "mfa#{if @sort.column == "mfa" && !@sort.reverse, do: "-"}") %><%= if @sort.column == "mfa" do %><%= if @sort.reverse do %> <i class="fa fa-angle-down"></i><% else %> <i class="fa fa-angle-up"></i><% end %><% end %></th>
+ <th><%= link gettext("Admin"), to: Routes.admin_user_path(@conn, :index, sort: "admin#{if @sort.column == "admin" && !@sort.reverse, do: "-"}") %><%= if @sort.column == "admin" do %><%= if @sort.reverse do %> <i class="fa fa-angle-down"></i><% else %> <i class="fa fa-angle-up"></i><% end %><% end %></th>
+ <th><%= link gettext("Deploy"), to: Routes.admin_user_path(@conn, :index, sort: "deploy#{if @sort.column == "deploy" && !@sort.reverse, do: "-"}") %><%= if @sort.column == "deploy" do %><%= if @sort.reverse do %> <i class="fa fa-angle-down"></i><% else %> <i class="fa fa-angle-up"></i><% end %><% end %></th>
+ <th><%= gettext "Actions" %></th>
</tr>
- <% end %>
+ </thead>
+ <tbody>
+ <%= Enum.map @users, fn(user) -> %>
+ <tr>
+ <td><%= link user.id, to: Routes.admin_user_path(@conn, :show, user) %></td>
+ <td><%= link user.name, to: Routes.admin_user_path(@conn, :show, user) %></td>
+ <td><%= link user.email, to: "mailto:#{user.email}" %></td>
+ <td><%= link User.login(user), to: Routes.admin_user_path(@conn, :show, user) %></td>
+ <td><%= disk_usage(user.disk_usage) %></td>
+ <td><%= if user.totp_last != 0, do: "TOTP", else: "none" %></td>
+ <td><%= user.is_admin %></td>
+ <td><%= user.deploy_only %></td>
+ <td><%= link gettext("Show"), to: Routes.slug_path(@conn, :show, User.login(user) || ""), class: "btn btn-sm btn-primary" %></td>
+ </tr>
+ <% end %>
+ </tbody>
</table>
-
</div>
diff --git a/priv/repo/migrations/20220127154904_add_disk_usage_to_users.exs b/priv/repo/migrations/20220127154904_add_disk_usage_to_users.exs
new file mode 100644
index 0000000..f2d7d76
--- /dev/null
+++ b/priv/repo/migrations/20220127154904_add_disk_usage_to_users.exs
@@ -0,0 +1,9 @@
+defmodule Kmxgit.Repo.Migrations.AddDiskUsageToUsers do
+ use Ecto.Migration
+
+ def change do
+ alter table(:users) do
+ add :disk_usage, :integer, default: 0
+ end
+ end
+end