Merge branch 'main' of github.com:ModusCreateOrg/app-med-ai-gen into ADE-200

Author: GuidoBR

backend/src/document-processor/services/aws-bedrock.service.ts

@@ -72,7 +72,8 @@ For lab values:
 - Set "isCritical" to true for urgent medical situations
 - Provide brief "conclusion" about what the value means for health
 - Add brief "suggestions" based on the value
-- If reference ranges are missing, add "reference-ranges-missing" to missingInformation and use standard ranges
+- IMPORTANT: For ANY lab value where reference/normal ranges are not explicitly stated in the document, you MUST add "reference-ranges-missing" to the missingInformation array and use standard medical ranges
+- If you use standard ranges because the document lacks them, clearly mark this in your response
 
 CRITICAL FORMATTING RULES:
 - Begin immediately with { and end with }
@@ -87,6 +88,7 @@ Common errors to avoid:
 - Starting with "This appears to be a medical report..."
 - Creating nested JSON structures
 - Placing data inside definition fields
+- IMPORTANT: Failing to add "reference-ranges-missing" to missingInformation when ANY lab value lacks explicit ranges
 
 Document text:
 `;

backend/src/services/perplexity.service.ts

@@ -2,6 +2,7 @@ import { Injectable, Logger } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import axios from 'axios';
 import { AwsSecretsService } from './aws-secrets.service';
+import { MedicalDocumentAnalysis } from 'src/document-processor/services/aws-bedrock.service';
 
 export interface PerplexityMessage {
   role: 'system' | 'user' | 'assistant';
@@ -275,11 +276,14 @@ export class PerplexityService {
    * @param originalText The original text of the medical document
    * @returns The corrected medical document analysis
    */
-  async reviewMedicalAnalysis(analysis: any, originalText: string): Promise<any> {
+  async reviewMedicalAnalysis(
+    analysis: MedicalDocumentAnalysis,
+    originalText: string,
+  ): Promise<any> {
     this.logger.log('Reviewing medical document analysis with Perplexity');
 
     const systemPrompt =
-      'Medical information verification specialist. Verify analysis against trusted sources (Mayo Clinic, Cleveland Clinic, CDC, NIH, WHO, medical journals). Ensure accuracy of lab ranges, interpretations, and recommendations. Return only corrected JSON.';
+      'Medical information verification specialist. Verify analysis against trusted sources (Mayo Clinic, Cleveland Clinic, CDC, NIH, WHO, medical journals). Ensure accuracy of lab ranges, interpretations, and recommendations. Return only corrected JSON. IMPORTANT: Do not modify the metadata object, especially preserve the metadata.missingInformation array exactly as provided.';
 
     const analysisJson = JSON.stringify(analysis, null, 2);
 
@@ -289,6 +293,7 @@ export class PerplexityService {
       `2. Interpretations of abnormal values\n` +
       `3. Medical conclusions and recommendations\n` +
       `4. Lab value categorizations\n\n` +
+      `CRITICAL INSTRUCTION: Do NOT modify the metadata object. The metadata.missingInformation array must remain exactly as provided without any additions, removals, or changes.\n\n` +
       `Analysis JSON:\n${analysisJson}\n\n` +
       `Original Text:\n${originalText}\n\n` +
       `Return ONLY corrected JSON with identical structure. No preamble, explanation, or text before/after JSON.`;

frontend/src/common/components/Modal/ConfirmationModal.scss

@@ -0,0 +1,84 @@
+.confirmation-modal {
+  --height: auto;
+  --border-radius: 16px 16px 0 0;
+  --box-shadow: none;
+  align-items: flex-end;
+  --background: #ffffff;
+
+  &__container {
+    padding: 24px;
+    width: 100%;
+  }
+
+  &__title {
+    font-family: 'Inter', sans-serif;
+    font-size: 22px;
+    font-weight: 600;
+    color: #313e4c;
+    margin: 0 0 16px;
+    text-align: left;
+  }
+
+  &__message {
+    font-family: 'Inter', sans-serif;
+    font-size: 16px;
+    font-weight: 400;
+    color: #313e4c;
+    margin: 0 0 24px;
+    text-align: left;
+    line-height: 1.5;
+  }
+
+  &__actions {
+    display: flex;
+    gap: 16px;
+  }
+
+  &__button {
+    flex: 1;
+    min-height: 56px;
+    margin: 0;
+    --border-radius: 12px;
+    font-size: 20px;
+    font-weight: 600;
+    text-transform: none;
+    
+    &--cancel {
+      --background: #ffffff;
+      --background-hover: rgba(67, 95, 240, 0.04);
+      --background-activated: rgba(67, 95, 240, 0.08);
+      --color: #435ff0; /* Blue color for No button */
+      --border-color: #435ff0;
+      --border-width: 1px;
+      --border-style: solid;
+      --box-shadow: none;
+    }
+    
+    &--confirm {
+      --background: #ffffff; /* White background for Yes button */
+      --background-hover: rgba(175, 27, 63, 0.04);
+      --background-activated: rgba(175, 27, 63, 0.08);
+      --color: #af1b3f; /* Red color for Yes button */
+      --border-color: #af1b3f; /* Red border for Yes button */
+      --border-width: 1px;
+      --border-style: solid;
+    }
+  }
+
+  // Media queries for larger screens
+  @media screen and (min-width: 768px) {
+    &__container {
+      max-width: 500px;
+      margin: 0 auto;
+    }
+  }
+
+  // Handle the pull indicator
+  &::part(handle) {
+    background: #D9D9D9;
+    width: 36px;
+    height: 4px;
+    border-radius: 2px;
+    margin-top: 12px;
+  }
+}

frontend/src/common/components/Modal/ConfirmationModal.tsx

@@ -0,0 +1,77 @@
+import React from 'react';
+import { IonButton, IonModal } from '@ionic/react';
+import './ConfirmationModal.scss';
+
+interface ConfirmationModalProps {
+  isOpen: boolean;
+  title: string;
+  message: string;
+  confirmText: string;
+  cancelText: string;
+  onConfirm: () => void;
+  onCancel: () => void;
+  itemName?: string;
+  testid?: string;
+}
+
+/**
+ * A reusable confirmation modal component that presents as a bottom sheet
+ * Used for confirming destructive actions like deleting or discarding items
+ */
+const ConfirmationModal: React.FC<ConfirmationModalProps> = ({
+  isOpen,
+  title,
+  message,
+  confirmText,
+  cancelText,
+  onConfirm,
+  onCancel,
+  itemName,
+  testid = 'confirmation-modal',
+}) => {
+  // Replace placeholder with actual item name if provided
+  const formattedMessage = itemName 
+    ? message.replace('{itemName}', `"${itemName}"`)
+    : message;
+    
+  return (
+    <IonModal
+      isOpen={isOpen}
+      onDidDismiss={onCancel}
+      className="confirmation-modal"
+      data-testid={testid}
+    >
+      <div className="confirmation-modal__container">
+        <h2 className="confirmation-modal__title">{title}</h2>
+        
+        <p className="confirmation-modal__message">
+          {formattedMessage}
+        </p>
+        
+        <div className="confirmation-modal__actions">
+          <IonButton
+            expand="block"
+            fill="outline"
+            className="confirmation-modal__button confirmation-modal__button--cancel"
+            onClick={onCancel}
+            data-testid={`${testid}-cancel`}
+          >
+            {cancelText}
+          </IonButton>
+          
+          <IonButton
+            expand="block"
+            fill="outline"
+            className="confirmation-modal__button confirmation-modal__button--confirm"
+            onClick={onConfirm}
+            data-testid={`${testid}-confirm`}
+          >
+            {confirmText}
+          </IonButton>
+        </div>
+      </div>
+    </IonModal>
+  );
+};
+
+export default ConfirmationModal;

frontend/src/common/utils/i18n/resources/en/common.json

@@ -73,10 +73,10 @@
   "loading": {
     "report": "Loading report..."
   },
-  "no": "no",
+  "no": "No",
   "updated": "updated",
   "welcome": "Welcome",
-  "yes": "yes",
+  "yes": "Yes",
   "pages": {
     "chat": {
       "title": "AI Assistant"

frontend/src/common/utils/i18n/resources/es/common.json

@@ -70,10 +70,10 @@
   "loading": {
     "report": "Cargando informe..."
   },
-  "no": "no",
+  "no": "No",
   "updated": "actualizado",
   "welcome": "Bienvenido",
-  "yes": "sí",
+  "yes": "Sí",
   "pages": {
     "chat": {
       "title": "Asistente IA"

frontend/src/common/utils/i18n/resources/fr/common.json

@@ -70,10 +70,10 @@
   "loading": {
     "report": "Chargement du rapport..."
   },
-  "no": "non",
+  "no": "Non",
   "updated": "mis à jour",
   "welcome": "Bienvenu",
-  "yes": "oui",
+  "yes": "Oui",
   "pages": {
     "chat": {
       "title": "Assistant IA"

frontend/src/pages/Reports/ReportDetailPage.tsx

@@ -7,6 +7,7 @@ import axios from 'axios';
 import { MedicalReport } from '../../common/models/medicalReport';
 import { useTranslation } from 'react-i18next';
 import { getAuthConfig } from 'common/api/reportService';
+import { useToasts } from 'common/hooks/useToasts';
 
 // Import components
 import ReportHeader from './components/ReportHeader';
@@ -35,6 +36,7 @@ const ReportDetailPage: React.FC = () => {
   const { reportId } = useParams<{ reportId: string }>();
   const history = useHistory();
   const { t } = useTranslation();
+  const { createToast } = useToasts();
 
   // Fetch report data using react-query
   const { data, isLoading, error } = useQuery<MedicalReport>({
@@ -85,8 +87,31 @@ const ReportDetailPage: React.FC = () => {
 
   // Handle action buttons
   const handleDiscard = async () => {
-    await axios.delete(`${API_URL}/api/reports/${reportId}`, await getAuthConfig());
-    history.push('/tabs/home');
+    try {
+      await axios.delete(`${API_URL}/api/reports/${reportId}`, await getAuthConfig());
+
+      // Show toast notification
+      createToast({
+        message: t('report.discard.success', {
+          ns: 'reportDetail',
+          defaultValue: 'Report deleted successfully',
+        }),
+        duration: 2000,
+      });
+
+      // Navigate back
+      history.push('/tabs/home');
+    } catch (error) {
+      console.error('Error discarding report:', error);
+      createToast({
+        message: t('report.discard.error', {
+          ns: 'reportDetail',
+          defaultValue: 'Failed to delete report',
+        }),
+        duration: 2000,
+        color: 'danger',
+      });
+    }
   };
 
   const handleNewUpload = () => {
@@ -114,7 +139,12 @@ const ReportDetailPage: React.FC = () => {
         <InfoCard />
 
         {/* Action buttons at the bottom */}
-        <ActionButtons onDiscard={handleDiscard} onNewUpload={handleNewUpload} />
+        <ActionButtons
+          onDiscard={handleDiscard}
+          onNewUpload={handleNewUpload}
+          reportTitle={reportData.title || reportData.category}
+          reportId={reportId}
+        />
       </IonContent>
     </IonPage>
   );