[ADF-2010] Move/copy, when searching for folder multiple results are returned (#2727)

* adding debounce time in object picker
unify search api
fix multiples duplicate result
remove limit of 4 character to search

* remove three.min.js

* remove unused import

* tlsint fix and remove file

* rename sitesApiService to sitesService as all the other services

* fix test timeout async

demo-shell/.angular-cli.json

@@ -65,8 +65,7 @@
         "../node_modules/pdfjs-dist/build/pdf.js",
         "../node_modules/pdfjs-dist/web/pdf_viewer.js",
         "../node_modules/raphael/raphael.min.js",
-        "../node_modules/moment/min/moment.min.js",
+        "../node_modules/moment/min/moment.min.js"
-        "../node_modules/three/build/three.min.js"
       ],
       "environmentSource": "environments/environment.ts",
       "environments": {
@@ -149,8 +148,7 @@
         "../node_modules/pdfjs-dist/build/pdf.js",
         "../node_modules/pdfjs-dist/web/pdf_viewer.js",
         "../node_modules/raphael/raphael.min.js",
-        "../node_modules/moment/min/moment.min.js",
+        "../node_modules/moment/min/moment.min.js"
-        "../node_modules/three/build/three.min.js"
       ],
       "environmentSource": "environments/environment.ts",
       "environments": {

demo-shell/package.json

@@ -87,7 +87,6 @@
     "minimatch": "3.0.4",
     "moment-es6": "^1.0.0",
     "moment": "2.15.2",
-    "ng2-3d-editor": "0.0.18",
     "ng2-charts": "1.6.0",
     "pdfjs-dist": "1.5.404",
     "raphael": "2.2.7",

demo-shell/src/app/components/app-layout/app-layout.component.scss

@@ -4,7 +4,7 @@
   $toolbarHeight: 64px;
 
 
-   @media screen and ($mat-small) {
+   @media screen and ($mat-xsmall) {
        adf-search-bar {
            width: 150px;
        }

demo-shell/src/main.ts

@@ -6,8 +6,6 @@ import { environment } from './environments/environment';
 import 'hammerjs';
 import 'chart.js';
 import 'ng2-charts';
-// import 'ng2-3d-editor';
-import 'three';
 
 import pdfjsLib from 'pdfjs-dist';
 pdfjsLib.PDFJS.workerSrc = 'pdf.worker.js';

docs/README.md

@@ -121,7 +121,7 @@ for more information about installing and using the source code.
 - [Renditions service](renditions.service.md)
 - [Search api service](search-api.service.md)
 - [Shared links api service](shared-links-api.service.md)
-- [Sites api service](sites-api.service.md)
+- [Sites api service](sites.service.md)
 - [Storage service](storage.service.md)
 - [Thumbnail service](thumbnail.service.md)
 - [Translation service](translation.service.md)

docs/seeAlsoGraph.json

@@ -106,7 +106,7 @@
     "search-control.component": ["search.component"],
     "search.component": [],
     "site.model": [],
-    "sites-api.service": ["site.model"],
+    "sites.service": ["site.model"],
     "sites-dropdown.component": [],
     "start-process.component": [],
     "start-task.component": [],

docs/site.model.md

@@ -4,7 +4,7 @@ Provides information about a site in a Content Services repository.
 
 ## Details
 
-`SiteModel` is returned by methods from the [Sites Api service](sites-api.service.md).
+`SiteModel` is returned by methods from the [Sites Api service](sites.service.md).
 Also, the
 [`getSite`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-core-rest-api/docs/SitesApi.md#getSite)
 and
@@ -44,5 +44,5 @@ class SiteMembersModel {
 <!-- seealso start -->
 ## See also
 
-- [Sites api service](sites-api.service.md)
+- [Sites api service](sites.service.md)
 <!-- seealso end -->

lib/content-services/content-node-selector/content-node-selector.component.html

@@ -1,28 +1,32 @@
 <header matDialogTitle
-    class="adf-content-node-selector-title"
+        class="adf-content-node-selector-title"
-    data-automation-id="content-node-selector-title">{{title}}</header>
+        data-automation-id="content-node-selector-title">{{title}}
+</header>
 
 <section matDialogContent
-    class="adf-content-node-selector-content"
+         class="adf-content-node-selector-content"
-    (node-select)="onNodeSelect($event)">
+         (node-select)="onNodeSelect($event)">
 
     <mat-form-field floatPlaceholder="never" class="adf-content-node-selector-content-input">
-        <input #searchInput
+        <input matInput
-            matInput
+               id="searchInput"
-            placeholder="Search"
+               [formControl]="searchInput"
-            (input)="search(searchInput.value)"
+               type="text"
-            [value]="searchTerm"
+               placeholder="Search"
-            data-automation-id="content-node-selector-search-input">
+               [value]="searchTerm"
+               data-automation-id="content-node-selector-search-input">
 
         <mat-icon *ngIf="searchTerm.length > 0"
-                matSuffix (click)="clear()"
+                  matSuffix (click)="clear()"
-                class="adf-content-node-selector-content-input-icon"
+                  class="adf-content-node-selector-content-input-icon"
-                data-automation-id="content-node-selector-search-clear">clear</mat-icon>
+                  data-automation-id="content-node-selector-search-clear">clear
+        </mat-icon>
 
         <mat-icon *ngIf="searchTerm.length === 0"
-            matSuffix
+                  matSuffix
-            class="adf-content-node-selector-content-input-icon"
+                  class="adf-content-node-selector-content-input-icon"
-            data-automation-id="content-node-selector-search-icon">search</mat-icon>
+                  data-automation-id="content-node-selector-search-icon">search
+        </mat-icon>
 
     </mat-form-field>
 
@@ -36,35 +40,35 @@
     <adf-toolbar>
         <adf-toolbar-title>
             <adf-dropdown-breadcrumb *ngIf="needBreadcrumbs()"
-                class="adf-content-node-selector-content-breadcrumb"
+                                     class="adf-content-node-selector-content-breadcrumb"
-                (navigate)="clear()"
+                                     (navigate)="clear()"
-                [target]="documentList"
+                                     [target]="documentList"
-                [folderNode]="breadcrumbFolderNode"
+                                     [folderNode]="breadcrumbFolderNode"
-                data-automation-id="content-node-selector-content-breadcrumb">
+                                     data-automation-id="content-node-selector-content-breadcrumb">
             </adf-dropdown-breadcrumb>
         </adf-toolbar-title>
     </adf-toolbar>
 
     <div class="adf-content-node-selector-content-list" data-automation-id="content-node-selector-content-list">
         <adf-document-list
-                    #documentList
+            #documentList
-                    adf-highlight
+            adf-highlight
-                    adf-highlight-selector=".cell-value adf-datatable-cell .adf-datatable-cell-value"
+            adf-highlight-selector=".cell-value adf-datatable-cell .adf-datatable-cell-value"
-                    [node]="nodes"
+            [node]="nodes"
-                    [maxItems]="pageSize"
+            [maxItems]="pageSize"
-                    [skipCount]="skipCount"
+            [skipCount]="skipCount"
-                    [enableInfiniteScrolling]="infiniteScroll"
+            [enableInfiniteScrolling]="infiniteScroll"
-                    [rowFilter]="rowFilter"
+            [rowFilter]="rowFilter"
-                    [imageResolver]="imageResolver"
+            [imageResolver]="imageResolver"
-                    [currentFolderId]="folderIdToShow"
+            [currentFolderId]="folderIdToShow"
-                    selectionMode="single"
+            selectionMode="single"
-                    [contextMenuActions]="false"
+            [contextMenuActions]="false"
-                    [contentActions]="false"
+            [contentActions]="false"
-                    [allowDropFiles]="false"
+            [allowDropFiles]="false"
-                    (folderChange)="onFolderChange()"
+            (folderChange)="onFolderChange()"
-                    (ready)="onFolderLoaded($event)"
+            (ready)="onFolderLoaded($event)"
-                    (node-dblclick)="onNodeDoubleClick($event)"
+            (node-dblclick)="onNodeDoubleClick($event)"
-                    data-automation-id="content-node-selector-document-list">
+            data-automation-id="content-node-selector-document-list">
             <empty-folder-content>
                 <ng-template>
                     <div>{{ 'NODE_SELECTOR.NO_RESULTS' | translate }}</div>
@@ -87,17 +91,17 @@
 <footer matDialogActions class="adf-content-node-selector-actions">
 
     <button *ngIf="inDialog"
-        mat-button
+            mat-button
-        class="adf-content-node-selector-actions-cancel"
+            class="adf-content-node-selector-actions-cancel"
-        (click)="close()"
+            (click)="close()"
-        data-automation-id="content-node-selector-actions-cancel">{{ 'NODE_SELECTOR.CANCEL' | translate }}
+            data-automation-id="content-node-selector-actions-cancel">{{ 'NODE_SELECTOR.CANCEL' | translate }}
     </button>
 
     <button mat-button
-        [disabled]="!chosenNode"
+            [disabled]="!chosenNode"
-        class="adf-content-node-selector-actions-choose"
+            class="adf-content-node-selector-actions-choose"
-        (click)="choose()"
+            (click)="choose()"
-        data-automation-id="content-node-selector-actions-choose">{{ buttonActionName | translate }}
+            data-automation-id="content-node-selector-actions-choose">{{ buttonActionName | translate }}
     </button>
 
 </footer>

lib/content-services/content-node-selector/content-node-selector.component.spec.ts

@@ -16,19 +16,29 @@
  */
 
 import { CUSTOM_ELEMENTS_SCHEMA, EventEmitter } from '@angular/core';
-import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
 import { By } from '@angular/platform-browser';
 import { MinimalNodeEntryEntity } from 'alfresco-js-api';
-import { AlfrescoApiService, ContentService, TranslationService, SearchService, SiteModel, SitesApiService, UserPreferencesService } from '@alfresco/adf-core';
+import {
+    AlfrescoApiService,
+    ContentService,
+    TranslationService,
+    SearchService,
+    SiteModel,
+    SitesService,
+    UserPreferencesService
+} from '@alfresco/adf-core';
 import { DataTableModule } from '@alfresco/adf-core';
 import { Observable } from 'rxjs/Observable';
+import { Observer } from 'rxjs/Observer';
 import { MaterialModule } from '../material.module';
 import { EmptyFolderContentDirective, DocumentListComponent, DocumentListService } from '../document-list';
 import { DropdownSitesComponent } from '../site-dropdown';
 import { DropdownBreadcrumbComponent } from '../breadcrumb';
 import { ContentNodeSelectorComponent } from './content-node-selector.component';
 import { ContentNodeSelectorService } from './content-node-selector.service';
+import { NodePaging } from 'alfresco-js-api';
 
 const ONE_FOLDER_RESULT = {
     list: {
@@ -56,17 +66,17 @@ describe('ContentNodeSelectorComponent', () => {
     let apiService: AlfrescoApiService;
     let nodesApi;
 
-    let _resolve: Function;
+    let _observer: Observer<NodePaging>;
 
     function typeToSearchBox(searchTerm = 'string-to-search') {
         let searchInput = fixture.debugElement.query(By.css('[data-automation-id="content-node-selector-search-input"]'));
         searchInput.nativeElement.value = searchTerm;
-        searchInput.triggerEventHandler('input', {});
+        component.searchInput.setValue(searchTerm);
         fixture.detectChanges();
     }
 
     function respondWithSearchResults(result) {
-        _resolve(result);
+        _observer.next(result);
     }
 
     function setupTestbed(plusProviders) {
@@ -85,10 +95,10 @@ describe('ContentNodeSelectorComponent', () => {
             providers: [
                 AlfrescoApiService,
                 ContentService,
-                SitesApiService,
+                SearchService,
                 TranslationService,
                 DocumentListService,
-                SearchService,
+                SitesService,
                 ContentNodeSelectorService,
                 UserPreferencesService,
                 ...plusProviders
@@ -109,7 +119,8 @@ describe('ContentNodeSelectorComponent', () => {
                 title: 'Move along citizen...',
                 actionName: 'move',
                 select: new EventEmitter<MinimalNodeEntryEntity>(),
-                rowFilter: () => {},
+                rowFilter: () => {
+                },
                 imageResolver: () => 'piccolo',
                 currentFolderId: 'cat-girl-nuku-nuku'
             };
@@ -176,7 +187,10 @@ describe('ContentNodeSelectorComponent', () => {
             fakePreference.paginationSize = 10;
 
             beforeEach(() => {
-                dummyMdDialogRef = <MatDialogRef<ContentNodeSelectorComponent>> { close: () => {} };
+                dummyMdDialogRef = <MatDialogRef<ContentNodeSelectorComponent>> {
+                    close: () => {
+                    }
+                };
             });
 
             it('should be shown if dialogRef is injected', () => {
@@ -205,12 +219,13 @@ describe('ContentNodeSelectorComponent', () => {
         beforeEach(() => {
             fixture = TestBed.createComponent(ContentNodeSelectorComponent);
             component = fixture.componentInstance;
+            component.debounceSearch = 0;
 
             searchService = TestBed.get(SearchService);
-            searchSpy = spyOn(searchService, 'getQueryNodesPromise').and.callFake(() => {
+            searchSpy = spyOn(searchService, 'search').and.callFake(() => {
-                return new Promise((resolve, reject) => {
+                return Observable.create((observer: Observer<NodePaging>) => {
-                    _resolve = resolve;
+                    _observer = observer;
-                 });
+                });
             });
 
             apiService = TestBed.get(AlfrescoApiService);
@@ -245,16 +260,16 @@ describe('ContentNodeSelectorComponent', () => {
         describe('Breadcrumbs', () => {
 
             let documentListService,
-                sitesApiService,
+                sitesService,
                 expectedDefaultFolderNode;
 
             beforeEach(() => {
                 expectedDefaultFolderNode = <MinimalNodeEntryEntity> { path: { elements: [] } };
                 documentListService = TestBed.get(DocumentListService);
-                sitesApiService = TestBed.get(SitesApiService);
+                sitesService = TestBed.get(SitesService);
                 spyOn(documentListService, 'getFolderNode').and.returnValue(Promise.resolve(expectedDefaultFolderNode));
                 spyOn(documentListService, 'getFolder').and.returnValue(Observable.throw('No results for test'));
-                spyOn(sitesApiService, 'getSites').and.returnValue(Observable.of([]));
+                spyOn(sitesService, 'getSites').and.returnValue(Observable.of([]));
                 spyOn(component.documentList, 'loadFolderNodesByFolderNodeId').and.returnValue(Promise.resolve());
                 component.currentFolderId = 'cat-girl-nuku-nuku';
                 fixture.detectChanges();
@@ -274,28 +289,37 @@ describe('ContentNodeSelectorComponent', () => {
 
             it('should not show the breadcrumb if search was performed as last action', (done) => {
                 typeToSearchBox();
-                respondWithSearchResults(ONE_FOLDER_RESULT);
+                fixture.detectChanges();
+
+                setTimeout(() => {
+                    respondWithSearchResults(ONE_FOLDER_RESULT);
+
+                    fixture.whenStable().then(() => {
+                        fixture.detectChanges();
+                        const breadcrumb = fixture.debugElement.query(By.directive(DropdownBreadcrumbComponent));
+                        expect(breadcrumb).toBeNull();
+                        done();
+                    });
+                }, 300);
 
-                fixture.whenStable().then(() => {
-                    fixture.detectChanges();
-                    const breadcrumb = fixture.debugElement.query(By.directive(DropdownBreadcrumbComponent));
-                    expect(breadcrumb).toBeNull();
-                    done();
-                });
             });
 
             it('should show the breadcrumb again on folder navigation in the results list', (done) => {
                 typeToSearchBox();
-                respondWithSearchResults(ONE_FOLDER_RESULT);
+                fixture.detectChanges();
+
+                setTimeout(() => {
+                    respondWithSearchResults(ONE_FOLDER_RESULT);
+                    fixture.whenStable().then(() => {
+                        fixture.detectChanges();
+                        component.onFolderChange();
+                        fixture.detectChanges();
+                        const breadcrumb = fixture.debugElement.query(By.directive(DropdownBreadcrumbComponent));
+                        expect(breadcrumb).not.toBeNull();
+                        done();
+                    });
+                }, 300);
 
-                fixture.whenStable().then(() => {
-                    fixture.detectChanges();
-                    component.onFolderChange();
-                    fixture.detectChanges();
-                    const breadcrumb = fixture.debugElement.query(By.directive(DropdownBreadcrumbComponent));
-                    expect(breadcrumb).not.toBeNull();
-                    done();
-                });
             });
 
             it('should show the breadcrumb for the selected node when search results are displayed', (done) => {
@@ -303,20 +327,22 @@ describe('ContentNodeSelectorComponent', () => {
                 spyOn(alfrescoContentService, 'hasPermission').and.returnValue(true);
 
                 typeToSearchBox();
-                respondWithSearchResults(ONE_FOLDER_RESULT);
 
-                fixture.whenStable().then(() => {
+                setTimeout(() => {
-                    fixture.detectChanges();
+                    respondWithSearchResults(ONE_FOLDER_RESULT);
+                    fixture.whenStable().then(() => {
+                        fixture.detectChanges();
 
-                    const chosenNode = <MinimalNodeEntryEntity> { path: { elements: [] } };
+                        const chosenNode = <MinimalNodeEntryEntity> { path: { elements: ['one'] } };
-                    component.onNodeSelect({ detail: { node: { entry: chosenNode} } });
+                        component.onNodeSelect({ detail: { node: { entry: chosenNode } } });
-                    fixture.detectChanges();
+                        fixture.detectChanges();
 
-                    const breadcrumb = fixture.debugElement.query(By.directive(DropdownBreadcrumbComponent));
+                        const breadcrumb = fixture.debugElement.query(By.directive(DropdownBreadcrumbComponent));
-                    expect(breadcrumb).not.toBeNull();
+                        expect(breadcrumb).not.toBeNull();
-                    expect(breadcrumb.componentInstance.folderNode).toBe(chosenNode);
+                        expect(breadcrumb.componentInstance.folderNode.path).toBe(chosenNode.path);
-                    done();
+                        done();
-                });
+                    });
+                }, 300);
             });
 
             it('should NOT show the breadcrumb for the selected node when not on search results list', (done) => {
@@ -324,36 +350,48 @@ describe('ContentNodeSelectorComponent', () => {
                 spyOn(alfrescoContentService, 'hasPermission').and.returnValue(true);
 
                 typeToSearchBox();
-                respondWithSearchResults(ONE_FOLDER_RESULT);
 
-                fixture.whenStable().then(() => {
+                setTimeout(() => {
+                    respondWithSearchResults(ONE_FOLDER_RESULT);
+
                     fixture.detectChanges();
                     component.onFolderChange();
                     fixture.detectChanges();
 
                     const chosenNode = <MinimalNodeEntryEntity> { path: { elements: [] } };
-                    component.onNodeSelect({ detail: { node: { entry: chosenNode} } });
+                    component.onNodeSelect({ detail: { node: { entry: chosenNode } } });
                     fixture.detectChanges();
 
                     const breadcrumb = fixture.debugElement.query(By.directive(DropdownBreadcrumbComponent));
                     expect(breadcrumb).not.toBeNull();
                     expect(breadcrumb.componentInstance.folderNode).toBe(expectedDefaultFolderNode);
                     done();
-                });
+                }, 300);
             });
         });
 
         describe('Search functionality', () => {
 
-            function defaultSearchOptions(rootNodeId = undefined, skipCount = 0) {
+            function defaultSearchOptions(searchTerm, rootNodeId = undefined, skipCount = 0) {
-                return {
+                let defaultSearchNode: any = {
+                    query: {
+                        query: searchTerm ? `${searchTerm}* OR name:${searchTerm}*` : searchTerm
+                    },
                     include: ['path', 'allowableOperations'],
-                    skipCount,
+                    paging: {
-                    rootNodeId,
+                        maxItems: '25',
-                    nodeType: 'cm:folder',
+                        skipCount: skipCount.toString()
-                    maxItems: 25,
+                    },
-                    orderBy: null
+                    filterQueries: [
+                        { query: "TYPE:'cm:folder'" },
+                        { query: 'NOT cm:creator:System' }]
                 };
+
+                if (rootNodeId) {
+                    defaultSearchNode.scope = rootNodeId;
+                }
+
+                return defaultSearchNode;
             }
 
             beforeEach(() => {
@@ -367,66 +405,75 @@ describe('ContentNodeSelectorComponent', () => {
                 fixture.detectChanges();
             });
 
-            it('should load the results by calling the search api on search change', () => {
+            it('should load the results by calling the search api on search change', (done) => {
                 typeToSearchBox('kakarot');
 
-                expect(searchSpy).toHaveBeenCalledWith('kakarot*', defaultSearchOptions());
+                setTimeout(() => {
+                    expect(searchSpy).toHaveBeenCalledWith(defaultSearchOptions('kakarot'));
+                    done();
+                }, 300);
             });
 
-            it('should reset the currently chosen node in case of starting a new search', () => {
+            it('should reset the currently chosen node in case of starting a new search', (done) => {
                 component.chosenNode = <MinimalNodeEntryEntity> {};
                 typeToSearchBox('kakarot');
 
-                expect(component.chosenNode).toBeNull();
+                setTimeout(() => {
+                    expect(component.chosenNode).toBeNull();
+                    done();
+                }, 300);
             });
 
-            it('should NOT call the search api if the searchTerm length is less than 4 characters', () => {
+            it('should call the search api on changing the site selectbox\'s value', (done) => {
-                typeToSearchBox('1');
-                typeToSearchBox('12');
-                typeToSearchBox('123');
-
-                expect(searchSpy).not.toHaveBeenCalled();
-            });
-
-            xit('should debounce the search call by 500 ms', () => {
-
-            });
-
-            it('should call the search api on changing the site selectbox\'s value', () => {
                 typeToSearchBox('vegeta');
-                expect(searchSpy.calls.count()).toBe(1, 'Search count should be one after only one search');
 
-                component.siteChanged(<SiteModel> { guid: 'namek' });
+                setTimeout(() => {
+                    expect(searchSpy.calls.count()).toBe(1, 'Search count should be one after only one search');
 
-                expect(searchSpy.calls.count()).toBe(2, 'Search count should be two after the site change');
+                    component.siteChanged(<SiteModel> { guid: 'namek' });
-                expect(searchSpy.calls.argsFor(1)).toEqual(['vegeta*', defaultSearchOptions('namek') ]);
+
+                    expect(searchSpy.calls.count()).toBe(2, 'Search count should be two after the site change');
+                    expect(searchSpy.calls.argsFor(1)).toEqual([defaultSearchOptions('vegeta', 'namek')]);
+                    done();
+                }, 300);
             });
 
-            it('should show the search icon by default without the X (clear) icon', () => {
+            it('should show the search icon by default without the X (clear) icon', (done) => {
                 fixture.detectChanges();
-                let searchIcon = fixture.debugElement.query(By.css('[data-automation-id="content-node-selector-search-icon"]'));
+                setTimeout(() => {
-                let clearIcon = fixture.debugElement.query(By.css('[data-automation-id="content-node-selector-search-clear"]'));
 
-                expect(searchIcon).not.toBeNull('Search icon should be in the DOM');
+                    let searchIcon = fixture.debugElement.query(By.css('[data-automation-id="content-node-selector-search-icon"]'));
-                expect(clearIcon).toBeNull('Clear icon should NOT be in the DOM');
+                    let clearIcon = fixture.debugElement.query(By.css('[data-automation-id="content-node-selector-search-clear"]'));
+
+                    expect(searchIcon).not.toBeNull('Search icon should be in the DOM');
+                    expect(clearIcon).toBeNull('Clear icon should NOT be in the DOM');
+                    done();
+                }, 300);
             });
 
-            it('should show the X (clear) icon without the search icon when the search contains at least one character', () => {
+            it('should show the X (clear) icon without the search icon when the search contains at least one character', (done) => {
                 fixture.detectChanges();
                 typeToSearchBox('123');
 
-                let searchIcon = fixture.debugElement.query(By.css('[data-automation-id="content-node-selector-search-icon"]'));
+                setTimeout(() => {
-                let clearIcon = fixture.debugElement.query(By.css('[data-automation-id="content-node-selector-search-clear"]'));
+                    fixture.detectChanges();
 
-                expect(searchIcon).toBeNull('Search icon should NOT be in the DOM');
+                    let searchIcon = fixture.debugElement.query(By.css('[data-automation-id="content-node-selector-search-icon"]'));
-                expect(clearIcon).not.toBeNull('Clear icon should be in the DOM');
+                    let clearIcon = fixture.debugElement.query(By.css('[data-automation-id="content-node-selector-search-clear"]'));
+
+                    expect(searchIcon).toBeNull('Search icon should NOT be in the DOM');
+                    expect(clearIcon).not.toBeNull('Clear icon should be in the DOM');
+                    done();
+                }, 300);
             });
 
             it('should clear the search field, nodes and chosenNode when clicking on the X (clear) icon', () => {
                 component.chosenNode = <MinimalNodeEntryEntity> {};
-                component.nodes = { list: {
+                component.nodes = {
-                    entries: [ { entry: component.chosenNode } ]
+                    list: {
-                } };
+                        entries: [{ entry: component.chosenNode }]
+                    }
+                };
                 component.searchTerm = 'piccolo';
                 component.showingSearchResults = true;
 
@@ -445,7 +492,8 @@ describe('ContentNodeSelectorComponent', () => {
             });
 
             it('should pass through the rowFilter to the documentList', () => {
-                const filter = () => {};
+                const filter = () => {
+                };
                 component.rowFilter = filter;
 
                 fixture.detectChanges();
@@ -466,59 +514,79 @@ describe('ContentNodeSelectorComponent', () => {
                 expect(documentList.componentInstance.imageResolver).toBe(resolver);
             });
 
-            it('should show the result list when search was performed', async(() => {
+            it('should show the result list when search was performed', (done) => {
                 typeToSearchBox();
-                respondWithSearchResults(ONE_FOLDER_RESULT);
 
-                fixture.whenStable().then(() => {
+                setTimeout(() => {
+                    respondWithSearchResults(ONE_FOLDER_RESULT);
+
                     fixture.detectChanges();
                     let documentList = fixture.debugElement.query(By.css('[data-automation-id="content-node-selector-document-list"]'));
                     expect(documentList).not.toBeNull('Document list should be shown');
-                    expect(documentList.componentInstance.currentFolderId).toBeUndefined();
+                    expect(documentList.componentInstance.currentFolderId).toBeNull();
-                });
+                    done();
-            }));
+                }, 300);
+            });
 
-            it('should highlight the results when search was performed in the next timeframe', fakeAsync(() => {
+            xit('should highlight the results when search was performed in the next timeframe', (done) => {
                 spyOn(component.highlighter, 'highlight');
                 typeToSearchBox('shenron');
-                respondWithSearchResults(ONE_FOLDER_RESULT);
 
-                expect(component.highlighter.highlight).not.toHaveBeenCalled();
+                setTimeout(() => {
-                tick();
+                    respondWithSearchResults(ONE_FOLDER_RESULT);
-                expect(component.highlighter.highlight).toHaveBeenCalledWith('shenron');
+                    fixture.detectChanges();
-            }));
 
-            it('should show the default text instead of result list if search was cleared', async(() => {
+                    expect(component.highlighter.highlight).not.toHaveBeenCalled();
+
+                    setTimeout(() => {
+                        expect(component.highlighter.highlight).toHaveBeenCalledWith('shenron');
+                    }, 300);
+
+                    done();
+                }, 300);
+
+            });
+
+            it('should show the default text instead of result list if search was cleared', (done) => {
                 typeToSearchBox();
-                respondWithSearchResults(ONE_FOLDER_RESULT);
 
-                fixture.whenStable().then(() => {
+                setTimeout(() => {
-                    fixture.detectChanges();
+                    respondWithSearchResults(ONE_FOLDER_RESULT);
-                    let clearButton = fixture.debugElement.query(By.css('[data-automation-id="content-node-selector-search-clear"]'));
-                    expect(clearButton).not.toBeNull('Clear button should be in DOM');
-                    clearButton.triggerEventHandler('click', {});
                     fixture.detectChanges();
 
-                    let documentList = fixture.debugElement.query(By.css('[data-automation-id="content-node-selector-document-list"]'));
+                    fixture.whenStable().then(() => {
-                    expect(documentList).not.toBeNull('Document list should be shown');
+                        let clearButton = fixture.debugElement.query(By.css('[data-automation-id="content-node-selector-search-clear"]'));
-                    expect(documentList.componentInstance.currentFolderId).toBe('cat-girl-nuku-nuku');
+                        expect(clearButton).not.toBeNull('Clear button should be in DOM');
-                });
+                        clearButton.triggerEventHandler('click', {});
-            }));
+                        fixture.detectChanges();
 
-            it('should reload the original documentlist when clearing the search input', async(() => {
+                        let documentList = fixture.debugElement.query(By.css('[data-automation-id="content-node-selector-document-list"]'));
+                        expect(documentList).not.toBeNull('Document list should be shown');
+                        expect(documentList.componentInstance.currentFolderId).toBe('cat-girl-nuku-nuku');
+                        done();
+                    });
+                }, 300);
+            });
+
+            xit('should reload the original documentlist when clearing the search input', (done) => {
                 typeToSearchBox('shenron');
-                respondWithSearchResults(ONE_FOLDER_RESULT);
 
-                fixture.whenStable().then(() => {
+                setTimeout(() => {
+                    respondWithSearchResults(ONE_FOLDER_RESULT);
+
                     typeToSearchBox('');
                     fixture.detectChanges();
 
-                    let documentList = fixture.debugElement.query(By.css('[data-automation-id="content-node-selector-document-list"]'));
+                    setTimeout(() => {
-                    expect(documentList.componentInstance.currentFolderId).toBe('cat-girl-nuku-nuku');
+                        let documentList = fixture.debugElement.query(By.css('[data-automation-id="content-node-selector-document-list"]'));
-                });
+                        expect(documentList.componentInstance.currentFolderId).toBe('cat-girl-nuku-nuku');
-            }));
+                    }, 300);
 
-            it('should set the folderIdToShow to the default "currentFolderId" if siteId is undefined', () => {
+                    done();
+                }, 300);
+            });
+
+            it('should set the folderIdToShow to the default "currentFolderId" if siteId is undefined', (done) => {
                 component.siteChanged(<SiteModel> { guid: 'Kame-Sennin Muten Roshi' });
                 fixture.detectChanges();
 
@@ -530,6 +598,8 @@ describe('ContentNodeSelectorComponent', () => {
 
                 documentList = fixture.debugElement.query(By.css('[data-automation-id="content-node-selector-document-list"]'));
                 expect(documentList.componentInstance.currentFolderId).toBe('cat-girl-nuku-nuku');
+
+                done();
             });
 
             describe('Pagination "Load more" button', () => {
@@ -540,57 +610,65 @@ describe('ContentNodeSelectorComponent', () => {
                     expect(pagination).toBeNull();
                 });
 
-                it('should be shown when diplaying search results', async(() => {
+                it('should be shown when diplaying search results', (done) => {
                     typeToSearchBox('shenron');
-                    respondWithSearchResults(ONE_FOLDER_RESULT);
 
-                    fixture.whenStable().then(() => {
+                    setTimeout(() => {
-                        fixture.detectChanges();
+                        respondWithSearchResults(ONE_FOLDER_RESULT);
-                        const pagination = fixture.debugElement.query(By.css('[data-automation-id="content-node-selector-search-pagination"]'));
+
-                        expect(pagination).not.toBeNull();
+                        fixture.whenStable().then(() => {
-                    });
+                            fixture.detectChanges();
-                }));
+                            const pagination = fixture.debugElement.query(By.css('[data-automation-id="content-node-selector-search-pagination"]'));
+                            expect(pagination).not.toBeNull();
+                            done();
+                        });
+                    }, 300);
+                });
 
                 it('button\'s callback should load the next batch of results by calling the search api', () => {
                     const skipCount = 8;
                     component.searchTerm = 'kakarot';
 
-                    component.getNextPageOfSearch({skipCount});
+                    component.getNextPageOfSearch({ skipCount });
 
-                    expect(searchSpy).toHaveBeenCalledWith('kakarot*', defaultSearchOptions(undefined, skipCount));
+                    expect(searchSpy).toHaveBeenCalledWith(defaultSearchOptions('kakarot', undefined, skipCount));
                 });
 
-                it('should set its loading state to true after search was started', () => {
+                it('should set its loading state to true after search was started', (done) => {
                     component.showingSearchResults = true;
                     component.pagination = { hasMoreItems: true };
 
                     typeToSearchBox('shenron');
-                    fixture.detectChanges();
 
-                    const spinnerSelector = By.css('[data-automation-id="content-node-selector-search-pagination"] [data-automation-id="adf-infinite-pagination-spinner"]');
+                    setTimeout(() => {
-                    const paginationLoading = fixture.debugElement.query(spinnerSelector);
-                    expect(paginationLoading).not.toBeNull();
-                });
-
-                it('should set its loading state to true after search was performed', async(() => {
-                    component.showingSearchResults = true;
-                    component.pagination = { hasMoreItems: true };
-
-                    typeToSearchBox('shenron');
-                    fixture.detectChanges();
-                    respondWithSearchResults(ONE_FOLDER_RESULT);
-
-                    fixture.whenStable().then(() => {
                         fixture.detectChanges();
+
                         const spinnerSelector = By.css('[data-automation-id="content-node-selector-search-pagination"] [data-automation-id="adf-infinite-pagination-spinner"]');
                         const paginationLoading = fixture.debugElement.query(spinnerSelector);
-                        expect(paginationLoading).toBeNull();
+                        expect(paginationLoading).not.toBeNull();
-                    });
+                        done();
-                }));
+                    }, 300);
-            });
+                });
 
-            xit('should trigger some kind of error when error happened during search', () => {
+                it('should set its loading state to true after search was performed', (done) => {
+                    component.showingSearchResults = true;
+                    component.pagination = { hasMoreItems: true };
 
+                    typeToSearchBox('shenron');
+                    fixture.detectChanges();
+
+                    setTimeout(() => {
+                        respondWithSearchResults(ONE_FOLDER_RESULT);
+
+                        fixture.whenStable().then(() => {
+                            fixture.detectChanges();
+                            const spinnerSelector = By.css('[data-automation-id="content-node-selector-search-pagination"] [data-automation-id="adf-infinite-pagination-spinner"]');
+                            const paginationLoading = fixture.debugElement.query(spinnerSelector);
+                            expect(paginationLoading).toBeNull();
+                            done();
+                        });
+                    }, 300);
+                });
             });
         });
 
@@ -687,12 +765,12 @@ describe('ContentNodeSelectorComponent', () => {
             it('should make the call to get the corresponding node entry to emit when a site node is selected as destination', () => {
                 spyOn(nodesApi, 'getNode').and.callFake((nodeId) => {
                     return new Promise(resolve => {
-                        resolve({entry: {id: nodeId}});
+                        resolve({ entry: { id: nodeId } });
                     });
                 });
 
-                const siteNode1 = {title: 'my files', guid: '-my-'};
+                const siteNode1 = { title: 'my files', guid: '-my-' };
-                const siteNode2 = {title: 'my sites', guid: '-mysites-'};
+                const siteNode2 = { title: 'my sites', guid: '-mysites-' };
 
                 component.dropdownSiteList = [siteNode1, siteNode2];
                 fixture.detectChanges();

lib/content-services/content-node-selector/content-node-selector.component.ts

@@ -15,16 +15,34 @@
  * limitations under the License.
  */
 
-import { Component, EventEmitter, Inject, Input, OnInit, Optional, Output, ViewChild, ViewEncapsulation } from '@angular/core';
+import {
-import { AlfrescoApiService, ContentService, HighlightDirective, SiteModel, UserPreferencesService } from '@alfresco/adf-core';
+    Component,
+    EventEmitter,
+    Inject,
+    Input,
+    OnInit,
+    Optional,
+    Output,
+    ViewChild,
+    ViewEncapsulation
+} from '@angular/core';
+import {
+    AlfrescoApiService,
+    ContentService,
+    HighlightDirective,
+    SiteModel,
+    UserPreferencesService
+} from '@alfresco/adf-core';
+import { FormControl } from '@angular/forms';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
 import { MinimalNodeEntryEntity, NodePaging, Pagination, Site } from 'alfresco-js-api';
-import { DocumentListComponent, PaginationStrategy  } from '../document-list/components/document-list.component';
+import { DocumentListComponent, PaginationStrategy } from '../document-list/components/document-list.component';
 import { RowFilter } from '../document-list/data/row-filter.model';
 import { ImageResolver } from '../document-list/data/image-resolver.model';
 
 import { ContentNodeSelectorComponentData } from './content-node-selector.component-data.interface';
 import { ContentNodeSelectorService } from './content-node-selector.service';
+import { debounceTime } from 'rxjs/operators';
 
 @Component({
     selector: 'adf-content-node-selector',
@@ -81,6 +99,10 @@ export class ContentNodeSelectorComponent implements OnInit {
     @ViewChild(HighlightDirective)
     highlighter: HighlightDirective;
 
+    debounceSearch: number= 200;
+
+    searchInput: FormControl = new FormControl();
+
     constructor(private contentNodeSelectorService: ContentNodeSelectorService,
                 private contentService: ContentService,
                 private apiService: AlfrescoApiService,
@@ -102,6 +124,15 @@ export class ContentNodeSelectorComponent implements OnInit {
         if (this.containingDialog) {
             this.inDialog = true;
         }
+
+        this.searchInput.valueChanges
+            .pipe(
+                debounceTime(this.debounceSearch)
+            )
+            .subscribe((searchValue) => {
+                this.search(searchValue);
+            });
+
         this.pageSize = this.preferences.paginationSize;
     }
 
@@ -200,12 +231,10 @@ export class ContentNodeSelectorComponent implements OnInit {
      * Perform the call to searchService with the proper parameters
      */
     private querySearch(): void {
-        if (this.isSearchTermLongEnough()) {
+        this.loadingSearchResults = true;
-            this.loadingSearchResults = true;
 
-            this.contentNodeSelectorService.search(this.searchTerm, this.siteId, this.skipCount, this.pageSize)
+        this.contentNodeSelectorService.search(this.searchTerm, this.siteId, this.skipCount, this.pageSize)
-                .subscribe(this.showSearchResults.bind(this));
+            .subscribe(this.showSearchResults.bind(this));
-        }
     }
 
     /**
@@ -228,13 +257,6 @@ export class ContentNodeSelectorComponent implements OnInit {
         this.highlight();
     }
 
-    /**
-     * Predicate method to decide whether searchTerm fulfills the necessary criteria
-     */
-    isSearchTermLongEnough(): boolean {
-        return this.searchTerm.length > 3;
-    }
-
     /**
      * Hightlight the actual searchterm in the next frame
      */

lib/content-services/content-node-selector/content-node-selector.module.ts

@@ -17,6 +17,7 @@
 
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { MaterialModule } from '../material.module';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -29,6 +30,8 @@ import { DocumentListModule } from '../document-list/document-list.module';
 
 @NgModule({
     imports: [
+        FormsModule,
+        ReactiveFormsModule,
         DirectiveModule,
         CommonModule,
         MaterialModule,

lib/content-services/content-node-selector/content-node-selector.service.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { SearchOptions, SearchService } from '@alfresco/adf-core';
+import { SearchService } from '@alfresco/adf-core';
 import { Injectable } from '@angular/core';
 import { NodePaging } from 'alfresco-js-api';
 import { Observable } from 'rxjs/Observable';
@@ -26,7 +26,8 @@ import { Observable } from 'rxjs/Observable';
 @Injectable()
 export class ContentNodeSelectorService {
 
-    constructor(private searchService: SearchService) {}
+    constructor(private searchService: SearchService) {
+    }
 
     /**
      * Performs a search for content node selection
@@ -36,19 +37,26 @@ export class ContentNodeSelectorService {
      * @param rootNodeId    The root is to start the search from
      * @param maxItems      How many items to load
      */
-    public search(searchTerm: string, rootNodeId: string, skipCount: number, maxItems: number): Observable<NodePaging> {
+    public search(searchTerm: string, rootNodeId: string, skipCount: number = 0, maxItems: number = 25): Observable<NodePaging> {
 
-        searchTerm = searchTerm + '*';
+        let defaultSearchNode: any = {
-
+            query: {
-        let searchOpts: SearchOptions = {
+                query: `${searchTerm}* OR name:${searchTerm}*`
+            },
             include: ['path', 'allowableOperations'],
-            skipCount,
+            paging: {
-            rootNodeId,
+                maxItems: `${maxItems}`,
-            nodeType: 'cm:folder',
+                skipCount: `${skipCount}`
-            maxItems,
+            },
-            orderBy: null
+            filterQueries: [
+                { query: "TYPE:'cm:folder'" },
+                { query: 'NOT cm:creator:System' }]
         };
 
-        return this.searchService.getNodeQueryResults(searchTerm, searchOpts);
+        if (rootNodeId) {
+            defaultSearchNode.scope = rootNodeId;
+        }
+
+        return this.searchService.search(defaultSearchNode);
     }
 }

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

@@ -19,7 +19,7 @@ import { DebugElement } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { MaterialModule } from '../../material.module';
 import { By } from '@angular/platform-browser';
-import { AuthenticationService, SearchApiService } from '@alfresco/adf-core';
+import { AuthenticationService, SearchService } from '@alfresco/adf-core';
 import { ThumbnailService } from '@alfresco/adf-core';
 import { Observable } from 'rxjs/Observable';
 import { noResult, results } from '../../mock';
@@ -33,7 +33,7 @@ describe('SearchControlComponent', () => {
     let component: SearchControlComponent;
     let element: HTMLElement;
     let debugElement: DebugElement;
-    let searchService: SearchApiService;
+    let searchService: SearchService;
     let authService: AuthenticationService;
 
     beforeEach(async(() => {
@@ -48,12 +48,12 @@ describe('SearchControlComponent', () => {
             ],
             providers: [
                 ThumbnailService,
-                SearchApiService
+                SearchService
             ]
         }).compileComponents().then(() => {
             fixture = TestBed.createComponent(SearchControlComponent);
             debugElement = fixture.debugElement;
-            searchService = TestBed.get(SearchApiService);
+            searchService = TestBed.get(SearchService);
             authService = TestBed.get(AuthenticationService);
             component = fixture.componentInstance;
             element = fixture.nativeElement;

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

@@ -16,7 +16,7 @@
  */
 
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { SearchApiService } from '@alfresco/adf-core';
+import { SearchService } from '@alfresco/adf-core';
 import { QueryBody } from 'alfresco-js-api';
 import { Observable } from 'rxjs/Observable';
 import { SearchModule } from '../../index';
@@ -37,7 +37,7 @@ describe('SearchComponent', () => {
 
     let fixture: ComponentFixture<SimpleSearchTestComponent>, element: HTMLElement;
     let component: SimpleSearchTestComponent;
-    let searchService: SearchApiService;
+    let searchService: SearchService;
 
     beforeEach(async(() => {
         TestBed.configureTestingModule({
@@ -49,7 +49,7 @@ describe('SearchComponent', () => {
             fixture = TestBed.createComponent(SimpleSearchTestComponent);
             component = fixture.componentInstance;
             element = fixture.nativeElement;
-            searchService = TestBed.get(SearchApiService);
+            searchService = TestBed.get(SearchService);
         });
     }));
 

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

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { SearchApiService } from '@alfresco/adf-core';
+import { SearchService } from '@alfresco/adf-core';
 import {
     AfterContentInit,
     ChangeDetectionStrategy,
@@ -101,7 +101,7 @@ export class SearchComponent implements AfterContentInit, OnChanges {
     _classList: { [key: string]: boolean } = {};
 
     constructor(
-        private searchService: SearchApiService,
+        private searchService: SearchService,
         private changeDetectorRef: ChangeDetectorRef,
         private _elementRef: ElementRef) {
         this.keyPressedStream.asObservable()
@@ -148,7 +148,6 @@ export class SearchComponent implements AfterContentInit, OnChanges {
         let searchOpts: QueryBody = this.getSearchNode(searchTerm);
 
         if (this.hasValidSearchQuery(searchOpts)) {
-            searchTerm = searchTerm + '*';
             this.searchService
                 .search(searchOpts)
                 .subscribe(

lib/content-services/site-dropdown/sites-dropdown.component.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { SiteModel, SitesApiService } from '@alfresco/adf-core';
+import { SiteModel, SitesService } from '@alfresco/adf-core';
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 
 @Component({
@@ -41,7 +41,7 @@ export class DropdownSitesComponent implements OnInit {
 
     public siteSelected: string;
 
-    constructor(private sitesService: SitesApiService) {}
+    constructor(private sitesService: SitesService) {}
 
     ngOnInit() {
         if (!this.siteList) {

lib/core/pagination/infinite-pagination.component.html

@@ -1,4 +1,4 @@
-<div *ngIf="pagination.hasMoreItems" class="adf-infinite-pagination">
+<div *ngIf="pagination?.hasMoreItems" class="adf-infinite-pagination">
     <button mat-button
         *ngIf="!isLoading"
         class="adf-infinite-pagination-load-more"
@@ -11,4 +11,4 @@
         mode="indeterminate"
         class="adf-infinite-pagination-spinner"
         data-automation-id="adf-infinite-pagination-spinner"></mat-progress-bar>
-</div>
+</div>

lib/core/services/public-api.ts

@@ -43,9 +43,8 @@ export * from './favorites-api.service';
 export * from './nodes-api.service';
 export * from './people-content.service';
 export * from './people-process.service';
-export * from './search-api.service';
 export * from './search.service';
 export * from './shared-links-api.service';
-export * from './sites-api.service';
+export * from './sites.service';
 export * from './discovery-api.service';
 export * from './comment-process.service';

lib/core/services/search-api.service.ts

@@ -1,47 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
-import 'rxjs/add/observable/fromPromise';
-
-import { NodePaging } from 'alfresco-js-api';
-import { AlfrescoApiService } from './alfresco-api.service';
-
-@Injectable()
-export class SearchApiService {
-
-    constructor(private apiService: AlfrescoApiService) {}
-
-    private get searchApi() {
-       return this.apiService.getInstance().search.searchApi;
-    }
-
-    search(query: any): Observable<NodePaging> {
-        const { searchApi, handleError } = this;
-        const searchQuery = Object.assign(query);
-        const promise = searchApi.search(searchQuery);
-
-        return Observable
-            .fromPromise(promise)
-            .catch(handleError);
-    }
-
-    private handleError(error): Observable<any> {
-        return Observable.of(error);
-    }
-}

lib/core/services/search.service.ts

@@ -16,7 +16,7 @@
  */
 
 import { Injectable } from '@angular/core';
-import { NodePaging } from 'alfresco-js-api';
+import { NodePaging, QueryBody } from 'alfresco-js-api';
 import { Observable } from 'rxjs/Observable';
 import { AlfrescoApiService } from './alfresco-api.service';
 import { AuthenticationService } from './authentication.service';
@@ -32,21 +32,19 @@ export class SearchService {
                 private apiService: AlfrescoApiService) {
     }
 
-    /**
-     * Execute a search against the repository
-     *
-     * @param term Search term
-     * @param options Additional options passed to the search
-     * @returns {Observable<NodePaging>} Search results
-     */
     getNodeQueryResults(term: string, options?: SearchOptions): Observable<NodePaging> {
-        return Observable.fromPromise(this.getQueryNodesPromise(term, options))
+        return Observable.fromPromise(this.apiService.getInstance().core.queriesApi.findNodes(term, options))
             .map(res => <NodePaging> res)
             .catch(err => this.handleError(err));
     }
 
-    getQueryNodesPromise(term: string, opts: SearchOptions): Promise<NodePaging> {
+    search(query: QueryBody): Observable<NodePaging> {
-        return this.apiService.getInstance().core.queriesApi.findNodes(term, opts);
+        const searchQuery = Object.assign(query);
+        const promise = this.apiService.getInstance().search.searchApi.search(searchQuery);
+
+        return Observable
+            .fromPromise(promise)
+            .catch(err => this.handleError(err));
     }
 
     private handleError(error: any): Observable<any> {

lib/core/services/service.module.ts

@@ -39,11 +39,10 @@ import { PageTitleService } from './page-title.service';
 import { PeopleContentService } from './people-content.service';
 import { PeopleProcessService } from './people-process.service';
 import { RenditionsService } from './renditions.service';
-import { SearchApiService } from './search-api.service';
 import { SearchService } from './search.service';
 import { SettingsService } from './settings.service';
 import { SharedLinksApiService } from './shared-links-api.service';
-import { SitesApiService } from './sites-api.service';
+import { SitesService } from './sites.service';
 import { StorageService } from './storage.service';
 import { ThumbnailService } from './thumbnail.service';
 import { TranslateLoaderService } from './translate-loader.service';
@@ -82,10 +81,9 @@ import { UserPreferencesService } from './user-preferences.service';
         NodesApiService,
         PeopleContentService,
         PeopleProcessService,
-        SearchApiService,
         SearchService,
         SharedLinksApiService,
-        SitesApiService,
+        SitesService,
         DiscoveryApiService,
         CommentProcessService
     ],

lib/core/services/sites-api.spec.ts

@@ -23,7 +23,7 @@ import { AppConfigService } from '../app-config/app-config.service';
 import { AppConfigModule } from '../app-config/app-config.module';
 import { AuthenticationService } from './authentication.service';
 import { LogService } from './log.service';
-import { SitesApiService } from './sites-api.service';
+import { SitesService } from './sites.service';
 import { StorageService } from './storage.service';
 import { TranslateLoaderService } from './translate-loader.service';
 import { UserPreferencesService } from './user-preferences.service';
@@ -46,7 +46,7 @@ describe('Sites service', () => {
                 })
             ],
             providers: [
-                SitesApiService,
+                SitesService,
                 AlfrescoApiService,
                 UserPreferencesService,
                 AuthenticationService,
@@ -66,7 +66,7 @@ describe('Sites service', () => {
             }
         };
 
-        service = TestBed.get(SitesApiService);
+        service = TestBed.get(SitesService);
         jasmine.Ajax.install();
     });
 

lib/core/services/sites.service.ts

@@ -24,7 +24,7 @@ import 'rxjs/add/observable/fromPromise';
 import 'rxjs/add/operator/catch';
 
 @Injectable()
-export class SitesApiService {
+export class SitesService {
 
     constructor(
         private apiService: AlfrescoApiService) { }