Address code review: extract aggregation helper in ReportViewer, simplify map warning message

Co-authored-by: hotlong <50353452+hotlong@users.noreply.github.com>

Author: Copilot

packages/plugin-map/src/ObjectMap.tsx

@@ -415,7 +415,7 @@ export const ObjectMap: React.FC<ObjectMapProps> = ({
     <div className={className}>
       {invalidCount > 0 && (
         <div className="mb-2 p-2 text-sm text-yellow-800 bg-yellow-50 border border-yellow-200 rounded">
-          {invalidCount} record{invalidCount !== 1 ? 's' : ''} with missing or invalid coordinates {invalidCount !== 1 ? 'were' : 'was'} excluded from the map.
+          {`${invalidCount} record${invalidCount !== 1 ? 's' : ''} with missing or invalid coordinates excluded from the map.`}
         </div>
       )}
       <div className="relative border rounded-lg overflow-hidden bg-muted" style={{ height: '600px', width: '100%' }}>

packages/plugin-report/src/ReportViewer.tsx

@@ -45,14 +45,28 @@ export const ReportViewer: React.FC<ReportViewerProps> = ({ schema, onRefresh })
   };
 
   const handlePrint = () => {
-    console.log('Print report');
     window.print();
   };
 
   const handleRefresh = () => {
     onRefresh?.();
   };
 
+  const computeAggregation = (fieldName: string, aggregation?: string): string | number => {
+    if (!data) return 0;
+    const values = data.map(item => Number(item[fieldName]) || 0);
+    switch (aggregation) {
+      case 'count': return data.length;
+      case 'sum': return values.reduce((sum, v) => sum + v, 0);
+      case 'avg': return values.length > 0
+        ? (values.reduce((sum, v) => sum + v, 0) / values.length).toFixed(2)
+        : 0;
+      case 'min': return values.length > 0 ? Math.min(...values) : 0;
+      case 'max': return values.length > 0 ? Math.max(...values) : 0;
+      default: return '';
+    }
+  };
+
   if (!report) {
     return (
       <Card>
@@ -159,17 +173,7 @@ export const ReportViewer: React.FC<ReportViewerProps> = ({ schema, onRefresh })
                           <CardContent className="p-4">
                             <div className="text-sm text-muted-foreground">{field.label || field.name}</div>
                             <div className="text-2xl font-bold">
-                              {field.aggregation === 'count' && data?.length}
-                              {field.aggregation === 'sum' && data?.reduce((sum, item) => sum + (Number(item[field.name]) || 0), 0)}
-                              {field.aggregation === 'avg' && data && data.length > 0
-                                ? (data.reduce((sum, item) => sum + (Number(item[field.name]) || 0), 0) / data.length).toFixed(2)
-                                : field.aggregation === 'avg' ? 0 : null}
-                              {field.aggregation === 'min' && data && data.length > 0
-                                ? Math.min(...data.map(item => Number(item[field.name]) || 0))
-                                : field.aggregation === 'min' ? 0 : null}
-                              {field.aggregation === 'max' && data && data.length > 0
-                                ? Math.max(...data.map(item => Number(item[field.name]) || 0))
-                                : field.aggregation === 'max' ? 0 : null}
+                              {computeAggregation(field.name, field.aggregation)}
                             </div>
                           </CardContent>
                         </Card>