Merge pull request #144 from ModusCreateOrg/ADE-215

[ADE-215] fixes

Author: GuidoBR

frontend/src/common/hooks/useReports.ts

@@ -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),
       );
     },
   });

frontend/src/pages/Processing/ProcessingPage.tsx

@@ -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) {

frontend/src/pages/Processing/components/ProcessingError.tsx

@@ -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;
@@ -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">
@@ -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>
   );