Commit dacbfb4026a4371dce6b74bd54a6324ef08d460f
2022-01-27T19:59:41
[admin] fix column sort
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
diff --git a/lib/kmxgit/organisation_manager.ex b/lib/kmxgit/organisation_manager.ex
index bb86630..9a94551 100644
--- a/lib/kmxgit/organisation_manager.ex
+++ b/lib/kmxgit/organisation_manager.ex
@@ -16,19 +16,7 @@ defmodule Kmxgit.OrganisationManager do
join: s in Slug,
on: s.organisation_id == org.id,
preload: ^@list_preload,
- order_by: s.slug
- end
- def list_organisations(%{column: "du", reverse: true}) do
- update_disk_usage()
- Repo.all from org in Organisation,
- preload: ^@list_preload,
- order_by: [desc: :disk_usage]
- end
- def list_organisations(%{column: "du"}) do
- update_disk_usage()
- Repo.all from org in Organisation,
- preload: ^@list_preload,
- order_by: :disk_usage
+ order_by: [asc_nulls_last: fragment("lower(?)", s.slug)]
end
def list_organisations(%{column: "id", reverse: true}) do
update_disk_usage()
@@ -46,13 +34,13 @@ defmodule Kmxgit.OrganisationManager do
update_disk_usage()
Repo.all from org in Organisation,
preload: ^@list_preload,
- order_by: [desc: :name]
+ order_by: [desc_nulls_last: fragment("lower(?)", org.name)]
end
def list_organisations(%{column: "name"}) do
update_disk_usage()
Repo.all from org in Organisation,
preload: ^@list_preload,
- order_by: :name
+ order_by: [asc_nulls_last: fragment("lower(?)", org.name)]
end
def list_organisations(%{column: "slug", reverse: true}) do
update_disk_usage()
@@ -60,7 +48,7 @@ defmodule Kmxgit.OrganisationManager do
join: s in Slug,
on: s.organisation_id == org.id,
preload: ^@list_preload,
- order_by: [desc: s.slug]
+ order_by: [desc_nulls_last: fragment("lower(?)", s.slug)]
end
def list_organisations(%{column: "slug"}) do
update_disk_usage()
@@ -68,7 +56,19 @@ defmodule Kmxgit.OrganisationManager do
join: s in Slug,
on: s.organisation_id == org.id,
preload: ^@list_preload,
- order_by: s.slug
+ order_by: [asc_nulls_last: fragment("lower(?)", s.slug)]
+ end
+ def list_organisations(%{column: "du", reverse: true}) do
+ update_disk_usage()
+ Repo.all from org in Organisation,
+ preload: ^@list_preload,
+ order_by: [desc: :disk_usage]
+ end
+ def list_organisations(%{column: "du"}) do
+ update_disk_usage()
+ Repo.all from org in Organisation,
+ preload: ^@list_preload,
+ order_by: :disk_usage
end
def update_disk_usage() do
diff --git a/lib/kmxgit/repository_manager.ex b/lib/kmxgit/repository_manager.ex
index c6bb64e..cca598f 100644
--- a/lib/kmxgit/repository_manager.ex
+++ b/lib/kmxgit/repository_manager.ex
@@ -15,21 +15,19 @@ defmodule Kmxgit.RepositoryManager do
user: :slug]
def list_repositories do
- Repo.all(from r in Repository,
- preload: ^@list_preload)
- |> Enum.sort_by(&Repository.full_slug/1)
- end
- def list_repositories(%{column: "du", reverse: true}) do
- update_disk_usage()
- Repo.all from r in Repository,
- preload: ^@list_preload,
- order_by: [desc: :disk_usage]
- end
- def list_repositories(%{column: "du"}) do
update_disk_usage()
Repo.all from r in Repository,
+ full_join: o in Organisation,
+ on: o.id == r.organisation_id,
+ full_join: os in Slug,
+ on: os.organisation_id == o.id,
+ full_join: u in User,
+ on: u.id == r.user_id,
+ full_join: us in Slug,
+ on: us.user_id == u.id,
+ where: not is_nil(r),
preload: ^@list_preload,
- order_by: :disk_usage
+ order_by: [desc: fragment("concat(lower(?), lower(?))", os.slug, us.slug), desc: :slug]
end
def list_repositories(%{column: "id", reverse: true}) do
update_disk_usage()
@@ -103,6 +101,18 @@ defmodule Kmxgit.RepositoryManager do
preload: ^@list_preload,
order_by: [fragment("concat(lower(?), lower(?))", os.slug, us.slug), :slug]
end
+ def list_repositories(%{column: "du", reverse: true}) do
+ update_disk_usage()
+ Repo.all from r in Repository,
+ preload: ^@list_preload,
+ order_by: [desc: :disk_usage]
+ end
+ def list_repositories(%{column: "du"}) do
+ update_disk_usage()
+ Repo.all from r in Repository,
+ preload: ^@list_preload,
+ order_by: :disk_usage
+ end
def update_disk_usage() do
repos = Repo.all(from repo in Repository, preload: [organisation: :slug,
diff --git a/lib/kmxgit/user_manager.ex b/lib/kmxgit/user_manager.ex
index 33fb39e..3581339 100644
--- a/lib/kmxgit/user_manager.ex
+++ b/lib/kmxgit/user_manager.ex
@@ -33,25 +33,25 @@ defmodule Kmxgit.UserManager do
update_disk_usage()
Repo.all from user in User,
preload: ^@list_preload,
- order_by: [desc: :name]
+ order_by: [desc_nulls_last: fragment("lower(?)", user.name)]
end
def list_users(%{column: "name"}) do
update_disk_usage()
Repo.all from user in User,
preload: ^@list_preload,
- order_by: :name
+ order_by: [asc_nulls_last: fragment("lower(?)", user.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]
+ order_by: [desc_nulls_last: fragment("lower(?)", user.email)]
end
def list_users(%{column: "email"}) do
update_disk_usage()
Repo.all from user in User,
preload: ^@list_preload,
- order_by: :email
+ order_by: [asc_nulls_last: fragment("lower(?)", user.email)]
end
def list_users(%{column: "login", reverse: true}) do
update_disk_usage()
@@ -59,7 +59,7 @@ defmodule Kmxgit.UserManager do
join: s in Slug,
on: s.user_id == user.id,
preload: ^@list_preload,
- order_by: [desc: s.slug]
+ order_by: [desc_nulls_last: fragment("lower(?)", s.slug)]
end
def list_users(%{column: "login"}) do
update_disk_usage()
@@ -67,7 +67,7 @@ defmodule Kmxgit.UserManager do
join: s in Slug,
on: s.user_id == user.id,
preload: ^@list_preload,
- order_by: s.slug
+ order_by: [asc_nulls_last: fragment("lower(?)", s.slug)]
end
def list_users(%{column: "du", reverse: true}) do
update_disk_usage()