From 04c064fa38dbe9b5df31b48b52664e7f26dee785 Mon Sep 17 00:00:00 2001
From: Alex Martzios <alexandros.martzios@gmail.com>
Date: Tue, 7 Dec 2021 16:59:13 +0200
Subject: [PATCH 1/2] Add 'Copy URL' button for number/chart URL(indicators) -
 dev only

---
 src/app/openaireLibrary                 |  2 +-
 src/app/topic/indicators.component.html | 22 ++++++++++++++-------
 src/app/topic/indicators.component.ts   | 26 +++++++++++++++++++++++++
 src/assets/common-assets                |  2 +-
 4 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary
index 2eb0671..ca430fd 160000
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit 2eb06717dd681898ef47da0f5da39a9005df3878
+Subproject commit ca430fd89f7654bb71f52383bd52bf58e4c70e5f
diff --git a/src/app/topic/indicators.component.html b/src/app/topic/indicators.component.html
index 7f0e7ab..810cd87 100644
--- a/src/app/topic/indicators.component.html
+++ b/src/app/topic/indicators.component.html
@@ -290,11 +290,14 @@
           <div class="uk-grid" uk-grid>
             <div class="uk-width-1-1">
               <div class="uk-grid" uk-grid>
-                <div class="uk-width-1-1">
+                <div class="uk-width-1-1 uk-flex uk-flex-between uk-flex-bottom">
                   <div dashboard-input [formInput]="indicatorPath.get('url')" label="Number URL"
-                       placeholder="Write a URL">
+                       placeholder="Write a URL" class='uk-width-1-1' id="numberURL">
                     <div *ngIf="urlParameterizedMessage" warning>{{urlParameterizedMessage}}</div>
                   </div>
+									<div *ngIf='properties.environment == "development"' class='uk-padding-small'>
+										<i class="clickable" uk-icon="copy" (click)="copyToClipboard('numberURL')" uk-tooltip="Copy URL"></i>
+									</div>
                 </div>
                 <div *ngIf="showCheckForSchemaEnhancements" class=" uk-width-1-1 ">
                   <div class="uk-alert uk-alert-warning">
@@ -419,11 +422,16 @@
       <div *ngIf="chartIndicatorPaths" formArrayName="indicatorPaths" class="uk-width-1-1">
         <div *ngFor="let indicatorPath of chartIndicatorPaths.controls; let  i=index;"
              [formGroup]="indicatorPath" class="uk-grid" uk-grid>
-          <div dashboard-input class="uk-width-1-1"
-               [title]="indicatorPath.get('url').disabled?'Default chart URLs cannot change':''"
-               [formInput]="indicatorPath.get('url')" placeholder="Write a URL" label="Chart URL">
-            <div *ngIf="urlParameterizedMessage" warning>{{urlParameterizedMessage}}</div>
-          </div>
+					<div class="uk-width-1-1 uk-flex uk-flex-between uk-flex-bottom">
+						<div dashboard-input class="uk-width-1-1"
+								 [title]="indicatorPath.get('url').disabled?'Default chart URLs cannot change':''"
+								 [formInput]="indicatorPath.get('url')" placeholder="Write a URL" label="Chart URL" id="chartURL">
+							<div *ngIf="urlParameterizedMessage" warning>{{urlParameterizedMessage}}</div>
+						</div>
+						<div *ngIf='properties.environment == "development"' class='uk-padding-small'>
+							<i class="clickable" uk-icon="copy" (click)="copyToClipboard('chartURL')" uk-tooltip="Copy URL"></i>
+						</div>
+					</div>
           <div *ngIf="showCheckForSchemaEnhancements" class=" uk-width-1-1 ">
             <div class="uk-alert uk-alert-warning">
               There are schema enchancements that can be applied in this query. <a
diff --git a/src/app/topic/indicators.component.ts b/src/app/topic/indicators.component.ts
index 96dd139..a285dd9 100644
--- a/src/app/topic/indicators.component.ts
+++ b/src/app/topic/indicators.component.ts
@@ -1415,4 +1415,30 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
       xhr.send(formData);
     });
   }
+
+	copyToClipboard(val: string) {
+		if(val === 'numberURL') {
+			var inputElement = document.getElementById("numberURL").children[1].children[0].children[1].children[0] as HTMLInputElement;
+		}
+		if(val === 'chartURL') {
+			var inputElement = document.getElementById("chartURL").children[1].children[0].children[1].children[0] as HTMLInputElement;
+		}
+		const tempBox = document.createElement('textarea');
+		tempBox.style.position = 'fixed';
+		tempBox.style.left = '0';
+		tempBox.style.top = '0';
+		tempBox.style.opacity = '0';
+		tempBox.value = inputElement.value;
+		document.body.appendChild(tempBox);
+		tempBox.focus();
+		tempBox.select();
+		tempBox.setSelectionRange(0,99999);
+		document.execCommand('copy');
+		document.body.removeChild(tempBox);
+		UIkit.notification('Copied to clipboard', {
+			status: 'success',
+			timeout: 5000,
+			pos: 'bottom-right'
+		});
+	}
 }
diff --git a/src/assets/common-assets b/src/assets/common-assets
index 28db142..18d805e 160000
--- a/src/assets/common-assets
+++ b/src/assets/common-assets
@@ -1 +1 @@
-Subproject commit 28db142aa54b8bea87ada52dbae2da7c7da8f458
+Subproject commit 18d805e05fe839e143f9f1eeb9fd42f4dcea67d0

From c071795dad0046f3b7cfe79fa5f9d1608e8c18f8 Mon Sep 17 00:00:00 2001
From: argirok <argirokokogiannaki@gmail.com>
Date: Wed, 8 Dec 2021 14:37:37 +0200
Subject: [PATCH 2/2] update login properties for beta single login service,
 copy url: remove check for dev

---
 src/app/topic/indicators.component.html | 2 +-
 src/environments/environment.beta.ts    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/topic/indicators.component.html b/src/app/topic/indicators.component.html
index 810cd87..37c1bec 100644
--- a/src/app/topic/indicators.component.html
+++ b/src/app/topic/indicators.component.html
@@ -295,7 +295,7 @@
                        placeholder="Write a URL" class='uk-width-1-1' id="numberURL">
                     <div *ngIf="urlParameterizedMessage" warning>{{urlParameterizedMessage}}</div>
                   </div>
-									<div *ngIf='properties.environment == "development"' class='uk-padding-small'>
+									<div class='uk-padding-small'>
 										<i class="clickable" uk-icon="copy" (click)="copyToClipboard('numberURL')" uk-tooltip="Copy URL"></i>
 									</div>
                 </div>
diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts
index fbe9484..39d3bd8 100644
--- a/src/environments/environment.beta.ts
+++ b/src/environments/environment.beta.ts
@@ -48,10 +48,10 @@ export let properties: EnvProperties = {
   
   piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
   piwikSiteId: "298",
-  loginUrl: "https://beta.services.openaire.eu/monitor-dashboard-login/openid_connect_login",
+  loginUrl: "https://beta.services.openaire.eu/login-service/openid_connect_login",
+  userInfoUrl: "https://beta.services.openaire.eu/login-service/userInfo",
   registryUrl: 'https://beta.services.openaire.eu/uoa-user-management/api/registry/',
-  userInfoUrl : "https://beta.services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=",
-  logoutUrl: "https://beta.services.openaire.eu/monitor-dashboard-login/openid_logout",
+  logoutUrl: "https://beta.services.openaire.eu/login-service/openid_logout",
   cookieDomain: ".openaire.eu",
   
   feedbackmail: "feedback@openaire.eu",