From 888113fdc274c75ad018b36a870dd4b3c3968912 Mon Sep 17 00:00:00 2001
From: Suzana Dirla <dirla.silvia.suzana@gmail.com>
Date: Fri, 29 Mar 2019 13:54:47 +0200
Subject: [PATCH] [ADF-4280] fix initial display for search-sorting-picker
 (#4522)

* [ADF-4280] fix initial display for search-sorting-picker

* [ADF-4280] fix unrelated error TS6133: 'renderingQueueServices' is declared but its value is never read

* [ADF-4280] update e2e test
---
 e2e/search/components/search-sorting-picker.e2e.ts            | 1 +
 .../search-sorting-picker.component.spec.ts                   | 4 ++--
 .../search-sorting-picker/search-sorting-picker.component.ts  | 2 +-
 lib/core/viewer/components/pdfViewer.component.spec.ts        | 2 --
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/e2e/search/components/search-sorting-picker.e2e.ts b/e2e/search/components/search-sorting-picker.e2e.ts
index fdec031ef5..54916e8d5b 100644
--- a/e2e/search/components/search-sorting-picker.e2e.ts
+++ b/e2e/search/components/search-sorting-picker.e2e.ts
@@ -159,6 +159,7 @@ describe('Search Sorting Picker', () => {
         configEditor.clickSearchConfiguration();
         configEditor.clickClearButton();
         jsonFile.sorting.options[0].ascending = false;
+        jsonFile.sorting.defaults[0] = { 'key': 'Size', 'label': 'Size', 'type': 'FIELD', 'field': 'content.size', 'ascending': true };
         configEditor.enterBigConfigurationText(JSON.stringify(jsonFile));
         configEditor.clickSaveButton();
 
diff --git a/lib/content-services/search/components/search-sorting-picker/search-sorting-picker.component.spec.ts b/lib/content-services/search/components/search-sorting-picker/search-sorting-picker.component.spec.ts
index 27c13ef37c..22e6da6fe8 100644
--- a/lib/content-services/search/components/search-sorting-picker/search-sorting-picker.component.spec.ts
+++ b/lib/content-services/search/components/search-sorting-picker/search-sorting-picker.component.spec.ts
@@ -40,7 +40,7 @@ describe('SearchSortingPickerComponent', () => {
                     <any> { 'key': 'description', 'label': 'Description', 'type': 'FIELD', 'field': 'cm:description', 'ascending': true }
                 ],
                 defaults: [
-                    <any> { 'key': 'name', 'type': 'FIELD', 'field': 'cm:name', 'ascending': true }
+                    <any> { 'key': 'name', 'type': 'FIELD', 'field': 'cm:name', 'ascending': false }
                 ]
             },
             categories: [
@@ -64,7 +64,7 @@ describe('SearchSortingPickerComponent', () => {
         component.ngOnInit();
 
         expect(component.value).toEqual('name');
-        expect(component.ascending).toBeTruthy();
+        expect(component.ascending).toBe(false);
     });
 
     it('should update query builder each time selection is changed', () => {
diff --git a/lib/content-services/search/components/search-sorting-picker/search-sorting-picker.component.ts b/lib/content-services/search/components/search-sorting-picker/search-sorting-picker.component.ts
index 6c2f32dbe9..ec6a990cdf 100644
--- a/lib/content-services/search/components/search-sorting-picker/search-sorting-picker.component.ts
+++ b/lib/content-services/search/components/search-sorting-picker/search-sorting-picker.component.ts
@@ -39,7 +39,7 @@ export class SearchSortingPickerComponent implements OnInit {
         const primary = this.queryBuilder.getPrimarySorting();
         if (primary) {
             this.value = primary.key;
-            this.ascending = this.getSortingOrder();
+            this.ascending = primary.ascending;
         }
     }
 
diff --git a/lib/core/viewer/components/pdfViewer.component.spec.ts b/lib/core/viewer/components/pdfViewer.component.spec.ts
index c2952012fb..d8cb0e479f 100644
--- a/lib/core/viewer/components/pdfViewer.component.spec.ts
+++ b/lib/core/viewer/components/pdfViewer.component.spec.ts
@@ -124,7 +124,6 @@ describe('Test PdfViewer component', () => {
     let element: HTMLElement;
     let change: any;
     let dialog: MatDialog;
-    let renderingQueueServices: RenderingQueueServices;
 
     setupTestBed({
         imports: [
@@ -151,7 +150,6 @@ describe('Test PdfViewer component', () => {
     beforeEach((done) => {
         fixture = TestBed.createComponent(PdfViewerComponent);
         dialog = TestBed.get(MatDialog);
-        renderingQueueServices = TestBed.get(RenderingQueueServices);
 
         element = fixture.nativeElement;
         component = fixture.componentInstance;