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

Production release July 2024 [EXPLORE] #47

Merged
konstantina.galouni merged 21 commits from develop into master 2024-07-12 10:03:51 +02:00
Conversation 0 Commits 21 Files Changed 63 +24 -61
23 changed files with 24 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1401a68256 - Show all commits

3
claims/claim-utils/displayClaims/displayClaims.component.ts
View File

@ -28,7 +28,7 @@ import {DropdownFilterComponent} from "../../../utils/dropdown-filter/dropdown-f
}) })
export class DisplayClaimsComponent implements OnInit, OnDestroy { export class DisplayClaimsComponent implements OnInit, OnDestroy {
@Input() pageTitle: string = ""; @Input() pageTitle: string = "";
properties: EnvProperties; properties: EnvProperties = properties;
public searchTermStream = new Subject<string>(); public searchTermStream = new Subject<string>();
subscriptions: any = []; subscriptions: any = [];
public subResults: any; public subResults: any;
@ -101,7 +101,6 @@ export class DisplayClaimsComponent implements OnInit, OnDestroy {
sort: this._fb.control(this.sortOptions[0].value) sort: this._fb.control(this.sortOptions[0].value)
}); });
this.properties = properties;
this.url = properties.domain + properties.baseLink + this._router.url; this.url = properties.domain + properties.baseLink + this._router.url;
if (!this.myClaims) { if (!this.myClaims) {
this.sortOptions.push({label: "User (desc) ", value: {sort: "user", descending: true}}); this.sortOptions.push({label: "User (desc) ", value: {sort: "user", descending: true}});

3
claims/directLinking/directLinking.component.ts
View File

@ -34,7 +34,7 @@ export class DirectLinkingComponent {
sources: ClaimEntity[] = []; sources: ClaimEntity[] = [];
inlineEntity: ClaimEntity = null; inlineEntity: ClaimEntity = null;
validInput: boolean = null;//'true; validInput: boolean = null;//'true;
properties: EnvProperties; properties: EnvProperties = properties;
@Input() communityId: string = null; @Input() communityId: string = null;
localStoragePrefix: string = ""; localStoragePrefix: string = "";
@Input() organizationClaim: boolean = false; @Input() organizationClaim: boolean = false;
@ -50,7 +50,6 @@ export class DirectLinkingComponent {
}); });
} }
ngOnInit() { ngOnInit() {
this.properties = properties;
/* if(!this.claimsProperties){ /* if(!this.claimsProperties){
this.claimsProperties = new ClaimsProperties(); this.claimsProperties = new ClaimsProperties();
}*/ }*/

3
connect/approvedByCommunity/approved.component.ts
View File

@ -21,13 +21,12 @@ export class ApprovedByCommunityComponent {
public approved:boolean = false; public approved:boolean = false;
private communityContentProviders = []; private communityContentProviders = [];
properties:EnvProperties; properties:EnvProperties = properties;
public openaireEntities = OpenaireEntities; public openaireEntities = OpenaireEntities;
constructor (private route: ActivatedRoute, private _searchDataprovidersService: SearchCommunityDataprovidersService) {} constructor (private route: ActivatedRoute, private _searchDataprovidersService: SearchCommunityDataprovidersService) {}
public ngOnInit() { public ngOnInit() {
this.properties =properties;
this.route.queryParams.subscribe( this.route.queryParams.subscribe(
communityId => { communityId => {
this.communityId = ConnectHelper.getCommunityFromDomain(this.properties.domain); this.communityId = ConnectHelper.getCommunityFromDomain(this.properties.domain);

3
connect/components/curators/curators.component.ts
View File

@ -36,7 +36,7 @@ export class CuratorsComponent {
public viewingMore: boolean = false; public viewingMore: boolean = false;
public curatorInModal; public curatorInModal;
public properties: EnvProperties; public properties: EnvProperties = properties;
public pageContents = null; public pageContents = null;
public divContents = null; public divContents = null;
@ -63,7 +63,6 @@ export class CuratorsComponent {
ngOnInit() { ngOnInit() {
this.showLoading = true; this.showLoading = true;
this.properties = properties;
this.downloadUrl = this.properties.utilsService + '/download/'; this.downloadUrl = this.properties.utilsService + '/download/';
//if (properties.environment !== 'development') { //if (properties.environment !== 'development') {
if (!this.longView) { if (!this.longView) {

3
dashboard/portal/portals.component.ts
View File

@ -34,7 +34,7 @@ export class PortalsComponent implements OnInit {
private searchText: RegExp = new RegExp(''); private searchText: RegExp = new RegExp('');
public keyword = ''; public keyword = '';
public properties: EnvProperties = null; public properties: EnvProperties = properties;
public showLoading = true; public showLoading = true;
public portalUtils: PortalUtils = new PortalUtils(); public portalUtils: PortalUtils = new PortalUtils();
@ -61,7 +61,6 @@ export class PortalsComponent implements OnInit {
})); }));
HelperFunctions.scroll(); HelperFunctions.scroll();
this.properties = properties;
this.getPortals(); this.getPortals();
} }

3
deposit/depositFirstPage.component.ts
View File

@ -191,7 +191,7 @@ export class DepositFirstPageComponent {
public keyword: string; public keyword: string;
public depositRoute: string; public depositRoute: string;
public searchPlaceHolder = "Search by title, country, organization, subject, type..."; public searchPlaceHolder = "Search by title, country, organization, subject, type...";
properties:EnvProperties; properties:EnvProperties = properties;
public routerHelper:RouterHelper = new RouterHelper(); public routerHelper:RouterHelper = new RouterHelper();
@Input() showBreadcrumb:boolean = false; @Input() showBreadcrumb:boolean = false;
breadcrumbs:Breadcrumb[] = []; breadcrumbs:Breadcrumb[] = [];
@ -208,7 +208,6 @@ export class DepositFirstPageComponent {
ngOnInit() { ngOnInit() {
this.properties = properties;
this.url = this.properties.domain+this.properties.baseLink + this._router.url; this.url = this.properties.domain+this.properties.baseLink + this._router.url;
this.seoService.createLinkForCanonicalURL(this.url, false); this.seoService.createLinkForCanonicalURL(this.url, false);

4
deposit/searchResultsInDeposit.component.ts
View File

@ -18,7 +18,7 @@ export class SearchResultsInDepositComponent {
@Input() results: SearchResult[]; @Input() results: SearchResult[];
@Input() status: number; @Input() status: number;
@Input() type: string; @Input() type: string;
@Input() properties:EnvProperties; @Input() properties:EnvProperties = properties;
@Input() isMobile: boolean = false; @Input() isMobile: boolean = false;
@ -60,8 +60,6 @@ export class SearchResultsInDepositComponent {
this.urlParam = "datasourceId"; this.urlParam = "datasourceId";
} }
this.properties = properties;
if (!this.zenodoInformation) { if (!this.zenodoInformation) {
this.zenodoInformation = new ZenodoInformationClass(); this.zenodoInformation = new ZenodoInformationClass();
} }

5
landingPages/dataProvider/statisticsTab.component.ts
View File

@ -78,15 +78,12 @@ export class StatisticsTabComponent {
private dataProjectsUrl:string ; private dataProjectsUrl:string ;
private pubsProjectsUrl:string; private pubsProjectsUrl:string;
public errorCodes:ErrorCodes = new ErrorCodes(); public errorCodes:ErrorCodes = new ErrorCodes();
properties:EnvProperties; properties:EnvProperties = properties;
public openaireEntities = OpenaireEntities; public openaireEntities = OpenaireEntities;
sub; sub;
constructor (private route: ActivatedRoute) {} constructor (private route: ActivatedRoute) {}
ngOnInit() { ngOnInit() {
this.properties = properties;
if (this.properties.useNewStatistisTool) { if (this.properties.useNewStatistisTool) {
this.docsTimelineUrl = this.properties.statisticsFrameNewAPIURL + this.docsTimelineUrl = this.properties.statisticsFrameNewAPIURL +
'chart?json='+StringUtils.URIEncode('{"library":"HighCharts","chartDescription":{"queries":[{"name":"'+this.openaireEntities.RESULTS+'","type":"column","query":{"name":"dtsrcYear","parameters":["'+this.datasourceId+'"]}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Produced '+this.openaireEntities.RESULTS+' per year"},"subtitle":{},"yAxis":{"title":{"text":"'+this.openaireEntities.RESULTS+'"}},"xAxis":{"title":{"text":"Year"}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":false},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}'); 'chart?json='+StringUtils.URIEncode('{"library":"HighCharts","chartDescription":{"queries":[{"name":"'+this.openaireEntities.RESULTS+'","type":"column","query":{"name":"dtsrcYear","parameters":["'+this.datasourceId+'"]}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Produced '+this.openaireEntities.RESULTS+' per year"},"subtitle":{},"yAxis":{"title":{"text":"'+this.openaireEntities.RESULTS+'"}},"xAxis":{"title":{"text":"Year"}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":false},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}');

3
landingPages/landing-utils/citeThis/citeThis.component.ts
View File

@ -41,7 +41,7 @@ export class CiteThisComponent implements OnInit, OnDestroy {
public selectedStyle: string = null; public selectedStyle: string = null;
public selectedFormat: string = null; public selectedFormat: string = null;
public fileText: string; public fileText: string;
properties:EnvProperties; properties:EnvProperties = properties;
public citationText: string; public citationText: string;
public citation: Citation = new Citation(); public citation: Citation = new Citation();
@Input() result: any; @Input() result: any;
@ -55,7 +55,6 @@ export class CiteThisComponent implements OnInit, OnDestroy {
constructor( @Inject(DOCUMENT) private document, private rendererFactory: RendererFactory2, private _piwikService: PiwikService){ constructor( @Inject(DOCUMENT) private document, private rendererFactory: RendererFactory2, private _piwikService: PiwikService){
} }
ngOnInit() { ngOnInit() {
this.properties = properties;
try{ try{
if (!this.document.getElementById('citationjs')) { if (!this.document.getElementById('citationjs')) {
const renderer = this.rendererFactory.createRenderer(this.document, { const renderer = this.rendererFactory.createRenderer(this.document, {

5
landingPages/organization/deletedByInference/deletedByInference.component.ts
View File

@ -57,7 +57,7 @@ export class OrganizationsDeletedByInferenceComponent {
public errorCodes:ErrorCodes = new ErrorCodes(); public errorCodes:ErrorCodes = new ErrorCodes();
subscriptions = []; subscriptions = [];
properties:EnvProperties; properties:EnvProperties = properties;
constructor ( private element: ElementRef, constructor ( private element: ElementRef,
private _deletedByInferenceService: OrganizationsDeletedByInferenceService, private _deletedByInferenceService: OrganizationsDeletedByInferenceService,
@ -65,9 +65,6 @@ export class OrganizationsDeletedByInferenceComponent {
} }
ngOnInit() { ngOnInit() {
this.properties = properties;
this.subscriptions.push(this.route.queryParams.subscribe(data => { this.subscriptions.push(this.route.queryParams.subscribe(data => {
this.errorCodes = new ErrorCodes(); this.errorCodes = new ErrorCodes();
this.status = this.errorCodes.LOADING; this.status = this.errorCodes.LOADING;

3
landingPages/organization/organization.component.ts
View File

@ -117,7 +117,7 @@ export class OrganizationComponent {
subscriptions = []; subscriptions = [];
innerReportSubscriptions = []; innerReportSubscriptions = [];
properties: EnvProperties; properties: EnvProperties = properties;
public openaireEntities = OpenaireEntities; public openaireEntities = OpenaireEntities;
public indexUpdateDate: Date; public indexUpdateDate: Date;
public showFeedback: boolean = false; public showFeedback: boolean = false;
@ -167,7 +167,6 @@ export class OrganizationComponent {
this.isBottomIntersecting = isBottomIntersecting; this.isBottomIntersecting = isBottomIntersecting;
this.cdr.detectChanges(); this.cdr.detectChanges();
})); }));
this.properties = properties;
if (typeof document !== 'undefined') { if (typeof document !== 'undefined') {
this.subscriptions.push(this.indexInfoService.getLastIndexDate(this.properties).subscribe(lastIndexUpdate => { this.subscriptions.push(this.indexInfoService.getLastIndexDate(this.properties).subscribe(lastIndexUpdate => {
if (lastIndexUpdate) { if (lastIndexUpdate) {

3
landingPages/project/project.component.ts
View File

@ -171,7 +171,7 @@ export class ProjectComponent {
subscriptions = []; subscriptions = [];
private sub: Subscription; private sub: Subscription;
properties: EnvProperties; properties: EnvProperties = properties;
public openaireEntities = OpenaireEntities; public openaireEntities = OpenaireEntities;
public isMobile: boolean = false; public isMobile: boolean = false;
@ -214,7 +214,6 @@ export class ProjectComponent {
this.isBottomIntersecting = isBottomIntersecting; this.isBottomIntersecting = isBottomIntersecting;
this.cdr.detectChanges(); this.cdr.detectChanges();
})); }));
this.properties = properties;
if (typeof document !== 'undefined') { if (typeof document !== 'undefined') {
this.subscriptions.push(this.indexInfoService.getLastIndexDate(this.properties).subscribe(lastIndexUpdate => { this.subscriptions.push(this.indexInfoService.getLastIndexDate(this.properties).subscribe(lastIndexUpdate => {
if (lastIndexUpdate) { if (lastIndexUpdate) {

6
landingPages/result/deletedByInference/deletedByInference.component.ts
View File

@ -62,7 +62,7 @@ export class DeletedByInferenceComponent {
public errorCodes: ErrorCodes = new ErrorCodes(); public errorCodes: ErrorCodes = new ErrorCodes();
subscriptions = []; subscriptions = [];
properties: EnvProperties; properties: EnvProperties = properties;
constructor(private element: ElementRef, constructor(private element: ElementRef,
private _deletedByInferenceService: DeletedByInferenceService, private _deletedByInferenceService: DeletedByInferenceService,
@ -70,10 +70,6 @@ export class DeletedByInferenceComponent {
} }
ngOnInit() { ngOnInit() {
this.properties = properties;
this.subscriptions.push(this.route.queryParams.subscribe(data => { this.subscriptions.push(this.route.queryParams.subscribe(data => {
this.errorCodes = new ErrorCodes(); this.errorCodes = new ErrorCodes();
this.status = this.errorCodes.LOADING; this.status = this.errorCodes.LOADING;

3
orcid/my-orcid-links/myOrcidLinks.component.ts
View File

@ -121,7 +121,7 @@ export class MyOrcidLinksComponent {
public oldTotalResults: number = 0; public oldTotalResults: number = 0;
pagingLimit = 0; pagingLimit = 0;
properties:EnvProperties; properties:EnvProperties = properties;
public openaireEntities = OpenaireEntities; public openaireEntities = OpenaireEntities;
public lastOrcidUpdateDate: string = ""; public lastOrcidUpdateDate: string = "";
@ -183,7 +183,6 @@ export class MyOrcidLinksComponent {
} }
public ngOnInit() { public ngOnInit() {
this.properties = properties;
this.baseUrl = this.properties.myOrcidLinksPage; this.baseUrl = this.properties.myOrcidLinksPage;
this.pagingLimit = this.properties.pagingLimit; this.pagingLimit = this.properties.pagingLimit;
var description = "Openaire, ORCID linking, publication, research data, software, other research product"; var description = "Openaire, ORCID linking, publication, research data, software, other research product";

5
orcid/my-orcid-links/searchMyOrcidResults.component.ts
View File

@ -21,7 +21,7 @@ export class searcMyOrcidResultsComponent {
@Input() results: SearchResult[]; @Input() results: SearchResult[];
@Input() status: number; @Input() status: number;
@Input() type: string; @Input() type: string;
@Input() properties:EnvProperties; @Input() properties:EnvProperties = properties;
public openaireEntities = OpenaireEntities; public openaireEntities = OpenaireEntities;
@Input() previewResults:{"work":{},results:ResultPreview[]}[]; @Input() previewResults:{"work":{},results:ResultPreview[]}[];
@ -57,9 +57,6 @@ export class searcMyOrcidResultsComponent {
this.linkToAdvancedSearchPage = this.properties.searchLinkToAdvancedOrps; this.linkToAdvancedSearchPage = this.properties.searchLinkToAdvancedOrps;
this.urlParam = "orpId"; this.urlParam = "orpId";
} }
this.properties = properties;
} }

3
orcid/recommend-orcid-links/searchRecommendedResultsForOrcid.component.ts
View File

@ -77,7 +77,7 @@ export class SearchRecommendedResultsForOrcidComponent {
public oldTotalResults: number = 0; public oldTotalResults: number = 0;
pagingLimit = 0; pagingLimit = 0;
properties:EnvProperties; properties:EnvProperties = properties;
@Input() public communityId: string = null; @Input() public communityId: string = null;
@ -100,7 +100,6 @@ export class SearchRecommendedResultsForOrcidComponent {
} }
public ngOnInit() { public ngOnInit() {
this.properties = properties;
this.depositLearnHowPage = this.properties.depositLearnHowPage; this.depositLearnHowPage = this.properties.depositLearnHowPage;
this.baseUrl = this.properties.depositSearchPage; this.baseUrl = this.properties.depositSearchPage;
this.pagingLimit = this.properties.pagingLimit; this.pagingLimit = this.properties.pagingLimit;

5
orcid/recommend-orcid-links/searchResultsForOrcid.component.ts
View File

@ -17,7 +17,7 @@ export class SearchResultsForOrcidComponent {
@Input() results: SearchResult[]; @Input() results: SearchResult[];
@Input() status: number; @Input() status: number;
@Input() type: string; @Input() type: string;
@Input() properties:EnvProperties; @Input() properties:EnvProperties = properties;
public urlParam: string; public urlParam: string;
@ -56,9 +56,6 @@ export class SearchResultsForOrcidComponent {
this.linkToAdvancedSearchPage = this.properties.searchLinkToAdvancedDataProviders; this.linkToAdvancedSearchPage = this.properties.searchLinkToAdvancedDataProviders;
this.urlParam = "datasourceId"; this.urlParam = "datasourceId";
} }
this.properties = properties;
} }
public quote(params: string):string { public quote(params: string):string {

3
searchPages/find/searchAll.component.ts
View File

@ -85,7 +85,7 @@ export class SearchAllComponent {
showServices: boolean = false; showServices: boolean = false;
showOrganizations: boolean = false; showOrganizations: boolean = false;
advancedSearchLink: string = properties.searchLinkToAdvancedResults; advancedSearchLink: string = properties.searchLinkToAdvancedResults;
properties: EnvProperties; properties: EnvProperties = properties;
offset: number; offset: number;
public openaireEntities = OpenaireEntities; public openaireEntities = OpenaireEntities;
@Input() logoURL; @Input() logoURL;
@ -154,7 +154,6 @@ export class SearchAllComponent {
var description = "Search for "+OpenaireEntities.RESULTS+" ("+OpenaireEntities.PUBLICATIONS+", "+OpenaireEntities.DATASETS+", "+OpenaireEntities.SOFTWARE+", "+OpenaireEntities.OTHER+"), "+OpenaireEntities.PROJECTS+", "+OpenaireEntities.ORGANIZATIONS+", "+OpenaireEntities.DATASOURCES+" in the OpenAIRE Graph. "; var description = "Search for "+OpenaireEntities.RESULTS+" ("+OpenaireEntities.PUBLICATIONS+", "+OpenaireEntities.DATASETS+", "+OpenaireEntities.SOFTWARE+", "+OpenaireEntities.OTHER+"), "+OpenaireEntities.PROJECTS+", "+OpenaireEntities.ORGANIZATIONS+", "+OpenaireEntities.DATASOURCES+" in the OpenAIRE Graph. ";
var title = "OpenAIRE |Search for "+OpenaireEntities.RESULTS+", "+OpenaireEntities.PROJECTS+", "+OpenaireEntities.DATASOURCES+" & "+OpenaireEntities.ORGANIZATIONS; var title = "OpenAIRE |Search for "+OpenaireEntities.RESULTS+", "+OpenaireEntities.PROJECTS+", "+OpenaireEntities.DATASOURCES+" & "+OpenaireEntities.ORGANIZATIONS;
this.properties = properties;
var url = this.properties.domain + this.properties.baseLink + this._router.url; var url = this.properties.domain + this.properties.baseLink + this._router.url;
this._title.setTitle(title); this._title.setTitle(title);
this._meta.updateTag({content: description}, "name='description'"); this._meta.updateTag({content: description}, "name='description'");

3
searchPages/searchDataProviders.component.ts
View File

@ -80,7 +80,7 @@ export class SearchDataProvidersComponent {
public loadPaging: boolean = true; public loadPaging: boolean = true;
public oldTotalResults: number = 0; public oldTotalResults: number = 0;
public pagingLimit: number = 0; public pagingLimit: number = 0;
properties:EnvProperties; properties:EnvProperties = properties;
public openaireEntities = OpenaireEntities; public openaireEntities = OpenaireEntities;
@Input() type: "all" | "registries" | "journals" | "compatible" | "deposit" | "services" = "all"; @Input() type: "all" | "registries" | "journals" | "compatible" | "deposit" | "services" = "all";
@Input() entityType: "dataprovider" | "service" = "dataprovider"; @Input() entityType: "dataprovider" | "service" = "dataprovider";
@ -130,7 +130,6 @@ export class SearchDataProvidersComponent {
if(this.showSwitchSearchLink == null){ if(this.showSwitchSearchLink == null){
this.showSwitchSearchLink = (this.type == "all" || this.type == "services"); this.showSwitchSearchLink = (this.type == "all" || this.type == "services");
} }
this.properties= properties;
this.csvPath = this.entityType == "service" ? OpenaireEntities.SERVICES_FILE : OpenaireEntities.DATASOURCES_FILE; this.csvPath = this.entityType == "service" ? OpenaireEntities.SERVICES_FILE : OpenaireEntities.DATASOURCES_FILE;
if (!this.simpleSearchLink) { if (!this.simpleSearchLink) {
this.simpleSearchLink = this.entityType == "service" ? this.properties.searchLinkToServices : this.properties.searchLinkToDataProviders; this.simpleSearchLink = this.entityType == "service" ? this.properties.searchLinkToServices : this.properties.searchLinkToDataProviders;

3
searchPages/searchOrganizations.component.ts
View File

@ -47,7 +47,7 @@ import {zip} from "rxjs";
export class SearchOrganizationsComponent { export class SearchOrganizationsComponent {
private errorCodes: ErrorCodes; private errorCodes: ErrorCodes;
private errorMessages: ErrorMessagesComponent; private errorMessages: ErrorMessagesComponent;
properties:EnvProperties; properties:EnvProperties = properties;
public openaireEntities = OpenaireEntities; public openaireEntities = OpenaireEntities;
@Input() searchForm: SearchForm = {class: 'search-form', dark: true}; @Input() searchForm: SearchForm = {class: 'search-form', dark: true};
public results =[]; public results =[];
@ -103,7 +103,6 @@ export class SearchOrganizationsComponent {
} }
ngOnInit() { ngOnInit() {
this.properties= properties;
if (!this.simpleSearchLink) { if (!this.simpleSearchLink) {
this.simpleSearchLink = this.properties.searchLinkToOrganizations; this.simpleSearchLink = this.properties.searchLinkToOrganizations;
} }

4
searchPages/searchProjects.component.ts
View File

@ -67,7 +67,7 @@ export class SearchProjectsComponent {
public fieldIdsMap = this.searchFields.PROJECT_FIELDS; public fieldIdsMap = this.searchFields.PROJECT_FIELDS;
public rangeFields: string[][] = this.searchFields.PROJECT_RANGE_FIELDS; public rangeFields: string[][] = this.searchFields.PROJECT_RANGE_FIELDS;
public selectedFields: AdvancedField[] = []; public selectedFields: AdvancedField[] = [];
properties: EnvProperties; properties: EnvProperties = properties;
public openaireEntities = OpenaireEntities; public openaireEntities = OpenaireEntities;
public resourcesQuery = "(oaftype exact project)"; public resourcesQuery = "(oaftype exact project)";
@ -107,8 +107,6 @@ export class SearchProjectsComponent {
} }
ngOnInit() { ngOnInit() {
this.properties = properties;
if (!this.simpleSearchLink) { if (!this.simpleSearchLink) {
this.simpleSearchLink = this.properties.searchLinkToProjects; this.simpleSearchLink = this.properties.searchLinkToProjects;
} }

6
searchPages/searchUtils/advancedSearchForm.component.ts
View File

@ -51,7 +51,7 @@ export class AdvancedSearchFormComponent implements OnInit, OnDestroy, OnChanges
newFieldName: string; newFieldName: string;
fieldList: { [id: string]: any[] } = {}; fieldList: { [id: string]: any[] } = {};
public searchFields: SearchFields = new SearchFields(); public searchFields: SearchFields = new SearchFields();
properties: EnvProperties; properties: EnvProperties = properties;
public openaireEntities = OpenaireEntities; public openaireEntities = OpenaireEntities;
public operators: string[] = this.searchFields.ADVANCED_SEARCH_OPERATORS; public operators: string[] = this.searchFields.ADVANCED_SEARCH_OPERATORS;
public isOperators: Option[] = [{label: 'is', value: true}, {label: 'is not', value: false}]; public isOperators: Option[] = [{label: 'is', value: true}, {label: 'is not', value: false}];
@ -69,9 +69,7 @@ export class AdvancedSearchFormComponent implements OnInit, OnDestroy, OnChanges
ngOnInit() { ngOnInit() {
this.selectedEntity = this.entityType; this.selectedEntity = this.entityType;
this.properties = properties;
for (var i = 0; i < this.fieldIds.length; i++) { for (var i = 0; i < this.fieldIds.length; i++) {
this.fieldList[this.fieldIds[i]] = []; this.fieldList[this.fieldIds[i]] = [];
} }

3
searchPages/searchUtils/searchDownload.component.ts
View File

@ -39,7 +39,7 @@ export class SearchDownloadComponent {
@ViewChild(ModalLoading) loading: ModalLoading; @ViewChild(ModalLoading) loading: ModalLoading;
// Alert box when something is wrong with CSV requests // Alert box when something is wrong with CSV requests
@ViewChild('AlertModalCsvError') alertCsvError; @ViewChild('AlertModalCsvError') alertCsvError;
public properties: EnvProperties; public properties: EnvProperties = properties;
public errorCodes: ErrorCodes = new ErrorCodes(); public errorCodes: ErrorCodes = new ErrorCodes();
subscriptions = []; subscriptions = [];
@ -47,7 +47,6 @@ export class SearchDownloadComponent {
} }
ngOnInit() { ngOnInit() {
this.properties = properties;
this.csvLimit = this.properties.csvLimit; this.csvLimit = this.properties.csvLimit;
this.downloadURLAPI = this.properties.csvAPIURL; this.downloadURLAPI = this.properties.csvAPIURL;
} }