MaDgIK
/
openaire-library
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add foslabel in searchFiles only for beta, dev. Change eoscifguidelines to refine. Input fix double icon in select with many values.

This commit is contained in:
Konstantinos Triantafyllou 2023-07-06 12:53:37 +03:00
parent ea1b054b63
commit 76cb586ebd
2 changed files with 79 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sharedComponents/input/input.component.ts
View File

@ -168,11 +168,11 @@ declare var UIkit;
<ng-template [ngIf]="formControl.enabled"> <ng-template [ngIf]="formControl.enabled">
<icon *ngIf="!searchControl?.value && icon" [name]="icon" [flex]="true"></icon> <icon *ngIf="!searchControl?.value && icon" [name]="icon" [flex]="true"></icon>
<icon *ngIf="!icon && selectable && selectArrow" [name]="selectArrow" [flex]="true"></icon> <icon *ngIf="!icon && selectable && selectArrow" [name]="selectArrow" [flex]="true"></icon>
<button *ngIf="focused && type === 'autocomplete'" class="uk-close uk-icon" <button *ngIf="focused && type === 'autocomplete' && (!selectable || searchControl.value)" class="uk-close uk-icon"
(click)="resetSearch($event)"> (click)="resetSearch($event)">
<icon [flex]="true" name="close"></icon> <icon [flex]="true" name="close"></icon>
</button> </button>
<button *ngIf="(!focused && type === 'autocomplete') || (type !== 'autocomplete' && !searchControl?.value && !!formControl?.value && (searchable || !selectable))" <button *ngIf="(!focused && type === 'autocomplete' && !selectable) || (type !== 'autocomplete' && !searchControl?.value && !!formControl?.value && (searchable || !selectable))"
class="uk-close uk-icon" (click)="resetValue($event)"> class="uk-close uk-icon" (click)="resetValue($event)">
<icon [flex]="true" name="close"></icon> <icon [flex]="true" name="close"></icon>
</button> </button>

24
utils/properties/searchFields.ts
View File

@ -14,7 +14,7 @@ export class SearchFields {
// Remove Collected From Filter "collectedfrom","collectedfrom" // Remove Collected From Filter "collectedfrom","collectedfrom"
public RESULT_REFINE_FIELDS = [ public RESULT_REFINE_FIELDS = [
"resultbestaccessright", "instancetypename", "fos", "relfunder", "resultbestaccessright", "instancetypename", (properties.environment !== 'production' ? "foslabel" : "fos"), "relfunder",
"relfundinglevel0_id", "relfundinglevel1_id", "relfundinglevel2_id", "relfundinglevel0_id", "relfundinglevel1_id", "relfundinglevel2_id",
"relproject", "sdg", "country", "resultlanguagename", "resulthostingdatasource", "community"]; "relproject", "sdg", "country", "resultlanguagename", "resulthostingdatasource", "community"];
@ -59,7 +59,7 @@ export class SearchFields {
}, },
["eoscifguidelines"]: { ["eoscifguidelines"]: {
name: "EOSC Subject", name: "EOSC Subject",
type: "keyword", type: "refine",
param: "eoscSubj", param: "eoscSubj",
operator: "es", operator: "es",
equalityOperator: " exact ", equalityOperator: " exact ",
@ -81,7 +81,14 @@ export class SearchFields {
equalityOperator: "=", equalityOperator: "=",
filterType: null filterType: null
}, },
["pid"]: {name: "PID", type: "keyword", param: "pid", operator: "pd", equalityOperator: " exact ", filterType: null}, ["pid"]: {
name: "PID",
type: "keyword",
param: "pid",
operator: "pd",
equalityOperator: " exact ",
filterType: null
},
["resulthostingdatasourceid"]: { ["resulthostingdatasourceid"]: {
name: "Hosting " + OpenaireEntities.DATASOURCE, name: "Hosting " + OpenaireEntities.DATASOURCE,
type: "entity", type: "entity",
@ -257,6 +264,14 @@ export class SearchFields {
operator: "fs", operator: "fs",
equalityOperator: " exact ", equalityOperator: " exact ",
filterType: "checkbox" filterType: "checkbox"
},
["foslabel"]: {
name: "Field of Science [Beta]",
type: "vocabulary",
param: "foslabel",
operator: "fl",
equalityOperator: " exact ",
filterType: "checkbox"
} }
}; };
@ -741,6 +756,7 @@ export class SearchFields {
return null; return null;
} }
} }
getFieldName(fieldId: string, fieldType: string): string { getFieldName(fieldId: string, fieldType: string): string {
let field = this.getField(fieldId, fieldType); let field = this.getField(fieldId, fieldType);
return field ? field.name : "UNDEFINED"; return field ? field.name : "UNDEFINED";
@ -768,6 +784,7 @@ export class SearchFields {
let field = this.getField(fieldId, fieldType); let field = this.getField(fieldId, fieldType);
return field ? field.param : "UNDEFINED"; return field ? field.param : "UNDEFINED";
} }
public static getParameterOrder(fieldId: string, params): number { public static getParameterOrder(fieldId: string, params): number {
let fields = []; let fields = [];
let searchFields = new SearchFields(); let searchFields = new SearchFields();
@ -792,6 +809,7 @@ export class SearchFields {
} }
return paramIndex; return paramIndex;
} }
/* /*
AND AND
Funder: relfunder, relfundinglevel0_id, relfundinglevel1_id, relfundinglevel2_id Funder: relfunder, relfundinglevel0_id, relfundinglevel1_id, relfundinglevel2_id