Merge branch 'main' of https://github.com/monkvision/monkjs

Author: KseniaBuntova

package.json

@@ -1,6 +1,6 @@
 {
   "name": "monk",
-  "version": "3.8.5",
+  "version": "3.8.6",
   "author": "monkvision",
   "license": "BSD-3-Clause-Clear",
   "private": true,

packages/camera/package.json

@@ -2,7 +2,7 @@
   "name": "@monkvision/camera",
   "author": "monkvision",
   "license": "BSD-3-Clause-Clear",
-  "version": "3.8.5",
+  "version": "3.8.6",
   "private": false,
   "description": "AI-powered vehicle damage detection for React Native",
   "homepage": "https://github.com/monkvision/monkjs/packages/camera/#readme",
@@ -70,10 +70,10 @@
     "release-it": "*"
   },
   "peerDependencies": {
-    "@monkvision/corejs": "3.8.5",
-    "@monkvision/inspection-report": "3.8.5",
-    "@monkvision/sights": "3.8.5",
-    "@monkvision/toolkit": "3.8.5",
+    "@monkvision/corejs": "3.8.6",
+    "@monkvision/inspection-report": "3.8.6",
+    "@monkvision/sights": "3.8.6",
+    "@monkvision/toolkit": "3.8.6",
     "expo-camera": "^12.3.0",
     "react": "*",
     "react-native": "*",

packages/camera/src/components/Capture/hooks.js

@@ -444,7 +444,7 @@ export function useUploadAdditionalDamage({ inspectionId, addDamageParts, onPict
 export function useCheckComplianceAsync({
   compliance, inspectionId, sightId: currentSighId,
 }) {
-  return useCallback(async (imageId, customSightId) => {
+  return useCallback(async (imageId, customSightId, increment = false) => {
     const { dispatch } = compliance;
     const sightId = customSightId || currentSighId;
 
@@ -455,7 +455,7 @@ export function useCheckComplianceAsync({
     try {
       dispatch({
         type: Actions.compliance.UPDATE_COMPLIANCE,
-        increment: true,
+        increment,
         payload: { id: sightId, status: 'pending', imageId },
       });
 

packages/camera/src/components/UploadCenter/UploadCard/hooks/useSubtitle.js

@@ -2,6 +2,10 @@ import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
 const translatedErrorCodes = [
+  'NO_CAR_BODY',
+  'BLURRINESS',
+  'UNDEREXPOSURE',
+  'OVEREXPOSURE',
   'TOO_ZOOMED',
   'NOT_ZOOMED_ENOUGH',
   'WRONG_ANGLE',
@@ -13,6 +17,19 @@ const translatedErrorCodes = [
   'INTERIOR_NOT_SUPPORTED',
 ];
 
+function getSubtitle(reasons, t) {
+  if (reasons.length === 0) {
+    return t('uploadCenter.subtitle.unknown');
+  }
+  const translatedReasons = reasons.map((reason) => {
+    const key = translatedErrorCodes
+      .find((errorCode) => reason.toUpperCase().startsWith(errorCode));
+    return key ? t(`uploadCenter.subtitle.reasons.${key}`) : `[MISSING TRANSLATION : ${reason}]`;
+  });
+  const joinedReasons = translatedReasons.join(`${t('uploadCenter.subtitle.reasonsJoin')} `);
+  return `${t('uploadCenter.subtitle.reasonsStart')} ${joinedReasons}`;
+}
+
 export default function useSubtitle({
   isComplianceUnknown,
   isComplianceIdle,
@@ -40,31 +57,14 @@ export default function useSubtitle({
       const reasons = [];
 
       if (badQuality && iqa.reasons) {
-        iqa.reasons.forEach((reason, index) => {
-          const errorCode = translatedErrorCodes.find((code) => reason.startsWith(code));
-          if (errorCode && errorCode !== 'UNKNOWN_SIGHT') {
-            const first = index === 0;
-            reasons.push(first ? t(`uploadCenter.subtitle.reasons.${reason}`)
-              : `${t('uploadCenter.subtitle.reasonsJoin')} ${t(`uploadCenter.subtitle.reasons.${reason}`)}`);
-          }
-        });
+        reasons.push(...iqa.reasons);
       }
 
       if (badCoverage && carCov.reasons) {
-        carCov.reasons.forEach((reason, index) => {
-          const first = index === 0 && !badQuality;
-          const errorCode = translatedErrorCodes.find((code) => reason.startsWith(code));
-          // display all reasons expect `UNKNOWN_SIGHT`
-          if (errorCode && errorCode !== 'UNKNOWN_SIGHT') {
-            reasons.push(first ? t(`uploadCenter.subtitle.reasons.${errorCode}`)
-              : `${t('uploadCenter.subtitle.reasonsJoin')} ${t(`uploadCenter.subtitle.reasons.${errorCode}`)}`);
-          }
-        });
+        reasons.push(...carCov.reasons);
       }
 
-      if (reasons.length > 0) {
-        return `${t('uploadCenter.subtitle.reasonsStart')} ${reasons.join(' ')}`;
-      }
+      return getSubtitle(reasons, t);
     }
 
     return t('uploadCenter.subtitle.queueBlocked');

packages/camera/src/components/UploadCenter/hooks/allowedComplianceReasons.js

@@ -1,4 +1,5 @@
 const ALLOWED_COMPLIANCE_REASONS = [
+  'NO_CAR_BODY',
   'LOW_RESOLUTION',
   'BLURRINESS',
   'UNDEREXPOSURE',
@@ -16,7 +17,7 @@ export default function filterUnwantedComplianceReasons(reasons) {
   }
   return reasons.filter(
     (reason) => ALLOWED_COMPLIANCE_REASONS
-      .findIndex((allowedReason) => reason.startsWith(allowedReason)) !== -1,
+      .findIndex((allowedReason) => reason.toUpperCase().startsWith(allowedReason)) !== -1,
   );
 }
 
@@ -35,6 +36,7 @@ export default function filterUnwantedComplianceReasons(reasons) {
  * REFLECTIONS
  * UNKNOWN_SIGHT
  * UNKNOWN_VIEWPOINT
+ * NO_CAR_BODY
  * NO_VEHICLE
  * WRONG_ANGLE
  * WRONG_CENTER_PART

packages/camera/src/components/UploadCenter/hooks/useComplianceIds.js

@@ -35,9 +35,17 @@ export default function useComplianceIds({
       const handleChangeReasons = (compliances) => ({
         ...item,
         requestCount,
-        result: { ...result,
+        result: {
+          ...result,
           data: {
-            ...result.data, compliances: { ...result.data.compliances, ...compliances } } } });
+            ...result.data,
+            compliances: {
+              ...result.data.compliances,
+              ...compliances,
+            },
+          },
+        },
+      });
 
       const hasReachedMaxRetries = requestCount >= 2;
 

packages/camera/src/components/UploadCenter/hooks/useHandlers.js

@@ -70,7 +70,7 @@ export default function useHandlers({
     // double check if the compliance is not invalid
     const hasTodoCompliances = Object.values(compliances).some((c) => hasTodo(c));
     if (!hasTodoCompliances) { return; }
-    setTimeout(async () => { await checkComplianceAsync(pictureId, currentId); }, 500);
+    setTimeout(async () => { await checkComplianceAsync(pictureId, currentId, true); }, 500);
   }, [compliance.state]);
 
   const handleRecheck = useCallback((id) => {

packages/camera/src/i18n/resources/en.js

@@ -38,9 +38,9 @@ const en = {
         reasonsStart: 'This image',
         reasonsJoin: 'and',
         reasons: {
-          blurriness: 'is blurry',
-          underexposure: 'is underexposed (too dark)',
-          overexposure: 'is overexposed (too bright)',
+          BLURRINESS: 'is blurry',
+          UNDEREXPOSURE: 'is underexposed (too dark)',
+          OVEREXPOSURE: 'is overexposed (too bright)',
           TOO_ZOOMED: 'is too zoomed',
           NOT_ZOOMED_ENOUGH: 'is too far from vehicle',
           WRONG_ANGLE: 'is taken from incorrect angle',

packages/camera/src/i18n/resources/fr.js

@@ -38,9 +38,9 @@ const fr = {
         reasonsStart: 'Cette image',
         reasonsJoin: 'et',
         reasons: {
-          blurriness: 'est floue',
-          underexposure: 'est sous-exposée (trop sombre)',
-          overexposure: 'est sur-exposée (trop lumineuse)',
+          BLURRINESS: 'est floue',
+          UNDEREXPOSURE: 'est sous-exposée (trop sombre)',
+          OVEREXPOSURE: 'est sur-exposée (trop lumineuse)',
           TOO_ZOOMED: 'est trop zoomée',
           NOT_ZOOMED_ENOUGH: 'est trop loin du véhicule',
           WRONG_ANGLE: 'est prise depuis un angle incorrect',

packages/corejs/package.json

@@ -2,7 +2,7 @@
   "name": "@monkvision/corejs",
   "author": "monkvision",
   "license": "BSD-3-Clause-Clear",
-  "version": "3.8.5",
+  "version": "3.8.6",
   "private": false,
   "description": "AI-powered vehicle damage detection for JavaScript",
   "homepage": "https://github.com/monkvision/monkjs/packages/corejs/#readme",