Skip to content

Commit

Permalink
more simplifications and better database stuff - all working
Browse files Browse the repository at this point in the history
  • Loading branch information
@sahil-lalani
sahil-lalani committed Nov 9, 2024
1 parent d05a3cb commit a51d677
Show file tree
Hide file tree
Showing 9 changed files with 92 additions and 251 deletions.
27 changes: 2 additions & 25 deletions src/main/main.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ export const createWindow = async (visible: boolean = true) => {
};

mainWindow = new BrowserWindow({
show: false,
show: true,
//set to max with on mac screen
width: 1560,
height: 1024,
Expand Down Expand Up @@ -459,18 +459,6 @@ export const createWindow = async (visible: boolean = true) => {
});


mainWindow.on('ready-to-show', () => {
if (!mainWindow) {
throw new Error('"mainWindow" is not defined');
}
mainWindow.show()
// if (process.env.START_MINIMIZED) {
// mainWindow.minimize();
// } else {
// mainWindow.show();
// }
});

ipcMain.on('show-dev-tools', (event) => {
try {
console.log('OPENING DEVTOOLS!');
Expand Down Expand Up @@ -1101,15 +1089,4 @@ ipcMain.on('open-platform-export-folder', (event, company, name) => {
const exportFolderPath = path.join(app.getPath('userData'), 'surfer_data', company, name);
console.log('exportFolderPath', exportFolderPath);
shell.openPath(exportFolderPath);
});

// app.on('before-quit', (event) => {
// event.preventDefault(); // Prevent the app from quitting immediately
// mainWindow?.webContents.send('stop-all-jobs');
// });

// // ... rest of the existing code ...

// ipcMain.on('jobs-stopped', () => {
// app.exit(0); // Now we can safely exit the app
// });
});
9 changes: 0 additions & 9 deletions src/renderer/Surfer.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,19 +64,10 @@ function Surfer() {
dispatch(setCurrentRoute(route));
});

const handleStopAllJobs = async () => {
console.log('Stopping all jobs...');
await dispatch(stopAllJobs());
window.electron.ipcRenderer.send('jobs-stopped');
};

window.electron.ipcRenderer.on('stop-all-jobs', handleStopAllJobs);

// Cleanup
return () => {
window.removeEventListener('keydown', handleKeyDown);
window.electron.ipcRenderer.removeAllListeners('route-change');
window.electron.ipcRenderer.removeListener('stop-all-jobs', handleStopAllJobs);
};
}, [dispatch, contentScale]);

Expand Down
197 changes: 68 additions & 129 deletions src/renderer/components/PlatformDashboard.jsx
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
import React, { useEffect, useState, useCallback, useRef } from 'react';
import { useDispatch, useSelector } from 'react-redux';
import { startRun, toggleRunVisibility, setExportRunning, updateExportStatus, addRun } from '../state/actions';
import { useTheme } from './ui/theme-provider';
import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "./ui/table";
import { Button } from "./ui/button";
import { ArrowUpRight, ArrowRight, Check, X, Link, Download, Search, ChevronLeft, ChevronRight, HardDriveDownload, Folder, Eye } from 'lucide-react';
import { openDB } from 'idb';
import { Input } from "./ui/input";
import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription, DialogFooter } from "./ui/dialog";
import { Checkbox } from "./ui/checkbox";
import { Progress } from "./ui/progress";
import RunDetailsPage from './RunDetails';
import RunDetails from './RunDetails';
import ConfettiExplosion from 'react-confetti-explosion';
import { Tooltip, TooltipProvider, TooltipTrigger, TooltipContent } from "./ui/tooltip";
import { Info } from 'lucide-react';
Expand All @@ -22,13 +20,10 @@ import { MoonLoader } from 'react-spinners';
const PlatformDashboard = ({ onPlatformClick, webviewRef }) => {
const dispatch = useDispatch();
const runs = useSelector(state => state.app.runs);
const activeRuns = runs.filter(
(run) => run.status === 'pending' || run.status === 'running',
);

const [searchTerm, setSearchTerm] = useState('');
const [currentPage, setCurrentPage] = useState(1);
const itemsPerPage = 20;
const { theme } = useTheme(); // Get the current theme
const [dbUpdateTrigger, setDbUpdateTrigger] = useState(0);
const dbRef = useRef(null);
const [selectedRun, setSelectedRun] = useState(null);
Expand All @@ -41,9 +36,6 @@ const PlatformDashboard = ({ onPlatformClick, webviewRef }) => {
const [allPlatforms, setAllPlatforms] = useState([]);


const LOGO_SIZE = 24; // Set a consistent size for all logos


useEffect(() => {
// Listen for runs request from main process
const handleGetRunsRequest = () => {
Expand All @@ -59,39 +51,9 @@ useEffect(() => {
};
}, [runs]);

const loadRuns = useCallback(async () => {
const db = await openDB('dataExtractionDB', 1, {
upgrade(db) {
db.createObjectStore('runs', { keyPath: 'id' });
},
});
dbRef.current = db;
const loadedRuns = await db.getAll('runs');
}, [dispatch]);

useEffect(() => {
loadRuns();

return () => {
if (dbRef.current) {
dbRef.current.close();
}
};
}, [loadRuns, dbUpdateTrigger]);

useEffect(() => {
const handleDbChange = () => {
setDbUpdateTrigger(prev => prev + 1);
};

window.electron.ipcRenderer.on('db-changed', handleDbChange);

return () => {
window.electron.ipcRenderer.removeListener('db-changed', handleDbChange);
};
}, []);

const getLatestRun = useCallback((platformId) => {
const getLatestRun = (platformId) => {
const platformRuns = runs.filter(run => run.platformId === platformId);
if (platformRuns.length === 0) return null;

Expand All @@ -100,7 +62,7 @@ useEffect(() => {
const currentDate = current.startDate ? new Date(current.startDate) : new Date(0);
return currentDate > latestDate ? current : latest;
});
}, [runs]);
};


useEffect(() => {
Expand Down Expand Up @@ -152,7 +114,7 @@ useEffect(() => {
return () => {
window.electron.ipcRenderer.removeListener('element-found', handleElementFound);
};
}, [connectedPlatforms]);
}, [allPlatforms]);

// useEffect(() => {
// const runisUpdateds = async () => {
Expand Down Expand Up @@ -270,100 +232,77 @@ useEffect(() => {
setSelectedRun(null);
};

const renderResults = (platform) => {
const renderRunStatus = (platform) => {
const latestRun = getLatestRun(platform.id);
const exportRunning = isExportRunning(platform.id);
const isHovered = hoveredPlatformId === platform.id;
if (!latestRun || latestRun.status !== 'running' || !latestRun.logs) return null;

return (
<div className="relative w-full flex items-center">
<div className="flex-grow flex items-center">
<div className="flex-shrink-0 mr-4 w-1/2">
{!latestRun || latestRun.status === 'idle' ? (
<div className="flex justify-between items-center w-full h-full">
<div></div>
</div>
) : (
renderRunStatus(latestRun, platform)
)}
</div>
{/* {latestRun && latestRun.status === 'running' && (
<div className="flex-grow overflow-hidden">
{showLogs(platform)}
</div>
)} */}
</div>
</div>
);
};
// // Show loading spinner if no logs yet
// if (!latestRun.logs || latestRun.logs.length === 0) {
// return <div><MoonLoader size={16} /></div>;
// }

const renderRunStatus = (latestRun, platform) => {
if (!latestRun || !latestRun.logs || latestRun.logs.length === 0) {
return <div><MoonLoader size={16} /></div>
}
const logLines = latestRun.logs.split('\n');
switch (latestRun.status) {
case 'running':

switch (latestRun.status) {
case 'running':
return (
<div className="flex items-center space-x-2">
<div className="flex-grow">
<div className="flex items-center space-x-2 group">
<div id="log-container" className="max-h-[100px] overflow-y-auto bg-black text-green-400 p-2 rounded" style={{ maxWidth: '500px' }}>
<pre className="font-mono text-xs whitespace-pre-wrap break-words">
{logLines.map((line, index) => (
<span key={index} className={line === 'YOU NEED TO SIGN IN (click the eye in the top right)!' ? 'text-red-500' : ''}>
{line}
{index < logLines.length - 1 && '\n'}
</span>
))}
</pre>
</div>
</div>
<div id="log-container" className="max-h-[100px] overflow-y-auto bg-black text-green-400 p-2 rounded" style={{ maxWidth: '500px' }}>
<pre className="font-mono text-xs whitespace-pre-wrap break-words">
{logLines.map((line, index) => (
<span key={index} className={line === 'YOU NEED TO SIGN IN (click the eye in the top right)!' ? 'text-red-500' : ''}>
{line}
{index < logLines.length - 1 && '\n'}
</span>
))}
</pre>
</div>
</div>
);
case 'success':
return (
<div className="flex items-center space-x-2">
{completedRuns[latestRun.id] && (
<ConfettiExplosion
particleCount={50}
width={200}
duration={2200}
force={0.4}
/>
)}
<div
onClick={() => window.electron.ipcRenderer.send('open-folder', latestRun.exportPath)}
style={{ cursor: 'pointer' }}
>
<Folder size={17} />
</div>

<span className="text-gray-500">-</span>
<span
className="cursor-pointer flex items-center hover:underline"
onClick={() => onViewRunDetails(latestRun, platform)}
>
{formatLastRunTime(latestRun.exportDate || latestRun.startDate)}
<ArrowUpRight size={22} className="ml-1" color="#5a5a5a" />
</span>
</div>
);
case 'error':
case 'stopped':
return (
<div className="flex items-center space-x-2">
<X className="text-red-500" size={16} />
<span className="hover:underline cursor-pointer" onClick={() => onViewRunDetails(latestRun, platform)}>
Export {latestRun.status === 'error' ? 'failed' : 'stopped'}
</span>
case 'success':
return (
<div className="flex items-center space-x-2">
{completedRuns[latestRun.id] && (
<ConfettiExplosion
particleCount={50}
width={200}
duration={2200}
force={0.4}
/>
)}
<div
onClick={() => window.electron.ipcRenderer.send('open-folder', latestRun.exportPath)}
style={{ cursor: 'pointer' }}
>
<Folder size={17} />
</div>
);
default:
return <span>Unknown status</span>;
}
};
<span className="text-gray-500">-</span>
<span
className="cursor-pointer flex items-center hover:underline"
onClick={() => onViewRunDetails(latestRun, platform)}
>
{formatLastRunTime(latestRun.exportDate || latestRun.startDate)}
<ArrowUpRight size={22} className="ml-1" color="#5a5a5a" />
</span>
</div>
);

case 'error':
case 'stopped':
return (
<div className="flex items-center space-x-2">
<X className="text-red-500" size={16} />
<span className="hover:underline cursor-pointer" onClick={() => onViewRunDetails(latestRun, platform)}>
- {formatLastRunTime(latestRun.endDate)}
</span>
</div>
);

default:
return null;
}
};

useEffect(() => {
const logContainers = document.querySelectorAll('#log-container');
Expand Down Expand Up @@ -454,7 +393,7 @@ const renderResults = (platform) => {
onClick={() => onPlatformClick(platform)}
>
{platformLogos[platform.id] && (
<img src={platformLogos[platform.id]} alt={platform.name} className="w-4 h-4" style={{ width: `${LOGO_SIZE}px`, height: `${LOGO_SIZE}px` }}/>
<img src={platformLogos[platform.id]} alt={platform.name} className="w-4 h-4" style={{ width: `24px`, height: `24px` }}/>
)}
<div className="flex items-center">
<p className="flex items-center">
Expand All @@ -470,7 +409,7 @@ const renderResults = (platform) => {
<p className="font-medium">{platform.description || 'No description available'}</p>
</TableCell>
<TableCell className="w-[600px]">
{renderResults(platform)}
{renderRunStatus(platform)}
</TableCell>
<TableCell>
<div className="flex space-x-2">
Expand Down Expand Up @@ -543,7 +482,7 @@ const renderResults = (platform) => {
</div>
)}
{selectedRun && (
<RunDetailsPage
<RunDetails
runId={selectedRun.run.id}
onClose={handleCloseDetails}
platform={selectedRun.platform}
Expand Down
Loading

0 comments on commit a51d677

Please sign in to comment.