[Monitor | Trunk]
- fix issue losing the active topic - when changing the sub categeries - add property disableFrameLoad in dev, and disable loading frames when the property exists and is true - remove checks about recommnededFor stakeholders git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@60117 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
parent
0f7180af2a
commit
82c9d21e07
|
@ -118,7 +118,7 @@ export class AppComponent implements OnInit, OnDestroy {
|
||||||
this.subscriptions.push(this.params.subscribe(params => {
|
this.subscriptions.push(this.params.subscribe(params => {
|
||||||
if (this.paramsResolved) {
|
if (this.paramsResolved) {
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
let isSearch = this.router.url.includes('search');
|
let isSearch = this.router.url.includes('/search/');
|
||||||
if (params && params['stakeholder']) {
|
if (params && params['stakeholder']) {
|
||||||
// this.stakeholder = this.stakeholderService.stakeholder;
|
// this.stakeholder = this.stakeholderService.stakeholder;
|
||||||
if (!this.stakeholder || this.stakeholder.alias !== params['stakeholder']) {
|
if (!this.stakeholder || this.stakeholder.alias !== params['stakeholder']) {
|
||||||
|
|
|
@ -174,10 +174,13 @@
|
||||||
<div *ngIf="properties.environment == 'development'">
|
<div *ngIf="properties.environment == 'development'">
|
||||||
Filtered: {{chartsActiveType.get(i + '-' + j).filtersApplied}} out of
|
Filtered: {{chartsActiveType.get(i + '-' + j).filtersApplied}} out of
|
||||||
{{countSelectedFilters()}}</div>
|
{{countSelectedFilters()}}</div>
|
||||||
<iframe *ngIf="chartsActiveType.get(i + '-' + j).source !== 'image'"
|
<iframe *ngIf=" !properties.disableFrameLoad && chartsActiveType.get(i + '-' + j).source !==
|
||||||
|
'image'"
|
||||||
[src]="chartsActiveType.get(i + '-' + j).safeResourceUrl"
|
[src]="chartsActiveType.get(i + '-' + j).safeResourceUrl"
|
||||||
[class]="' uk-width-1-1 uk-height-' +
|
[class]="' uk-width-1-1 uk-height-' +
|
||||||
(indicator.height?indicator.height.toLowerCase():'medium')"></iframe>
|
(indicator.height?indicator.height.toLowerCase():'medium')"></iframe>
|
||||||
|
<div *ngIf="properties.disableFrameLoad && chartsActiveType.get(i + '-' + j).source !==
|
||||||
|
'image'" class="uk-alert uk-alert-danger uk-text-center">I frames preview is disabled</div>
|
||||||
<!-- {{chartsActiveType.get(i).safeResourceUrl}}-->
|
<!-- {{chartsActiveType.get(i).safeResourceUrl}}-->
|
||||||
<!-- <a [href]="chartsActiveType.get(i).safeResourceUrl" target="_blank" > ChartuURL</a>-->
|
<!-- <a [href]="chartsActiveType.get(i).safeResourceUrl" target="_blank" > ChartuURL</a>-->
|
||||||
<img *ngIf="chartsActiveType.get(i + '-' + j).source === 'image'"
|
<img *ngIf="chartsActiveType.get(i + '-' + j).source === 'image'"
|
||||||
|
|
|
@ -179,12 +179,17 @@
|
||||||
<div *ngIf="indicator.name" class="uk-text-center uk-text-bold uk-margin-small-bottom">
|
<div *ngIf="indicator.name" class="uk-text-center uk-text-bold uk-margin-small-bottom">
|
||||||
{{indicator.name}}
|
{{indicator.name}}
|
||||||
</div>
|
</div>
|
||||||
<iframe *ngIf="indicator.indicatorPaths[0] && indicator.indicatorPaths[0].source !== 'image' &&
|
<iframe *ngIf="!properties.disableFrameLoad && indicator.indicatorPaths[0] &&
|
||||||
|
indicator.indicatorPaths[0].source !==
|
||||||
|
'image' &&
|
||||||
safeUrls.get(indicatorUtils.getFullUrl(stakeholder, indicator.indicatorPaths[0]))"
|
safeUrls.get(indicatorUtils.getFullUrl(stakeholder, indicator.indicatorPaths[0]))"
|
||||||
[src]="safeUrls.get(indicatorUtils.getFullUrl(stakeholder, indicator.indicatorPaths[0]))"
|
[src]="safeUrls.get(indicatorUtils.getFullUrl(stakeholder, indicator.indicatorPaths[0]))"
|
||||||
[class]="' uk-width-1-1 uk-height-' +
|
[class]="' uk-width-1-1 uk-height-' +
|
||||||
(indicator.height?indicator.height.toLowerCase():'medium')"></iframe>
|
(indicator.height?indicator.height.toLowerCase():'medium')"></iframe>
|
||||||
<!-- <div>Uncomment for iframes preview</div>-->
|
<div *ngIf="properties.disableFrameLoad &&
|
||||||
|
indicator.indicatorPaths[0].source !==
|
||||||
|
'image'" class="uk-alert uk-alert-danger uk-text-center">I frames
|
||||||
|
preview is disabled</div>
|
||||||
<div *ngIf="indicator.indicatorPaths[0] && indicator.indicatorPaths[0].source === 'image'">
|
<div *ngIf="indicator.indicatorPaths[0] && indicator.indicatorPaths[0].source === 'image'">
|
||||||
<img [class]="' uk-width-1-1 uk-height-' +
|
<img [class]="' uk-width-1-1 uk-height-' +
|
||||||
(indicator.height?indicator.height.toLowerCase():'medium')"
|
(indicator.height?indicator.height.toLowerCase():'medium')"
|
||||||
|
@ -437,9 +442,11 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<iframe *ngIf="indicator.indicatorPaths[i].source !== 'image'"
|
<iframe *ngIf="!properties.disableFrameLoad && indicator.indicatorPaths[i].source !== 'image'"
|
||||||
[src]="indicator.indicatorPaths[i].safeResourceUrl"
|
[src]="indicator.indicatorPaths[i].safeResourceUrl"
|
||||||
class="uk-width-1-1 uk-height-large"></iframe>
|
class="uk-width-1-1 uk-height-large"></iframe>
|
||||||
|
<div *ngIf="properties.disableFrameLoad && indicator.indicatorPaths[i].source !== 'image'" class="uk-alert uk-alert-danger uk-text-center">I frames
|
||||||
|
preview is disabled</div>
|
||||||
<div *ngIf="indicator.indicatorPaths[i].source === 'image'">
|
<div *ngIf="indicator.indicatorPaths[i].source === 'image'">
|
||||||
<img class="uk-width-1-1 uk-height-large" [src]="indicator.indicatorPaths[i].url">
|
<img class="uk-width-1-1 uk-height-large" [src]="indicator.indicatorPaths[i].url">
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -63,9 +63,7 @@ export class StakeholderUtils {
|
||||||
for (let subCategory of category.subCategories) {
|
for (let subCategory of category.subCategories) {
|
||||||
subCategory.defaultId = subCategory._id;
|
subCategory.defaultId = subCategory._id;
|
||||||
subCategory._id = null;
|
subCategory._id = null;
|
||||||
if (!subCategory.recommendedFor || subCategory.recommendedFor.length == 0 || subCategory.recommendedFor.indexOf(funder.index_id) != -1) {
|
subTokeep.push(subCategory);
|
||||||
subTokeep.push(subCategory);
|
|
||||||
}
|
|
||||||
for (let section of subCategory.charts) {
|
for (let section of subCategory.charts) {
|
||||||
let chartsTokeep: Indicator[] = [];
|
let chartsTokeep: Indicator[] = [];
|
||||||
section.defaultId = section._id;
|
section.defaultId = section._id;
|
||||||
|
@ -74,9 +72,7 @@ export class StakeholderUtils {
|
||||||
for (let indicator of section.indicators) {
|
for (let indicator of section.indicators) {
|
||||||
indicator.defaultId = indicator._id;
|
indicator.defaultId = indicator._id;
|
||||||
indicator._id = null;
|
indicator._id = null;
|
||||||
if (!indicator.recommendedFor || indicator.recommendedFor.length == 0 || indicator.recommendedFor.indexOf(funder.index_id) != -1) {
|
chartsTokeep.push(indicator);
|
||||||
chartsTokeep.push(indicator);
|
|
||||||
}
|
|
||||||
for (let indicatorPath of indicator.indicatorPaths) {
|
for (let indicatorPath of indicator.indicatorPaths) {
|
||||||
if (indicatorPath.parameters) {
|
if (indicatorPath.parameters) {
|
||||||
Object.keys(indicatorPath.parameters).forEach(key => {
|
Object.keys(indicatorPath.parameters).forEach(key => {
|
||||||
|
|
|
@ -19,6 +19,7 @@ export let properties: EnvProperties = {
|
||||||
statisticsFrameAPIURL: "https://beta.openaire.eu/stats/",
|
statisticsFrameAPIURL: "https://beta.openaire.eu/stats/",
|
||||||
statisticsFrameNewAPIURL: "https://stats.madgik.di.uoa.gr/stats-api/",
|
statisticsFrameNewAPIURL: "https://stats.madgik.di.uoa.gr/stats-api/",
|
||||||
useNewStatistisTool: false,
|
useNewStatistisTool: false,
|
||||||
|
disableFrameLoad: true,
|
||||||
claimsAPIURL: "http://scoobydoo.di.uoa.gr:8080/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/",
|
claimsAPIURL: "http://scoobydoo.di.uoa.gr:8080/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/",
|
||||||
searchAPIURLLAst: "https://beta.services.openaire.eu/search/v2/api/",
|
searchAPIURLLAst: "https://beta.services.openaire.eu/search/v2/api/",
|
||||||
searchResourcesAPIURL: "https://beta.services.openaire.eu/search/v2/api/resources",
|
searchResourcesAPIURL: "https://beta.services.openaire.eu/search/v2/api/resources",
|
||||||
|
|
Loading…
Reference in New Issue