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

[Library | Explore | new-theme]: Added a container for modals | Fixes in orcid modal | for journals and registries use common query for beta & prod. 

1. app.component.ts: Added <div id="modal-container"></div>.
2. alert.ts: [Bug fix] Updated target container in modal to id #modal-container (get portal specific css and have a generic z-index).
3. datasourcesHelper.class.ts: In method getQueryPrefix(), have a common setting for beta & prod environments.
4. orcid-work.component.ts: In grant modal, removed uk-text-center class and added [overflowBody]=false.
This commit is contained in:
Konstantina Galouni 2022-06-20 13:02:23 +03:00
parent d42edec539
commit 65bf435e12
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
orcid/orcid-work.component.ts
View File

@ -87,8 +87,8 @@ declare var UIkit: any;
</span> </span>
</ng-container> </ng-container>
<modal-alert #grantModal (alertOutput)="openGrantWindow()"> <modal-alert #grantModal [overflowBody]=false (alertOutput)="openGrantWindow()">
<div class="uk-text-center"> <div>
<div>{{requestGrantMessage}}</div> <div>{{requestGrantMessage}}</div>
<!-- <div class="uk-margin-medium-top uk-align-right">--> <!-- <div class="uk-margin-medium-top uk-align-right">-->

36
searchPages/searchUtils/datasourcesHelper.class.ts
View File

@ -47,23 +47,23 @@ export class DatasourcesHelperClass {
} }
} }
public static getQueryPrefix(type: "all" | "registries" | "journals" | "compatible" | "deposit" | "services"): string { public static getQueryPrefix(type: "all" | "registries" | "journals" | "compatible" | "deposit" | "services"): string {
if(properties.environment == "production") { // if(properties.environment == "production") {
if (type == "registries") { // if (type == "registries") {
return ' (datasourcetypeuiid = "entityregistry" or datasourcetypeuiid = "entityregistry::products" or datasourcetypeuiid = "entityregistry::repositories" ' + // return ' (datasourcetypeuiid = "entityregistry" or datasourcetypeuiid = "entityregistry::products" or datasourcetypeuiid = "entityregistry::repositories" ' +
'or datasourcetypeuiid = "entityregistry::organizations" or datasourcetypeuiid = "entityregistry::researchers" ) '; // 'or datasourcetypeuiid = "entityregistry::organizations" or datasourcetypeuiid = "entityregistry::researchers" ) ';
//
} else if (type == "journals") { // } else if (type == "journals") {
// return ' not(datasourcecompatibilityid = UNKNOWN) not(datasourcecompatibilityid = notCompatible) and (datasourcetypeuiid exact "pubsrepository::journal" or datasourcetypeuiid exact "aggregator::pubsrepository::journals" ) '; // // return ' not(datasourcecompatibilityid = UNKNOWN) not(datasourcecompatibilityid = notCompatible) and (datasourcetypeuiid exact "pubsrepository::journal" or datasourcetypeuiid exact "aggregator::pubsrepository::journals" ) ';
return 'oaftype exact datasource not datasourcecompatibilityid = notCompatible and (datasourcetypeuiid exact "pubsrepository::journal" or datasourcetypeuiid exact "aggregator::pubsrepository::journals" ) '; // return 'oaftype exact datasource not datasourcecompatibilityid = notCompatible and (datasourcetypeuiid exact "pubsrepository::journal" or datasourcetypeuiid exact "aggregator::pubsrepository::journals" ) ';
//
} else if (type == "compatible") { // } else if (type == "compatible") {
return ' oaftype exact datasource and datasourcecompatibilityid <> notCompatible and datasourcetypeuiid <> other and datasourcetypeuiid <> "pubsrepository::journal" and datasourcetypeuiid <> "aggregator::pubsrepository::journals" '; // return ' oaftype exact datasource and datasourcecompatibilityid <> notCompatible and datasourcetypeuiid <> other and datasourcetypeuiid <> "pubsrepository::journal" and datasourcetypeuiid <> "aggregator::pubsrepository::journals" ';
} else if (type == "deposit") { // } else if (type == "deposit") {
return ' oaftype exact datasource '; // return ' oaftype exact datasource ';
} else { // } else {
return ""; // return "";
} // }
}else{ // }else{
if (type == "registries") { if (type == "registries") {
return 'datasourcetypeuiname exact "Registry"'; return 'datasourcetypeuiname exact "Registry"';
} else if (type == "journals") { } else if (type == "journals") {
@ -77,7 +77,7 @@ export class DatasourcesHelperClass {
} else { } else {
return ""; return "";
} }
} // }
} }
public static createFilters(type: "all" | "registries" | "journals" | "compatible" | "deposit" | "services"): Filter[] { public static createFilters(type: "all" | "registries" | "journals" | "compatible" | "deposit" | "services"): Filter[] {

2
utils/modal/alert.ts
View File

@ -5,7 +5,7 @@ declare var UIkit: any;
@Component({ @Component({
selector: 'modal-alert', selector: 'modal-alert',
template: ` template: `
<div #element class="uk-modal" [class.uk-modal-container]="large" [id]="id" uk-modal="container: #here"> <div #element class="uk-modal" [class.uk-modal-container]="large" [id]="id" uk-modal="container: #modal-container">
<div class="uk-modal-dialog"> <div class="uk-modal-dialog">
<div class="uk-modal-header uk-text-left uk-flex uk-flex-middle uk-flex-between" [ngClass]="classTitle"> <div class="uk-modal-header uk-text-left uk-flex uk-flex-middle uk-flex-between" [ngClass]="classTitle">
<div class="uk-modal-title" [hidden]=!alertHeader> <div class="uk-modal-title" [hidden]=!alertHeader>