From a8add8b4759ea69a3e2ebbc0f9edf92352477308 Mon Sep 17 00:00:00 2001
From: "argiro.kokogiannaki"
 <argiro.kokogiannaki@d315682c-612b-4755-9ff5-7f18f6832af3>
Date: Wed, 21 Jun 2017 08:35:41 +0000
Subject: [PATCH] change order in loading scripts | use new dnet45 claims -
 from scooby | change direct index original id to format userclaim___::md5(id)

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@47600 d315682c-612b-4755-9ff5-7f18f6832af3
---
 .../insertClaim/insertClaim.component.ts      |  2 +-
 portal-2/src/app/test/test.component.ts       |  6 ++--
 .../utils/properties/openaireProperties.ts    |  2 +-
 portal-2/src/index.html                       | 35 ++++++++++++-------
 4 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/portal-2/src/app/claims/linking/insertClaim/insertClaim.component.ts b/portal-2/src/app/claims/linking/insertClaim/insertClaim.component.ts
index b1586393..0723e9b6 100644
--- a/portal-2/src/app/claims/linking/insertClaim/insertClaim.component.ts
+++ b/portal-2/src/app/claims/linking/insertClaim/insertClaim.component.ts
@@ -294,7 +294,7 @@ private errorsInClaimsInsertion(){
 createDirectClaim(result, projects, contexts){
   var entity = {};
   var md5_id = Md5.hashStr(result.id);
-  entity["originalId"]="user:claim__"+md5_id;
+  entity["originalId"]="userclaim___::"+md5_id;
   entity["title"]=result.title;
   entity["title"] =(Array.isArray(result.title) && result.title.length > 0 )?result.title[0]:result.title;
 
diff --git a/portal-2/src/app/test/test.component.ts b/portal-2/src/app/test/test.component.ts
index 7143368e..f66864f6 100644
--- a/portal-2/src/app/test/test.component.ts
+++ b/portal-2/src/app/test/test.component.ts
@@ -44,9 +44,7 @@ export class TestComponent {
     this.checktables(sf.ORGANIZATION_REFINE_FIELDS,sf.ORGANIZATION_FIELDS,sf.ORGANIZATION_FIELDS);
     this.checktables(sf.ORGANIZATION_ADVANCED_FIELDS,sf.ORGANIZATION_FIELDS,sf.ORGANIZATION_FIELDS);
     console.info("~~~PERSON");
-
-    this.checktables(sf.PERSON_REFINE_FIELDS,sf.PERSON_FIELDS,sf.PERSON_FIELDS);
-    this.checktables(sf.PERSON_ADVANCED_FIELDS,sf.PERSON_FIELDS,sf.PERSON_FIELDS);
+   
  }
   checktables(fields,fieldsDetails,fieldsParam){
  for(var i =0; i < fields.length; i++){
@@ -59,5 +57,5 @@ export class TestComponent {
 
 
 
- 
+
 }
diff --git a/portal-2/src/app/utils/properties/openaireProperties.ts b/portal-2/src/app/utils/properties/openaireProperties.ts
index 57b80df8..de47104e 100644
--- a/portal-2/src/app/utils/properties/openaireProperties.ts
+++ b/portal-2/src/app/utils/properties/openaireProperties.ts
@@ -38,7 +38,7 @@ export class OpenaireProperties {
     private static loginAPIURL = "http://scoobydoo.di.uoa.gr:8080/uoa-user-management-1.0.0-SNAPSHOT/api/users/authenticates";
     private static loginAPIURL_pm = "https://beta.services.openaire.eu/uoa-user-management/api/users/authenticates";
 
-    private static claimsAPIURL = "http://scoobydoo.di.uoa.gr:8080/dnet-openaire-connector-service-2.0.0-SNAPSHOT/rest/claimsService/";
+    private static claimsAPIURL = "http://scoobydoo.di.uoa.gr:8080/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/";
     private static claimsAPIURL_pm = "https://beta.services.openaire.eu/claims/rest/claimsService/";
 
      private static searchAPIURLLAst_pm     = "https://beta.services.openaire.eu/search/v2/api/";
diff --git a/portal-2/src/index.html b/portal-2/src/index.html
index 71285c41..3e8aae23 100644
--- a/portal-2/src/index.html
+++ b/portal-2/src/index.html
@@ -25,26 +25,35 @@
       <title>Search OpenAIRE</title>
       <script>
       window.onerror = function (errorMsg, url, lineNumber, column, errorObj) {
-        console.log(errorMsg + " __" + url + " __" +  lineNumber + " __" +  column + " __" +  errorObj);
+        // console.log(errorMsg + " __" + url + " __" +  lineNumber + " __" +  column + " __" +  errorObj);
         if(errorMsg.indexOf("uikit.js") != -1 || url.indexOf("uikit.js") != -1 ){
           console.log("********UIKIT Error ***********");
-          jQuery.loadScript = function (url, callback) {
-    jQuery.ajax({
-        url: url,
-        dataType: 'script',
-    });}
-    $.loadScript("assets/dl119_files/uikit.js", function(){
-console.log("LOOOOOOOOOOOOOOOOOOOAD");});
+          // location.reload();
+      //     var script= document.createElement('script');
+      // script.type= 'text/javascript';
+      // script.src= 'assets/dl119_files/uikit.js';
+      // head.appendChild(script);
+      // console.log("LOOOOOOOOOOOOOOOOOOOAD");
+
+//           jQuery.loadScript = function (url, callback) {
+//     jQuery.ajax({
+//         url: url,
+//         dataType: 'script',
+//     });}
+//     $.loadScript("assets/dl119_files/uikit.js", function(){
+// console.log("LOOOOOOOOOOOOOOOOOOOAD");});
 }
 
 }
       </script>
        <!-- <script src="assets/jquery/jquery.min.js" type="text/javascript"></script> -->
+       <script  src="assets/dl119_files/jquery.js"></script>
+
+       <script  src="assets/dl119_files/uikit.js"></script>
+       <script src="assets/dl119_files/uikit-icons-max.js"></script>
+
       <script src="../node_modules/angular2/bundles/angular2-polyfills.js"></script>
-      <script  src="assets/dl119_files/jquery.js"></script>
-      <script  src="assets/dl119_files/uikit.js"></script>
-      <script src="assets/dl119_files/uikit-icons-max.js"></script>
-      
+
       <!-- <link rel="stylesheet" href="node_modules/uikit/dist/css/uikit.min.css"> -->
       <link rel="stylesheet" href="assets/dl119_files/theme.css">
       <link rel="stylesheet" href="assets/dl119_files/custom.css">
@@ -92,10 +101,10 @@ console.log("LOOOOOOOOOOOOOOOOOOOAD");});
  <body class="" style="">
 
    <div class="uk-offcanvas-content uk-height-viewport">
+     <script async  src="/main.bundle.js"></script>
 
 
 
-      <script async src="/main.bundle.js"></script>
 
       <app>
         Loading Universal ...