[ADF-2150] improved queryBody mechanism (#2852)

* [ADF-2150] changed query body parameter to a function

* [ADF-2150] added an example page where to try change query body

* [ADF-2150] improved queryBody mechanism

* [ADF-2150] fixed content node test

* [ADF-2150] extended docs added another way to use the query node

* [ADF-2150] fixed test for search on content node

* [ADF-2150] added some improvements to service config

* [ADF-2150] changed the documentation accordingly

* [ADF-2150] added PR changes

* [ADF-2150] fixed jdoc

* [ADF-2150] added checkbox to switch from service approach to input object approach

* [ADF-2150] fixed build error on demo shell

lib/core/interface/public-api.ts

@@ -17,3 +17,4 @@
 
 export * from './authentication.interface';
 export * from './injection.tokens';
+export * from './search-configuration.interface';

lib/core/interface/search-configuration.interface.ts

@@ -0,0 +1,24 @@
+/*!
+ * @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 { QueryBody } from 'alfresco-js-api';
+
+export interface SearchConfigurationInterface {
+
+    generateQueryBody(searchTerm: string, maxResults: string, skipCount: string): QueryBody;
+
+}

lib/core/services/public-api.ts

@@ -46,3 +46,4 @@ export * from './shared-links-api.service';
 export * from './sites.service';
 export * from './discovery-api.service';
 export * from './comment-process.service';
+export * from './search-configuration.service';

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

@@ -0,0 +1,45 @@
+/*!
+ * @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 { QueryBody } from 'alfresco-js-api';
+import { SearchConfigurationInterface } from '../interface/search-configuration.interface';
+
+@Injectable()
+export class SearchConfigurationService implements SearchConfigurationInterface {
+
+    constructor() {
+    }
+
+    public generateQueryBody(searchTerm: string, maxResults: string, skipCount: string): QueryBody {
+        let defaultQueryBody: QueryBody = {
+            query: {
+                query: searchTerm ? `${searchTerm}* OR name:${searchTerm}*` : searchTerm
+            },
+            include: ['path', 'allowableOperations'],
+            paging: {
+                maxItems: maxResults,
+                skipCount: skipCount
+            },
+            filterQueries: [
+                { query: "TYPE:'cm:folder' OR TYPE:'cm:content'" },
+                { query: 'NOT cm:creator:System' }]
+        };
+
+        return defaultQueryBody;
+    }
+}

lib/core/services/search.service.ts

@@ -21,15 +21,14 @@ import { Observable } from 'rxjs/Observable';
 import { AlfrescoApiService } from './alfresco-api.service';
 import { AuthenticationService } from './authentication.service';
 import 'rxjs/add/observable/throw';
+import { SearchConfigurationService } from './search-configuration.service';
 
-/**
- * Internal service used by Document List component.
- */
 @Injectable()
 export class SearchService {
 
     constructor(public authService: AuthenticationService,
-                private apiService: AlfrescoApiService) {
+                private apiService: AlfrescoApiService,
+                private searchConfigurationService: SearchConfigurationService) {
     }
 
     getNodeQueryResults(term: string, options?: SearchOptions): Observable<NodePaging> {
@@ -38,8 +37,8 @@ export class SearchService {
             .catch(err => this.handleError(err));
     }
 
-    search(query: QueryBody): Observable<NodePaging> {
-        const searchQuery = Object.assign(query);
+    search(searchTerm: string, maxResults: string, skipCount: string): Observable<NodePaging> {
+        const searchQuery = Object.assign(this.searchConfigurationService.generateQueryBody(searchTerm, maxResults, skipCount));
         const promise = this.apiService.getInstance().search.searchApi.search(searchQuery);
 
         return Observable
@@ -47,6 +46,14 @@ export class SearchService {
             .catch(err => this.handleError(err));
     }
 
+    searchByQueryBody(queryBody: QueryBody): Observable<NodePaging> {
+        const promise = this.apiService.getInstance().search.searchApi.search(queryBody);
+
+        return Observable
+            .fromPromise(promise)
+            .catch(err => this.handleError(err));
+    }
+
     private handleError(error: any): Observable<any> {
         return Observable.throw(error || 'Server error');
     }

lib/core/services/service.module.ts

@@ -47,6 +47,7 @@ import { TranslateLoaderService } from './translate-loader.service';
 import { TranslationService } from './translation.service';
 import { UploadService } from './upload.service';
 import { UserPreferencesService } from './user-preferences.service';
+import { SearchConfigurationService } from './search-configuration.service';
 
 @NgModule({
     imports: [],
@@ -81,7 +82,8 @@ import { UserPreferencesService } from './user-preferences.service';
         SharedLinksApiService,
         SitesService,
         DiscoveryApiService,
-        CommentProcessService
+        CommentProcessService,
+        SearchConfigurationService
     ],
     exports: [
     ]