Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add new fieldconfiguration Data #73

Merged
merged 1 commit into from
Jul 10, 2018
Merged

Add new fieldconfiguration Data #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 61 additions & 38 deletions src/contributors/ResultListContributor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import {
Filter, Aggregation, Expression, Hit
} from 'arlas-api';
import { getElementFromJsonObject, isArray, download } from '../utils/utils';
import { Action, ElementIdentifier, triggerType, SortEnum, FieldsConfiguration, Column, Detail } from '../models/models';
import { Action, ElementIdentifier, triggerType, SortEnum, FieldsConfiguration, Column, Detail, Field } from '../models/models';
import * as jsonpath from 'jsonpath';
import * as jsonSchema from '../jsonSchemas/resultlistContributorConf.schema.json';

Expand Down Expand Up @@ -176,6 +176,8 @@ export class ResultListContributor extends Contributor {
*/
private geoOrderSort: Sort = {};

private includesvalues = new Array<string>();


public fieldsConfiguration = this.getConfigValue('fieldsConfiguration');
private columns: Array<Column> = (this.getConfigValue('columns') !== undefined) ? (this.getConfigValue('columns')) : ([]);
Expand All @@ -195,9 +197,30 @@ export class ResultListContributor extends Contributor {
super(identifier, configService, collaborativeSearcheService);
// Link the ResultListContributor and the detailedDataRetriever
this.detailedDataRetriever.setContributor(this);
this.fieldsList = [];
this.columns.forEach(column => {
this.columnsProcess[column.columnName] = column.process;
this.fieldsList.push(column);
this.includesvalues.push(column.fieldName);
});
this.includesvalues.push(this.fieldsConfiguration.idFieldName);
if (this.fieldsConfiguration.titleFieldNames) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FieldsConfiguration interface in models.ts is not updated with the new attributes

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fix

this.includesvalues.concat(this.fieldsConfiguration.titleFieldNames.map(field => field.fieldPath));
}
if (this.fieldsConfiguration.urlImageTemplate) {
this.includesvalues.concat(this.fieldsFromUrlTemplate(this.fieldsConfiguration.urlImageTemplate));
}
if (this.fieldsConfiguration.urlThumbnailTemplate) {
this.includesvalues.concat(this.fieldsFromUrlTemplate(this.fieldsConfiguration.urlThumbnailTemplate));
}
if (this.fieldsConfiguration.imageEnabled) {
this.includesvalues.push(this.fieldsConfiguration.imageEnabled);
}
if (this.fieldsConfiguration.thumbnailEnabled) {
this.includesvalues.push(this.fieldsConfiguration.thumbnailEnabled);
}
const setOfIncludeValues = new Set(this.includesvalues);
this.includesvalues = Array.from(setOfIncludeValues);
}

public static getJsonSchema(): Object {
Expand Down Expand Up @@ -281,7 +304,7 @@ export class ResultListContributor extends Contributor {
}
this.sort = sort;
this.geoOrderSort = {};
this.getHitsObservable(this.sort)
this.getHitsObservable(this.includesvalues, this.sort)
.map(f => this.computeData(f))
.map(f => this.setData(f))
.map(f => this.setSelection(f, this.collaborativeSearcheService.getCollaboration(this.identifier)))
Expand All @@ -297,7 +320,7 @@ export class ResultListContributor extends Contributor {
'sort': 'geodistance:' + lat.toString() + ' ' + lng.toString()
};
this.geoOrderSort = sort;
this.getHitsObservable(this.geoOrderSort)
this.getHitsObservable(this.includesvalues, this.geoOrderSort)
.map(f => this.computeData(f))
.map(f => this.setData(f))
.map(f => this.setSelection(f, this.collaborativeSearcheService.getCollaboration(this.identifier)))
Expand Down Expand Up @@ -350,19 +373,19 @@ export class ResultListContributor extends Contributor {
*/
public getMoreData(from: number) {
if (this.geoOrderSort !== {}) {
this.getHitsObservable(this.geoOrderSort, from * this.getConfigValue('search_size'))
this.getHitsObservable(this.includesvalues, this.geoOrderSort, from * this.getConfigValue('search_size'))
.map(f => this.computeData(f))
.map(f => f.forEach(d => { this.data.push(d); }))
.subscribe(data => data);
} else {
this.getHitsObservable(this.sort, from * this.getConfigValue('search_size'))
this.getHitsObservable(this.includesvalues, this.sort, from * this.getConfigValue('search_size'))
.map(f => this.computeData(f))
.map(f => f.forEach(d => { this.data.push(d); }))
.subscribe(data => data);
}
}
public fetchData(collaborationEvent: CollaborationEvent): Observable<Hits> {
return this.getHitsObservable(this.geoOrderSort);
return this.getHitsObservable(this.includesvalues, this.geoOrderSort);
}

public computeData(hits: Hits): Array<Map<string, string | number | Date>> {
Expand All @@ -373,17 +396,27 @@ export class ResultListContributor extends Contributor {
this.fieldsList.forEach(element => {
const result: string = getElementFromJsonObject(h.data, element.fieldName);
const process: string = this.columnsProcess[element.columnName];
let resultValue = null;
if (process.trim().length > 0) {
resultValue = eval(this.columnsProcess[element.columnName]);
} else {
resultValue = result;
let resultValue = result;
if (process) {
if (process.trim().length > 0) {
resultValue = eval(this.columnsProcess[element.columnName]);
}
}
map.set(element.fieldName, resultValue);
});
if (this.fieldsConfiguration.titleFieldName) {
const resultValue: string = getElementFromJsonObject(h.data, this.fieldsConfiguration.titleFieldName);
map.set(this.fieldsConfiguration.titleFieldName, resultValue);
if (this.fieldsConfiguration.titleFieldNames) {
this.fieldsConfiguration.titleFieldNames.forEach(field => {
this.setProcessFieldData(h, field, map, 'title');
});
}
if (this.fieldsConfiguration.tooltipFieldNames) {
this.fieldsConfiguration.tooltipFieldNames.forEach(field => {
this.setProcessFieldData(h, field, map, 'tooltip');
});
}
if (this.fieldsConfiguration.iconCssClass) {
const resultValue: string = getElementFromJsonObject(h.data, this.fieldsConfiguration.iconCssClass);
map.set(this.fieldsConfiguration.iconCssClass, resultValue);
}
if (this.fieldsConfiguration.urlImageTemplate) {
this.setUrlField('urlImageTemplate', h, map);
Expand Down Expand Up @@ -437,39 +470,17 @@ export class ResultListContributor extends Contributor {
return Observable.from([]);
}

private getHitsObservable(sort?: Sort, from?: number): Observable<Hits> {
private getHitsObservable(includesvalues: Array<string>, sort?: Sort, from?: number): Observable<Hits> {
const projection: Projection = {};
let includesvalue = '';
const search: Search = { size: { size: this.getConfigValue('search_size') } };
if (sort) {
search.sort = sort;
}
if (from) {
search.size.from = from;
}
this.fieldsList = [];
this.columns.forEach(element => {
this.fieldsList.push(element);
includesvalue = includesvalue + ',' + element.fieldName;
});
if (this.fieldsConfiguration.titleFieldName) {
includesvalue = includesvalue + ',' + this.fieldsConfiguration.titleFieldName;
}
includesvalue = includesvalue + ',' + this.fieldsConfiguration.idFieldName;
if (this.fieldsConfiguration.urlImageTemplate) {
includesvalue = includesvalue + ',' + this.fieldsFromUrlTemplate(this.fieldsConfiguration.urlImageTemplate);
}
if (this.fieldsConfiguration.urlThumbnailTemplate) {
includesvalue = includesvalue + ',' + this.fieldsFromUrlTemplate(this.fieldsConfiguration.urlThumbnailTemplate);
}
if (this.fieldsConfiguration.imageEnabled) {
includesvalue = includesvalue + ',' + this.fieldsConfiguration.imageEnabled;
}
if (this.fieldsConfiguration.thumbnailEnabled) {
includesvalue = includesvalue + ',' + this.fieldsConfiguration.thumbnailEnabled;
}
search.projection = projection;
projection.includes = includesvalue.trim().substring(1);
projection.includes = includesvalues.join(',');
const newData = [];
const searchResult = this.collaborativeSearcheService
.resolveButNotHits([projType.search, search])
Expand Down Expand Up @@ -529,4 +540,16 @@ export class ResultListContributor extends Contributor {
}
});
}

private setProcessFieldData(h: Hit, field: Field, map: Map<string, string | number | Date>, dataType: string) {
const result: string = getElementFromJsonObject(h.data, field.fieldPath);
const process: string = field.process;
let resultValue = result;
if (process) {
if (process.trim().length > 0) {
resultValue = eval(field.process);
}
}
map.set(field.fieldPath + '_' + dataType, resultValue);
}
}
44 changes: 42 additions & 2 deletions src/jsonSchemas/resultlistContributorConf.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,48 @@
"description": "Url template of thumbnail",
"type": "string"
},
"titleFieldName": {
"description": "Field name of title for item",
"titleFieldNames": {
"description": "Fields elements to draw title of a grid element",
"type": "array",
"items": {
"description": "Fields",
"type": "object",
"properties": {
"fieldPath": {
"description": "Path of field",
"type": "string"
},
"process": {
"description": "Process transformation to display (ex : result.trim())",
"type": "string"
}
}
}
},
"tooltipFieldNames": {
"description": "Fields elements to draw tooltip of a grid element",
"type": "array",
"items": {
"description": "Fields",
"type": "object",
"properties": {
"fieldPath": {
"description": "Path of field",
"type": "string"
},
"process": {
"description": "Process transformation to display (ex : result.trim())",
"type": "string"
}
}
}
},
"icon": {
"description": "Material icon value",
"type": "string"
},
"iconCssClass": {
"description": "Field path of field to customize css class",
"type": "string"
}
}
Expand Down
11 changes: 10 additions & 1 deletion src/models/models.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,12 @@ export interface FieldsConfiguration {
idFieldName: string;
urlImageTemplate?: string;
urlThumbnailTemplate?: string;
titleFieldName?: string;
titleFieldNames?: Array<Field>;
tooltipFieldNames?: Array<Field>;
imageEnabled?: boolean;
thumbnailEnabled?: boolean;
icon?: string;
iconCssClass?: string;

}

Expand Down Expand Up @@ -383,3 +388,7 @@ export class DateExpression {
}
}
}
export interface Field {
fieldPath: string;
process?: string;
}