Fix : Inspection report handle tasks in error

monkvision · Nov 3, 2023 · ce14456 · ce14456
1 parent 9ee5b41
commit ce14456
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 13 deletions.
diff --git a/packages/inspection-report/src/components/DamageReport/DamageReport.js b/packages/inspection-report/src/components/DamageReport/DamageReport.js
@@ -60,7 +60,7 @@ const styles = StyleSheet.create({
   },
   tabDesktopInnerContainer: {
     width: '50%',
-    paddingHorizontal: 15
+    paddingHorizontal: 15,
   },
   text: {
     color: '#fafafa',
@@ -111,7 +111,7 @@ const styles = StyleSheet.create({
   galleryWrapper: {
     maxHeight: '39vh',
     overflowY: 'auto',
-    paddingBottom: 15
+    paddingBottom: 15,
   },
 });
 
@@ -144,6 +144,7 @@ export default function DamageReport({
     isError,
     retry,
     isInspectionReady,
+    inspectionErrors,
     vinNumber,
     pictures,
     damages,
@@ -213,15 +214,15 @@ export default function DamageReport({
     if (pdfStatus === PdfStatus.ERROR) {
       setIsEditable(true);
     }
-  }, [pdfStatus])
+  }, [pdfStatus]);
 
   useEffect(() => {
     if (isPopUpVisible) {
       setShowPictures(false);
     } else {
       setShowPictures(true);
     }
-  }, [isPopUpVisible])
+  }, [isPopUpVisible]);
 
   return (
     <View style={[styles.container]}>
@@ -231,8 +232,20 @@ export default function DamageReport({
           {
             isDesktopMode && (
               <>
-                <Text style={[styles.text, styles.subTitle]}>{t('damageReport.inspection')} : {inspectionId}</Text>
-                <Text style={[styles.text, styles.subTitle]}>{t('damageReport.vinNumber')} : {vinNumber}</Text>
+                <Text style={[styles.text, styles.subTitle]}>
+                  {t('damageReport.inspection')}
+                  {' '}
+                  :
+                  {' '}
+                  {inspectionId}
+                </Text>
+                <Text style={[styles.text, styles.subTitle]}>
+                  {t('damageReport.vinNumber')}
+                  {' '}
+                  :
+                  {' '}
+                  {vinNumber}
+                </Text>
               </>
             )
           }
@@ -259,10 +272,29 @@ export default function DamageReport({
             </TouchableOpacity>
           </View>
         )}
-        {!isLoading && !isError && (
+        {!isLoading && inspectionErrors.isInError && (
+          <View style={[styles.notReadyContainer]}>
+            <Text style={[styles.notReadyMessage]}>{t('damageReport.inspectionInError.message')}</Text>
+            <Text
+              style={[styles.notReadyMessage, { fontFamily: 'monospace' }]}
+            >
+              {`${t('damageReport.inspectionInError.id')} : ${inspectionId}`}
+            </Text>
+            <Text
+              style={[styles.notReadyMessage, { fontFamily: 'monospace' }]}
+            >
+              {`${t('damageReport.inspectionInError.tasks')} : ${inspectionErrors.tasks.join(', ')}`}
+            </Text>
+            <TouchableOpacity style={[styles.retryButton]} onPress={onStartNewInspection}>
+              <Text style={[styles.retryTxt]}>{t('damageReport.inspectionInError.startNewInspection')}</Text>
+            </TouchableOpacity>
+          </View>
+        )}
+        {!isLoading && !isError && !inspectionErrors.isInError && (
           <>
             {
-              !isDesktopMode &&
+              !isDesktopMode
+              && (
               <View style={[styles.tabGroup]}>
                 <TabGroup>
                   <TabButton
@@ -281,6 +313,7 @@ export default function DamageReport({
                   />
                 </TabGroup>
               </View>
+              )
             }
             <View style={[styles.tabContent, isDesktopMode && styles.tabDesktopContent]}>
               <View style={[isDesktopMode && styles.tabDesktopInnerContainer]}>

diff --git a/packages/inspection-report/src/components/DamageReport/hooks/useFetchInspection.js b/packages/inspection-report/src/components/DamageReport/hooks/useFetchInspection.js
@@ -16,6 +16,7 @@ export default function useFetchInspection({
     processInspection,
     resetState,
     isInspectionReady,
+    inspectionErrors,
     vinNumber,
     pictures,
     damages,
@@ -60,6 +61,7 @@ export default function useFetchInspection({
     isError,
     retry,
     isInspectionReady,
+    inspectionErrors,
     vinNumber,
     pictures,
     damages,

diff --git a/packages/inspection-report/src/components/DamageReport/hooks/useProcessInspection.js b/packages/inspection-report/src/components/DamageReport/hooks/useProcessInspection.js
@@ -3,6 +3,15 @@ import monk from '@monkvision/corejs';
 
 import { RepairOperation, Severity } from '../../../resources';
 
+const REQUIRED_INSPECTION_TASKS = [
+  'damage_detection',
+  'wheel_analysis',
+  'images_ocr',
+  'repair_estimate',
+  'pricing',
+  'dashboard_ocr',
+];
+
 function getRepairOperation(repairType) {
   switch (repairType) {
     case true:
@@ -40,7 +49,7 @@ function getRenderedOutputImages(image) {
     isRendered: true,
     label: image.additional_data?.label ?? undefined,
     url: damagedImage.path,
-  }
+  };
 }
 
 function getPictures(inspection) {
@@ -80,6 +89,7 @@ function getDamages(inspection) {
 
 export default function useProcessInspection() {
   const [isInspectionReady, setIsInspectionReady] = useState(false);
+  const [inspectionErrors, setInspectionErrors] = useState({ isInError: false, tasks: [] });
   const [vinNumber, setVinNumber] = useState('');
   const [pictures, setPictures] = useState([]);
   const [damages, setDamages] = useState([]);
@@ -91,11 +101,17 @@ export default function useProcessInspection() {
   }, []);
 
   const processInspection = useCallback((axiosResponse) => {
+    const tasks = axiosResponse.data.tasks
+      .filter((task) => REQUIRED_INSPECTION_TASKS.includes(task.name));
     setIsInspectionReady(
-      axiosResponse.data.tasks
-        .filter((task) => (task.name !== 'inspection_pdf'))
-        .every((task) => (task.status === monk.types.InspectionStatus.DONE)),
+      tasks.every((task) => (task.status === monk.types.InspectionStatus.DONE)),
     );
+    const tasksInError = tasks
+      .filter((task) => (task.status === monk.types.InspectionStatus.ERROR));
+    setInspectionErrors({
+      isInError: tasksInError.length > 0,
+      tasks: tasksInError,
+    });
     setPictures(getPictures(axiosResponse.data));
     setDamages(getDamages(axiosResponse.data));
     setVinNumber(axiosResponse.data?.vehicle?.vin);
@@ -105,6 +121,7 @@ export default function useProcessInspection() {
     processInspection,
     resetState,
     isInspectionReady,
+    inspectionErrors,
     vinNumber,
     pictures,
     damages,

diff --git a/packages/inspection-report/src/components/DamageReport/index.js b/packages/inspection-report/src/components/DamageReport/index.js
@@ -3,7 +3,7 @@ import { I18nextProvider } from 'react-i18next';
 
 import i18n from '../../i18n';
 import DamageReport from './DamageReport';
-import { CurrencyProvider } from './../../hooks';
+import { CurrencyProvider } from '../../hooks';
 
 function DamageReportHOC(props) {
   return (

diff --git a/packages/inspection-report/src/i18n/resources/en.js b/packages/inspection-report/src/i18n/resources/en.js
@@ -22,6 +22,12 @@ const en = {
         message: 'An unexpected error occurred while fetching the inspection results.',
         retry: 'Retry',
       },
+      inspectionInError: {
+        message: 'Sorry, an unexpected error occurred during the inspection. Please contact the support with the following information :',
+        id: 'Inspection ID',
+        tasks: 'Failed tasks',
+        startNewInspection: 'New Inspection',
+      },
       loading: 'Fetching inspection results...',
       notReady: 'Inspection still in progress...',
       validate: 'Validate',

diff --git a/packages/inspection-report/src/i18n/resources/fr.js b/packages/inspection-report/src/i18n/resources/fr.js
@@ -22,6 +22,12 @@ const fr = {
         message: 'Une erreur inattendue est survenue lors de la récupération des résultats de l\'inspection.',
         retry: 'Réessayer',
       },
+      inspectionInError: {
+        message: 'Désolé, une erreur inattendue est survenue lors de l\'inspection. Veuillez contacter le support avec les informations suivantes :',
+        id: 'Identifiant de l\'inspection',
+        tasks: 'Tâches en erreur',
+        startNewInspection: 'Nouvelle Inspection',
+      },
       loading: 'Récupération des résultats...',
       notReady: 'Inspection en cours...',
       validate: 'Valider',