sort by timestamp (#22)

alrocar · web-flow · commit cd624ae0ac1c · 2025-02-18T13:06:13.000+01:00
* sort by timestamp

* skip tests

* fix tests
diff --git a/dashboard/log-analyzer/src/components/logs/LogTable.tsx b/dashboard/log-analyzer/src/components/logs/LogTable.tsx
@@ -43,11 +43,8 @@ export function LogTable({ logs = [], onSort, sortColumn, sortOrder, observerRef
             <TableRow>
               <TableHead 
                 className="w-[10%] truncate" 
-                onClick={() => onSort('request_id')}
-                onMouseEnter={() => setHoveredColumn('request_id')}
-                onMouseLeave={() => setHoveredColumn(null)}
               >
-                ID{renderSortIndicator('request_id')}
+                ID
               </TableHead>
               <TableHead 
                 className="w-[120px] max-w-[120px] truncate"
@@ -59,51 +56,33 @@ export function LogTable({ logs = [], onSort, sortColumn, sortOrder, observerRef
               </TableHead>
               <TableHead 
                 className="w-[80px] max-w-[80px] truncate"
-                onClick={() => onSort('level')} 
-                onMouseEnter={() => setHoveredColumn('level')} 
-                onMouseLeave={() => setHoveredColumn(null)}
               >
-                Level{renderSortIndicator('level')}
+                Level
               </TableHead>
               <TableHead 
                 className="w-[120px] max-w-[120px] truncate" 
-                onClick={() => onSort('service')} 
-                onMouseEnter={() => setHoveredColumn('service')} 
-                onMouseLeave={() => setHoveredColumn(null)}
               >
-                Service{renderSortIndicator('service')}
+                Service
               </TableHead>
               <TableHead 
                 className="w-[80px] max-w-[80px] truncate"
-                onClick={() => onSort('request_method')} 
-                onMouseEnter={() => setHoveredColumn('request_method')} 
-                onMouseLeave={() => setHoveredColumn(null)}
               >
-                Method{renderSortIndicator('request_method')}
+                Method
               </TableHead>
               <TableHead 
                 className="w-[14%] truncate" 
-                onClick={() => onSort('request_path')} 
-                onMouseEnter={() => setHoveredColumn('request_path')} 
-                onMouseLeave={() => setHoveredColumn(null)}
               >
-                Path{renderSortIndicator('request_path')}
+                Path
               </TableHead>
               <TableHead 
                 className="w-[80px] max-w-[80px] truncate"
-                onClick={() => onSort('status_code')} 
-                onMouseEnter={() => setHoveredColumn('status_code')} 
-                onMouseLeave={() => setHoveredColumn(null)}
               >
-                Status{renderSortIndicator('status_code')}
+                Status
               </TableHead>
               <TableHead 
                 className="w-[30%] truncate" 
-                onClick={() => onSort('message')} 
-                onMouseEnter={() => setHoveredColumn('message')} 
-                onMouseLeave={() => setHoveredColumn(null)}
               >
-                Message{renderSortIndicator('message')}
+                Message
               </TableHead>
             </TableRow>
           </TableHeader>
diff --git a/dashboard/log-analyzer/src/components/logs/LogTableWithPagination.tsx b/dashboard/log-analyzer/src/components/logs/LogTableWithPagination.tsx
@@ -61,7 +61,7 @@ export function LogTableWithPagination({ pageSize }: LogTableWithPaginationProps
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const shouldUseExplorerApi = useCallback((filters: Record<string, any>) => {
-    const allowedFilters = ['start_date', 'end_date', 'environment', 'service', 'level'];
+    const allowedFilters = ['start_date', 'end_date', 'environment', 'service', 'level', 'order', 'sort_by'];
     const activeFilters = Object.keys(filters);
     return activeFilters.every(filter => allowedFilters.includes(filter));
   }, []);
diff --git a/tinybird/endpoints/log_explorer.pipe b/tinybird/endpoints/log_explorer.pipe
@@ -8,7 +8,16 @@ SQL >
         start_ts,
         end_ts,
         sum(n_rows) as rows,
-        sum(n_rows) OVER (ORDER BY start_ts asc) as _n_rows,
+        sum(n_rows) OVER (ORDER BY start_ts 
+        {% if defined(order) and order != '' %}
+            {% if order == 'asc' %}
+                ASC
+            {% else %}
+                DESC
+            {% end %}
+        {% else %}
+            DESC
+        {% end %}) as _n_rows,
         _n_rows - rows as previous_cum_sum
     from (
     SELECT start_ts, end_ts, countMerge(n_rows) AS n_rows
@@ -28,7 +37,16 @@ SQL >
         group by start_ts, end_ts
     )
     group by start_ts, end_ts, n_rows
-    ORDER BY end_ts asc
+    ORDER BY end_ts 
+    {% if defined(order) and order != '' %}
+        {% if order == 'asc' %}
+            ASC
+        {% else %}
+            DESC
+        {% end %}
+    {% else %}
+        DESC
+    {% end %}
 
 
 
@@ -65,9 +83,21 @@ SQL >
 
 %
     WITH
-        (SELECT start_ts FROM min_ts_range) AS start_range,
-        (SELECT end_ts FROM max_ts_range) AS end_range,
-        (SELECT ifNull(previous_cum_sum, 0) FROM min_ts_range) AS previous
+        {% if defined(order) and order != '' %}
+            {% if order == 'asc' %}
+                (SELECT start_ts FROM min_ts_range) AS start_range,
+                (SELECT end_ts FROM max_ts_range) AS end_range,
+                (SELECT ifNull(previous_cum_sum, 0) FROM min_ts_range) AS previous
+            {% else %}
+                (SELECT start_ts FROM max_ts_range) AS start_range,
+                (SELECT end_ts FROM min_ts_range) AS end_range,
+                (SELECT ifNull(previous_cum_sum, 0) FROM min_ts_range) AS previous
+            {% end %}
+        {% else %}
+            (SELECT start_ts FROM max_ts_range) AS start_range,
+            (SELECT end_ts FROM min_ts_range) AS end_range,
+            (SELECT ifNull(previous_cum_sum, 0) FROM min_ts_range) AS previous
+        {% end %}
 
     SELECT 
         timestamp,
@@ -106,7 +136,16 @@ SQL >
         {% end %}
         AND timestamp >= start_range
         AND timestamp <= end_range
-    ORDER BY timestamp ASC
+    ORDER BY timestamp 
+    {% if defined(order) and order != '' %}
+        {% if order == 'asc' %}
+            ASC
+        {% else %}
+            DESC
+        {% end %}
+    {% else %}
+        DESC
+    {% end %}
     LIMIT {{Int32(page_size, 10)}}
     OFFSET {{Int32(page, 0)}} * {{Int32(page_size, 10)}} - assumeNotNull(previous)
 
diff --git a/tinybird/tests/log_explorer.yaml b/tinybird/tests/log_explorer.yaml
@@ -1,23 +1,23 @@
 
 - name: default_log_explorer
   description: Test with default parameters for last 1 day
-  parameters: start_date=2025-02-03%2000:00:00&end_date=2025-02-04%2000:00:00&page=0&page_size=3
+  parameters: start_date=2025-02-03%2000:00:00&end_date=2025-02-04%2000:00:00&page=0&page_size=3&order=asc
   expected_result: |
     {"timestamp":"2025-02-03 00:04:05.000","request_id":"req-4860bb49e129c265","request_method":"PUT","status_code":322,"service":"auth","request_path":"\/products\/122","level":"WARN","message":"Log message 122"}
     {"timestamp":"2025-02-03 00:10:38.000","request_id":"req-1af70463d1e63266","request_method":"POST","status_code":329,"service":"cache","request_path":"\/orders\/729","level":"ERROR","message":"Log message 729"}
     {"timestamp":"2025-02-03 00:33:47.000","request_id":"req-67983c8adffea7e0","request_method":"GET","status_code":540,"service":"api","request_path":"\/users\/140","level":"INFO","message":"Log message 140"}
 
 - name: default_log_explorer_page_2
   description: Test with default parameters for last 1 day
-  parameters: start_date=2025-02-02%2000:00:00&end_date=2025-02-03%2000:00:00&page=1&page_size=3
+  parameters: start_date=2025-02-02%2000:00:00&end_date=2025-02-03%2000:00:00&page=1&page_size=3&order=asc
   expected_result: |
     {"timestamp":"2025-02-02 21:12:48.000","request_id":"req-3b61992a411c79a2","request_method":"DELETE","status_code":599,"service":"cache","request_path":"\/auth\/799","level":"DEBUG","message":"Log message 799"}
     {"timestamp":"2025-02-02 21:17:29.000","request_id":"req-d32589fb749768e8","request_method":"PUT","status_code":318,"service":"database","request_path":"\/products\/318","level":"WARN","message":"Log message 318"}
     {"timestamp":"2025-02-02 21:23:42.000","request_id":"req-77b0b28d7e89da92","request_method":"POST","status_code":345,"service":"api","request_path":"\/orders\/745","level":"ERROR","message":"Log message 745"}
 
 - name: filtered_by_service_and_level
   description: Test filtered by specific service and error level
-  parameters: start_date=2025-02-03%2000:00:00&end_date=2025-02-04%2000:00:00&service=api&level=ERROR&page=0&page_size=5
+  parameters: start_date=2025-02-03%2000:00:00&end_date=2025-02-04%2000:00:00&service=api&level=ERROR&page=0&page_size=5&order=asc
   expected_result: |
     {"timestamp":"2025-02-03 06:14:02.000","request_id":"req-5fcaa73d1df686e6","request_method":"POST","status_code":525,"service":"api","request_path":"\/orders\/925","level":"ERROR","message":"Log message 925"}
     {"timestamp":"2025-02-03 08:02:42.000","request_id":"req-e80695b4b6b1f89f","request_method":"POST","status_code":405,"service":"api","request_path":"\/orders\/205","level":"ERROR","message":"Log message 205"}
@@ -28,9 +28,11 @@
 - name: search_by_message
   description: Test searching for specific message content
   parameters: start_date=2025-02-03%2000:00:00&end_date=2025-02-04%2000:00:00&message=945&page=0&page_size=3
-  expected_result: ''
+  expected_result: |
+    {"timestamp":"2025-02-03 19:23:42.000","request_id":"req-ab50f632c7544b42","request_method":"POST","status_code":345,"service":"api","request_path":"\/orders\/945","level":"ERROR","message":"Log message 945"}
 
 - name: filtered_by_request_method
   description: Test filtered by HTTP method and status code
   parameters: start_date=2025-02-03%2000:00:00&end_date=2025-02-04%2000:00:00&request_method=POST&status_code=345&page=0&page_size=25
-  expected_result: ''
+  expected_result: |
+    {"timestamp":"2025-02-03 19:23:42.000","request_id":"req-ab50f632c7544b42","request_method":"POST","status_code":345,"service":"api","request_path":"\/orders\/945","level":"ERROR","message":"Log message 945"}
