Bugfix/usage report UUID (#4703)

* feat: replace user id with username in user report

* feat: pagelink arrow disable

* fix: import order

* fix: removed things we're not doing

Author: Orbital-Web

backend/ee/onyx/db/usage_export.py

@@ -5,6 +5,8 @@
 from typing import Optional
 
 from fastapi_users_db_sqlalchemy import UUID_ID
+from sqlalchemy import cast
+from sqlalchemy.dialects.postgresql import UUID
 from sqlalchemy.orm import Session
 
 from ee.onyx.db.query_history import fetch_chat_sessions_eagerly_by_time
@@ -13,6 +15,7 @@
 from ee.onyx.server.reporting.usage_export_models import UsageReportMetadata
 from onyx.configs.constants import MessageType
 from onyx.db.models import UsageReport
+from onyx.db.models import User
 from onyx.file_store.file_store import get_default_file_store
 
 
@@ -86,15 +89,27 @@ def get_all_empty_chat_message_entries(
 
 
 def get_all_usage_reports(db_session: Session) -> list[UsageReportMetadata]:
+    # Get the user emails
+    usage_reports = db_session.query(UsageReport).all()
+    user_ids = {r.requestor_user_id for r in usage_reports if r.requestor_user_id}
+    user_emails = {
+        user.id: user.email
+        for user in db_session.query(User)
+        .filter(cast(User.id, UUID).in_(user_ids))
+        .all()
+    }
+
     return [
         UsageReportMetadata(
             report_name=r.report_name,
-            requestor=str(r.requestor_user_id) if r.requestor_user_id else None,
+            requestor=(
+                user_emails.get(r.requestor_user_id) if r.requestor_user_id else None
+            ),
             time_created=r.time_created,
             period_from=r.period_from,
             period_to=r.period_to,
         )
-        for r in db_session.query(UsageReport).all()
+        for r in usage_reports
     ]
 
 

backend/ee/onyx/server/reporting/usage_export_generation.py

@@ -7,13 +7,16 @@
 from datetime import timezone
 
 from fastapi_users_db_sqlalchemy import UUID_ID
+from sqlalchemy import cast
+from sqlalchemy.dialects.postgresql import UUID
 from sqlalchemy.orm import Session
 
 from ee.onyx.db.usage_export import get_all_empty_chat_message_entries
 from ee.onyx.db.usage_export import write_usage_report
 from ee.onyx.server.reporting.usage_export_models import UsageReportMetadata
 from ee.onyx.server.reporting.usage_export_models import UserSkeleton
 from onyx.configs.constants import FileOrigin
+from onyx.db.models import User
 from onyx.db.users import get_all_users
 from onyx.file_store.constants import MAX_IN_MEMORY_SIZE
 from onyx.file_store.file_store import FileStore
@@ -153,11 +156,19 @@ def create_new_usage_report(
     # add report after zip file is written
     new_report = write_usage_report(db_session, report_name, user_id, period)
 
+    # get user email
+    requestor_user = (
+        db_session.query(User)
+        .filter(cast(User.id, UUID) == new_report.requestor_user_id)
+        .one_or_none()
+        if new_report.requestor_user_id
+        else None
+    )
+    requestor_email = requestor_user.email if requestor_user else None
+
     return UsageReportMetadata(
         report_name=new_report.report_name,
-        requestor=(
-            str(new_report.requestor_user_id) if new_report.requestor_user_id else None
-        ),
+        requestor=requestor_email,
         time_created=new_report.time_created,
         period_from=new_report.period_from,
         period_to=new_report.period_to,

web/src/components/PageSelector.tsx

@@ -54,18 +54,19 @@ const PageLink = ({
   <div
     className={`
     select-none
-    inline-block 
-    text-sm 
-    border 
-    px-3 
-    py-1 
-    leading-5 
-    -ml-px 
+    inline-block
+    text-sm
+    border
+    px-3
+    py-1
+    leading-5
+    -ml-px
     border-border
+    ${unclickable ? "text-text-200" : ""}
     ${!unclickable ? "hover:bg-accent-background-hovered" : ""}
     ${!unclickable ? "cursor-pointer" : ""}
-    first:ml-0 
-    first:rounded-l-md 
+    first:ml-0
+    first:rounded-l-md
     last:rounded-r-md
     ${active ? "bg-background-200" : ""}
   `}
@@ -103,6 +104,7 @@ export const PageSelector = ({
     <div style={{ display: "inline-block" }}>
       <PageLink
         linkText="‹"
+        unclickable={currentPage === 1}
         pageChangeHandler={() => {
           onPageChange(Math.max(currentPage - 1, 1));
           modifiedScrollUp();
@@ -139,6 +141,7 @@ export const PageSelector = ({
       })}
       <PageLink
         linkText="›"
+        unclickable={currentPage === totalPages}
         pageChangeHandler={() => {
           onPageChange(Math.min(currentPage + 1, totalPages));
           modifiedScrollUp();