[ADF-2061] Fix content node selector search (#2772)

* Fix content node selector search

* Fix tests

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

@@ -373,6 +373,9 @@ describe('ContentNodeSelectorComponent', () => {
         describe('Search functionality', () => {
 
             function defaultSearchOptions(searchTerm, rootNodeId = undefined, skipCount = 0) {
+
+                const parentFiltering = rootNodeId ? [ { query: `ANCESTOR:'workspace://SpacesStore/${rootNodeId}'` } ] : [];
+
                 let defaultSearchNode: any = {
                     query: {
                         query: searchTerm ? `${searchTerm}* OR name:${searchTerm}*` : searchTerm
@@ -384,13 +387,14 @@ describe('ContentNodeSelectorComponent', () => {
                     },
                     filterQueries: [
                         { query: "TYPE:'cm:folder'" },
-                        { query: 'NOT cm:creator:System' }]
+                        { query: 'NOT cm:creator:System' },
+                        ...parentFiltering
+                    ],
+                    scope: {
+                        locations: ['nodes']
+                    }
                 };
 
-                if (rootNodeId) {
-                    defaultSearchNode.scope = rootNodeId;
-                }
-
                 return defaultSearchNode;
             }
 

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

@@ -0,0 +1,106 @@
+/*!
+ * @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 { async, TestBed } from '@angular/core/testing';
+import { QueryBody } from 'alfresco-js-api';
+import { SearchService } from '@alfresco/adf-core';
+import { ContentNodeSelectorService } from './content-node-selector.service';
+
+class SearchServiceMock {
+    public query: QueryBody;
+    search(query: QueryBody) {
+        this.query = query;
+    }
+}
+
+describe('ContentNodeSelectorService', () => {
+
+    let service: ContentNodeSelectorService,
+        search: SearchServiceMock;
+
+    beforeEach(async(() => {
+        TestBed.configureTestingModule({
+            providers: [
+                ContentNodeSelectorService,
+                { provide: SearchService, useClass: SearchServiceMock }
+            ]
+        }).compileComponents();
+    }));
+
+    beforeEach(() => {
+        service = TestBed.get(ContentNodeSelectorService);
+        search = TestBed.get(SearchService);
+    });
+
+    it('should have the proper main query for search string', () => {
+        service.search('nuka cola quantum');
+
+        expect(search.query.query).toEqual({
+            query: 'nuka cola quantum* OR name:nuka cola quantum*'
+        });
+    });
+
+    it('should make it including the path and allowableOperations', () => {
+        service.search('nuka cola quantum');
+
+        expect(search.query.include).toEqual(['path', 'allowableOperations']);
+    });
+
+    it('should make the search restricted to nodes only', () => {
+        service.search('nuka cola quantum');
+
+        expect(search.query.scope.locations).toEqual(['nodes']);
+    });
+
+    it('should set the maxItems and paging properly by parameters', () => {
+        service.search('nuka cola quantum', null, 10, 100);
+
+        expect(search.query.paging.maxItems).toEqual('100');
+        expect(search.query.paging.skipCount).toEqual('10');
+    });
+
+    it('should set the maxItems and paging properly by default', () => {
+        service.search('nuka cola quantum');
+
+        expect(search.query.paging.maxItems).toEqual('25');
+        expect(search.query.paging.skipCount).toEqual('0');
+    });
+
+    it('should filter the search only for folders', () => {
+        service.search('nuka cola quantum');
+
+        expect(search.query.filterQueries).toContain({ query: "TYPE:'cm:folder'" });
+    });
+
+    it('should filter out the "system-base" entries', () => {
+        service.search('nuka cola quantum');
+
+        expect(search.query.filterQueries).toContain({ query: 'NOT cm:creator:System' });
+    });
+
+    it('should filter for the provided ancestor if defined', () => {
+        service.search('nuka cola quantum', 'diamond-city');
+
+        expect(search.query.filterQueries).toContain({ query: 'ANCESTOR:\'workspace://SpacesStore/diamond-city\'' });
+    });
+
+    it('should NOT filter for the ancestor if NOT defined', () => {
+        service.search('nuka cola quantum');
+
+        expect(search.query.filterQueries).not.toContain({ query: 'ANCESTOR:\'workspace://SpacesStore/null\'' });
+    });
+});

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

@@ -26,8 +26,7 @@ import { Observable } from 'rxjs/Observable';
 @Injectable()
 export class ContentNodeSelectorService {
 
-    constructor(private searchService: SearchService) {
-    }
+    constructor(private searchService: SearchService) {}
 
     /**
      * Performs a search for content node selection
@@ -37,7 +36,9 @@ 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 = 0, maxItems: number = 25): Observable<NodePaging> {
+    public search(searchTerm: string, rootNodeId: string = null, skipCount: number = 0, maxItems: number = 25): Observable<NodePaging> {
+
+        const parentFiltering = rootNodeId ? [ { query: `ANCESTOR:'workspace://SpacesStore/${rootNodeId}'` } ] : [];
 
         let defaultSearchNode: any = {
             query: {
@@ -50,13 +51,14 @@ export class ContentNodeSelectorService {
             },
             filterQueries: [
                 { query: "TYPE:'cm:folder'" },
-                { query: 'NOT cm:creator:System' }]
+                { query: 'NOT cm:creator:System' },
+                ...parentFiltering
+            ],
+            scope: {
+                locations: ['nodes']
+            }
         };
 
-        if (rootNodeId) {
-            defaultSearchNode.scope = rootNodeId;
-        }
-
         return this.searchService.search(defaultSearchNode);
     }
 }