reenable and fix stats rendering

Author: enaut

…13cb37d57d99f0170538f1b1da14665bbb5.json …d39c8a9cd5c327c4dff3776b4cfc37f1dc5.json.sqlx/query-eb5c92f5a47a730bf82d92fc0107913cb37d57d99f0170538f1b1da14665bbb5.json renamed to .sqlx/query-86474d3afa501597c7eeef4136a60d39c8a9cd5c327c4dff3776b4cfc37f1dc5.json .sqlx/query-eb5c92f5a47a730bf82d92fc0107913cb37d57d99f0170538f1b1da14665bbb5.json renamed to .sqlx/query-86474d3afa501597c7eeef4136a60d39c8a9cd5c327c4dff3776b4cfc37f1dc5.json

@@ -10,7 +10,7 @@ use dioxus::prelude::{ServerFnError, server, server_fn};
 use enum_map::EnumMap;
 use pslink_shared::{
     apirequests::links::{LinkDelta, LinkRequestForm},
-    datatypes::{FullLink, Item, Link, ListWithOwner},
+    datatypes::{Clicks, FullLink, Item, Link, ListWithOwner},
 };
 
 #[cfg(feature = "server")]
@@ -20,7 +20,7 @@ use pslink_shared::{
         links::LinkOverviewColumns,
         users::Role,
     },
-    datatypes::{Clicks, Count, Lang, Secret, User},
+    datatypes::{Count, Lang, Secret, User},
 };
 /// Returns a List of `FullLink` meaning `Links` enriched by their author and statistics. This returns all links if the user is either Admin or Regular user.
 ///
@@ -272,3 +272,21 @@ pub async fn delete_link(link_id: i64) -> Result<(), ServerFnError> {
 
     Ok(())
 }
+
+#[server(GetLinkStatistics, endpoint = "get_link_statistics")]
+pub async fn get_link_statistics(link_id: i64) -> Result<Clicks, ServerFnError> {
+    let auth = crate::auth::get_session().await?;
+    if auth.is_anonymous() {
+        return Err(ServerFnError::new("Not authenticated".to_owned()));
+    }
+    let _user = auth
+        .current_user
+        .expect("not authenticated")
+        .get_user()
+        .expect("User is authenticated");
+
+    // Get existing link first
+    let stats = Link::get_statistics(link_id).await?;
+
+    Ok(Clicks::Extended(stats))
+}

backend/src/link_api.rs

@@ -280,7 +280,7 @@ pub trait LinkDbOperations<T> {
     async fn get_link_by_id(id: i64) -> Result<T, ServerFnError>;
     async fn delete_link_by_code(code: &str) -> Result<(), ServerFnError>;
     async fn update_link(&self) -> Result<(), ServerFnError>;
-    async fn get_statistics(code: i64) -> Result<Statistics, ServerFnError>;
+    async fn get_statistics(link_id: i64) -> Result<Statistics, ServerFnError>;
 }
 
 impl LinkDbOperations<Self> for Link {
@@ -292,24 +292,37 @@ impl LinkDbOperations<Self> for Link {
     async fn get_statistics(link_id: i64) -> Result<Statistics, ServerFnError> {
         let db = crate::get_db().await;
         // Verify that the code exists to avoid injections in the next query
-        let code = sqlx::query!("select code from links where id=?", link_id)
+        let link = sqlx::query!("select id,code from links where id=?", link_id)
             .fetch_one(&db)
-            .await?
-            .code;
-        // The query to get the statistics carefully check code before to avoid injections.
-        let qry = format!(
-            r#"SELECT created_at AS month,
-    cast(strftime('%W', created_at) AS String) AS week,
-    count(*) AS total
-FROM clicks
-WHERE month > date('now', 'start of month', '-1 year')
-    AND link = '{}'
-GROUP BY week
-ORDER BY month"#,
-            link_id
-        );
+            .await?;
+        // Use proper parameter binding for SQLx static analysis
+        let qry = "WITH all_weeks AS (
+  WITH RECURSIVE weeks(date_value) AS (
+    SELECT datetime('now', 'start of month', '-1 year')
+    UNION ALL
+    SELECT datetime(date_value, '+7 days')
+    FROM weeks
+    WHERE date_value < date('now')
+  )
+  SELECT 
+    date_value AS month,
+    cast(strftime('%W', date_value) AS String) AS week
+  FROM weeks
+)
+SELECT 
+  aw.month,
+  aw.week,
+  COALESCE(COUNT(c.id), 0) AS total
+FROM all_weeks aw
+LEFT JOIN clicks c ON cast(strftime('%W', c.created_at) AS String) = aw.week 
+  AND c.link = ?  
+  AND c.created_at > date('now', 'start of month', '-1 year')
+GROUP BY aw.week
+ORDER BY aw.month";
+        let code = link.code;
         // Execute and map the query to the desired type
-        let values: Vec<WeekCount> = sqlx::query(&qry)
+        let values: Vec<WeekCount> = sqlx::query(qry)
+            .bind(link.id)
             .fetch_all(&db)
             .await?
             .into_iter()
@@ -326,13 +339,13 @@ ORDER BY month"#,
             "select count(*) as number from clicks join links on clicks.link = links.id where links.code = ?",
             code
         ).fetch_one(&db).await?;
-        info!("Found Statistics: {:?}", &values);
         Ok(Statistics {
             link_id,
             total,
             values,
         })
     }
+
     /// Get a link by its code (the short url code)
     ///
     /// # Errors

backend/src/models.rs

@@ -111,7 +111,7 @@ impl Ord for WeekCount {
     }
 }
 
-#[derive(Serialize, Deserialize, Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 pub struct Statistics {
     pub link_id: i64,
     pub total: Count,

shared/src/datatypes.rs

@@ -1,7 +1,10 @@
 # Generated translation template by dioxus-i18n-collect
-# Contains 65 translation keys
+# Contains 68 translation keys
 
-# Source: ./ui/src/login.rs:108
+# Source: ./ui/src/navbar.rs:160
+demo-warning = Diese Instanz ist nicht für dauerhaftes Speichern konfiguriert... Die eingegebenen Daten werden nur bis zum Neustart gespeichert.
+
+# Source: ./ui/src/login.rs:103
 # Parameters: $error
 failed-login = Benutzername oder passwort waren leider falsch, bitte versuche es erneut.
 
@@ -65,131 +68,141 @@ link-edit-placeholder-description = Beschreibung
 link-edit-placeholder-target = Ziel der Weiterleitung
 
 # Button text to load more links
-# Source: ./ui/src/links/mod.rs:323
+# Source: ./ui/src/links/mod.rs:355
 links-button-load-more = Mehr Links laden
 
 # Text displayed while loading links data
-# Source: ./ui/src/links/mod.rs:329
+# Source: ./ui/src/links/mod.rs:361
 links-loading = Die Links werden geladen
 
 # Text for login link
-# Source: ./ui/src/links/mod.rs:330
+# Source: ./ui/src/links/mod.rs:362
 links-login = Anmelden
 
 # Placeholder text for filter input field
-# Source: ./ui/src/links/mod.rs:242
+# Source: ./ui/src/links/mod.rs:261
 links-table-filter-placeholder = Filtere die Links nach…
 
 # Column header for link code
-# Source: ./ui/src/links/mod.rs:204
+# Source: ./ui/src/links/mod.rs:222
 links-table-header-code = Code
 
 # Column header for description
-# Source: ./ui/src/links/mod.rs:211
+# Source: ./ui/src/links/mod.rs:229
 links-table-header-description = Beschreibung
 
 # Column header for statistics
-# Source: ./ui/src/links/mod.rs:232
+# Source: ./ui/src/links/mod.rs:250
 links-table-header-statistics = Statistik
 
 # Column header for link target
-# Source: ./ui/src/links/mod.rs:218
+# Source: ./ui/src/links/mod.rs:236
 links-table-header-target = Ziel des Kurzlinks
 
 # Column header for username
-# Source: ./ui/src/links/mod.rs:225
+# Source: ./ui/src/links/mod.rs:243
 links-table-header-username = Author
 
 # The menu entry for login
-# Source: ./ui/src/login.rs:146
+# Source: ./ui/src/login.rs:141
 login = Anmelden
 
 # The menu entry for logout
 # Source: ./ui/src/navbar.rs:106
 logout = Abmelden
 
 # The title of the page
-# Source: ./ui/src/navbar.rs:136
+# Source: ./ui/src/navbar.rs:137
 page-not-found = 404 – Seite nicht gefunden
 
 # The text of the page
-# Source: ./ui/src/navbar.rs:137
+# Source: ./ui/src/navbar.rs:138
 page-not-found-text = Diese Seite konnte nicht gefunden werden.
 
 # Source: ./ui/src/login.rs:77
 password = Passwort
 
 # The requested route on the 404 page
-# Source: ./ui/src/navbar.rs:138
+# Source: ./ui/src/navbar.rs:139
 # Parameters: $route
 requested-route = Der Pfad, der gesucht wurde: {$route}
 
 # The menu entry for links
 # Source: ./ui/src/navbar.rs:69
 short_urls = Kurzlinks
 
+# Displayed as a tooltip when there have been no clicks on this link in the last 12 months.
+# Source: ./ui/src/links/stats.rs:23
+# Parameters: $count
+tooltip_no_clicks = Dieser Link wurde in den letzen 12 Monaten nicht geklickt. Davor wurde er {$count} mal geklickt.
+
+# Text below the click statistic graph
+# Source: ./ui/src/links/stats.rs:17
+# Parameters: $count
+total_clicks = Klicks insgesamt {$count}
+
 # Button text for confirming user deletion
-# Source: ./ui/src/users/user_edit.rs:270
+# Source: ./ui/src/users/user_edit.rs:278
 user-edit-button-confirm-delete = Benutzer wirklich löschen
 
 # Button text for creating a new user
-# Source: ./ui/src/users/user_edit.rs:215
+# Source: ./ui/src/users/user_edit.rs:221
 user-edit-button-create = Benutzer erstellen
 
 # Button text for deleting a user
-# Source: ./ui/src/users/user_edit.rs:226
+# Source: ./ui/src/users/user_edit.rs:233
 user-edit-button-delete = Benutzer löschen
 
 # Button text for updating an existing user
-# Source: ./ui/src/users/user_edit.rs:244
+# Source: ./ui/src/users/user_edit.rs:252
 user-edit-button-update = Benutzer editieren
 
 # Warning message displayed when attempting to delete a user
-# Source: ./ui/src/users/user_edit.rs:168
+# Source: ./ui/src/users/user_edit.rs:173
 user-edit-delete-warning = Einen Nutzer zu löschen ist meist nicht sinnvoll, da die erstellten Links dann Besitzerlos sind. Besser wäre es einfach das Passwort zu ändern.
 
 # Label for email field in edit form
-# Source: ./ui/src/users/user_edit.rs:66
+# Source: ./ui/src/users/user_edit.rs:70
 user-edit-label-email = E-Mail
 
 # Label for password field in edit form
-# Source: ./ui/src/users/user_edit.rs:86
+# Source: ./ui/src/users/user_edit.rs:90
 user-edit-label-password = Passwort
 
 # Label for role selection dropdown in edit form
-# Source: ./ui/src/users/user_edit.rs:111
+# Source: ./ui/src/users/user_edit.rs:115
 user-edit-label-role = Berechtigung
 
 # Label for username field in edit form
-# Source: ./ui/src/users/user_edit.rs:42
+# Source: ./ui/src/users/user_edit.rs:46
 user-edit-label-username = Benutzername
 
 # Placeholder text for email input field
-# Source: ./ui/src/users/user_edit.rs:72
+# Source: ./ui/src/users/user_edit.rs:76
 user-edit-placeholder-email = E-Mail
 
 # Placeholder text for password input field
-# Source: ./ui/src/users/user_edit.rs:92
+# Source: ./ui/src/users/user_edit.rs:96
 user-edit-placeholder-password = Passwort
 
 # Placeholder text for username input field
-# Source: ./ui/src/users/user_edit.rs:52
+# Source: ./ui/src/users/user_edit.rs:56
 user-edit-placeholder-username = Benutzername
 
 # Option for admin role in dropdown
-# Source: ./ui/src/users/user_edit.rs:132
+# Source: ./ui/src/users/user_edit.rs:137
 user-edit-role-admin = Administrator
 
 # Option for disabled role in dropdown
-# Source: ./ui/src/users/user_edit.rs:139
+# Source: ./ui/src/users/user_edit.rs:144
 user-edit-role-disabled = Deaktiviert
 
 # Option for regular user role in dropdown
-# Source: ./ui/src/users/user_edit.rs:127
+# Source: ./ui/src/users/user_edit.rs:132
 user-edit-role-regular = Regulär
 
 # Title of the username in the edit dialog
-# Source: ./ui/src/users/user_edit.rs:297
+# Source: ./ui/src/users/user_edit.rs:305
 # Parameters: $username
 user-edit-title = Benutzerdaten
 
@@ -257,4 +270,3 @@ welcome-stranger = welcome-stranger
 # Parameters: $username
 welcome-user = Herzlich Wilkommen {$username}
 
-demo-warning = Diese Instanz ist nicht für dauerhaftes Speichern konfiguriert... Die eingegebenen Daten werden nur bis zum Neustart gespeichert.