diff --git a/fos/fos.component.ts b/fos/fos.component.ts index 9aec0606..c02b6bed 100644 --- a/fos/fos.component.ts +++ b/fos/fos.component.ts @@ -216,6 +216,6 @@ export class FosComponent implements OnInit, OnDestroy { } public buildFosQueryParam(fos) { - return (properties.environment !== 'production' ? ({'foslabel': this.urlEncodeAndQuote(fos.id+"||"+fos.label)}) : ({'fos': this.urlEncodeAndQuote(fos.id)})); + return {'foslabel': this.urlEncodeAndQuote(fos.id+"||"+fos.label)}; } } diff --git a/landingPages/landing-utils/fos.component.ts b/landingPages/landing-utils/fos.component.ts index fece3437..4dfc59e6 100644 --- a/landingPages/landing-utils/fos.component.ts +++ b/landingPages/landing-utils/fos.component.ts @@ -121,10 +121,10 @@ export class FosComponent { } public buildFosQueryParam(fos) { - return (properties.environment !== 'production' ? ({'foslabel': this.urlEncodeAndQuote(fos.id+"||"+fos.label)}) : ({'fos': this.urlEncodeAndQuote(fos.id)})); + return {'foslabel': this.urlEncodeAndQuote(fos.id+"||"+fos.label)}; } public buildFosHrefParam(fos): string { - return (properties.environment !== 'production' ? ('foslabel='+this.urlEncodeAndQuote(fos.id+"||"+fos.label)) : ('fos='+this.urlEncodeAndQuote(fos.id))); + return ('foslabel='+this.urlEncodeAndQuote(fos.id+"||"+fos.label)); } } diff --git a/landingPages/landing-utils/resultLandingUtils.module.ts b/landingPages/landing-utils/resultLandingUtils.module.ts index 05869cf7..7ae62115 100644 --- a/landingPages/landing-utils/resultLandingUtils.module.ts +++ b/landingPages/landing-utils/resultLandingUtils.module.ts @@ -19,7 +19,7 @@ import {AlertModalModule} from "../../utils/modal/alertModal.module"; import { SearchInputModule } from '../../sharedComponents/search-input/search-input.module'; import {EntityMetadataComponent} from "./entity-metadata.component"; import {IconsService} from "../../utils/icons/icons.service"; -import {closed_access, open_access, unknown_access} from "../../utils/icons/icons"; +import {book, closed_access, cog, database, earth, open_access, unknown_access} from "../../utils/icons/icons"; import {FullScreenModalModule} from "../../utils/modal/full-screen-modal/full-screen-modal.module"; import {MobileDropdownModule} from "../../utils/mobile-dropdown/mobile-dropdown.module"; @@ -45,6 +45,6 @@ import {MobileDropdownModule} from "../../utils/mobile-dropdown/mobile-dropdown. }) export class ResultLandingUtilsModule { constructor(private iconsService: IconsService) { - this.iconsService.registerIcons([open_access, closed_access, unknown_access]); + this.iconsService.registerIcons([open_access, closed_access, unknown_access, book, cog, database, earth]); } } diff --git a/services/searchDataproviders.service.ts b/services/searchDataproviders.service.ts index a3c71083..af05a7f1 100644 --- a/services/searchDataproviders.service.ts +++ b/services/searchDataproviders.service.ts @@ -135,7 +135,7 @@ export class SearchDataprovidersService { // result.description = result.description.substring(0, this.sizeOfDescription) + "..."; // } - let typeid: string = resData['datasourcetype'].classid; + let typeid: string = resData['datasourcetype'] && resData['datasourcetype'].classid; if(typeid != "entityregistry" && typeid != "entityregistry::projects" && typeid != "entityregistry::repositories") { if(resData.hasOwnProperty('accessinfopackage')) { diff --git a/utils/dataTransfer/transferData.component.ts b/utils/dataTransfer/transferData.component.ts index 0c250dfe..4ca426d9 100644 --- a/utils/dataTransfer/transferData.component.ts +++ b/utils/dataTransfer/transferData.component.ts @@ -152,6 +152,7 @@ export class EGIDataTransferComponent { this.init(); if(!this.isMobile) { + this.egiTransferModal.stayOpen = true; // this.egiTransferModal.back = true; this.egiTransferModal.cancelButton = false; this.egiTransferModal.okButton = true;