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

[Library|Trunk] 

Connect - communities search : 
	- remove check for productionready communities
	- add check for custom filter
	- update openaire link in table view - remove graph info



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59990 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki 2020-11-30 16:55:28 +00:00
parent a106ba9b82
commit f82709b062
4 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
connect/community/communityInfo.ts
View File

@ -14,4 +14,4 @@ export class CommunityInfo {
isSubscribed: boolean;
isManager: boolean;
}
export const prodReadyCommunities = ["dh-ch", "ee", "fam", "mes", "ni", "covid-19", "dariah", "epos", "egi"];
// export const prodReadyCommunities = ["dh-ch", "ee", "fam", "mes", "ni", "covid-19", "dariah", "epos", "egi"];

9
searchPages/searchUtils/newSearchPage.component.html
View File

@ -98,8 +98,8 @@
Clear All
</a>
</div>
<div *ngIf="selectedRangeFilters+selectedFilters + selectedTypesNum > 0 || (customFilter && customFilter.selected
== true || customFilter.isHiddenFilter)"
<div *ngIf="selectedRangeFilters+selectedFilters + selectedTypesNum > 0 || (customFilter && (customFilter.selected
== true || customFilter.isHiddenFilter))"
class="uk-margin-small-top uk-margin-medium-bottom">
<ng-container *ngTemplateOutlet="selected_filters_pills; context: {}"></ng-container>
</div>
@ -295,7 +295,8 @@
Do you want to see results only for {{customFilter.valueName}}? <a
(click)="addCustomFilter();">Click here</a>.
</div>
<div *ngIf="openaireLink && (searchUtils.totalResults > 0 || !loadPaging )" class="uk-alert uk-text-center ">
<div *ngIf="openaireLink && (searchUtils.totalResults > 0 || !loadPaging )"
class="uk-alert uk-text-center uk-margin-small-top ">
<span *ngIf="customFilter">The following results are related to <span class="portal-color"
>{{customFilter.valueName}}</span>.</span>
Are you interested to view more results? Visit
@ -394,7 +395,7 @@
</search-paging>
</div>
<div *ngIf=" searchUtils.status !==
errorCodes.LOADING" class="uk-margin-small-top uk-grid uk-child-width-1-2">
errorCodes.LOADING && !(entityType == 'community' || entityType == 'stakeholder')" class="uk-margin-small-top uk-grid uk-child-width-1-2">
<!-- Last Index Info-->
<div class="">
<img src="assets/common-assets/graph.svg" style="opacity: 0.4">

7
searchPages/searchUtils/portal-search-result.component.ts
View File

@ -2,11 +2,10 @@ import {Component, Input, OnChanges, OnInit, SimpleChanges, ViewChild} from '@an
import {ErrorCodes} from '../../utils/properties/errorCodes';
import {RouterHelper} from '../../utils/routerHelper.class';
import {EnvProperties} from '../../utils/properties/env-properties';
import {CommunityInfo, prodReadyCommunities} from "../../connect/community/communityInfo";
import {CommunityInfo} from "../../connect/community/communityInfo";
import {Router} from "@angular/router";
import {LocalStorageService} from "../../services/localStorage.service";
import {Stakeholder, StakeholderInfo, Visibility} from "../../monitor/entities/stakeholder";
import {Subscriber} from "rxjs";
import {Stakeholder, StakeholderInfo} from "../../monitor/entities/stakeholder";
@Component({
selector: 'portal-search-result',
@ -56,7 +55,7 @@ export class PortalSearchResultComponent implements OnInit, OnChanges{
}
getProductionPrefix(id:string): string {
return (this.properties.environment == "production" && prodReadyCommunities.indexOf(id)!=-1) ? "" : "beta.";
return (this.properties.environment == "production") ? "" : "beta.";
}
isProduction(): boolean {

15
searchPages/searchUtils/searchPageTableView.component.html
View File

@ -159,8 +159,15 @@
</div>
<div class="uk-width-expand@m uk-width-1-1@s uk-first-column custom-dataTable-content" >
<div *ngIf="openaireLink && (searchUtils.totalResults > 0 || !disableForms )">
<a class="uk-button uk-button-text" [href]=openaireLink target="_blank">Results in OpenAIRE</a>
<div *ngIf="openaireLink && (searchUtils.totalResults > 0 || !disableForms )"
class="uk-alert uk-text-center uk-margin-small-top ">
<span *ngIf="customFilter">The following results are related to <span class="portal-color"
>{{customFilter.valueName}}</span>.</span>
Are you interested to view more results? Visit
<a
class="uk-margin-top uk-link"
[href]="openaireLink"
target="_blank"> OpenAIRE - Explore</a>.
</div>
<div *ngIf="searchUtils.totalResults > 0" class="uk-align-center uk-margin-remove-bottom ">
<div class="uk-grid">
@ -284,10 +291,10 @@
<div *ngIf="searchUtils.totalResults > 0" class="uk-align-center uk-margin-remove-bottom">
<ng-container *ngTemplateOutlet="paging; context: {}"></ng-container>
</div>
<a *ngIf="properties.showLastIndexInformationLink" class="last_index_info uk-button-text uk-button"
<!--<a *ngIf="properties.showLastIndexInformationLink" class="last_index_info uk-button-text uk-button"
[href]="properties.lastIndexInformationLink" target="_blank">
Last index information
</a>
</a>-->
</div>
</div>
</div>