From 774bdd2dcb376f8126ce505e514429c02cab245b Mon Sep 17 00:00:00 2001
From: Antoine Jeanneney <antoine.jeanneney@justice.fr>
Date: Wed, 3 Apr 2024 17:44:48 +0200
Subject: [PATCH 1/2] fix front logic

---
 .../AnnotationsPanel/AnnotationsPanel.tsx     | 29 ++++++++++++-------
 packages/generic/client/src/wordings/fr.ts    |  7 +++--
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/packages/generic/client/src/pages/Home/DocumentAnnotator/AnnotationsPanel/AnnotationsPanel.tsx b/packages/generic/client/src/pages/Home/DocumentAnnotator/AnnotationsPanel/AnnotationsPanel.tsx
index 898418bf1..36e7df53f 100644
--- a/packages/generic/client/src/pages/Home/DocumentAnnotator/AnnotationsPanel/AnnotationsPanel.tsx
+++ b/packages/generic/client/src/pages/Home/DocumentAnnotator/AnnotationsPanel/AnnotationsPanel.tsx
@@ -88,11 +88,11 @@ function AnnotationsPanel(props: {
   function renderAdditionalAnnotationTerms(
     additionalTermsToAnnotate: string,
     computedAdditionalTerms?: { additionalTermsToAnnotate: string[]; additionalTermsToUnAnnotate: string[] },
-    isParsingFailedOnAdditionalTerms?: boolean,
+    additionalTermsParsingFailed?: boolean,
   ) {
     if (
-      isParsingFailedOnAdditionalTerms ||
-      (isParsingFailedOnAdditionalTerms == undefined && additionalTermsToAnnotate !== '') ||
+      additionalTermsParsingFailed ||
+      (additionalTermsParsingFailed == undefined && additionalTermsToAnnotate !== '') ||
       (computedAdditionalTerms?.additionalTermsToAnnotate != undefined &&
         computedAdditionalTerms.additionalTermsToAnnotate.length > 0) ||
       (computedAdditionalTerms?.additionalTermsToUnAnnotate != undefined &&
@@ -104,13 +104,17 @@ function AnnotationsPanel(props: {
             <Icon iconName={settingsModule.lib.additionalAnnotationCategoryHandler.getCategoryIconName()} />
           </div>
           <div style={styles.additionalAnnotationTermsRightContainer}>
-            {isParsingFailedOnAdditionalTerms ||
-            (isParsingFailedOnAdditionalTerms == undefined && additionalTermsToAnnotate !== '') ? (
-              <>
-                <Text>{wordings.homePage.additionalOccultationsParsingFailed}</Text>
-                <Text variant="body2">{additionalTermsToAnnotate}</Text>
-              </>
-            ) : (
+            {(additionalTermsParsingFailed ||
+              (additionalTermsParsingFailed == undefined && additionalTermsToAnnotate !== '')) && (
+                <>
+                  <Text>{wordings.homePage.additionalTermsParsingFailed}</Text>
+                </>
+              )}
+
+            {((computedAdditionalTerms?.additionalTermsToAnnotate != undefined &&
+              computedAdditionalTerms.additionalTermsToAnnotate.length > 0) ||
+              (computedAdditionalTerms?.additionalTermsToUnAnnotate != undefined &&
+                computedAdditionalTerms.additionalTermsToUnAnnotate.length > 0)) ? (
               <>
                 <Text>{wordings.homePage.askedAdditionalOccultations}</Text>
                 {computedAdditionalTerms?.additionalTermsToAnnotate != undefined &&
@@ -132,6 +136,11 @@ function AnnotationsPanel(props: {
                     </>
                   )}
               </>
+            ) : (
+              <>
+                <Text>{wordings.homePage.promptRawAdditionalTermsText}</Text>
+                <Text variant="body2">{additionalTermsToAnnotate}</Text>
+              </>
             )}
           </div>
         </div>
diff --git a/packages/generic/client/src/wordings/fr.ts b/packages/generic/client/src/wordings/fr.ts
index ecd3d3d20..6d5229193 100644
--- a/packages/generic/client/src/wordings/fr.ts
+++ b/packages/generic/client/src/wordings/fr.ts
@@ -188,9 +188,10 @@ const fr = {
     anonymisedView: 'Vue anonymisée',
     applyEveryWhere: 'Appliquer à tous',
     askedAnnotations: 'Annotations demandées',
-    askedAdditionalOccultations: "Demandes d'occultation particulières",
-    additionalOccultationsParsingFailed:
-      "Les demandes d'occultations particulières n'ont pas pu être traitées. Texte fourni par la juridiction :",
+    askedAdditionalOccultations: "Demandes d'occultation particulières :",
+    additionalTermsParsingFailed:
+      "Attention, les demandes d'occultations particulières n'ont pas pu être annotées automatiquement intégralement.",
+    promptRawAdditionalTermsText: 'Texte fourni par la juridiction :',
     additionalTermsToAnnotate: 'Termes supplémentaires à annoter :',
     additionalTermsToUnAnnotate: 'Termes à NE PAS annoter :',
     annotationGuide: "Guide d'annotation",

From ddf161b330b01174c2e8454ed03d3e17ad103d1d Mon Sep 17 00:00:00 2001
From: Antoine Jeanneney <antoine.jeanneney@justice.fr>
Date: Wed, 3 Apr 2024 17:56:52 +0200
Subject: [PATCH 2/2] lint

---
 .../AnnotationsPanel/AnnotationsPanel.tsx          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/generic/client/src/pages/Home/DocumentAnnotator/AnnotationsPanel/AnnotationsPanel.tsx b/packages/generic/client/src/pages/Home/DocumentAnnotator/AnnotationsPanel/AnnotationsPanel.tsx
index 36e7df53f..9885ba5be 100644
--- a/packages/generic/client/src/pages/Home/DocumentAnnotator/AnnotationsPanel/AnnotationsPanel.tsx
+++ b/packages/generic/client/src/pages/Home/DocumentAnnotator/AnnotationsPanel/AnnotationsPanel.tsx
@@ -106,15 +106,15 @@ function AnnotationsPanel(props: {
           <div style={styles.additionalAnnotationTermsRightContainer}>
             {(additionalTermsParsingFailed ||
               (additionalTermsParsingFailed == undefined && additionalTermsToAnnotate !== '')) && (
-                <>
-                  <Text>{wordings.homePage.additionalTermsParsingFailed}</Text>
-                </>
-              )}
+              <>
+                <Text>{wordings.homePage.additionalTermsParsingFailed}</Text>
+              </>
+            )}
 
-            {((computedAdditionalTerms?.additionalTermsToAnnotate != undefined &&
+            {(computedAdditionalTerms?.additionalTermsToAnnotate != undefined &&
               computedAdditionalTerms.additionalTermsToAnnotate.length > 0) ||
-              (computedAdditionalTerms?.additionalTermsToUnAnnotate != undefined &&
-                computedAdditionalTerms.additionalTermsToUnAnnotate.length > 0)) ? (
+            (computedAdditionalTerms?.additionalTermsToUnAnnotate != undefined &&
+              computedAdditionalTerms.additionalTermsToUnAnnotate.length > 0) ? (
               <>
                 <Text>{wordings.homePage.askedAdditionalOccultations}</Text>
                 {computedAdditionalTerms?.additionalTermsToAnnotate != undefined &&