minor-bugs-fixes

Author: hhftechnology

internal/api/handlers/dashboard.go

@@ -62,11 +62,16 @@ func GetDecisions(dockerClient *docker.Client, cfg *config.Config, ttlCache ...*
 	return func(c *gin.Context) {
 		dockerClient = resolveDockerClient(c, dockerClient)
 
-		// Check cache first
+		// Resolve pagination before building cache key so key includes limit/offset.
 		summary := c.Query("summary") == "true"
-		cacheKey := "decisions"
+		defaultLimit := config.EffectiveLimit(cfg.DecisionListLimit, constants.MaxListLimit)
+		limit, offset := parsePaginationParams(c, defaultLimit, constants.MaxListLimit)
+
+		var cacheKey string
 		if summary {
 			cacheKey = "decisions-summary"
+		} else {
+			cacheKey = fmt.Sprintf("decisions:limit=%d:offset=%d", limit, offset)
 		}
 		if len(ttlCache) > 0 && ttlCache[0] != nil {
 			if cached, ok := ttlCache[0].Get(cacheKey); ok {
@@ -80,8 +85,6 @@ func GetDecisions(dockerClient *docker.Client, cfg *config.Config, ttlCache ...*
 
 		logger.Info("Getting CrowdSec decisions via cscli")
 
-		defaultLimit := config.EffectiveLimit(cfg.DecisionListLimit, constants.MaxListLimit)
-		limit, offset := parsePaginationParams(c, defaultLimit, constants.MaxListLimit)
 		fetchLimit := defaultLimit
 		if c.Query("limit") != "" || c.Query("offset") != "" {
 			fetchLimit = constants.MaxListLimit

internal/history/store.go

@@ -699,20 +699,29 @@ func (s *Store) GetDecisionHistoryRecord(ctx context.Context, id int64) (*models
 // GetHistoryStats returns aggregate counts for the history dashboard.
 func (s *Store) GetHistoryStats(ctx context.Context) (*models.HistoryStats, error) {
 	var stats models.HistoryStats
-	queries := []struct {
-		dest  *int
-		query string
-	}{
-		{&stats.TotalDecisions, "SELECT COUNT(1) FROM decision_history"},
-		{&stats.ActiveDecisions, "SELECT COUNT(1) FROM decision_history WHERE is_stale = 0"},
-		{&stats.TotalAlerts, "SELECT COUNT(1) FROM alert_history"},
-		{&stats.ActiveAlerts, "SELECT COUNT(1) FROM alert_history WHERE is_stale = 0"},
-		{&stats.RepeatedOffenderCount, "SELECT COUNT(1) FROM repeated_offender_events"},
-	}
-	for _, q := range queries {
-		if err := s.db.QueryRowContext(ctx, q.query).Scan(q.dest); err != nil {
-			return nil, err
-		}
+	query := `
+		SELECT
+			(SELECT COUNT(1) FROM decision_history),
+			(SELECT COUNT(1) FROM decision_history WHERE is_stale = 0),
+			(SELECT COUNT(1) FROM alert_history),
+			(SELECT COUNT(1) FROM alert_history WHERE is_stale = 0),
+			(SELECT COUNT(DISTINCT value || '|' || scope)
+			 FROM (
+			   SELECT value, scope FROM decision_history
+			   WHERE datetime(created_at) >= datetime('now', '-30 days')
+			   GROUP BY value, scope
+			   HAVING COUNT(1) >= 3
+			 ))
+	`
+	err := s.db.QueryRowContext(ctx, query).Scan(
+		&stats.TotalDecisions,
+		&stats.ActiveDecisions,
+		&stats.TotalAlerts,
+		&stats.ActiveAlerts,
+		&stats.RepeatedOffenderCount,
+	)
+	if err != nil {
+		return nil, err
 	}
 	return &stats, nil
 }

web/src/components/history/ReapplyDecisionDialog.tsx

@@ -3,7 +3,7 @@ import { useForm, Controller } from 'react-hook-form'
 import { toast } from 'sonner'
 import { RotateCcw, Loader2 } from 'lucide-react'
 import api from '@/lib/api'
-import type { DecisionHistoryRecord, RepeatedOffender } from '@/lib/api'
+import type { DecisionHistoryRecord } from '@/lib/api'
 import { Button } from '@/components/ui/button'
 import {
   Dialog,
@@ -31,7 +31,7 @@ interface ReapplyFormValues {
 }
 
 interface ReapplyDecisionDialogProps {
-  record: DecisionHistoryRecord | RepeatedOffender | null
+  record: DecisionHistoryRecord | null
   open: boolean
   onClose: () => void
   onSuccess: () => void
@@ -47,12 +47,7 @@ const DURATION_PRESETS = [
   { value: 'custom', label: 'Custom…' },
 ]
 
-function getRecordId(record: DecisionHistoryRecord | RepeatedOffender): number | null {
-  if ('id' in record) return record.id
-  return null
-}
-
-function getRecordValue(record: DecisionHistoryRecord | RepeatedOffender): string {
+function getRecordValue(record: DecisionHistoryRecord): string {
   return record.value
 }
 
@@ -72,11 +67,7 @@ export function ReapplyDecisionDialog({ record, open, onClose, onSuccess }: Reap
 
   const onSubmit = async (data: ReapplyFormValues) => {
     if (!record) return
-    const id = getRecordId(record)
-    if (!id) {
-      toast.error('Cannot reapply: no record ID available')
-      return
-    }
+    const id = record.id
 
     const duration = data.duration === 'custom' ? data.customDuration : data.duration
     if (!duration) {

web/src/pages/History.tsx

@@ -124,7 +124,7 @@ export default function History() {
   const [decisionValue, setDecisionValue] = useState('')
   const [decisionScenario, setDecisionScenario] = useState('')
   const [decisionSelected, setDecisionSelected] = useState<Set<number>>(new Set())
-  const [reapplyRecord, setReapplyRecord] = useState<DecisionHistoryRecord | RepeatedOffender | null>(null)
+  const [reapplyRecord, setReapplyRecord] = useState<DecisionHistoryRecord | null>(null)
   const [bulkReapplyOpen, setBulkReapplyOpen] = useState(false)
 
   // Alerts tab state
@@ -663,16 +663,7 @@ export default function History() {
                           : <span className="text-muted-foreground text-xs">-</span>
                         }
                       </TableCell>
-                      <TableCell className="text-right">
-                        <Button
-                          variant="ghost"
-                          size="sm"
-                          className="h-7 gap-1 text-xs"
-                          onClick={() => setReapplyRecord(o)}
-                        >
-                          <RotateCcw className="h-3 w-3" /> Re-apply
-                        </Button>
-                      </TableCell>
+                      <TableCell className="text-right" />
                     </TableRow>
                   ))
                 )}