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

EXPLORE Production release August 2024 #49

Merged
konstantina.galouni merged 2 commits from develop into master 2024-08-02 09:38:05 +02:00
Conversation 0 Commits 2 Files Changed 6 +103 -74
6 changed files with 103 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fos/fos.component.html
View File

@ -157,6 +157,8 @@
{{child.id}}
</a>
</h3>
<!-- hide L3 & L4 FoS-->
<ng-container *ngIf="properties.environment == 'development'">
<!-- class="parent uk-transition-toggle" tabindex="0"-->
<div *ngFor="let subChild of child.children; let i=index" style="margin-bottom: 7px;"
class="uk-flex uk-flex-middle uk-flex-between uk-transition-toggle" tabindex="0">
@ -202,6 +204,7 @@
<!-- </div>-->
<!-- </div>-->
</div>
</ng-container>
</div>
</div>
</div>
@ -223,6 +226,8 @@
class="uk-link-text" [innerHTML]="highlightKeyword(subItem.id)">
</a>
</h3>
<!-- hide L3 & L4 FoS-->
<ng-container *ngIf="properties.environment == 'development'">
<div *ngFor="let subSubItem of subItem.children" style="margin-bottom: 7px;">
<a [routerLink]="properties.searchLinkToResults" [queryParams]="buildFosQueryParam(subSubItem)"
class="uk-link-text" [innerHTML]="highlightKeyword(searchFieldsHelper.getFosParameter() == 'foslabel' ? subSubItem.label : subSubItem.id)">
@ -236,6 +241,7 @@
</div>
</ng-container>
</div>
</ng-container>
</div>
</div>
</div>

8
fos/fos.component.ts
View File

@ -184,7 +184,8 @@ export class FosComponent implements OnInit, OnDestroy {
if(fos.children) {
fos.children.forEach(l2 => {
this.fosOptions.push(l2.id);
if(l2.children) {
// hide L3 & L4 FoS
if(l2.children && properties.environment == "development") {
l2.children.forEach(l3 => {
this.fosOptions.push(l3.id);
if(l3.children) {
@ -212,6 +213,8 @@ export class FosComponent implements OnInit, OnDestroy {
if(item.children?.length && !matchLevel1) {
item.children = item.children.filter(subItem => {
matchLevel2 = !!subItem.id.includes(value?.toLowerCase());
// hide L3 & L4 FoS
if(properties.environment == "development") {
// 3rd level search
if(subItem.children?.length && !matchLevel2) {
subItem.children = subItem.children.filter(subSubItem => {
@ -226,6 +229,9 @@ export class FosComponent implements OnInit, OnDestroy {
});
}
return subItem.children?.length > 0;
} else {
return matchLevel2;
}
});
}
return item.children?.length > 0;

5
landingPages/landing-utils/fos.component.ts
View File

@ -22,12 +22,13 @@ import {SearchFields} from "../../utils/properties/searchFields";
(click)="viewAllClick();" class="view-more-less-link uk-link uk-link-text uk-text-truncate">
View all
</a>
<!-- hide L3 & L4 FoS-->
<!-- <a *ngIf="viewAll && lessBtn" (click)="viewAll = !viewAll; lessBtn=false;">View less</a> -->
<a *ngIf="properties.adminToolsPortalType != 'eosc' && subjects && subjects.length > threshold && !viewAll"
(click)="viewAllClick();" class="view-more-less-link uk-link uk-link-text uk-text-truncate">
View all & suggest
View all<ng-container *ngIf="properties.environment == 'development'"> & suggest</ng-container>
</a>
<a *ngIf="properties.adminToolsPortalType != 'eosc' && (subjects && subjects.length <= threshold || viewAll)" class="uk-link uk-link-text uk-text-truncate"
<a *ngIf="properties.environment == 'development' && properties.adminToolsPortalType != 'eosc' && (subjects && subjects.length <= threshold || viewAll)" class="uk-link uk-link-text uk-text-truncate"
(click)="suggestClick();">Suggest</a>
</div>
<div class="uk-margin-small-top">

15
landingPages/result/resultLanding.service.ts
View File

@ -344,9 +344,22 @@ export class ResultLandingService {
if (subjectResults[3]) {
let searchFieldsHelper: SearchFields = new SearchFields();
subjectResults[3].forEach(element => {
// hide L3 & L4 FoS
let add = true;
if(element) {
let id = element.split(" ")[0];
if(id.length > 4 && properties.environment != "development") {
add = false;
}
}
if(add) {
this.resultLandingInfo.fos.push(
{id: element, label: searchFieldsHelper.getFosParameter() == "foslabel" ? element.replace(/^\d+/, '').trim() : element}
{
id: element,
label: searchFieldsHelper.getFosParameter() == "foslabel" ? element.replace(/^\d+/, '').trim() : element
}
);
}
});
}
if (this.resultLandingInfo.fos) {

2
monitor-admin/utils/indicator-utils.ts
View File

@ -734,6 +734,7 @@ export class IndicatorUtils {
} else if ((obj[this.getDescriptionObjectName(obj)]).hasOwnProperty("queries")) {
return "queries";
}
return null;
}
private getDescriptionObjectName(obj) {
@ -746,6 +747,7 @@ export class IndicatorUtils {
} else if (obj.hasOwnProperty("series")) {
return "series";
}
return null;
}
private extractType(obj, indicatorPath: IndicatorPath): IndicatorPathType {

3
utils/staticAutoComplete/ISVocabularies.service.ts
View File

@ -150,7 +150,8 @@ export class ISVocabulariesService {
value.id = fos.id;//data[i].code;
value.label = fos.label;
array.push(value);
if(fos.children && fos.children.length > 0) {
// hide L3 & L4 FoS
if(fos.children && fos.children.length > 0 && (fos.level == 1)) {
for (let i=fos.children.length-1; i>=0; i--) {
children.push(fos.children[i]);
}