diff --git a/connect/connectHelper.ts b/connect/connectHelper.ts index 18c60846..0e9d1e43 100644 --- a/connect/connectHelper.ts +++ b/connect/connectHelper.ts @@ -12,7 +12,7 @@ export class ConnectHelper { if(properties.environment == "development" && (properties.adminToolsPortalType == "connect" || properties.adminToolsPortalType == "community" || properties.adminToolsPortalType == "aggregator" || properties.adminToolsPortalType == "eosc")) { - domain = "covid-19.openaire.eu"; //for testing + // domain = "covid-19.openaire.eu"; //for testing } domain = domain.indexOf("//") != -1? domain.split("//")[1]:domain; //remove https:// prefix if (domain.indexOf('eosc-portal.eu') != -1) { diff --git a/landingPages/result/resultLanding.component.html b/landingPages/result/resultLanding.component.html index 7621c2a0..f3a0de11 100644 --- a/landingPages/result/resultLanding.component.html +++ b/landingPages/result/resultLanding.component.html @@ -1000,10 +1000,10 @@ Overview
  • - Impact + Impact
  • - Social + Social
  • Usage @@ -1092,44 +1092,46 @@
  • -
    -
    - - - - - - - - - - -
    - - - {{measure.name}} - - - {{isNumber(measure.value) ? formatNumber(measure.value) : measure.value}} -
    + +
    +
    + + + + + + + + + + +
    + + + {{measure.name}} + + + {{isNumber(measure.value) ? formatNumber(measure.value) : measure.value}} +
    +
    +
    + +
    -
    - +
    + Powered by + + BIP! + BIP! +
    -
    -
    - Powered by - - BIP! - BIP! - -
    +
  • - +
  • diff --git a/landingPages/result/resultLanding.component.ts b/landingPages/result/resultLanding.component.ts index 8596a08b..910897ff 100644 --- a/landingPages/result/resultLanding.component.ts +++ b/landingPages/result/resultLanding.component.ts @@ -79,6 +79,8 @@ export class ResultLandingComponent { public descriptionClicked: boolean; // Metrics tab variables + public impactClicked: boolean; + public altMetricsClicked: boolean; public metricsClicked: boolean; public hasAltMetrics: boolean = false; public viewsFrameUrl: string; @@ -1126,6 +1128,18 @@ export class ResultLandingComponent { this.descriptionModal.open(); } + public clickedImpactIndicators() { + setTimeout( () => { + this.impactClicked = true; + }); + } + + public clickedAltMetrics() { + setTimeout( () => { + this.altMetricsClicked = true; + }); + } + public clickedUsageMetrics() { setTimeout( () => { this.metricsClicked = true; diff --git a/monitor-admin/utils/cache-indicators/cache-indicators.ts b/monitor-admin/utils/cache-indicators/cache-indicators.ts index 8b7418b3..c3b577c8 100644 --- a/monitor-admin/utils/cache-indicators/cache-indicators.ts +++ b/monitor-admin/utils/cache-indicators/cache-indicators.ts @@ -1,4 +1,5 @@ import {IndicatorType, Stakeholder} from "../../../monitor/entities/stakeholder"; +// @ts-ignore import axios from "axios"; import {IndicatorUtils} from "../indicator-utils"; import {Composer} from "../../../utils/email/composer"; diff --git a/monitor-admin/utils/indicator-utils.ts b/monitor-admin/utils/indicator-utils.ts index 5a17a189..a30172dd 100644 --- a/monitor-admin/utils/indicator-utils.ts +++ b/monitor-admin/utils/indicator-utils.ts @@ -53,18 +53,16 @@ export interface StakeholderCategory { export class StakeholderConfiguration { public static ENTITIES: Entities = new Entities(); - public static STAKEHOLDER_CATEGORIES: StakeholderCategory[] = (properties.environment !== 'production')?[ + public static STAKEHOLDER_CATEGORIES: StakeholderCategory[] = [ {name: 'All', plural: 'All', value: 'all'}, {name: 'Template', plural: 'Templates', value: 'templates'}, {name: 'Standalone', plural: 'Standalone', value: 'standalone'}, {name: 'Umbrella', plural: 'Umbrella', value: 'umbrella'}, - {name: 'Integrated ', plural: 'Integrated', value: 'dependent', + { + name: 'Integrated ', plural: 'Integrated', value: 'dependent', tooltip: 'A profile that doesn\'t have his own ' + StakeholderConfiguration.ENTITIES.stakeholder + - ', but can be integrated into another ' + StakeholderConfiguration.ENTITIES.stakeholder + '.'} - ]:[ - {name: 'All', plural: 'All', value: 'all'}, - {name: 'Template', plural: 'Templates', value: 'templates'}, - {name: 'Profiles', plural: 'Profiles', value: 'standalone'}, + ', but can be integrated into another ' + StakeholderConfiguration.ENTITIES.stakeholder + '.' + } ]; public static TYPES: Option[] = [ @@ -734,7 +732,7 @@ export class IndicatorUtils { if (indicatorPath.type == null) { indicatorPath.type = this.defaultChartType; } - if(tab) { + if (tab) { indicatorPath.parameters.tab = tab; } return indicatorPath; @@ -783,7 +781,7 @@ export class IndicatorUtils { for (let gfilter of filter["groupFilters"]) { let replacedValue = this.replaceIndexValues(gfilter["values"][0], stakeholder); if (replacedValue) { // don't proceed in replacement if no replaced value matches - gfilter["values"][0] = replacedValue; + gfilter["values"][0] = replacedValue; } } } diff --git a/monitor/browse-stakeholder/browse-stakeholder-base.component.ts b/monitor/browse-stakeholder/browse-stakeholder-base.component.ts index a0fd6112..c26df7f6 100644 --- a/monitor/browse-stakeholder/browse-stakeholder-base.component.ts +++ b/monitor/browse-stakeholder/browse-stakeholder-base.component.ts @@ -20,7 +20,7 @@ export class BrowseStakeholderBaseComponent extends StakeholderBaseComponent gridView: boolean = true; sortOptions: Option[] = [ {value: 'alphAsc', label: 'Alphabetically Asc. (A-Z)'}, - {value: 'alphDsc', label: 'Alphabetically Dsc. (Z-A)'}, + {value: 'alphDsc', label: 'Alphabetically Desc. (Z-A)'}, ]; pageOptions: number[] = [10, 20, 30, 40]; sortBy: string = null; diff --git a/utils/entity-actions/entity-actions.component.ts b/utils/entity-actions/entity-actions.component.ts index b4d218e0..36be6079 100644 --- a/utils/entity-actions/entity-actions.component.ts +++ b/utils/entity-actions/entity-actions.component.ts @@ -58,7 +58,7 @@ import {EnvProperties} from "../properties/env-properties"; [type]="getTypeName().toLowerCase()"> - +
    @@ -98,6 +98,7 @@ export class EntityActionsComponent implements OnInit { @Input() showTooltip: boolean = true; @Input() compactView: boolean = false; // if true, do not show label for actions public citeThisClicked: boolean; + public addThisClicked: boolean; public routerHelper: RouterHelper = new RouterHelper(); @ViewChild('citeModal') citeModal; @ViewChild('embedResultsModal') embedResultsModal; @@ -140,6 +141,7 @@ export class EntityActionsComponent implements OnInit { } public openAddThisModal() { + this.addThisClicked = true; this.addThisModal.cancelButton = false; this.addThisModal.okButton = false; this.addThisModal.alertTitle = "Share this " + this.getTypeName() + " in your social networks"; diff --git a/utils/properties/env-properties.ts b/utils/properties/env-properties.ts index 1932596d..f518f97f 100644 --- a/utils/properties/env-properties.ts +++ b/utils/properties/env-properties.ts @@ -8,6 +8,7 @@ export interface EnvProperties { adminToolsPortalType?: PortalType; dashboard?: Dashboard; isDashboard?: boolean; + plan?:string; domain?: string; enablePiwikTrack?: boolean; useCache?: boolean; diff --git a/utils/properties/searchFields.base.ts b/utils/properties/searchFields.base.ts index 4d25b6ec..effe8ade 100644 --- a/utils/properties/searchFields.base.ts +++ b/utils/properties/searchFields.base.ts @@ -349,7 +349,15 @@ export class SearchFieldsBase { operator: "hl", equalityOperator: " = ", filterType: "triplet" - } + }, + ["relorganization"]: { + name: OpenaireEntities.ORGANIZATION, + type: "refine", + param: "organization", + operator: "or", + equalityOperator: " exact ", + filterType: "checkbox" + }, }; public RESULT_STATIC_FIELD_VALUES: { [key: string]: {"name": string, "id": string, "count": string}[] } = {