Merge pull request #431 from sebadob/413-sort-users-created-login

feat: sort users created login
sebadob · May 10, 2024 · 4c41d64 · 4c41d64
2 parents 033db25 + 3e55b74
commit 4c41d64
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 39 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/frontend/src/components/admin/users/Users.svelte b/frontend/src/components/admin/users/Users.svelte
@@ -9,7 +9,6 @@
     import PaginationServer from "$lib/PaginationServer.svelte";
 
     let msg = '';
-    let isInitialized = false;
 
     let users = [];
     let resUsers = [];
@@ -42,6 +41,20 @@
             label: 'ID',
             callback: (a, b) => a.id.localeCompare(b.id),
         },
+        {
+            label: 'Created',
+            callback: (a, b) => a.created_at < b.created_at,
+        },
+        {
+            label: 'Last Login',
+            callback: (a, b) => {
+                // 9999999999 as default to make ordering correct with a unix timestamp
+                // otherwise undefined values will screw ordering up
+                let al = a.last_login || 9999999999;
+                let bl = b.last_login || 9999999999;
+                return al < bl;
+            }
+        },
     ];
 
     onMount(async () => {
@@ -157,7 +170,7 @@
 
     <div id="users">
         {#if useServerSideIdx && !isSearchFiltered}
-            {#each users as user (user.id)}
+            {#each resUsers as user (user.id)}
                 <div>
                     <UserTile userId={user.id} userEmail={user.email} onSave={onSave}/>
                 </div>

diff --git a/frontend/src/lib/search/SearchBar.svelte b/frontend/src/lib/search/SearchBar.svelte
@@ -2,6 +2,7 @@
     import IconMagnify from "$lib/icons/IconMagnify.svelte";
     import {onMount} from "svelte";
     import Tooltip from "../Tooltip.svelte";
+    import {getKey} from "../utils/helpers.js";
     import IconBackspace from "$lib/icons/IconBackspace.svelte";
     import {getSearch} from "../../utils/dataFetchingAdmin.js";
     import {SERVER_SIDE_SEARCH_THRES} from "../../utils/constants.js";
@@ -56,6 +57,12 @@
     }
 
     function filerItems() {
+        if (search.length < 2) {
+            resItems = items;
+            isSearchFiltered = false;
+            return;
+        }
+
         resItems = [...items.filter(i => {
             // This switch is a bit more annoying to maintain, but we can set a more strict CSP without `eval`
             if (options.length > 0) {
@@ -103,6 +110,7 @@
         <input
                 class="input"
                 type="text"
+                name={getKey()}
                 bind:value={search}
                 placeholder="Search"
                 autocomplete="off"

diff --git a/justfile b/justfile
@@ -228,7 +228,7 @@ migrate-postgres:
 
 
 # runs any of: none (sqlite), postgres, ui
-@run ty="sqlite":
+run ty="sqlite":
     #!/usr/bin/env bash
     set -euxo pipefail
     clear

diff --git a/rauthy-models/src/entity/users.rs b/rauthy-models/src/entity/users.rs
@@ -342,7 +342,7 @@ impl User {
     ) -> Result<Vec<UserResponseSimple>, ErrorResponse> {
         let res = sqlx::query_as!(
             UserResponseSimple,
-            "SELECT id, email FROM users ORDER BY created_at ASC"
+            "SELECT id, email, created_at, last_login FROM users ORDER BY created_at ASC"
         )
         .fetch_all(&data.db)
         .await?;
@@ -373,7 +373,7 @@ impl User {
             if backwards {
                 offset += page_size;
                 let mut rows = sqlx::query!(
-                    r#"SELECT id, email, created_at
+                    r#"SELECT id, email, created_at, last_login
                     FROM users
                     WHERE created_at <= $1 AND id != $2
                     ORDER BY created_at DESC
@@ -393,12 +393,14 @@ impl User {
                     res.push(UserResponseSimple {
                         id: row.id,
                         email: row.email,
+                        created_at: row.created_at,
+                        last_login: row.last_login,
                     });
                     latest_ts = row.created_at;
                 }
             } else {
                 let rows = sqlx::query!(
-                    r#"SELECT id, email, created_at
+                    r#"SELECT id, email, created_at, last_login
                     FROM users
                     WHERE created_at >= $1 AND id != $2
                     ORDER BY created_at ASC
@@ -416,6 +418,8 @@ impl User {
                     res.push(UserResponseSimple {
                         id: row.id,
                         email: row.email,
+                        created_at: row.created_at,
+                        last_login: row.last_login,
                     });
                     latest_ts = row.created_at;
                 }
@@ -424,7 +428,7 @@ impl User {
             // backwards without any continuation token will simply
             // serve the last elements without any other conditions
             let mut rows = sqlx::query!(
-                r#"SELECT id, email, created_at
+                r#"SELECT id, email, created_at, last_login
                    FROM users
                    ORDER BY created_at DESC
                    LIMIT $1
@@ -441,12 +445,14 @@ impl User {
                 res.push(UserResponseSimple {
                     id: row.id,
                     email: row.email,
+                    created_at: row.created_at,
+                    last_login: row.last_login,
                 });
                 latest_ts = row.created_at;
             }
         } else {
             let rows = sqlx::query!(
-                r#"SELECT id, email, created_at
+                r#"SELECT id, email, created_at, last_login
                    FROM users
                    ORDER BY created_at ASC
                    LIMIT $1
@@ -461,6 +467,8 @@ impl User {
                 res.push(UserResponseSimple {
                     id: row.id,
                     email: row.email,
+                    created_at: row.created_at,
+                    last_login: row.last_login,
                 });
                 latest_ts = row.created_at;
             }
@@ -620,7 +628,11 @@ impl User {
             SearchParamsIdx::Id | SearchParamsIdx::UserId => {
                 query_as!(
                     UserResponseSimple,
-                    "SELECT id, email FROM users WHERE id LIKE $1 ORDER BY created_at ASC LIMIT $2",
+                    r#"SELECT id, email, created_at, last_login
+                    FROM users
+                    WHERE id LIKE $1
+                    ORDER BY created_at ASC
+                    LIMIT $2"#,
                     q,
                     limit
                 )
@@ -629,11 +641,15 @@ impl User {
             }
             SearchParamsIdx::Email => {
                 query_as!(
-                UserResponseSimple,
-                "SELECT id, email FROM users WHERE email LIKE $1 ORDER BY created_at ASC LIMIT $2",
-                q,
-                limit
-            )
+                    UserResponseSimple,
+                    r#"SELECT id, email, created_at, last_login
+                    FROM users
+                    WHERE email LIKE $1
+                    ORDER BY created_at ASC
+                    LIMIT $2"#,
+                    q,
+                    limit
+                )
                 .fetch_all(&data.db)
                 .await?
             }

diff --git a/rauthy-models/src/response.rs b/rauthy-models/src/response.rs
@@ -729,13 +729,17 @@ impl UserResponse {
 pub struct UserResponseSimple {
     pub id: String,
     pub email: String,
+    pub created_at: i64,
+    pub last_login: Option<i64>,
 }
 
 impl From<User> for UserResponseSimple {
     fn from(value: User) -> Self {
         Self {
             id: value.id,
             email: value.email,
+            created_at: value.created_at,
+            last_login: value.last_login,
         }
     }
 }

diff --git a/rauthy.cfg b/rauthy.cfg
@@ -949,7 +949,7 @@ SWAGGER_UI_EXTERNAL=true
 # change search and pagination for users in the Admin UI from client
 # side to server side to not have a degradation in performance.
 # default: 1000
-SSP_THRESHOLD=2
+SSP_THRESHOLD=1000
 
 #####################################
 ############ TEMPLATES ##############