-
@@ -219,13 +198,16 @@
+
-
-
+
-
+
+
@@ -440,8 +422,6 @@
-
-
![]()
@@ -462,25 +442,10 @@
-
Indicators of all profiles based on this default indicator, will be deleted as well.
-
-
-
Are you sure you want to proceed?
@@ -490,20 +455,9 @@
-
Sections of all profiles based on this default section and their contents, will be deleted as well.
-
-
-
Are you sure you want to proceed?
diff --git a/monitor-admin/topic/indicators.component.ts b/monitor-admin/topic/indicators.component.ts
index 30343944..46119354 100644
--- a/monitor-admin/topic/indicators.component.ts
+++ b/monitor-admin/topic/indicators.component.ts
@@ -86,8 +86,7 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
public safeUrls: Map = new Map([]);
public numberResponses: Map = new Map();
public numberResults: Map = new Map();
- /** Import / Export Indicators */
- importLoading: boolean = false;
+ public loading: boolean = false;
@ViewChild('editChartModal', {static: true}) editChartModal: AlertModal;
@ViewChild('editNumberModal', {static: true}) editNumberModal: AlertModal;
@ViewChild('deleteModal', {static: true}) deleteModal: AlertModal;
@@ -354,7 +353,7 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
return this.stakeholder &&
this.stakeholder.topics[this.topicIndex] &&
this.stakeholder.topics[this.topicIndex].categories[this.categoryIndex] &&
- this.stakeholder.topics[this.topicIndex].categories[this.categoryIndex].subCategories[this.subcategoryIndex];
+ this.stakeholder.topics[this.topicIndex].categories[this.categoryIndex].subCategories[this.subcategoryIndex] && !this.loading;
}
public get numberIndicatorPaths(): UntypedFormArray {
@@ -504,16 +503,6 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
this.numberIndicatorPaths.at(index).get('result').setValue(null);
if (this.numberIndicatorPaths.at(index).get('url').valid) {
let indicatorPath: IndicatorPath = this.indicatorUtils.generateIndicatorByNumberUrl(this.indicatorUtils.getNumberSource(value), value, this.stakeholder, this.numberIndicatorPaths.at(index).get('jsonPath').value, this.indicatorUtils.numberSources.get(this.indicatorUtils.getNumberSource(value)));
- if (!this.isStakeholderParametersValid(indicatorPath)) {
- // default profile
- if (this.stakeholder.defaultId == null) {
- this.urlParameterizedMessage = "This indicator couldn't be generated properly. Stakeholders based on this profile may not inherit the data correctly."
- } else {
- this.urlParameterizedMessage = "This indicator couldn't be generated properly. Please make sure chart data is for the current stakeholder."
- }
- } else {
- this.urlParameterizedMessage = null;
- }
this.checkForSchemaEnhancements(this.numberIndicatorPaths.at(index).get('url').value);
if (this.indicator.indicatorPaths[index]) {
this.indicator.indicatorPaths[index] = indicatorPath;
@@ -574,16 +563,6 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
this.urlSubscriptions.push(this.chartIndicatorPaths.at(index).get('url').valueChanges.subscribe(value => {
if (this.chartIndicatorPaths.at(index).get('url').valid) {
let indicatorPath: IndicatorPath = this.indicatorUtils.generateIndicatorByChartUrl(this.indicatorUtils.getChartSource(value), value, this.chartIndicatorPaths.at(index).get('type').value, this.stakeholder);
- if (!this.isStakeholderParametersValid(indicatorPath)) {
- // default profile
- if (this.stakeholder.defaultId == null) {
- this.urlParameterizedMessage = "This chart couldn't be generated properly. Stakeholders based on this profile may not inherit the data correctly."
- } else {
- this.urlParameterizedMessage = "This chart couldn't be generated properly. Please make sure chart data is for the current stakeholder."
- }
- } else {
- this.urlParameterizedMessage = null;
- }
this.checkForSchemaEnhancements(this.chartIndicatorPaths.at(index).get('url').value);
(this.chartIndicatorPaths.at(index) as UntypedFormGroup).get('type').setValue(indicatorPath.type);
(this.chartIndicatorPaths.at(index) as UntypedFormGroup).setControl('parameters', this.getParametersAsFormArray(indicatorPath));
@@ -601,12 +580,6 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
}
}
- private isStakeholderParametersValid(indicatorPath: IndicatorPath) {
- return !((indicatorPath.chartObject && Object.keys(indicatorPath.parameters).indexOf("index_id") == -1 && Object.keys(indicatorPath.parameters).indexOf("index_name") == -1 && Object.keys(indicatorPath.parameters).indexOf("index_shortName") == -1)
- || (!indicatorPath.chartObject && indicatorPath.url.indexOf("index_id") == -1 && indicatorPath.url.indexOf("index_name") == -1 && (indicatorPath.url).indexOf("index_shortName") == -1));
-
- }
-
private getJsonPathAsFormArray(indicatorPath: IndicatorPath): UntypedFormArray {
let jsonPath = this.fb.array([]);
if (indicatorPath.jsonPath) {
@@ -900,19 +873,22 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
});
}
}
- this.editing = false;
- this.importLoading = false;
+ this.finish();
NotificationHandler.rise('Indicators have been imported successfully!');
}, error => {
this.chartIndicatorFb = null;
NotificationHandler.rise('An error has occurred. Please try again later', 'danger');
- this.editing = false;
- this.importLoading = false;
+ this.finish();
}));
}
+ finish() {
+ this.editing = false;
+ this.loading = false;
+ }
+
reorderIndicators(sectionId: string, type: IndicatorType, reorder: Reorder) {
this.editing = true;
let path = [
@@ -1159,24 +1135,6 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
}));
}
- // deleteNumberSectionOpen(section: Section, index: number) {
- // this.section = section;
- // this.index = index;
- // this.deleteNumberSectionModal.alertTitle = 'Delete Section';
- // this.deleteNumberSectionModal.cancelButtonText = 'No';
- // this.deleteNumberSectionModal.okButtonText = 'Yes';
- // this.deleteNumberSectionModal.open();
- // }
- //
- // deleteChartSectionOpen(section: Section, index: number) {
- // this.section = section;
- // this.index = index;
- // this.deleteChartSectionModal.alertTitle = 'Delete Section';
- // this.deleteChartSectionModal.cancelButtonText = 'No';
- // this.deleteChartSectionModal.okButtonText = 'Yes';
- // this.deleteChartSectionModal.open();
- // }
-
deleteSectionOpen(section: Section, index: number, type: IndicatorType, childrenAction: string = null) {
if (!this.editing && !section.defaultId) {
this.sectionTypeToDelete = type;
@@ -1256,11 +1214,19 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
return charts;
}
- importIndicatorsAndSave(charts: any[]) {
+ importIndicatorsAndSave(stakeholder: Stakeholder, charts: any[]) {
let sectionsToSave: Section[] = [];
let countIndicators = 0;
+ if(stakeholder.type !== this.stakeholder.type) {
+ UIkit.notification("The type of this profile is not the same with the file's one!", {
+ status: 'warning',
+ timeout: 6000,
+ pos: 'bottom-right'
+ });
+ this.finish();
+ return;
+ }
// name description additionalDescription, height, width, visibility
- let noValidParams = 0;
let duplicates = 0;
charts = this.migrateFromOldImportJsonFile(charts);
for (let chart of charts) {
@@ -1290,13 +1256,12 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
timeout: 6000,
pos: 'bottom-right'
});
- this.editing = false;
- this.importLoading = false;
+ this.finish();
break;
}
if (chart.type == "chart") {
- indicatorPath = this.indicatorUtils.generateIndicatorByChartUrl(this.indicatorUtils.getChartSource(chart.url), chart.url, chart.type, this.stakeholder);
+ indicatorPath = this.indicatorUtils.generateIndicatorByChartUrl(this.indicatorUtils.getChartSource(chart.url), chart.url, chart.type, stakeholder);
for (let section of this.stakeholder.topics[this.topicIndex].categories[this.categoryIndex].subCategories[this.index].charts) {
for (let chart of section.indicators) {
if (JSON.stringify(chart.indicatorPaths[0].chartObject) == JSON.stringify(indicatorPath.chartObject)) {
@@ -1304,10 +1269,9 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
exists = true;
}
}
-
}
} else if (chart.type == "number") {
- indicatorPath = this.indicatorUtils.generateIndicatorByNumberUrl(this.indicatorUtils.getNumberSource(chart.url), chart.url, this.stakeholder,
+ indicatorPath = this.indicatorUtils.generateIndicatorByNumberUrl(this.indicatorUtils.getNumberSource(chart.url), chart.url, stakeholder,
chart.jsonPath, this.indicatorUtils.numberSources.get(this.indicatorUtils.getNumberSource(chart.url)));
for (let section of this.stakeholder.topics[this.topicIndex].categories[this.categoryIndex].subCategories[this.index].numbers) {
for (let chart of section.indicators) {
@@ -1316,20 +1280,14 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
exists = true;
}
}
-
}
}
- if (!this.isStakeholderParametersValid(indicatorPath)) {
- noValidParams++;
- }
if (!exists) {
let i: Indicator = new Indicator(chart.name, chart.description, chart.additionalDescription, chart.type, chart.width, chart.height, this.showVisibility?"RESTRICTED":this.stakeholderUtils.defaultValue(this.stakeholderUtils.visibilities), [indicatorPath]);
sectionsToSave[chart['sectionIndex']].indicators.push(i);
countIndicators++;
}
-
}
-
if (duplicates > 0) {
UIkit.notification(duplicates + " urls already exist and will not be imported!", {
status: 'warning',
@@ -1337,19 +1295,7 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
pos: 'bottom-right'
});
}
- if (noValidParams > 0 && !(this.stakeholder.type == 'country')) {
- let noValidMessage = "Some indicators couldn't be generated properly. Please make sure chart data is for the current stakeholder.";
- if (this.stakeholder.defaultId == null) {
- noValidMessage = "Some indicators couldn't be generated properly. Stakeholders based on this profile may not inherit the data correctly.";
- }
- UIkit.notification(noValidMessage, {
- status: 'danger',
- timeout: 6000,
- pos: 'bottom-right'
- });
- this.editing = false;
- this.importLoading = false;
- } else if (sectionsToSave.length > 0 && countIndicators > 0) {
+ if (sectionsToSave.length > 0 && countIndicators > 0) {
this.saveIndicators(sectionsToSave.filter(section => !!section));
}
if (sectionsToSave.length == 0 || countIndicators == 0) {
@@ -1358,8 +1304,7 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
timeout: 6000,
pos: 'bottom-right'
});
- this.editing = false;
- this.importLoading = false;
+ this.finish();
}
}
@@ -1408,8 +1353,12 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
let topic = this.stakeholder ? this.stakeholder.topics[this.topicIndex] : null;
let category = topic ? topic.categories[this.categoryIndex] : null;
let subCategory = category ? category.subCategories[subcategoryIndex] : null;
-
- var jsonFileUrl = window.URL.createObjectURL(new Blob([JSON.stringify(indicators)], {type: 'application/json'}));
+ let json = {
+ stakeholder: HelperFunctions.copy(this.stakeholder),
+ indicators: indicators
+ }
+ delete json.stakeholder.topics;
+ var jsonFileUrl = window.URL.createObjectURL(new Blob([JSON.stringify(json)], {type: 'application/json'}));
var a = window.document.createElement('a');
window.document.body.appendChild(a);
a.setAttribute('style', 'display: none');
@@ -1418,14 +1367,13 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
a.click();
window.URL.revokeObjectURL(jsonFileUrl);
a.remove(); // remove the element
-
- this.editing = false;
+ this.finish();
}
fileChangeEvent(fileInput: any, index) {
this.index = index;
this.editing = true;
- this.importLoading = true;
+ this.loading = true;
this.filesToUpload = >fileInput.target.files;
this.upload();
}
@@ -1438,8 +1386,7 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
timeout: 6000,
pos: 'bottom-right'
});
- this.editing = false;
- this.importLoading = false;
+ this.finish();
return;
} else {
if (this.filesToUpload[0].name.indexOf(".json") == -1 || (this.filesToUpload[0].type != "application/json")) {
@@ -1449,27 +1396,30 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
timeout: 6000,
pos: 'bottom-right'
});
- this.editing = false;
- this.importLoading = false;
+ this.finish();
return;
}
}
this.makeFileRequest(this.properties.utilsService + '/upload?type=json', [], this.filesToUpload).then(async (result: string) => {
-
- let json_result = JSON.parse(result);
-
+ let json = JSON.parse(result);
// validate file
- if (!json_result || json_result.length == 0) {
+ if(json && Array.isArray(json)) {
+ UIkit.notification("This file is not supported any more. Please export indicators and try again!", {
+ status: 'danger',
+ timeout: 6000,
+ pos: 'bottom-right'
+ });
+ this.finish();
+ } else if (!json || json?.indicators.length == 0) {
UIkit.notification("Importing file is empty", {
status: 'danger',
timeout: 6000,
pos: 'bottom-right'
});
- this.editing = false;
- this.importLoading = false;
+ this.finish();
} else {
- this.importIndicatorsAndSave(json_result);
+ this.importIndicatorsAndSave(json.stakeholder, json.indicators);
}
}, (error) => {
console.error("Error importing files", error);
@@ -1478,8 +1428,7 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
timeout: 6000,
pos: 'bottom-right'
});
- this.editing = false;
- this.importLoading = false;
+ this.finish();
});
}
diff --git a/orcid/my-orcid-links/searchMyOrcidResults.module.ts b/orcid/my-orcid-links/searchMyOrcidResults.module.ts
index 87ce11d0..66cf5358 100644
--- a/orcid/my-orcid-links/searchMyOrcidResults.module.ts
+++ b/orcid/my-orcid-links/searchMyOrcidResults.module.ts
@@ -6,15 +6,15 @@ import {RouterModule} from '@angular/router';
import {ResultPreviewModule} from "../../utils/result-preview/result-preview.module";
import {ErrorMessagesModule} from "../../utils/errorMessages.module";
import {searcMyOrcidResultsComponent} from "./searchMyOrcidResults.component";
-import {OrcidModule} from "../orcid.module";
import {NoLoadPaging} from "../../searchPages/searchUtils/no-load-paging.module";
import {PagingModule} from "../../utils/paging.module";
+import {OrcidCoreModule} from "../orcid-core.module";
@NgModule({
imports: [
CommonModule, FormsModule,
RouterModule, ErrorMessagesModule,
- ResultPreviewModule, OrcidModule, NoLoadPaging, PagingModule
+ ResultPreviewModule, OrcidCoreModule, NoLoadPaging, PagingModule
],
declarations: [
searcMyOrcidResultsComponent
diff --git a/orcid/orcid-core.module.ts b/orcid/orcid-core.module.ts
new file mode 100644
index 00000000..eda20ab1
--- /dev/null
+++ b/orcid/orcid-core.module.ts
@@ -0,0 +1,43 @@
+import {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+
+import {RouterModule} from '@angular/router';
+
+import {OrcidComponent} from './orcid.component';
+import {OrcidService} from './orcid.service';
+import {OrcidWorkComponent} from './orcid-work.component';
+import {AlertModalModule} from '../utils/modal/alertModal.module';
+import {ResultLandingService} from '../landingPages/result/resultLanding.service';
+import {LoadingModule} from '../utils/loading/loading.module';
+import {ResultLandingUtilsModule} from '../landingPages/landing-utils/resultLandingUtils.module';
+import {IconsModule} from '../utils/icons/icons.module';
+import {IconsService} from "../utils/icons/icons.service";
+import {orcid_add, orcid_bin} from "../utils/icons/icons";
+import {FullScreenModalModule} from "../utils/modal/full-screen-modal/full-screen-modal.module";
+import {LogServiceModule} from "../utils/log/LogService.module";
+import {OrcidRoutingModule} from "./orcid-routing.module";
+
+@NgModule({
+ imports: [
+ CommonModule, RouterModule, AlertModalModule, LoadingModule, ResultLandingUtilsModule,
+ IconsModule, FullScreenModalModule, LogServiceModule
+ ],
+ declarations: [
+ OrcidComponent,
+ OrcidWorkComponent
+ ],
+ providers:[
+ OrcidService, ResultLandingService
+ ],
+ exports: [
+ OrcidComponent,
+ OrcidWorkComponent
+ ]
+})
+
+
+export class OrcidCoreModule{
+ constructor(private iconsService: IconsService) {
+ this.iconsService.registerIcons([orcid_add, orcid_bin])
+ }
+}
diff --git a/orcid/orcid.module.ts b/orcid/orcid.module.ts
index 54bae78b..5743c46a 100644
--- a/orcid/orcid.module.ts
+++ b/orcid/orcid.module.ts
@@ -1,43 +1,15 @@
import {NgModule} from '@angular/core';
-import {CommonModule} from '@angular/common';
-
-import {RouterModule} from '@angular/router';
-
-import {OrcidComponent} from './orcid.component';
-import {OrcidService} from './orcid.service';
-import {OrcidWorkComponent} from './orcid-work.component';
-import {AlertModalModule} from '../utils/modal/alertModal.module';
-import {ResultLandingService} from '../landingPages/result/resultLanding.service';
-import {LoadingModule} from '../utils/loading/loading.module';
-import {ResultLandingUtilsModule} from '../landingPages/landing-utils/resultLandingUtils.module';
-import {IconsModule} from '../utils/icons/icons.module';
import {IconsService} from "../utils/icons/icons.service";
import {orcid_add, orcid_bin} from "../utils/icons/icons";
-import {FullScreenModalModule} from "../utils/modal/full-screen-modal/full-screen-modal.module";
-import {LogServiceModule} from "../utils/log/LogService.module";
import {OrcidRoutingModule} from "./orcid-routing.module";
+import {OrcidCoreModule} from "./orcid-core.module";
+import {OrcidComponent} from "./orcid.component";
@NgModule({
- imports: [
- CommonModule, RouterModule, OrcidRoutingModule, AlertModalModule, LoadingModule, ResultLandingUtilsModule,
- IconsModule, FullScreenModalModule, LogServiceModule
- ],
- declarations: [
- OrcidComponent,
- OrcidWorkComponent
- ],
- providers:[
- OrcidService, ResultLandingService
- ],
- exports: [
- OrcidComponent,
- OrcidWorkComponent
- ]
+ imports: [OrcidCoreModule, OrcidRoutingModule],
+ exports: [OrcidComponent]
})
export class OrcidModule{
- constructor(private iconsService: IconsService) {
- this.iconsService.registerIcons([orcid_add, orcid_bin])
- }
}
diff --git a/role-verification/role-verification.component.ts b/role-verification/role-verification.component.ts
index 416c2624..1b54fe75 100644
--- a/role-verification/role-verification.component.ts
+++ b/role-verification/role-verification.component.ts
@@ -93,6 +93,8 @@ export class RoleVerificationComponent extends BaseComponent implements OnInit,
public userInfoLinkPrefix = '';
@Input()
public userInfoLink = null;
+ @Input()
+ public relativeTo: ActivatedRoute = this._route;
public user: User;
public verification: any;
public code: UntypedFormControl;
@@ -150,7 +152,7 @@ export class RoleVerificationComponent extends BaseComponent implements OnInit,
'errorCode': LoginErrorCodes.NOT_LOGIN,
'redirectUrl': this._router.url
},
- relativeTo: this._route
+ relativeTo: this.relativeTo
});
}
} else if(this.isMember) {
diff --git a/services/searchResearchResults.service.ts b/services/searchResearchResults.service.ts
index 3e49a7cc..aadcd730 100644
--- a/services/searchResearchResults.service.ts
+++ b/services/searchResearchResults.service.ts
@@ -133,7 +133,14 @@ export class SearchResearchResultsService {
return this.http.get((properties.useLongCache && size == 0 && !params && (!refineQuery || !refineQuery.includes("fq="))) ? (properties.cacheUrl + encodeURIComponent(url)) : url)
.pipe(map(res => [res['meta'].total, this.parseResults(resultType, res['results'], properties), RefineResultsUtils.parse(res['refineResults'], refineFields, "publication")]));
}
+ countResults(field:string,value:string): any {
+ let url = properties.utilsService + "/portals/countResults";
+ if (field && value) {
+ url += "?field=" + encodeURIComponent(field) + "&value="+encodeURIComponent(value);
+ }
+ return this.http.get((properties.useLongCache ) ? (properties.cacheUrl + encodeURIComponent(url)) : url);
+ }
searchResultForEntity(resultType: string, params: string, page: number, size: number, properties: EnvProperties): any {
let link = properties.searchAPIURLLAst;
//let url = link+params+"/"+this.getEntityQueryName(resultType,true)+ "?format=json";
diff --git a/sharedComponents/menu.ts b/sharedComponents/menu.ts
index e3b38e60..b4328834 100644
--- a/sharedComponents/menu.ts
+++ b/sharedComponents/menu.ts
@@ -23,10 +23,11 @@ export class MenuItem {
isFeatured: boolean;
isActive: boolean;
target: string = "_blank";
+ badge?: string = ""; // used only for RDGraph portal (FAIRCORE4EOSC)
constructor(id: string, title: string, url: string, route: string, needsAuthorization: boolean, entitiesRequired: string[],
routeRequired: string[], params, icon: Icon = null, fragment = null, customClass = null, routeActive = null,
- target: string = "_blank", type: string = "internal", isFeatured: boolean = false, items: MenuItem[] = []) {
+ target: string = "_blank", type: string = "internal", isFeatured: boolean = false, items: MenuItem[] = [], badge: string = "") {
this._id = id;
this.title = title;
this.url = url;
@@ -43,6 +44,7 @@ export class MenuItem {
this.target = target;
this.type = type;
this.isFeatured = isFeatured;
+ this.badge = badge;
}
public static isTheActiveMenu(menu: MenuItem, currentRoute: any, activeMenuItem: string = ""): boolean {
diff --git a/sharedComponents/navigationBar.component.html b/sharedComponents/navigationBar.component.html
index 7f502eab..a0147369 100644
--- a/sharedComponents/navigationBar.component.html
+++ b/sharedComponents/navigationBar.component.html
@@ -41,7 +41,9 @@
{{menu.title}}
+ [fragment]="menu.fragment">
+ {{menu.badge}}
+ {{menu.title}}
{{menu.title}}
- {{menu.title}}
+
+ {{menu.badge}}
+ {{menu.title}}