[sc-11384] Display labels of the text blocks in the preview page (#1916)

* [sc-11384] Display labels of the text blocks in the preview page * Allow to filter paragraphs by label * Fix translation * Fix tests * Fix * Fix build
nuclia · Jan 17, 2025 · 787b792 · 787b792
1 parent 5692f08
commit 787b792
Show file tree

Hide file tree

Showing 20 changed files with 361 additions and 197 deletions.
diff --git a/libs/common/common.babel b/libs/common/common.babel
@@ -23068,6 +23068,29 @@
 							<folder_node>
 								<name>preview</name>
 								<children>
+									<concept_node>
+										<name>answers</name>
+										<description/>
+										<comment/>
+										<translations>
+											<translation>
+												<language>ca-ES</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>en-US</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>es-ES</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>fr-FR</language>
+												<approved>false</approved>
+											</translation>
+										</translations>
+									</concept_node>
 									<concept_node>
 										<name>content</name>
 										<description/>
@@ -23114,6 +23137,29 @@
 											</translation>
 										</translations>
 									</concept_node>
+									<concept_node>
+										<name>labels</name>
+										<description/>
+										<comment/>
+										<translations>
+											<translation>
+												<language>ca-ES</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>en-US</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>es-ES</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>fr-FR</language>
+												<approved>false</approved>
+											</translation>
+										</translations>
+									</concept_node>
 									<concept_node>
 										<name>open-viewer</name>
 										<description/>
@@ -23160,6 +23206,29 @@
 											</translation>
 										</translations>
 									</concept_node>
+									<concept_node>
+										<name>question</name>
+										<description/>
+										<comment/>
+										<translations>
+											<translation>
+												<language>ca-ES</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>en-US</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>es-ES</language>
+												<approved>false</approved>
+											</translation>
+											<translation>
+												<language>fr-FR</language>
+												<approved>false</approved>
+											</translation>
+										</translations>
+									</concept_node>
 									<concept_node>
 										<name>questions-answers</name>
 										<description/>

diff --git a/libs/common/src/assets/i18n/ca.json b/libs/common/src/assets/i18n/ca.json
@@ -955,10 +955,13 @@
 	"resource.pagination.downloading": "S’està baixant...",
 	"resource.pagination.filtered": "{{num}} recursos amagats per filtres",
 	"resource.pagination.rows-per-page": "Files per pàgina",
+	"resource.preview.answers": "Respostes",
 	"resource.preview.content": "Contingut del camp",
 	"resource.preview.general": "General",
+	"resource.preview.labels": "Etiquetes",
 	"resource.preview.open-viewer": "Visor obert",
 	"resource.preview.origin": "Origen",
+	"resource.preview.question": "Pregunta",
 	"resource.preview.questions-answers": "Preguntes i respostes",
 	"resource.processed": "Processat",
 	"resource.processing": "Processant",

diff --git a/libs/common/src/assets/i18n/en.json b/libs/common/src/assets/i18n/en.json
@@ -955,10 +955,13 @@
 	"resource.pagination.downloading": "Downloading…",
 	"resource.pagination.filtered": "{{num}} resources hidden by filters",
 	"resource.pagination.rows-per-page": "Rows per page",
+	"resource.preview.answers": "Answers",
 	"resource.preview.content": "Field content",
 	"resource.preview.general": "General",
+	"resource.preview.labels": "Labels",
 	"resource.preview.open-viewer": "Open viewer",
 	"resource.preview.origin": "Origin",
+	"resource.preview.question": "Question",
 	"resource.preview.questions-answers": "Questions & Answers",
 	"resource.processed": "Processed",
 	"resource.processing": "Processing",

diff --git a/libs/common/src/assets/i18n/es.json b/libs/common/src/assets/i18n/es.json
@@ -955,10 +955,13 @@
 	"resource.pagination.downloading": "Descargando...",
 	"resource.pagination.filtered": "{{num}} recursos ocultos por filtros",
 	"resource.pagination.rows-per-page": "Filas por página",
+	"resource.preview.answers": "Respuestas",
 	"resource.preview.content": "Contenido del campo",
 	"resource.preview.general": "General",
+	"resource.preview.labels": "Etiquetas",
 	"resource.preview.open-viewer": "Visor abierto",
 	"resource.preview.origin": "Origen",
+	"resource.preview.question": "Pregunta",
 	"resource.preview.questions-answers": "Preguntas y respuestas",
 	"resource.processed": "Procesado",
 	"resource.processing": "Procesando",

diff --git a/libs/common/src/assets/i18n/fr.json b/libs/common/src/assets/i18n/fr.json
@@ -955,10 +955,13 @@
 	"resource.pagination.downloading": "Téléchargement...",
 	"resource.pagination.filtered": "{{num}}  ressources masquées par les filtres",
 	"resource.pagination.rows-per-page": "Lignes par page",
+	"resource.preview.answers": "Réponses",
 	"resource.preview.content": "Contenu du champ",
 	"resource.preview.general": "Général",
+	"resource.preview.labels": "Étiquettes",
 	"resource.preview.open-viewer": "Ouvrir la visionneuse",
 	"resource.preview.origin": "Origine",
+	"resource.preview.question": "Question",
 	"resource.preview.questions-answers": "Questions et réponses",
 	"resource.processed": "Traité",
 	"resource.processing": "Traitement",

diff --git a/...resources/edit-resource/annotation/paragraph-annotation/paragraph-annotation.component.ts b/...resources/edit-resource/annotation/paragraph-annotation/paragraph-annotation.component.ts
@@ -39,7 +39,9 @@ export class ParagraphAnnotationComponent extends SelectFirstFieldDirective impl
 
     combineLatest([this.fieldId, this.resource, this.entityFamilies])
       .pipe(takeUntil(this.unsubscribeAll))
-      .subscribe(([fieldId, resource, families]) => this.annotationService.initParagraphs(fieldId, resource, families));
+      .subscribe(([fieldId, resource, families]) =>
+        this.annotationService.initParagraphsWithAnnotations(fieldId, resource, families),
+      );
   }
 
   override ngOnDestroy() {

diff --git a/...b/resources/edit-resource/annotation/paragraph-annotation/paragraph-annotation.service.ts b/...b/resources/edit-resource/annotation/paragraph-annotation/paragraph-annotation.service.ts
@@ -32,7 +32,7 @@ export class ParagraphAnnotationService extends ParagraphService {
     super();
   }
 
-  initParagraphs(fieldId: FieldId, resource: Resource, families: EntityGroup[]) {
+  initParagraphsWithAnnotations(fieldId: FieldId, resource: Resource, families: EntityGroup[]) {
     const paragraphs: ParagraphWithTextAndAnnotations[] = this.getEnhancedParagraphs(fieldId, resource, families);
     this.setupParagraphs(paragraphs);
   }
@@ -72,11 +72,7 @@ export class ParagraphAnnotationService extends ParagraphService {
         const highlightedAnnotations = getHighlightedAnnotations(paragraph.annotations);
         return {
           ...paragraph,
-          annotatedText: getAnnotatedText(
-            paragraph.text,
-            highlightedAnnotations,
-            this.selectedFamilyValue,
-          ),
+          annotatedText: getAnnotatedText(paragraph.text, highlightedAnnotations, this.selectedFamilyValue),
         };
       }),
     );

diff --git a/libs/common/src/lib/resources/edit-resource/classification/paragraph-classification/index.ts b/libs/common/src/lib/resources/edit-resource/classification/paragraph-classification/index.ts
@@ -1,2 +1 @@
 export * from './paragraph-classification.component';
-export * from './paragraph-classification.service';
diff --git a/...it-resource/classification/paragraph-classification/paragraph-classification.component.ts b/...it-resource/classification/paragraph-classification/paragraph-classification.component.ts
@@ -5,8 +5,8 @@ import { combineLatest, filter, forkJoin, map, Observable, Subject, switchMap, t
 import { FieldId, LabelSets, Resource, Search } from '@nuclia/core';
 import { LabelsService } from '@flaps/core';
 import { ParagraphWithTextAndClassifications } from '../../edit-resource.helpers';
-import { ParagraphClassificationService } from './paragraph-classification.service';
 import { takeUntil } from 'rxjs/operators';
+import { ParagraphService } from '../../paragraph.service';
 
 @Component({
   templateUrl: './paragraph-classification.component.html',
@@ -32,9 +32,9 @@ export class ParagraphClassificationComponent implements OnInit, OnDestroy {
 
   availableLabels: Observable<LabelSets | null> = this.labelsService.textBlockLabelSets;
 
-  paragraphs: Observable<ParagraphWithTextAndClassifications[]> = this.classificationService.paragraphs;
-  hasParagraph: Observable<boolean> = this.classificationService.hasParagraph;
-  paragraphLoaded: Observable<boolean> = this.classificationService.paragraphLoaded;
+  paragraphs = this.paragraphService.paragraphList as Observable<ParagraphWithTextAndClassifications[]>;
+  hasParagraph: Observable<boolean> = this.paragraphService.hasParagraph;
+  paragraphLoaded: Observable<boolean> = this.paragraphService.paragraphLoaded;
 
   previousQuery?: string;
   searchQuery = '';
@@ -45,7 +45,7 @@ export class ParagraphClassificationComponent implements OnInit, OnDestroy {
   constructor(
     private route: ActivatedRoute,
     private editResource: EditResourceService,
-    private classificationService: ParagraphClassificationService,
+    private paragraphService: ParagraphService,
     private labelsService: LabelsService,
     private cdr: ChangeDetectorRef,
   ) {}
@@ -55,13 +55,13 @@ export class ParagraphClassificationComponent implements OnInit, OnDestroy {
 
     combineLatest([this.fieldId, this.resource])
       .pipe(takeUntil(this.unsubscribeAll))
-      .subscribe(([fieldId, resource]) => this.classificationService.initParagraphs(fieldId, resource));
+      .subscribe(([fieldId, resource]) => this.paragraphService.initParagraphs(fieldId, resource));
   }
 
   ngOnDestroy() {
     this.unsubscribeAll.next();
     this.unsubscribeAll.complete();
-    this.classificationService.cleanup();
+    this.paragraphService.cleanup();
   }
 
   triggerSearch() {
@@ -71,7 +71,7 @@ export class ParagraphClassificationComponent implements OnInit, OnDestroy {
       this.extendedResults = false;
     }
     this._triggerSearch(this.searchQuery).subscribe((results) => {
-      this.classificationService.setSearchResults(results);
+      this.paragraphService.setSearchResults(results);
       this.updatePagination(results);
     });
   }
@@ -83,7 +83,7 @@ export class ParagraphClassificationComponent implements OnInit, OnDestroy {
       $event.stopPropagation();
       $event.preventDefault();
       this.searchQuery = '';
-      this.classificationService.setSearchResults(null);
+      this.paragraphService.setSearchResults(null);
       this.hasMoreResults = false;
       this.extendedResults = false;
       this.cdr.markForCheck();
@@ -93,7 +93,7 @@ export class ParagraphClassificationComponent implements OnInit, OnDestroy {
   loadMore() {
     if (this.hasMoreResults && !this.extendedResults && this.searchQuery) {
       this._triggerSearch(this.searchQuery, true).subscribe((results) => {
-        this.classificationService.setSearchResults(results);
+        this.paragraphService.setSearchResults(results);
         this.updatePagination(results);
         this.extendedResults = true;
       });
@@ -109,7 +109,7 @@ export class ParagraphClassificationComponent implements OnInit, OnDestroy {
   private _triggerSearch(query: string, extendedResults = false) {
     return forkJoin([this.fieldId.pipe(take(1)), this.resource.pipe(take(1))]).pipe(
       switchMap(([field, resource]) =>
-        this.classificationService.searchInField(query, resource, field, extendedResults),
+        this.paragraphService.searchInField(query, resource, field, extendedResults),
       ),
     );
   }

diff --git a/...edit-resource/classification/paragraph-classification/paragraph-classification.service.ts b/...edit-resource/classification/paragraph-classification/paragraph-classification.service.ts
diff --git a/libs/common/src/lib/resources/edit-resource/edit-resource.helpers.spec.ts b/libs/common/src/lib/resources/edit-resource/edit-resource.helpers.spec.ts
@@ -12,6 +12,7 @@ describe('Edit resource helpers', () => {
           paragraphId: 'p1',
           userClassifications: [{ labelset: 'heroes', label: 'batman' }],
           generatedClassifications: [],
+          activeClassifications: [],
           text: '',
         },
       ],
@@ -36,18 +37,21 @@ describe('Edit resource helpers', () => {
             { labelset: 'heroes', label: 'catwoman' },
           ],
           generatedClassifications: [],
+          activeClassifications: [],
           text: '',
         },
         {
           paragraphId: 'p2',
           userClassifications: [{ labelset: 'heroes', label: 'catwoman' }],
           generatedClassifications: [],
+          activeClassifications: [],
           text: '',
         },
         {
           paragraphId: 'p3',
           userClassifications: [],
           generatedClassifications: [],
+          activeClassifications: [],
           text: '',
         },
       ],
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		export * from './paragraph-classification.component';
		export * from './paragraph-classification.service';