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

Merge remote-tracking branch 'origin/develop'

This commit is contained in:
Konstantina Galouni 2023-09-11 18:18:09 +03:00
parent 31f42cfc71 f679385725
commit 9b2524c1c7
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fos/fos.component.ts
View File

@ -216,6 +216,6 @@ export class FosComponent implements OnInit, OnDestroy {
} }
public buildFosQueryParam(fos) { 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)};
} }
} }

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

@ -121,10 +121,10 @@ export class FosComponent {
} }
public buildFosQueryParam(fos) { 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 { 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));
} }
} }

4
landingPages/landing-utils/resultLandingUtils.module.ts
View File

@ -19,7 +19,7 @@ import {AlertModalModule} from "../../utils/modal/alertModal.module";
import { SearchInputModule } from '../../sharedComponents/search-input/search-input.module'; import { SearchInputModule } from '../../sharedComponents/search-input/search-input.module';
import {EntityMetadataComponent} from "./entity-metadata.component"; import {EntityMetadataComponent} from "./entity-metadata.component";
import {IconsService} from "../../utils/icons/icons.service"; 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 {FullScreenModalModule} from "../../utils/modal/full-screen-modal/full-screen-modal.module";
import {MobileDropdownModule} from "../../utils/mobile-dropdown/mobile-dropdown.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 { export class ResultLandingUtilsModule {
constructor(private iconsService: IconsService) { 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]);
} }
} }

2
services/searchDataproviders.service.ts
View File

@ -135,7 +135,7 @@ export class SearchDataprovidersService {
// result.description = result.description.substring(0, this.sizeOfDescription) + "..."; // 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(typeid != "entityregistry" && typeid != "entityregistry::projects" && typeid != "entityregistry::repositories") {
if(resData.hasOwnProperty('accessinfopackage')) { if(resData.hasOwnProperty('accessinfopackage')) {

1
utils/dataTransfer/transferData.component.ts
View File

@ -152,6 +152,7 @@ export class EGIDataTransferComponent {
this.init(); this.init();
if(!this.isMobile) { if(!this.isMobile) {
this.egiTransferModal.stayOpen = true;
// this.egiTransferModal.back = true; // this.egiTransferModal.back = true;
this.egiTransferModal.cancelButton = false; this.egiTransferModal.cancelButton = false;
this.egiTransferModal.okButton = true; this.egiTransferModal.okButton = true;