EFRS-1173/BugFix displaying total number of examples that are valid a…

…nd uploaded to the db
khojametov · Nov 29, 2021 · a7bd3be · a7bd3be
1 parent 78885bc
commit a7bd3be
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/ui/src/app/core/collection/collection.service.ts b/ui/src/app/core/collection/collection.service.ts
@@ -68,7 +68,8 @@ export class CollectionService {
       .pipe(
         map((resp: { faces: SubjectExampleResponseItem[] }) => {
           const totalPages = resp['total_pages'];
-          return resp.faces.map(el => ({ ...el, page: page, totalPages: totalPages }));
+          const totalElements = resp['total_elements'];
+          return resp.faces.map(el => ({ ...el, page: page, totalPages: totalPages, totalElements: totalElements }));
         })
       );
   }

diff --git a/...ct-right/collection-manager-subject-right/collection-manager-subject-right.component.html b/...ct-right/collection-manager-subject-right/collection-manager-subject-right.component.html
@@ -29,9 +29,7 @@
             <ng-container *ngSwitchCase="subjectModeEnum.BulkSelect"
               >{{ 'manage_collection.right_side.selected_examples' | translate }} {{ selectedIds.length }}</ng-container
             >
-            <ng-container *ngSwitchDefault
-              >{{ 'manage_collection.right_side.examples' | translate }} {{ uploadedExamples.length }}</ng-container
-            >
+            <ng-container *ngSwitchDefault>{{ 'manage_collection.right_side.examples' | translate }} {{ totalElements }}</ng-container>
           </div>
         </div>
       </div>

diff --git a/...ject-right/collection-manager-subject-right/collection-manager-subject-right.component.ts b/...ject-right/collection-manager-subject-right/collection-manager-subject-right.component.ts
@@ -28,6 +28,7 @@ export class CollectionManagerSubjectRightComponent implements OnChanges {
   prevItemCollection: CollectionItem[] = [];
   subjectModeEnum = SubjectModeEnum;
   uploadedExamples: CollectionItem[] = [];
+  totalElements: number = 0;
 
   @Input() isPending: boolean;
   @Input() isCollectionPending: boolean;
@@ -55,9 +56,15 @@ export class CollectionManagerSubjectRightComponent implements OnChanges {
     const change = changes['collectionItems'];
 
     if (change && change['currentValue'] !== change['previousValue']) {
-      const examples = this.collectionItems.filter(item => item.status === CircleLoadingProgressEnum.Uploaded);
+      const examples = this.collectionItems.filter(
+        item => item['totalElements'] === undefined && item.status === CircleLoadingProgressEnum.Uploaded
+      );
 
-      this.uploadedExamples = examples;
+      this.uploadedExamples = this.collectionItems.filter(item => item.status === CircleLoadingProgressEnum.Uploaded);
+
+      this.uploadedExamples.length && this.collectionItems[0]['totalElements']
+        ? (this.totalElements = examples.length + this.collectionItems[0]['totalElements'])
+        : (this.totalElements = examples.length || 0);
     }
   }
 

diff --git a/ui/src/app/store/manage-collectiom/reducers.ts b/ui/src/app/store/manage-collectiom/reducers.ts
@@ -126,6 +126,7 @@ const reducer: ActionReducer<CollectionEntityState> = createReducer(
       subject: item.subject,
       page: item['page'],
       totalPages: item['totalPages'],
+      totalElements: item['totalElements'],
     }));
 
     return {
@@ -150,6 +151,7 @@ const reducer: ActionReducer<CollectionEntityState> = createReducer(
       subject: item.subject,
       page: item['page'],
       totalPages: item['totalPages'],
+      totalElements: item['totalElements'],
     }));
 
     return {