[AE-11486] move search service in alfresco content (#8086)

* [ci:force] move search service in alfresco content

* fix

* fix md

* fix dep

* fix demo shell

* fix lint

demo-shell/src/app/components/search/search-extended.component.ts

@@ -17,8 +17,8 @@
 
 import { Component, ViewChild, ViewEncapsulation } from '@angular/core';
 import { Pagination, QueryBody, MinimalNodeEntity } from '@alfresco/js-api';
-import { SearchComponent } from '@alfresco/adf-content-services';
+import { ThumbnailService } from '@alfresco/adf-core';
-import { ThumbnailService, SearchService, SearchConfigurationService } from '@alfresco/adf-core';
+import { SearchService, SearchConfigurationService, SearchComponent } from '@alfresco/adf-content-services';
 import { TestSearchConfigurationService } from './search-config-test.service';
 
 @Component({

demo-shell/src/app/components/search/search-filter-chips.component.ts

@@ -18,8 +18,8 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { ActivatedRoute, Params, Router } from '@angular/router';
 import { Pagination, ResultSetPaging } from '@alfresco/js-api';
-import { SearchConfiguration, SearchForm, SearchQueryBuilderService } from '@alfresco/adf-content-services';
+import { SearchConfiguration, SearchForm, SearchQueryBuilderService, SearchService } from '@alfresco/adf-content-services';
-import { SearchService, ShowHeaderMode, UserPreferencesService } from '@alfresco/adf-core';
+import { ShowHeaderMode, UserPreferencesService } from '@alfresco/adf-core';
 import { combineLatest, Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 

demo-shell/src/app/components/search/search-result.component.ts

@@ -18,8 +18,8 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { ActivatedRoute, Params, Router } from '@angular/router';
 import { Pagination, ResultSetPaging } from '@alfresco/js-api';
-import { SearchForm, SearchQueryBuilderService } from '@alfresco/adf-content-services';
+import { SearchForm, SearchQueryBuilderService, SearchService } from '@alfresco/adf-content-services';
-import { SearchService, ShowHeaderMode, UserPreferencesService } from '@alfresco/adf-core';
+import { ShowHeaderMode, UserPreferencesService } from '@alfresco/adf-core';
 import { combineLatest, Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 

docs/core/interfaces/search-configuration.interface.md

@@ -4,7 +4,7 @@ Added: v2.1.0
 Status: Active
 ---
 
-# [Search Configuration interface](../../../lib/core/src/lib/interface/search-configuration.interface.ts "Defined in search-configuration.interface.ts")
+# [Search Configuration interface](lib/core/src/lib/search-text/interfaces/search-configuration.interface.ts "Defined in search-configuration.interface.ts")
 
 Provides fine control of parameters to a search.
 

docs/core/services/search-configuration.service.md

@@ -5,7 +5,7 @@ Status: Active
 Last reviewed: 2018-09-13
 ---
 
-# [Search Configuration service](../../../lib/core/src/lib/services/search-configuration.service.ts "Defined in search-configuration.service.ts")
+# [Search Configuration service](lib/content-services/src/lib/search/services/search-configuration.service.ts "Defined in search-configuration.service.ts")
 
 Provides fine control of parameters to a search.
 

docs/core/services/search.service.md

@@ -5,7 +5,7 @@ Status: Active
 Last reviewed: 2018-12-03
 ---
 
-# [Search service](../../../lib/core/src/lib/services/search.service.ts "Defined in search.service.ts")
+# [Search service](lib/content-services/src/lib/search/services/search.service.ts "Defined in search.service.ts")
 
 Accesses the Content Services Search API.
 
@@ -13,10 +13,10 @@ Accesses the Content Services Search API.
 
 ### Methods
 
--   **getNodeQueryResults**(term: `string`, options?: [`SearchOptions`](../../../lib/core/src/lib/services/search.service.ts)): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`NodePaging`](https://github.com/Alfresco/alfresco-js-api/blob/develop/src/api/content-rest-api/docs/NodePaging.md)`>`<br/>
+-   **getNodeQueryResults**(term: `string`, options?: [`SearchOptions`](lib/content-services/src/lib/search/services/search.service.ts)): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`NodePaging`](https://github.com/Alfresco/alfresco-js-api/blob/develop/src/api/content-rest-api/docs/NodePaging.md)`>`<br/>
     Gets a list of nodes that match the given search criteria.
     -   _term:_ `string`  - Term to search for
-    -   _options:_ [`SearchOptions`](../../../lib/core/src/lib/services/search.service.ts)  - (Optional) Options for delivery of the search results
+    -   _options:_ [`SearchOptions`](lib/content-services/src/lib/search/services/search.service.ts)  - (Optional) Options for delivery of the search results
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`NodePaging`](https://github.com/Alfresco/alfresco-js-api/blob/develop/src/api/content-rest-api/docs/NodePaging.md)`>` - List of nodes resulting from the search
 -   **search**(searchTerm: `string`, maxResults: `number`, skipCount: `number`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ResultSetPaging`](https://github.com/Alfresco/alfresco-js-api/blob/develop/src/api/search-rest-api/docs/ResultSetPaging.md)`>`<br/>
     Performs a search.
@@ -36,7 +36,7 @@ See the
 in the Alfresco JS-API for the format of the query and returned data.
 The [Search Configuration service](../services/search-configuration.service.md)
 has a method to generate the QueryBody object used by `searchByQueryBody`. The properties of the
-[`SearchOptions`](../../../lib/core/src/lib/services/search.service.ts)
+[`SearchOptions`](lib/content-services/src/lib/search/services/search.service.ts)
 interface are documented in source file comments.
 
 ## See also

docs/release-notes/RelNote230.md

@@ -321,7 +321,7 @@ Release Notes - Apps Development Framework - Version 2.3.0
 -   \[[ADF-2421](https://issues.alfresco.com/jira/browse/ADF-2421)] - CLONE - Unable to copy / move a file from Recent or Favorites when user has only granular permissions on the file
 -   \[[ADF-2428](https://issues.alfresco.com/jira/browse/ADF-2428)] - \[Demo shell Unable to view document metadata from document list view
 -   \[[ADF-2429](https://issues.alfresco.com/jira/browse/ADF-2429)] - Viewer - media file full screen
--   \[[ADF-2442](https://issues.alfresco.com/jira/browse/ADF-2442)] - [Search Service](lib/core/src/lib/services/search.service.ts) has wrong types for the 'search' API
+-   \[[ADF-2442](https://issues.alfresco.com/jira/browse/ADF-2442)] - [Search Service](lib/content-services/src/lib/search/services/search.service.ts) has wrong types for the 'search' API
 -   \[[ADF-2443](https://issues.alfresco.com/jira/browse/ADF-2443)] - Typo in the UserPreferences service
 -   \[[ADF-2444](https://issues.alfresco.com/jira/browse/ADF-2444)] - CLONE - Incorrect Items per page values on all lists after upgrade to ADF 2.2.0
 -   \[[ADF-2448](https://issues.alfresco.com/jira/browse/ADF-2448)] - Wrong type definition for [`RequestPagination`](https://github.com/Alfresco/alfresco-js-api/blob/develop/src/api/search-rest-api/docs/RequestPagination.md)

docs/upgrade-guide/upgrade50-60.md

@@ -94,7 +94,6 @@ How to fix it:
 | `VersionCompatibilityDirective` | `@alfresco/adf-core` | `@alfresco/adf-content-services` |
 | `SitesService` | `@alfresco/adf-core` | `@alfresco/adf-content-services` |
 | `SearchService` | `@alfresco/adf-core` | `@alfresco/adf-content-services` |
-| `SearchConfigurationService` | `@alfresco/adf-core` | `@alfresco/adf-content-services` |
 | `AppsProcessService` | `@alfresco/adf-core` | `@alfresco/adf-process-services` |
 
 Following classes have been relocated:

lib/content-services/src/lib/document-list/components/filter-header/filter-header.component.spec.ts

@@ -18,7 +18,8 @@
 import { Subject, BehaviorSubject } from 'rxjs';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
-import { SearchService, setupTestBed, DataTableComponent, DataSorting } from '@alfresco/adf-core';
+import { setupTestBed, DataTableComponent, DataSorting } from '@alfresco/adf-core';
+import { SearchService  } from '../../../search/services/search.service';
 import { ContentTestingModule } from '../../../testing/content.testing.module';
 import { SimpleChange } from '@angular/core';
 import { SearchHeaderQueryBuilderService } from './../../../search/services/search-header-query-builder.service';

lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.spec.ts

@@ -18,10 +18,11 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { AddPermissionPanelComponent } from './add-permission-panel.component';
 import { By } from '@angular/platform-browser';
-import { SearchService, setupTestBed } from '@alfresco/adf-core';
+import { setupTestBed } from '@alfresco/adf-core';
 import { of } from 'rxjs';
 import { fakeAuthorityListResult, fakeNameListResult } from '../../../mock/add-permission.component.mock';
 import { ContentTestingModule } from '../../../testing/content.testing.module';
+import { SearchService  } from '../../../search/services/search.service';
 import { DebugElement } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { MatIconTestingModule } from '@angular/material/icon/testing';

lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.ts

@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-import { SearchConfigurationService, SearchService } from '@alfresco/adf-core';
+import { SearchConfigurationService } from '../../../search/services/search-configuration.service';
+import { SearchService } from '../../../search/services/search.service';
 import { NodeEntry } from '@alfresco/js-api';
 import { Component, EventEmitter, Output, ViewChild, ViewEncapsulation } from '@angular/core';
 import { UntypedFormControl } from '@angular/forms';

lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.spec.ts

@@ -15,11 +15,12 @@
  * limitations under the License.
  */
 
-import { NodesApiService, SearchService, setupTestBed } from '@alfresco/adf-core';
+import { NodesApiService, setupTestBed } from '@alfresco/adf-core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { TranslateModule } from '@ngx-translate/core';
 import { of, throwError } from 'rxjs';
+import { SearchService } from '../../../search/services/search.service';
 import { PermissionListComponent } from './permission-list.component';
 import { NodePermissionService } from '../../services/node-permission.service';
 import {

lib/content-services/src/lib/permission-manager/services/node-permission.service.spec.ts

@@ -17,7 +17,8 @@
 
 import { TestBed } from '@angular/core/testing';
 import { NodePermissionService } from './node-permission.service';
-import { SearchService, NodesApiService, setupTestBed } from '@alfresco/adf-core';
+import { NodesApiService, setupTestBed } from '@alfresco/adf-core';
+import { SearchService } from '../../search/services/search.service';
 import { Node, PermissionElement } from '@alfresco/js-api';
 import { of, throwError } from 'rxjs';
 import { fakeEmptyResponse, fakeNodeWithOnlyLocally, fakeSiteRoles, fakeSiteNodeResponse,

lib/content-services/src/lib/permission-manager/services/node-permission.service.ts

@@ -18,7 +18,6 @@
 import {
     AlfrescoApiService,
     NodesApiService,
-    SearchService,
     TranslationService,
     EcmUserModel
 } from '@alfresco/adf-core';
@@ -31,6 +30,7 @@ import {
     PermissionElement,
     QueryBody
 } from '@alfresco/js-api';
+import { SearchService } from '../../search/services/search.service';
 import { Injectable } from '@angular/core';
 import { forkJoin, from, Observable, of, throwError } from 'rxjs';
 import { catchError, map, switchMap } from 'rxjs/operators';

lib/content-services/src/lib/search/components/search-control.component.spec.ts

@@ -20,13 +20,13 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import {
     AuthenticationService,
-    SearchService,
     setupTestBed,
     UserPreferencesService,
     SearchTextInputComponent
 } from '@alfresco/adf-core';
 import { noResult, results } from '../../mock';
 import { SearchControlComponent } from './search-control.component';
+import { SearchService } from '../services/search.service';
 import { of } from 'rxjs';
 import { ContentTestingModule } from '../../testing/content.testing.module';
 import { TranslateModule } from '@ngx-translate/core';

lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.spec.ts

@@ -18,7 +18,8 @@
 import { Subject } from 'rxjs';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
-import { SearchService, setupTestBed } from '@alfresco/adf-core';
+import { setupTestBed } from '@alfresco/adf-core';
+import { SearchService } from '../../services/search.service';
 import { SearchHeaderQueryBuilderService } from '../../services/search-header-query-builder.service';
 import { ContentTestingModule } from '../../../testing/content.testing.module';
 import { SEARCH_QUERY_SERVICE_TOKEN } from '../../search-query-service.token';

lib/content-services/src/lib/search/components/search-filter/search-filter.component.spec.ts

@@ -17,7 +17,8 @@
 
 import { SearchFilterComponent } from './search-filter.component';
 import { SearchQueryBuilderService } from '../../services/search-query-builder.service';
-import { AppConfigService, SearchService, TranslationService } from '@alfresco/adf-core';
+import { AppConfigService, TranslationService } from '@alfresco/adf-core';
+import { SearchService } from  '../../services/search.service';
 import { Subject } from 'rxjs';
 import { SearchFilterList } from '../../models/search-filter-list.model';
 import { ComponentFixture, TestBed } from '@angular/core/testing';

lib/content-services/src/lib/search/components/search.component.spec.ts

@@ -16,7 +16,8 @@
  */
 
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { SearchService, setupTestBed } from '@alfresco/adf-core';
+import { setupTestBed } from '@alfresco/adf-core';
+import { SearchService } from '../services/search.service';
 import { differentResult, result, SimpleSearchTestComponent } from '../../mock';
 import { of, throwError } from 'rxjs';
 import { ContentTestingModule } from '../../testing/content.testing.module';

lib/content-services/src/lib/search/components/search.component.ts

@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-import { SearchService, SearchComponentInterface } from '@alfresco/adf-core';
+import { SearchService } from '../services/search.service';
+import { SearchComponentInterface } from '@alfresco/adf-core';
 import {
     AfterContentInit,
     Component,

lib/content-services/src/lib/search/public-api.ts

@@ -30,6 +30,12 @@ export * from './models/search-form.interface';
 
 export * from './search-query-service.token';
 export * from './services/search-header-query-builder.service';
+export * from './services/search-facet-filters.service';
+export * from './services/search-filter.service';
+export * from './services/search.service';
+export * from './services/search-configuration.service';
+
+export * from './mocks/search.service.mock';
 
 export * from './components/search.component';
 export * from './components/search-control.component';
@@ -41,7 +47,6 @@ export * from './components/search-check-list/search-check-list.component';
 export * from './components/search-chip-list/search-chip-list.component';
 export * from './components/search-date-range/search-date-range.component';
 export * from './components/search-filter/search-filter.component';
-export * from './services/search-filter.service';
 export * from './components/search-filter-container/search-filter-container.component';
 export * from './components/search-number-range/search-number-range.component';
 export * from './components/search-radio/search-radio.component';
@@ -52,7 +57,6 @@ export * from './components/search-text/search-text.component';
 export * from './components/search-widget-container/search-widget-container.component';
 export * from './components/search-datetime-range/search-datetime-range.component';
 export * from './components/search-form/search-form.component';
-export * from './services/search-facet-filters.service';
 export * from './components/search-filter-chips/search-filter-chips.component';
 export * from './components/search-filter-chips/search-filter-menu-card/search-filter-menu-card.component';
 export * from './components/search-facet-field/search-facet-field.component';

lib/content-services/src/lib/search/services/search-configuration.service.ts

@@ -17,7 +17,7 @@
 
 import { Injectable } from '@angular/core';
 import { QueryBody } from '@alfresco/js-api';
-import { SearchConfigurationInterface } from '../interface/search-configuration.interface';
+import { SearchConfigurationInterface } from '@alfresco/adf-core';
 
 @Injectable({
     providedIn: 'root'

lib/content-services/src/lib/search/services/search-facet-filters.service.ts

@@ -20,7 +20,8 @@ import { FacetField } from '../models/facet-field.interface';
 import { Subject } from 'rxjs';
 import { SEARCH_QUERY_SERVICE_TOKEN } from '../search-query-service.token';
 import { SearchQueryBuilderService } from './search-query-builder.service';
-import { SearchService, TranslationService } from '@alfresco/adf-core';
+import { TranslationService } from '@alfresco/adf-core';
+import { SearchService } from '../services/search.service';
 import { takeUntil } from 'rxjs/operators';
 import { GenericBucket, GenericFacetResponse, ResultSetContext, ResultSetPaging } from '@alfresco/js-api';
 import { SearchFilterList } from '../models/search-filter-list.model';

lib/content-services/src/lib/search/services/search.service.spec.ts

@@ -16,10 +16,9 @@
  */
 
 import { TestBed } from '@angular/core/testing';
-import { mockError, fakeSearch } from '../mock/search.service.mock';
+import { mockError, fakeSearch } from '../mocks/search.service.mock';
 import { SearchService } from './search.service';
-import { setupTestBed } from '../testing/setup-test-bed';
+import { setupTestBed, CoreTestingModule } from '@alfresco/adf-core';
-import { CoreTestingModule } from '../testing/core.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
 import { NodePaging } from '@alfresco/js-api';
 

lib/content-services/src/lib/search/services/search.service.ts

@@ -18,7 +18,7 @@
 import { Injectable } from '@angular/core';
 import { NodePaging, QueriesApi, QueryBody, ResultSetPaging, SearchApi } from '@alfresco/js-api';
 import { Observable, Subject, from, throwError } from 'rxjs';
-import { AlfrescoApiService } from './alfresco-api.service';
+import { AlfrescoApiService } from '@alfresco/adf-core';
 import { SearchConfigurationService } from './search-configuration.service';
 
 @Injectable({

lib/core/src/lib/auth/index.ts

@@ -49,3 +49,5 @@ export * from './models/identity-group.model';
 export * from './models/identity-user.model';
 export * from './models/identity-role.model';
 
+export * from './interface/authentication.interface';
+

lib/core/src/lib/interface/public-api.ts

@@ -15,6 +15,4 @@
  * limitations under the License.
  */
 
-export * from './authentication.interface';
 export * from './injection.tokens';
-export * from './search-configuration.interface';

lib/core/src/lib/mock/public-api.ts

@@ -22,7 +22,6 @@ export * from './cookie.service.mock';
 export * from './ecm-user.service.mock';
 export * from './event.mock';
 export * from './renditions-service.mock';
-export * from './search.service.mock';
 export * from './translation.service.mock';
 export * from './alfresco-api.service.mock';
 

lib/core/src/lib/search-text/public-api.ts

@@ -19,3 +19,5 @@ export * from './animations';
 export * from './search-text-input.component';
 export * from './search-trigger.directive';
 export * from './search-text-input.module';
+
+export * from './interfaces/search-configuration.interface';

lib/core/src/lib/search-text/search-trigger.directive.ts

@@ -33,7 +33,7 @@ import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
 import { DOCUMENT } from '@angular/common';
 import { Observable, Subject, Subscription, merge, of, fromEvent } from 'rxjs';
 import { filter, switchMap, takeUntil } from 'rxjs/operators';
-import { SearchComponentInterface } from '../interface/search-configuration.interface';
+import { SearchComponentInterface } from './interfaces/search-configuration.interface';
 
 export const SEARCH_AUTOCOMPLETE_VALUE_ACCESSOR: any = {
     provide: NG_VALUE_ACCESSOR,

lib/core/src/lib/services/public-api.ts

@@ -30,11 +30,9 @@ export * from './favorites-api.service';
 export * from './nodes-api.service';
 export * from './people-content.service';
 export * from './people-process.service';
-export * from './search.service';
 export * from './shared-links-api.service';
 export * from './discovery-api.service';
 export * from './comment-process.service';
-export * from './search-configuration.service';
 export * from './comment-content.service';
 export * from './login-dialog.service';
 export * from './external-alfresco-api.service';

lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.component.ts

@@ -17,9 +17,9 @@
 
 import { Component, Inject, ViewEncapsulation, ViewChild } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { ExternalAlfrescoApiService, AlfrescoApiService, LoginDialogPanelComponent, SearchService, TranslationService, AuthenticationService } from '@alfresco/adf-core';
+import { ExternalAlfrescoApiService, AlfrescoApiService, LoginDialogPanelComponent, TranslationService, AuthenticationService } from '@alfresco/adf-core';
 import { AttachFileWidgetDialogComponentData } from './attach-file-widget-dialog-component.interface';
-import { DocumentListService, SitesService } from '@alfresco/adf-content-services';
+import { DocumentListService, SitesService, SearchService } from '@alfresco/adf-content-services';
 import { Node } from '@alfresco/js-api';
 
 @Component({