@@ -194,7 +179,7 @@ const PivotTab = observer(() => {
{/* Controls Section with Reset Button */}
);
diff --git a/vite-app/src/components/PivotTable.tsx b/vite-app/src/components/PivotTable.tsx
index 52b2213d..af6063de 100644
--- a/vite-app/src/components/PivotTable.tsx
+++ b/vite-app/src/components/PivotTable.tsx
@@ -106,7 +106,6 @@ export function PivotTable
>({
filter,
});
- debugger;
return (
diff --git a/vite-app/src/hooks/usePivotData.ts b/vite-app/src/hooks/usePivotData.ts
new file mode 100644
index 00000000..ad170a15
--- /dev/null
+++ b/vite-app/src/hooks/usePivotData.ts
@@ -0,0 +1,87 @@
+import { useMemo } from 'react';
+import { computePivot } from '../util/pivot';
+import { createFilterFunction } from '../util/filter-utils';
+import { state } from '../App';
+
+export interface PivotDataConfig {
+ rowFields: string[];
+ columnFields: string[];
+ valueField?: string;
+ aggregator: 'count' | 'sum' | 'avg' | 'min' | 'max';
+ showRowTotals?: boolean;
+ showColumnTotals?: boolean;
+}
+
+export interface ProcessedPivotData {
+ rowFields: string[];
+ columnFields: string[];
+ valueField?: string;
+ aggregator: 'count' | 'sum' | 'avg' | 'min' | 'max';
+ pivotResult: ReturnType>;
+ hasValidConfiguration: boolean;
+}
+
+/**
+ * Custom hook that processes pivot configuration and computes pivot data
+ * Centralizes all pivot-related logic to avoid duplication
+ */
+export function usePivotData(
+ config: PivotDataConfig
+): ProcessedPivotData {
+ const { rowFields, columnFields, valueField, aggregator, showRowTotals = true, showColumnTotals = true } = config;
+
+ // Filter out empty fields and cast to proper types
+ const processedRowFields = useMemo(
+ () => rowFields.filter((field) => field !== '') as string[],
+ [rowFields]
+ );
+
+ const processedColumnFields = useMemo(
+ () => columnFields.filter((field) => field !== '') as string[],
+ [columnFields]
+ );
+
+ const processedValueField = useMemo(
+ () => (valueField && valueField !== '' ? valueField : undefined) as string | undefined,
+ [valueField]
+ );
+
+ // Check if we have a valid configuration for pivot computation
+ const hasValidConfiguration = useMemo(
+ () => processedRowFields.length > 0 && processedColumnFields.length > 0,
+ [processedRowFields, processedColumnFields]
+ );
+
+ // Compute pivot data only when configuration is valid
+ const pivotResult = useMemo(() => {
+ if (!hasValidConfiguration) {
+ // Return empty pivot result structure
+ return {
+ rowKeyTuples: [],
+ colKeyTuples: [],
+ cells: {},
+ rowTotals: {},
+ colTotals: {},
+ grandTotal: 0,
+ } as ReturnType>;
+ }
+
+ return computePivot({
+ data: state.flattenedDataset,
+ rowFields: processedRowFields,
+ columnFields: processedColumnFields,
+ valueField: processedValueField,
+ aggregator,
+ filter: createFilterFunction(state.filterConfig),
+ });
+ }, [hasValidConfiguration, processedRowFields, processedColumnFields, processedValueField, aggregator, state.filterConfig]);
+
+ return {
+ rowFields: processedRowFields,
+ columnFields: processedColumnFields,
+ valueField: processedValueField,
+ aggregator,
+ pivotResult,
+ hasValidConfiguration,
+ };
+}
diff --git a/vite-app/src/util/field-processors.ts b/vite-app/src/util/field-processors.ts
new file mode 100644
index 00000000..e1851f15
--- /dev/null
+++ b/vite-app/src/util/field-processors.ts
@@ -0,0 +1,121 @@
+import { state } from '../App';
+import { createFilterFunction as createFilterFunctionUtil } from '../util/filter-utils';
+import { type FilterGroup } from '../types/filters';
+
+/**
+ * Utility functions for processing field configurations and creating handlers
+ * Centralizes common field manipulation logic
+ */
+
+/**
+ * Creates a field change handler for a specific index
+ */
+export function createFieldHandler(
+ updater: (index: number, value: string) => void
+) {
+ return (index: number, value: string) => {
+ updater(index, value);
+ };
+}
+
+/**
+ * Creates an add field handler that respects the maximum limit
+ */
+export function createAddHandler(
+ fields: string[],
+ updater: (fields: string[]) => void,
+ maxFields: number = 3
+) {
+ return () => {
+ if (fields.length < maxFields) {
+ updater([...fields, '']);
+ }
+ };
+}
+
+/**
+ * Creates a remove field handler
+ */
+export function createRemoveHandler(
+ fields: string[],
+ updater: (fields: string[]) => void
+) {
+ return (index: number) => {
+ updater(fields.filter((_, i) => i !== index));
+ };
+}
+
+/**
+ * Creates a complete field handler set for a field array
+ */
+export function createFieldHandlerSet(
+ fields: string[],
+ updater: (fields: string[]) => void,
+ maxFields: number = 3
+) {
+ return {
+ onFieldChange: createFieldHandler((index: number, value: string) => {
+ const newFields = [...fields];
+ newFields[index] = value;
+ updater(newFields);
+ }),
+ onAddField: createAddHandler(fields, updater, maxFields),
+ onRemoveField: createRemoveHandler(fields, updater),
+ };
+}
+
+/**
+ * Gets available keys from the current dataset state
+ */
+export function getAvailableKeys(): string[] {
+ return state.flattenedDatasetKeys;
+}
+
+/**
+ * Processes pivot configuration from state
+ */
+export function getPivotConfig() {
+ return state.pivotConfig;
+}
+
+/**
+ * Updates pivot configuration
+ */
+export function updatePivotConfig(updates: Partial) {
+ state.updatePivotConfig(updates);
+}
+
+/**
+ * Resets pivot configuration to defaults
+ */
+export function resetPivotConfig() {
+ state.resetPivotConfig();
+}
+
+/**
+ * Updates filter configuration
+ */
+export function updateFilterConfig(filters: FilterGroup[]) {
+ state.updateFilterConfig(filters);
+}
+
+/**
+ * Gets the flattened dataset from state
+ */
+export function getFlattenedDataset() {
+ return state.flattenedDataset;
+}
+
+/**
+ * Creates a filter function using the current filter config
+ */
+export function createFilterFunction() {
+ return createFilterFunctionUtil(state.filterConfig);
+}
+
+/**
+ * Gets the current filter configuration
+ */
+export function getFilterConfig() {
+ return state.filterConfig;
+}