inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix search result pagination in demo shell (#3942)

Browse Source
This commit is contained in:
Denys Vuika
2018-11-02 23:14:51 +00:00
committed by Eugenio Romano
parent 23022d6ca7
commit ca3e1035fa
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
demo-shell/src/app.config.json
View File

@@ -68,6 +68,17 @@
} }
], ],
"search": { "search": {
"app:fields": [
"cm:name",
"cm:title",
"cm:description",
"ia:whatEvent",
"ia:descriptionEvent",
"lnk:title",
"lnk:description",
"TEXT",
"TAG"
],
"include": ["path", "allowableOperations"], "include": ["path", "allowableOperations"],
"sorting": { "sorting": {
"options": [ "options": [

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

@@ -19,7 +19,7 @@ import { Component, OnInit, Optional, OnDestroy } from '@angular/core';
import { Router, ActivatedRoute, Params } from '@angular/router'; import { Router, ActivatedRoute, Params } from '@angular/router';
import { NodePaging, Pagination } from 'alfresco-js-api'; import { NodePaging, Pagination } from 'alfresco-js-api';
import { SearchQueryBuilderService } from '@alfresco/adf-content-services'; import { SearchQueryBuilderService } from '@alfresco/adf-content-services';
import { UserPreferencesService, SearchService } from '@alfresco/adf-core'; import { UserPreferencesService, SearchService, AppConfigService } from '@alfresco/adf-core';
import { Subscription } from 'rxjs'; import { Subscription } from 'rxjs';
@Component({ @Component({
@@ -41,6 +41,7 @@ export class SearchResultComponent implements OnInit, OnDestroy {
private subscriptions: Subscription[] = []; private subscriptions: Subscription[] = [];
constructor(public router: Router, constructor(public router: Router,
private config: AppConfigService,
private preferences: UserPreferencesService, private preferences: UserPreferencesService,
private queryBuilder: SearchQueryBuilderService, private queryBuilder: SearchQueryBuilderService,
@Optional() private route: ActivatedRoute) { @Optional() private route: ActivatedRoute) {
@@ -61,6 +62,8 @@ export class SearchResultComponent implements OnInit, OnDestroy {
}), }),
this.queryBuilder.executed.subscribe(data => { this.queryBuilder.executed.subscribe(data => {
this.queryBuilder.paging.skipCount = 0;
this.onSearchResultLoaded(data); this.onSearchResultLoaded(data);
this.isLoading = false; this.isLoading = false;
}) })
@@ -87,10 +90,8 @@ export class SearchResultComponent implements OnInit, OnDestroy {
return null; return null;
} }
const suffix = userInput.lastIndexOf('*') >= 0 ? '' : '*'; const fields = this.config.get<string[]>('search.app:fields', ['cm:name']);
const query = `cm:name:${userInput}${suffix} OR cm:title:${userInput}${suffix} OR cm:description:${userInput}${suffix} const query = fields.map(field => `${field}:"${userInput}*"`).join(' OR ');
OR ia:whatEvent:${userInput}${suffix} OR ia:descriptionEvent:${userInput}${suffix} OR lnk:title:${userInput}${suffix}
OR lnk:description:${userInput}${suffix} OR TEXT:${userInput}${suffix} OR TAG:${userInput}${suffix}`;
return query; return query;
} }