From 65bf435e12df561421366d43eae37a0dce507b40 Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Mon, 20 Jun 2022 13:02:23 +0300
Subject: [PATCH] [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.

---
 orcid/orcid-work.component.ts                 |  4 +--
 .../searchUtils/datasourcesHelper.class.ts    | 36 +++++++++----------
 utils/modal/alert.ts                          |  2 +-
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/orcid/orcid-work.component.ts b/orcid/orcid-work.component.ts
index f94d03bf..2439599f 100644
--- a/orcid/orcid-work.component.ts
+++ b/orcid/orcid-work.component.ts
@@ -87,8 +87,8 @@ declare var UIkit: any;
       </span>
     </ng-container>
 
-    <modal-alert #grantModal (alertOutput)="openGrantWindow()">
-      <div class="uk-text-center">
+    <modal-alert #grantModal [overflowBody]=false (alertOutput)="openGrantWindow()">
+      <div>
         <div>{{requestGrantMessage}}</div>
 
 <!--        <div class="uk-margin-medium-top uk-align-right">-->
diff --git a/searchPages/searchUtils/datasourcesHelper.class.ts b/searchPages/searchUtils/datasourcesHelper.class.ts
index 40319e84..603996b3 100644
--- a/searchPages/searchUtils/datasourcesHelper.class.ts
+++ b/searchPages/searchUtils/datasourcesHelper.class.ts
@@ -47,23 +47,23 @@ export class DatasourcesHelperClass {
     }
   }
   public static getQueryPrefix(type: "all" | "registries" | "journals" | "compatible" | "deposit" | "services"): string {
-    if(properties.environment == "production") {
-    if (type == "registries") {
-      return ' (datasourcetypeuiid = "entityregistry" or datasourcetypeuiid = "entityregistry::products" or datasourcetypeuiid = "entityregistry::repositories" ' +
-        'or datasourcetypeuiid = "entityregistry::organizations" or datasourcetypeuiid = "entityregistry::researchers"  ) ';
-      
-    } else if (type == "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" ) ';
-
-    } else if (type == "compatible") {
-      return ' oaftype exact datasource  and datasourcecompatibilityid <> notCompatible  and datasourcetypeuiid <> other and datasourcetypeuiid <> "pubsrepository::journal" and datasourcetypeuiid <> "aggregator::pubsrepository::journals" ';
-    } else if (type == "deposit") {
-      return ' oaftype exact datasource  ';
-    } else {
-      return "";
-    }
-    }else{
+    // if(properties.environment == "production") {
+    // if (type == "registries") {
+    //   return ' (datasourcetypeuiid = "entityregistry" or datasourcetypeuiid = "entityregistry::products" or datasourcetypeuiid = "entityregistry::repositories" ' +
+    //     'or datasourcetypeuiid = "entityregistry::organizations" or datasourcetypeuiid = "entityregistry::researchers"  ) ';
+    //
+    // } else if (type == "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" ) ';
+    //
+    // } else if (type == "compatible") {
+    //   return ' oaftype exact datasource  and datasourcecompatibilityid <> notCompatible  and datasourcetypeuiid <> other and datasourcetypeuiid <> "pubsrepository::journal" and datasourcetypeuiid <> "aggregator::pubsrepository::journals" ';
+    // } else if (type == "deposit") {
+    //   return ' oaftype exact datasource  ';
+    // } else {
+    //   return "";
+    // }
+    // }else{
       if (type == "registries") {
         return 'datasourcetypeuiname exact "Registry"';
       } else if (type == "journals") {
@@ -77,7 +77,7 @@ export class DatasourcesHelperClass {
       } else {
         return "";
       }
-    }
+    // }
   }
 
   public static createFilters(type: "all" | "registries" | "journals" | "compatible" | "deposit" | "services"): Filter[] {
diff --git a/utils/modal/alert.ts b/utils/modal/alert.ts
index 98298926..65b5e505 100644
--- a/utils/modal/alert.ts
+++ b/utils/modal/alert.ts
@@ -5,7 +5,7 @@ declare var UIkit: any;
 @Component({
   selector: 'modal-alert',
   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-header uk-text-left uk-flex uk-flex-middle uk-flex-between" [ngClass]="classTitle">
           <div class="uk-modal-title" [hidden]=!alertHeader>