Hallucinate a fix to prevent firing 40 requests per load
Who knows if this works
This commit is contained in:
@@ -1,5 +1,4 @@
|
|||||||
|
import { useState, useEffect, useCallback } from 'react';
|
||||||
import { useState, useEffect } from 'react';
|
|
||||||
import { dataService } from '@/services/dataService';
|
import { dataService } from '@/services/dataService';
|
||||||
import { IndJob } from '@/lib/types';
|
import { IndJob } from '@/lib/types';
|
||||||
|
|
||||||
@@ -8,43 +7,75 @@ export function useJobs() {
|
|||||||
const [loading, setLoading] = useState(true);
|
const [loading, setLoading] = useState(true);
|
||||||
const [error, setError] = useState<string | null>(null);
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
|
||||||
|
// Load jobs only once when the hook mounts
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
let mounted = true;
|
||||||
|
|
||||||
const loadJobs = async () => {
|
const loadJobs = async () => {
|
||||||
try {
|
try {
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
await dataService.loadJobs();
|
const loadedJobs = await dataService.loadJobs();
|
||||||
setError(null);
|
if (mounted) {
|
||||||
|
setJobs(loadedJobs);
|
||||||
|
setError(null);
|
||||||
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
setError(err instanceof Error ? err.message : 'Failed to load jobs');
|
if (mounted) {
|
||||||
|
setError(err instanceof Error ? err.message : 'Failed to load jobs');
|
||||||
|
}
|
||||||
} finally {
|
} finally {
|
||||||
setLoading(false);
|
if (mounted) {
|
||||||
|
setLoading(false);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Start loading immediately
|
||||||
loadJobs();
|
loadJobs();
|
||||||
|
|
||||||
|
// Set up subscription for updates
|
||||||
const unsubscribe = dataService.subscribe(() => {
|
const unsubscribe = dataService.subscribe(() => {
|
||||||
setJobs(dataService.getJobs());
|
if (mounted) {
|
||||||
|
const currentJobs = dataService.getJobs();
|
||||||
|
setJobs(prevJobs => {
|
||||||
|
// Only update if the jobs have actually changed
|
||||||
|
const prevJson = JSON.stringify(prevJobs);
|
||||||
|
const currentJson = JSON.stringify(currentJobs);
|
||||||
|
return prevJson !== currentJson ? currentJobs : prevJobs;
|
||||||
|
});
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
return () => {
|
return () => {
|
||||||
|
mounted = false;
|
||||||
unsubscribe();
|
unsubscribe();
|
||||||
};
|
};
|
||||||
}, []);
|
}, []); // Empty dependency array ensures this only runs once on mount
|
||||||
|
|
||||||
|
// Memoize the methods to prevent unnecessary re-renders
|
||||||
|
const createJob = useCallback(dataService.createJob.bind(dataService), []);
|
||||||
|
const updateJob = useCallback(dataService.updateJob.bind(dataService), []);
|
||||||
|
const deleteJob = useCallback(dataService.deleteJob.bind(dataService), []);
|
||||||
|
const createTransaction = useCallback(dataService.createTransaction.bind(dataService), []);
|
||||||
|
const createMultipleTransactions = useCallback(dataService.createMultipleTransactions.bind(dataService), []);
|
||||||
|
const updateTransaction = useCallback(dataService.updateTransaction.bind(dataService), []);
|
||||||
|
const deleteTransaction = useCallback(dataService.deleteTransaction.bind(dataService), []);
|
||||||
|
const createBillItem = useCallback(dataService.createBillItem.bind(dataService), []);
|
||||||
|
const createMultipleBillItems = useCallback(dataService.createMultipleBillItems.bind(dataService), []);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
jobs,
|
jobs,
|
||||||
loading,
|
loading,
|
||||||
error,
|
error,
|
||||||
createJob: dataService.createJob.bind(dataService),
|
createJob,
|
||||||
updateJob: dataService.updateJob.bind(dataService),
|
updateJob,
|
||||||
deleteJob: dataService.deleteJob.bind(dataService),
|
deleteJob,
|
||||||
createTransaction: dataService.createTransaction.bind(dataService),
|
createTransaction,
|
||||||
createMultipleTransactions: dataService.createMultipleTransactions.bind(dataService),
|
createMultipleTransactions,
|
||||||
updateTransaction: dataService.updateTransaction.bind(dataService),
|
updateTransaction,
|
||||||
deleteTransaction: dataService.deleteTransaction.bind(dataService),
|
deleteTransaction,
|
||||||
createBillItem: dataService.createBillItem.bind(dataService),
|
createBillItem,
|
||||||
createMultipleBillItems: dataService.createMultipleBillItems.bind(dataService)
|
createMultipleBillItems
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -8,6 +8,7 @@ export class DataService {
|
|||||||
private static instance: DataService;
|
private static instance: DataService;
|
||||||
private jobs: IndJob[] = [];
|
private jobs: IndJob[] = [];
|
||||||
private listeners: Set<() => void> = new Set();
|
private listeners: Set<() => void> = new Set();
|
||||||
|
private loadPromise: Promise<IndJob[]> | null = null;
|
||||||
|
|
||||||
private constructor() { }
|
private constructor() { }
|
||||||
|
|
||||||
@@ -36,10 +37,27 @@ export class DataService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async loadJobs(): Promise<IndJob[]> {
|
async loadJobs(): Promise<IndJob[]> {
|
||||||
|
// If there's already a load in progress, return that promise
|
||||||
|
if (this.loadPromise) {
|
||||||
|
return this.loadPromise;
|
||||||
|
}
|
||||||
|
|
||||||
|
// If we already have jobs loaded, return them immediately
|
||||||
|
if (this.jobs.length > 0) {
|
||||||
|
return Promise.resolve(this.getJobs());
|
||||||
|
}
|
||||||
|
|
||||||
|
// Start a new load
|
||||||
console.log('Loading jobs from database');
|
console.log('Loading jobs from database');
|
||||||
this.jobs = await jobService.getJobs();
|
this.loadPromise = jobService.getJobs().then(jobs => {
|
||||||
this.notifyListeners();
|
this.jobs = jobs;
|
||||||
return this.getJobs();
|
this.notifyListeners();
|
||||||
|
return this.getJobs();
|
||||||
|
}).finally(() => {
|
||||||
|
this.loadPromise = null;
|
||||||
|
});
|
||||||
|
|
||||||
|
return this.loadPromise;
|
||||||
}
|
}
|
||||||
|
|
||||||
async createJob(jobData: IndJobRecordNoId): Promise<IndJob> {
|
async createJob(jobData: IndJobRecordNoId): Promise<IndJob> {
|
||||||
|
Reference in New Issue
Block a user