From d1b33c549fbb88ee78ce6c803ce79de2e1e3ff7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adina=20=C8=9Aeudan?= <adina@devplant.ro>
Date: Wed, 8 Feb 2023 16:24:47 +0200
Subject: [PATCH] RED-6037: sortedDisplayedEntities moved to ListingService

---
 .../file-attributes-csv-import-dialog.component.html         | 2 +-
 .../src/app/modules/file-preview/file-preview-providers.ts   | 3 ++-
 .../file-preview/services/annotations-listing.service.ts     | 5 +++--
 apps/red-ui/src/app/utils/functions.ts                       | 2 +-
 libs/common-ui                                               | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.html
index cd19562dc..88aeced82 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.html
+++ b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.html
@@ -98,7 +98,7 @@
                         width="full"
                     ></iqser-input-with-action>
                 </div>
-                <div *ngIf="sortedDisplayedEntities$ | async as fields" class="csv-header-pill-content">
+                <div *ngIf="listingService.sortedDisplayedEntities$ | async as fields" class="csv-header-pill-content">
                     <div
                         (click)="toggleFieldActive(field)"
                         (mouseenter)="setHoveredColumn(field.csvColumn)"
diff --git a/apps/red-ui/src/app/modules/file-preview/file-preview-providers.ts b/apps/red-ui/src/app/modules/file-preview/file-preview-providers.ts
index 0c09a41c3..c9a20b8b4 100644
--- a/apps/red-ui/src/app/modules/file-preview/file-preview-providers.ts
+++ b/apps/red-ui/src/app/modules/file-preview/file-preview-providers.ts
@@ -7,7 +7,7 @@ import { SkippedService } from './services/skipped.service';
 import { AnnotationActionsService } from './services/annotation-actions.service';
 import { FilePreviewStateService } from './services/file-preview-state.service';
 import { AnnotationReferencesService } from './services/annotation-references.service';
-import { EntitiesService, FilterService, ListingService, SearchService } from '@iqser/common-ui';
+import { EntitiesService, FilterService, ListingService, SearchService, SortingService } from '@iqser/common-ui';
 import { AnnotationProcessingService } from './services/annotation-processing.service';
 import { dossiersServiceProvider } from '@services/entity-services/dossiers.service.provider';
 import { FileDataService } from './services/file-data.service';
@@ -34,6 +34,7 @@ export const filePreviewScreenProviders = [
     dossiersServiceProvider,
     AnnotationsListingService,
     { provide: ListingService, useExisting: AnnotationsListingService },
+    SortingService,
     SearchService,
     StampService,
     PdfProxyService,
diff --git a/apps/red-ui/src/app/modules/file-preview/services/annotations-listing.service.ts b/apps/red-ui/src/app/modules/file-preview/services/annotations-listing.service.ts
index fb2ce8c85..c44540b9a 100644
--- a/apps/red-ui/src/app/modules/file-preview/services/annotations-listing.service.ts
+++ b/apps/red-ui/src/app/modules/file-preview/services/annotations-listing.service.ts
@@ -1,6 +1,6 @@
 import { AnnotationWrapper } from '@models/file/annotation.wrapper';
 import { Injectable } from '@angular/core';
-import { EntitiesService, FilterService, ListingService, SearchService } from '@iqser/common-ui';
+import { EntitiesService, FilterService, ListingService, SearchService, SortingService } from '@iqser/common-ui';
 import { filter, tap } from 'rxjs/operators';
 import { MultiSelectService } from './multi-select.service';
 import { PdfViewer } from '../../pdf-viewer/services/pdf-viewer.service';
@@ -12,11 +12,12 @@ export class AnnotationsListingService extends ListingService<AnnotationWrapper>
         protected readonly _filterService: FilterService,
         protected readonly _searchService: SearchService<AnnotationWrapper>,
         protected readonly _entitiesService: EntitiesService<AnnotationWrapper, AnnotationWrapper>,
+        protected readonly _sortingService: SortingService<AnnotationWrapper>,
         private readonly _multiSelectService: MultiSelectService,
         private readonly _pdf: PdfViewer,
         private readonly _annotationManager: REDAnnotationManager,
     ) {
-        super(_filterService, _searchService, _entitiesService);
+        super(_filterService, _searchService, _entitiesService, _sortingService);
 
         this.selectedLength$
             .pipe(
diff --git a/apps/red-ui/src/app/utils/functions.ts b/apps/red-ui/src/app/utils/functions.ts
index ff16d7819..b69838063 100644
--- a/apps/red-ui/src/app/utils/functions.ts
+++ b/apps/red-ui/src/app/utils/functions.ts
@@ -1,7 +1,7 @@
 import type { List } from '@iqser/common-ui';
+import { ITrackable } from '@iqser/common-ui';
 import type { AnnotationWrapper } from '@models/file/annotation.wrapper';
 import { Dayjs } from 'dayjs';
-import { ITrackable } from '../../../../../libs/common-ui/src/lib/listing/models/trackable';
 
 export function hexToRgb(hex: string) {
     const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
diff --git a/libs/common-ui b/libs/common-ui
index 40517f145..610a88570 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit 40517f145e0f8719e49ef133ef271f242d8dd078
+Subproject commit 610a88570bf1a2b8ea605833ab6d599d07185636