Skip to content

[ADE-215] fixes #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GuidoBR merged 3 commits into from
May 2, 2025
Merged

[ADE-215] fixes #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
382a22c
Refactor bookmark status update in useToggleReportBookmark for improv…
adamrefaey May 2, 2025
35a63e6
Refactor ProcessingError component to manage upload modal state and h…
adamrefaey May 2, 2025
0c404b2
Add clearStatusCheckInterval call before starting status check interv…
adamrefaey May 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions frontend/src/common/hooks/useReports.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,8 @@ export const useToggleReportBookmark = () => {

// Update the bookmark status in the report detail page
queryClient.setQueryData<MedicalReport | undefined>(
[QueryKey.ReportDetail, reportId],
(oldReport) => {
if (!oldReport) return undefined;
if (oldReport.id !== updatedReport.id) return oldReport;
return { ...oldReport, bookmarked: updatedReport.bookmarked };
},
[QueryKey.ReportDetail, updatedReport.id],
(report) => (report?.id === updatedReport.id ? updatedReport : report),
);
},
});
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/pages/Processing/ProcessingPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@ const ProcessingPage: React.FC = () => {
history.push(`/tabs/reports/${reportId}`);
}

clearStatusCheckInterval();

// Start checking the status every 2 seconds
statusCheckIntervalRef.current = window.setInterval(checkReportStatus, 2000);
} catch (error) {
Expand Down
18 changes: 16 additions & 2 deletions frontend/src/pages/Processing/components/ProcessingError.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import { IonButton } from '@ionic/react';
import { useHistory } from 'react-router-dom';
import '../ProcessingPage.scss';
import warning from '../../../assets/icons/warning.svg';
import UploadModal from 'common/components/Upload/UploadModal';
import { useState } from 'react';
import { useHistory } from 'react-router';

interface ProcessingErrorProps {
errorMessage: string;
Expand All @@ -19,6 +21,12 @@ const ProcessingError: React.FC<ProcessingErrorProps> = ({
onRetry,
}) => {
const history = useHistory();
const [isUploadModalOpen, setIsUploadModalOpen] = useState(false);

const handleUploadComplete = () => {
setIsUploadModalOpen(false);
history.push('/tabs/home');
};

return (
<div className="processing-page__error-container">
Expand Down Expand Up @@ -54,10 +62,16 @@ const ProcessingError: React.FC<ProcessingErrorProps> = ({
expand="block"
shape="round"
color="primary"
onClick={() => history.push('/tabs/upload')}
onClick={() => setIsUploadModalOpen(true)}
>
New Upload
</IonButton>

<UploadModal
isOpen={isUploadModalOpen}
onClose={handleUploadComplete}
onUploadComplete={handleUploadComplete}
/>
</div>
</div>
);
Expand Down