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

[ADF-4329][ASD-5330] plus Improve e2e (#6580)

Browse Source 
Improve e2e
Fix SSO user avatar 
Fix Priority for APS1
This commit is contained in:
Eugenio Romano
2021-02-05 15:18:30 +00:00
committed by GitHub
parent e4990f4b0c
commit f4976a1949
72 changed files with 649 additions and 442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/content-services/src/lib/search/base-query-builder.service.ts
View File

@@ -259,6 +259,7 @@ export abstract class BaseQueryBuilderService {
}
if (query) {
const result: QueryBody = <QueryBody> {
query: {
query: query,
@@ -336,13 +337,11 @@ export abstract class BaseQueryBuilderService {
* @returns True if defined, false otherwise
*/
get hasFacetIntervals(): boolean {
if (this.config
return this.config
&& this.config.facetIntervals
&& this.config.facetIntervals.intervals
&& this.config.facetIntervals.intervals.length > 0) {
return true;
}
return false;
&& this.config.facetIntervals.intervals.length > 0;
}
get hasFacetHighlight(): boolean {

15
lib/content-services/src/lib/search/search-header-query-builder.service.ts
View File

@@ -42,8 +42,8 @@ export class SearchHeaderQueryBuilderService extends BaseQueryBuilderService {
this.updated.pipe(
filter((query: QueryBody) => !!query)).subscribe(() => {
this.execute();
});
this.execute();
});
}
public isFilterServiceActive(): boolean {
@@ -99,8 +99,15 @@ export class SearchHeaderQueryBuilderService extends BaseQueryBuilderService {
dataSorting.forEach((columnSorting: DataSorting) => {
const fieldValue = this.getSortingFieldFromColumnName(columnSorting.key);
if (fieldValue) {
const optionAscending = columnSorting.direction.toLocaleLowerCase() === 'asc' ? true : false;
const currentSort: SearchSortingDefinition = { key: columnSorting.key, label: 'current', type: 'FIELD', field: fieldValue, ascending: optionAscending };
const optionAscending = columnSorting.direction.toLocaleLowerCase() === 'asc';
const type = fieldValue === 'score' ? 'SCORE' : 'FIELD';
const currentSort: SearchSortingDefinition = {
key: columnSorting.key,
label: 'current',
type: type,
field: fieldValue,
ascending: optionAscending
};
this.sorting.push(currentSort);
}
});