MaDgIK
/
monitor-dashboard
13
0
Fork 0
Code Issues Pull Requests Projects Releases 17 Wiki Activity

Merge branch 'master' of code-repo.d4science.org:MaDgIK/monitor-dashboard

This commit is contained in:
Konstantinos Triantafyllou 2021-12-09 10:16:01 +02:00
parent 8c0247c4c5 c071795dad
commit cebc5b08fe
3 changed files with 44 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/app/topic/indicators.component.html
View File

@ -289,11 +289,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 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">
@ -418,11 +421,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

26
src/app/topic/indicators.component.ts
View File

@ -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'
});
}
}

6
src/environments/environment.beta.ts
View File

@ -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",