From e589fdc3bf33490fcc731498aaef0dd6de6052c2 Mon Sep 17 00:00:00 2001
From: Vito <vito.albano@alfresco.com>
Date: Thu, 25 Jun 2020 18:47:42 +0100
Subject: [PATCH] [ACA-3520] - fixed providing by default of the service
 (#5813)

---
 .../src/app/components/search/search-result.component.ts  | 8 ++++----
 lib/content-services/src/lib/search/search.module.ts      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/demo-shell/src/app/components/search/search-result.component.ts b/demo-shell/src/app/components/search/search-result.component.ts
index 0a9b3abd87..1c97af7002 100644
--- a/demo-shell/src/app/components/search/search-result.component.ts
+++ b/demo-shell/src/app/components/search/search-result.component.ts
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-import { Component, OnInit, Optional, OnDestroy, Inject } from '@angular/core';
+import { Component, OnInit, Optional, OnDestroy } from '@angular/core';
 import { Router, ActivatedRoute, Params } from '@angular/router';
 import { Pagination, ResultSetPaging } from '@alfresco/js-api';
-import { SearchQueryBuilderService, SEARCH_QUERY_SERVICE_TOKEN } from '@alfresco/adf-content-services';
+import { SearchQueryBuilderService } from '@alfresco/adf-content-services';
 import { UserPreferencesService, SearchService, AppConfigService } from '@alfresco/adf-core';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
@@ -27,7 +27,7 @@ import { takeUntil } from 'rxjs/operators';
     selector: 'app-search-result-component',
     templateUrl: './search-result.component.html',
     styleUrls: ['./search-result.component.scss'],
-    providers: [SearchService, { provide: SEARCH_QUERY_SERVICE_TOKEN, useClass: SearchQueryBuilderService}]
+    providers: [SearchService]
 })
 export class SearchResultComponent implements OnInit, OnDestroy {
 
@@ -44,7 +44,7 @@ export class SearchResultComponent implements OnInit, OnDestroy {
     constructor(public router: Router,
                 private config: AppConfigService,
                 private preferences: UserPreferencesService,
-                @Inject(SEARCH_QUERY_SERVICE_TOKEN) private queryBuilder: SearchQueryBuilderService,
+                private queryBuilder: SearchQueryBuilderService,
                 @Optional() private route: ActivatedRoute) {
         queryBuilder.paging = {
             maxItems: this.preferences.paginationSize,
diff --git a/lib/content-services/src/lib/search/search.module.ts b/lib/content-services/src/lib/search/search.module.ts
index b7044cda3d..a867dcb5c7 100644
--- a/lib/content-services/src/lib/search/search.module.ts
+++ b/lib/content-services/src/lib/search/search.module.ts
@@ -89,7 +89,7 @@ import { SearchQueryBuilderService } from './search-query-builder.service';
         SearchDateRangeComponent
     ],
     providers: [
-        { provide: SEARCH_QUERY_SERVICE_TOKEN, useClass: SearchQueryBuilderService }
+        { provide: SEARCH_QUERY_SERVICE_TOKEN, useExisting: SearchQueryBuilderService }
     ]
 })
 export class SearchModule {}