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

[Monitor Dashboard | Trunk]: Add alias error. Fix number indicator form validation 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59775 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
Konstantinos Triantafyllou 2020-11-04 23:11:00 +00:00
parent 5f6c0884b5
commit f6319eac64
6 changed files with 111 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/general/edit-stakeholder/edit-stakeholder.component.ts
View File

@ -20,7 +20,7 @@ declare var UIkit;
[class.uk-padding-small]="!paddingLarge" [class.uk-padding-large]="paddingLarge" [class.uk-padding-small]="!paddingLarge" [class.uk-padding-large]="paddingLarge"
class="uk-overflow-auto" class="uk-overflow-auto"
[formGroup]="stakeholderFb"> [formGroup]="stakeholderFb">
<div class="uk-flex uk-flex-bottom" uk-grid> <div class="uk-grid" uk-grid uk-height-match=".uk-form-hint">
<div dashboard-input class="uk-width-1-2@m" [formInput]="stakeholderFb.get('name')" label="Name" <div dashboard-input class="uk-width-1-2@m" [formInput]="stakeholderFb.get('name')" label="Name"
placeholder="Write a name..." placeholder="Write a name..."
hint="Set a name for your profile."></div> hint="Set a name for your profile."></div>

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

@ -295,13 +295,22 @@
</div> </div>
</div> </div>
</div> </div>
<div> <div class="uk-flex uk-flex-middle">
<button <button
class="uk-button uk-button-secondary uk-button-small uk-flex uk-flex-middle uk-margin-medium-top" class="uk-icon-button uk-button-secondary uk-margin-medium-top"
(click)="addJsonPath(i)"> (click)="addJsonPath(i)">
<icon name="add" [flex]="true"></icon> <icon name="add"></icon>
<span class="space">Add level</span>
</button> </button>
<!--<span *ngIf="getJsonPath(i).invalid" class="uk-margin-small-left uk-margin-medium-top">
<button *ngIf="getJsonPath(i).errors.invalid" class="uk-icon-button uk-button-primary"
(click)="validateJsonPath(i)">
<icon name="done"></icon>
</button>
</span>
<span *ngIf="getJsonPath(i).disabled" class="uk-text-primary uk-margin-small-left uk-margin-medium-top">Validating...</span>
<span *ngIf="getJsonPath(i).valid" class="uk-text-success uk-margin-small-left uk-margin-medium-top">
<icon name="done"></icon>
</span>-->
</div> </div>
</div> </div>
</div> </div>

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

@ -76,7 +76,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
/** /**
* Toggles * Toggles
*/ */
// public grid: boolean = true; // public grid: boolean = true;
public editing: boolean = false; public editing: boolean = false;
/** Safe Urls*/ /** Safe Urls*/
public safeUrls: Map<string, SafeResourceUrl> = new Map<string, SafeResourceUrl>([]); public safeUrls: Map<string, SafeResourceUrl> = new Map<string, SafeResourceUrl>([]);
@ -96,7 +96,8 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
public indicatorChildrenActionOnDelete: string; public indicatorChildrenActionOnDelete: string;
urlParameterizedMessage = ""; urlParameterizedMessage = "";
constructor(private layoutService: LayoutService,
constructor(private layoutService: LayoutService,
private stakeholderService: StakeholderService, private stakeholderService: StakeholderService,
private statisticsService: StatisticsService, private statisticsService: StatisticsService,
private userManagementService: UserManagementService, private userManagementService: UserManagementService,
@ -112,7 +113,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
}); });
this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => { this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => {
this.stakeholder = stakeholder; this.stakeholder = stakeholder;
if(this.stakeholder) { if (this.stakeholder) {
this.buildFilters(); this.buildFilters();
this.buildSections(); this.buildSections();
this.filterCharts(); this.filterCharts();
@ -153,7 +154,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
let urls: Map<string, [number, number][]> = new Map<string, [number, number][]>(); let urls: Map<string, [number, number][]> = new Map<string, [number, number][]>();
this.numbers.forEach((section, i) => { this.numbers.forEach((section, i) => {
section.indicators.forEach((number, j) => { section.indicators.forEach((number, j) => {
let url =this.indicatorUtils.getFullUrlWithFilters(this.stakeholder, number.indicatorPaths[0]); let url = this.indicatorUtils.getFullUrlWithFilters(this.stakeholder, number.indicatorPaths[0]);
const pair = JSON.stringify([number.indicatorPaths[0].source, url]); const pair = JSON.stringify([number.indicatorPaths[0].source, url]);
const indexes = urls.get(pair) ? urls.get(pair) : []; const indexes = urls.get(pair) ? urls.get(pair) : [];
indexes.push([i, j]); indexes.push([i, j]);
@ -162,7 +163,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
}); });
urls.forEach((indexes, pair) => { urls.forEach((indexes, pair) => {
pair = JSON.parse(pair); pair = JSON.parse(pair);
this.statisticsService.getNumbers(this.statisticsService.getSourceType(pair[0]), pair[1]).subscribe(response => { this.statisticsService.getNumbers(this.statisticsService.getSourceType(pair[0]), pair[1]).subscribe(response => {
indexes.forEach(([i, j]) => { indexes.forEach(([i, j]) => {
let result = JSON.parse(JSON.stringify(response)); let result = JSON.parse(JSON.stringify(response));
this.numbers[i].indicators[j].indicatorPaths[0].jsonPath.forEach(jsonPath => { this.numbers[i].indicators[j].indicatorPaths[0].jsonPath.forEach(jsonPath => {
@ -170,7 +171,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
result = result[jsonPath]; result = result[jsonPath];
} }
}); });
if(typeof result == 'string') { if (typeof result == 'string') {
this.numberResults.set(i + '-' + j, Number(result)); this.numberResults.set(i + '-' + j, Number(result));
} }
}); });
@ -179,9 +180,9 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
} }
setPreview() { setPreview() {
if(this.stakeholder){ if (this.stakeholder) {
this.preview = '/' + this.stakeholder.alias; this.preview = '/' + this.stakeholder.alias;
if(this.stakeholder.topics[this.topicIndex]) { if (this.stakeholder.topics[this.topicIndex]) {
this.preview = '/' + this.stakeholder.alias + '/' + this.stakeholder.topics[this.topicIndex].alias; this.preview = '/' + this.stakeholder.alias + '/' + this.stakeholder.topics[this.topicIndex].alias;
if (this.stakeholder.topics[this.topicIndex].categories[this.categoryIndex]) { if (this.stakeholder.topics[this.topicIndex].categories[this.categoryIndex]) {
this.preview += '/' + this.stakeholder.topics[this.topicIndex].categories[this.categoryIndex].alias; this.preview += '/' + this.stakeholder.topics[this.topicIndex].categories[this.categoryIndex].alias;
@ -238,12 +239,12 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
hide(element: any) { hide(element: any) {
UIkit.dropdown(element).hide(); UIkit.dropdown(element).hide();
} }
private buildFilters() { private buildFilters() {
this.subscriptions.push(this.filters.get('chartType').valueChanges.subscribe(value => { this.subscriptions.push(this.filters.get('chartType').valueChanges.subscribe(value => {
this.onChartTypeChange(value); this.onChartTypeChange(value);
})); }));
this.subscriptions.push(this.filters.get('status').valueChanges.subscribe(value => { this.subscriptions.push(this.filters.get('status').valueChanges.subscribe(value => {
this.onStatusChange(value); this.onStatusChange(value);
})); }));
@ -309,7 +310,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
this.displayCharts = this.filterChartType(HelperFunctions.copy(this.charts), value); this.displayCharts = this.filterChartType(HelperFunctions.copy(this.charts), value);
} }
onStatusChange(value) { onStatusChange(value) {
this.displayCharts = this.filterStatus(HelperFunctions.copy(this.charts), value); this.displayCharts = this.filterStatus(HelperFunctions.copy(this.charts), value);
this.displayNumbers = this.filterStatus(HelperFunctions.copy(this.numbers), value); this.displayNumbers = this.filterStatus(HelperFunctions.copy(this.numbers), value);
@ -329,7 +330,6 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
return sections; return sections;
} }
private filterStatus(sections: Section[], value): Section[] { private filterStatus(sections: Section[], value): Section[] {
if (value !== 'all') { if (value !== 'all') {
@ -344,7 +344,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
sections.forEach(section => sections.forEach(section =>
section.indicators = section.indicators.filter(indicator => (indicator.name && indicator.name.toLowerCase().includes(value.toLowerCase())) section.indicators = section.indicators.filter(indicator => (indicator.name && indicator.name.toLowerCase().includes(value.toLowerCase()))
|| (indicator.description && indicator.description.toLowerCase().includes(value.toLowerCase())) || (indicator.description && indicator.description.toLowerCase().includes(value.toLowerCase()))
|| (indicator.additionalDescription && indicator.additionalDescription.toLowerCase().includes(value.toLowerCase())) || (indicator.additionalDescription && indicator.additionalDescription.toLowerCase().includes(value.toLowerCase()))
|| indicator.indicatorPaths.filter(indicatorPath => (indicatorPath.parameters && indicatorPath.parameters.title && || indicator.indicatorPaths.filter(indicatorPath => (indicatorPath.parameters && indicatorPath.parameters.title &&
indicatorPath.parameters.title.includes(value.toLowerCase()))).length > 0)); indicatorPath.parameters.title.includes(value.toLowerCase()))).length > 0));
} }
@ -404,11 +404,11 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
} }
public addJsonPath(index: number) { public addJsonPath(index: number) {
if(index==0 && this.getJsonPath(index).getRawValue()[index].indexOf(",")!=-1){ if (index == 0 && this.getJsonPath(index).getRawValue()[index].indexOf(",") != -1) {
//if in the first path there are more than one paaths comma separated, split them and autogenerate the forms //if in the first path there are more than one paaths comma separated, split them and autogenerate the forms
let paths = this.getJsonPath(index).getRawValue()[index].split(","); let paths = this.getJsonPath(index).getRawValue()[index].split(",");
for(let i = 0; i< paths.length; i++){ for (let i = 0; i < paths.length; i++) {
if(i !=0){ if (i != 0) {
this.getJsonPath(index).push(this.fb.control('', Validators.required)); this.getJsonPath(index).push(this.fb.control('', Validators.required));
} }
} }
@ -418,15 +418,43 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
this.getJsonPath(index).push(this.fb.control('', Validators.required)); this.getJsonPath(index).push(this.fb.control('', Validators.required));
} }
public removeJsonPath(i: number, j:number) { public removeJsonPath(i: number, j: number) {
this.getJsonPath(i).removeAt(j); this.getJsonPath(i).removeAt(j);
this.getJsonPath(i).markAsDirty(); if (this.getJsonPath(i).length !== this.getCurrentJsonPath(i).length) {
this.getJsonPath(i).markAsDirty();
}
}
public validateJsonPath(index: number) {
let indicatorPath: FormGroup = <FormGroup>this.numberIndicatorPaths.at(index);
this.getJsonPath(index).disable();
this.statisticsService.getNumbers(null, indicatorPath.get('url').value).subscribe(response => {
let result = JSON.parse(JSON.stringify(response));
this.getJsonPath(index).controls.forEach(jsonPath => {
if (result) {
result = result[jsonPath.value];
}
});
setTimeout( () => {
if (typeof result == 'string') {
this.getJsonPath(index).enable();
this.getJsonPath(index).setErrors(null);
} else {
this.getJsonPath(index).enable();
this.getJsonPath(index).setErrors({invalid: true});
}
}, 1000);
});
} }
public getJsonPath(index: number): FormArray { public getJsonPath(index: number): FormArray {
return this.numberIndicatorPaths.at(index).get('jsonPath') as FormArray; return this.numberIndicatorPaths.at(index).get('jsonPath') as FormArray;
} }
public getCurrentJsonPath(index: number): string[] {
return this.section.indicators[this.index].indicatorPaths[index].jsonPath;
}
public getParameters(index: number): FormArray { public getParameters(index: number): FormArray {
return this.chartIndicatorPaths.at(index).get('parameters') as FormArray; return this.chartIndicatorPaths.at(index).get('parameters') as FormArray;
} }
@ -444,8 +472,8 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
return this.statisticsService.getChartUrl(indicatorPath.source, this.indicatorUtils.getFullUrl(this.stakeholder, indicatorPath)); return this.statisticsService.getChartUrl(indicatorPath.source, this.indicatorUtils.getFullUrl(this.stakeholder, indicatorPath));
} }
public addNumberIndicatorPath(url: string = '',parameters: FormArray = new FormArray([]), source: string = 'search', jsonPath: FormArray = new FormArray([])) { public addNumberIndicatorPath(url: string = '', parameters: FormArray = new FormArray([]), source: string = 'search', jsonPath: FormArray = new FormArray([])) {
if(jsonPath.length === 0) { if (jsonPath.length === 0) {
jsonPath.push(this.fb.control('', Validators.required)); jsonPath.push(this.fb.control('', Validators.required));
} }
this.numberIndicatorPaths.push(this.fb.group({ this.numberIndicatorPaths.push(this.fb.group({
@ -455,56 +483,44 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
source: this.fb.control(source, Validators.required) source: this.fb.control(source, Validators.required)
} }
)); ));
for(let index = 0; index < this.numberIndicatorPaths.length; index++) { for (let index = 0; index < this.numberIndicatorPaths.length; index++) {
this.subscriptions.push(this.numberIndicatorPaths.at(index).get('url').valueChanges.subscribe(value => { this.subscriptions.push(this.numberIndicatorPaths.at(index).get('url').valueChanges.subscribe(value => {
if (this.numberIndicatorPaths.at(index).get('url').valid) { if (this.numberIndicatorPaths.at(index).get('url').valid) {
let indicatorPath: IndicatorPath = this.indicatorUtils.generateIndicatorByNumberUrl(this.statisticsService.getNumberSource(value), value, this.stakeholder,this.numberIndicatorPaths.at(index).get('jsonPath').value ); let indicatorPath: IndicatorPath = this.indicatorUtils.generateIndicatorByNumberUrl(this.statisticsService.getNumberSource(value), value, this.stakeholder, this.numberIndicatorPaths.at(index).get('jsonPath').value);
if((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 ) if ((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 )){ || (!indicatorPath.chartObject && indicatorPath.url.indexOf("index_id") == -1 && indicatorPath.url.indexOf("index_name") == -1 && (indicatorPath.url).indexOf("index_shortName") == -1)) {
// default profile // default profile
if(this.stakeholder.defaultId == null){ 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." this.urlParameterizedMessage = "This indicator couldn't be generated properly. Stakeholders based on this profile may not inherit the data correctly."
}else{ } else {
this.urlParameterizedMessage = "This indicator couldn't be generated properly. Please make sure chart data is for the current stakeholder." this.urlParameterizedMessage = "This indicator couldn't be generated properly. Please make sure chart data is for the current stakeholder."
} }
}else { } else {
this.urlParameterizedMessage = ""; this.urlParameterizedMessage = "";
} }
/* if(value != indicatorPath.url) { /* if(value != indicatorPath.url) {
(this.numberIndicatorPaths.at(index) as FormGroup).get('url').setValue( indicatorPath.url); (this.numberIndicatorPaths.at(index) as FormGroup).get('url').setValue( indicatorPath.url);
}*/ }*/
if (!this.indicator.indicatorPaths[index]) { this.indicator.indicatorPaths[index] = indicatorPath;
this.indicator.indicatorPaths[index] = indicatorPath;
} else {
this.indicator.indicatorPaths[index] = indicatorPath;
}
(this.numberIndicatorPaths.at(index) as FormGroup).get('source').setValue(indicatorPath.source); (this.numberIndicatorPaths.at(index) as FormGroup).get('source').setValue(indicatorPath.source);
} }
}) })
); );
this.subscriptions.push(this.numberIndicatorPaths.at(index).get('jsonPath').valueChanges.subscribe(value => { this.subscriptions.push(this.numberIndicatorPaths.at(index).get('jsonPath').valueChanges.subscribe(value => {
if (!this.indicator.indicatorPaths[index]) { this.indicator.indicatorPaths[index].jsonPath = value;
this.indicator.indicatorPaths[index].jsonPath = value; //this.getJsonPath(index).setErrors({invalid: true});
} else {
this.indicator.indicatorPaths[index].jsonPath = value;
}
}) })
); );
this.subscriptions.push(this.numberIndicatorPaths.at(index).get('source').valueChanges.subscribe(value => { this.subscriptions.push(this.numberIndicatorPaths.at(index).get('source').valueChanges.subscribe(value => {
if (!this.indicator.indicatorPaths[index]) { this.indicator.indicatorPaths[index].source = value;
this.indicator.indicatorPaths[index].source = value;
} else {
this.indicator.indicatorPaths[index].source = value;
}
}) })
); );
} }
} }
public addChartIndicatorPath(value: string = '', parameters: FormArray = new FormArray([]), disableUrl: boolean = false, type:string=null) { public addChartIndicatorPath(value: string = '', parameters: FormArray = new FormArray([]), disableUrl: boolean = false, type: string = null) {
this.chartIndicatorPaths.push(this.fb.group({ this.chartIndicatorPaths.push(this.fb.group({
url: this.fb.control(value, [Validators.required, url: this.fb.control(value, [Validators.required,
Validators.pattern('https?:\/\/(?:www\.|(?!www))[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\.[^\s]{2,}|www\.' + Validators.pattern('https?:\/\/(?:www\.|(?!www))[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\.[^\s]{2,}|www\.' +
@ -514,23 +530,23 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
type: this.fb.control(type) type: this.fb.control(type)
} }
)); ));
if(disableUrl) { if (disableUrl) {
for(let index = 0; index < this.chartIndicatorPaths.length; index++) { for (let index = 0; index < this.chartIndicatorPaths.length; index++) {
this.chartIndicatorPaths.at(index).get('url').disable(); this.chartIndicatorPaths.at(index).get('url').disable();
} }
} else { } else {
for(let index = 0; index < this.chartIndicatorPaths.length; index++) { for (let index = 0; index < this.chartIndicatorPaths.length; index++) {
this.urlSubscriptions.push(this.chartIndicatorPaths.at(index).get('url').valueChanges.subscribe(value => { this.urlSubscriptions.push(this.chartIndicatorPaths.at(index).get('url').valueChanges.subscribe(value => {
if (this.chartIndicatorPaths.at(index).get('url').valid) { if (this.chartIndicatorPaths.at(index).get('url').valid) {
let indicatorPath: IndicatorPath = this.indicatorUtils.generateIndicatorByChartUrl(this.statisticsService.getChartSource(value), value, this.chartIndicatorPaths.at(index).get('type').value, this.stakeholder); let indicatorPath: IndicatorPath = this.indicatorUtils.generateIndicatorByChartUrl(this.statisticsService.getChartSource(value), value, this.chartIndicatorPaths.at(index).get('type').value, this.stakeholder);
if(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 ){ if (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) {
// default profile // default profile
if(this.stakeholder.defaultId == null){ 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." this.urlParameterizedMessage = "This chart couldn't be generated properly. Stakeholders based on this profile may not inherit the data correctly."
}else{ } else {
this.urlParameterizedMessage = "This chart couldn't be generated properly. Please make sure chart data is for the current stakeholder." this.urlParameterizedMessage = "This chart couldn't be generated properly. Please make sure chart data is for the current stakeholder."
} }
}else { } else {
this.urlParameterizedMessage = ""; this.urlParameterizedMessage = "";
} }
(this.chartIndicatorPaths.at(index) as FormGroup).get('type').setValue(indicatorPath.type); (this.chartIndicatorPaths.at(index) as FormGroup).get('type').setValue(indicatorPath.type);
@ -600,10 +616,10 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
defaultId: this.fb.control(this.indicator.defaultId) defaultId: this.fb.control(this.indicator.defaultId)
}); });
this.indicator.indicatorPaths.forEach(indicatorPath => { this.indicator.indicatorPaths.forEach(indicatorPath => {
this.addNumberIndicatorPath(this.statisticsService.getNumberUrl(indicatorPath.source,this.indicatorUtils.getFullUrl(this.stakeholder, indicatorPath)),indicatorPath.parameters, indicatorPath.source, this.getJsonPathAsFormArray(indicatorPath)); this.addNumberIndicatorPath(this.statisticsService.getNumberUrl(indicatorPath.source, this.indicatorUtils.getFullUrl(this.stakeholder, indicatorPath)), indicatorPath.parameters, indicatorPath.source, this.getJsonPathAsFormArray(indicatorPath));
}); });
} else { } else {
this.indicator = new Indicator('', '', '','number', 'small', "PUBLIC", []); this.indicator = new Indicator('', '', '', 'number', 'small', "PUBLIC", []);
this.numberIndicatorFb = this.fb.group({ this.numberIndicatorFb = this.fb.group({
_id: this.fb.control(this.indicator._id), _id: this.fb.control(this.indicator._id),
name: this.fb.control(this.indicator.name, Validators.required), name: this.fb.control(this.indicator.name, Validators.required),
@ -657,7 +673,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
indicatorPath.safeResourceUrl = this.getSecureUrlByStakeHolder(indicatorPath); indicatorPath.safeResourceUrl = this.getSecureUrlByStakeHolder(indicatorPath);
}); });
} else { } else {
this.indicator = new Indicator('', '', '', 'chart', 'medium', "PUBLIC",[]); this.indicator = new Indicator('', '', '', 'chart', 'medium', "PUBLIC", []);
this.chartIndicatorFb = this.fb.group({ this.chartIndicatorFb = this.fb.group({
_id: this.fb.control(this.indicator._id), _id: this.fb.control(this.indicator._id),
name: this.fb.control(this.indicator.name), name: this.fb.control(this.indicator.name),
@ -692,8 +708,6 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
this.indicator = this.indicatorUtils.generateIndicatorByForm(this.numberIndicatorFb.value, this.indicator.indicatorPaths, this.indicator.type, false); this.indicator = this.indicatorUtils.generateIndicatorByForm(this.numberIndicatorFb.value, this.indicator.indicatorPaths, this.indicator.type, false);
this.section = this.numbers.find(section => section._id === this.section._id); this.section = this.numbers.find(section => section._id === this.section._id);
} }
console.debug("Indicator to svae");
console.debug(this.indicator);
let path = [ let path = [
this.stakeholder._id, this.stakeholder._id,
this.stakeholder.topics[this.topicIndex]._id, this.stakeholder.topics[this.topicIndex]._id,
@ -707,7 +721,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
} else { } else {
this.section.indicators.push(indicator); this.section.indicators.push(indicator);
} }
if(this.indicator.type === "chart") { if (this.indicator.type === "chart") {
this.filterCharts(); this.filterCharts();
this.chartIndicatorFb = null; this.chartIndicatorFb = null;
} else { } else {
@ -769,7 +783,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
} }
refreshIndicator() { refreshIndicator() {
this.indicator = this.indicatorUtils.generateIndicatorByForm(this.chartIndicatorFb.value, this.indicator.indicatorPaths,'chart', true); this.indicator = this.indicatorUtils.generateIndicatorByForm(this.chartIndicatorFb.value, this.indicator.indicatorPaths, 'chart', true);
this.indicator.indicatorPaths.forEach(indicatorPath => { this.indicator.indicatorPaths.forEach(indicatorPath => {
indicatorPath.safeResourceUrl = this.getSecureUrlByStakeHolder(indicatorPath); indicatorPath.safeResourceUrl = this.getSecureUrlByStakeHolder(indicatorPath);
}); });
@ -777,12 +791,12 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
deleteIndicatorOpen(section: Section, indicatorId: string, type: string, childrenAction: string = null) { deleteIndicatorOpen(section: Section, indicatorId: string, type: string, childrenAction: string = null) {
this.indicatorChildrenActionOnDelete = null; this.indicatorChildrenActionOnDelete = null;
if(childrenAction == "delete") { if (childrenAction == "delete") {
this.indicatorChildrenActionOnDelete = childrenAction; this.indicatorChildrenActionOnDelete = childrenAction;
} else if(childrenAction == "disconnect") { } else if (childrenAction == "disconnect") {
this.indicatorChildrenActionOnDelete = childrenAction; this.indicatorChildrenActionOnDelete = childrenAction;
} }
this.section = section; this.section = section;
if (type === 'chart') { if (type === 'chart') {
this.index = this.charts.find(value => value._id == section._id).indicators.findIndex(value => value._id == indicatorId); this.index = this.charts.find(value => value._id == section._id).indicators.findIndex(value => value._id == indicatorId);
@ -830,7 +844,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
}); });
} }
changeIndicatorStatus(sectionId: string, indicator: Indicator, visibility:Visibility) { changeIndicatorStatus(sectionId: string, indicator: Indicator, visibility: Visibility) {
this.editing = true; this.editing = true;
let path = [ let path = [
this.stakeholder._id, this.stakeholder._id,
@ -978,9 +992,9 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
// this.deleteChartSectionModal.okButtonText = 'Yes'; // this.deleteChartSectionModal.okButtonText = 'Yes';
// this.deleteChartSectionModal.open(); // this.deleteChartSectionModal.open();
// } // }
deleteSectionOpen(section: Section, index: number, type: IndicatorType, childrenAction: string = null) { deleteSectionOpen(section: Section, index: number, type: IndicatorType, childrenAction: string = null) {
if(!this.editing && !section.defaultId) { if (!this.editing && !section.defaultId) {
this.sectionTypeToDelete = type; this.sectionTypeToDelete = type;
this.sectionChildrenActionOnDelete = null; this.sectionChildrenActionOnDelete = null;
if (childrenAction == "delete") { if (childrenAction == "delete") {
@ -988,7 +1002,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
} else if (childrenAction == "disconnect") { } else if (childrenAction == "disconnect") {
this.sectionChildrenActionOnDelete = childrenAction; this.sectionChildrenActionOnDelete = childrenAction;
} }
this.section = section; this.section = section;
this.index = index; this.index = index;
this.deleteSectionModal.alertTitle = 'Delete Section'; this.deleteSectionModal.alertTitle = 'Delete Section';

7
src/app/topic/topic.module.ts
View File

@ -24,15 +24,16 @@ import {
group, group,
refresh, refresh,
close, close,
arrow_right arrow_right, done
} from "../openaireLibrary/utils/icons/icons"; } from "../openaireLibrary/utils/icons/icons";
import {IconsModule} from "../openaireLibrary/utils/icons/icons.module"; import {IconsModule} from "../openaireLibrary/utils/icons/icons.module";
import {PageContentModule} from "../openaireLibrary/dashboard/sharedComponents/page-content/page-content.module"; import {PageContentModule} from "../openaireLibrary/dashboard/sharedComponents/page-content/page-content.module";
import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module";
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, TopicRoutingModule, ClickModule, RouterModule, FormsModule, AlertModalModule, CommonModule, TopicRoutingModule, ClickModule, RouterModule, FormsModule, AlertModalModule,
ReactiveFormsModule, InputModule, IconsModule, PageContentModule ReactiveFormsModule, InputModule, IconsModule, PageContentModule, LoadingModule
], ],
declarations: [ declarations: [
TopicComponent, IndicatorsComponent TopicComponent, IndicatorsComponent
@ -47,6 +48,6 @@ import {PageContentModule} from "../openaireLibrary/dashboard/sharedComponents/p
}) })
export class TopicModule { export class TopicModule {
constructor(private iconsService: IconsService) { constructor(private iconsService: IconsService) {
this.iconsService.registerIcons([preview, bullet, add, earth, lock, group, refresh, close, arrow_right]); this.iconsService.registerIcons([preview, bullet, add, earth, lock, group, refresh, close, arrow_right, done]);
} }
} }

4
src/app/utils/indicator-utils.ts
View File

@ -137,11 +137,11 @@ export class StakeholderUtils {
} }
aliasValidator(elements: any[]): ValidatorFn { aliasValidator(elements: any[]): ValidatorFn {
return (control: AbstractControl): { [key: string]: boolean } | null => { return (control: AbstractControl): { [key: string]: string } | null => {
if (control.value && elements.find(element => if (control.value && elements.find(element =>
element.alias === control.value element.alias === control.value
)) { )) {
return {'alias': true}; return {'error': 'Alias already in use'};
} }
return null; return null;
} }

8
src/app/utils/services/statistics.service.ts
View File

@ -3,6 +3,7 @@ import {HttpClient} from "@angular/common/http";
import {EnvironmentSpecificService} from "../../openaireLibrary/utils/properties/environment-specific.service"; import {EnvironmentSpecificService} from "../../openaireLibrary/utils/properties/environment-specific.service";
import {Observable} from "rxjs"; import {Observable} from "rxjs";
import {SourceType} from "../../openaireLibrary/monitor/entities/stakeholder"; import {SourceType} from "../../openaireLibrary/monitor/entities/stakeholder";
import {el} from "@angular/platform-browser/testing/src/browser_util";
@Injectable({ @Injectable({
@ -35,8 +36,13 @@ export class StatisticsService {
}); });
return sourceType; return sourceType;
} }
getNumbers(source: SourceType, url: string): Observable<any> { getNumbers(source: SourceType, url: string): Observable<any> {
return this.http.get<any>(this.numberSources.get(source)[0] + url); if(source !== null) {
return this.http.get<any>(this.numberSources.get(source)[0] + url);
} else {
return this.http.get<any>(url);
}
} }
getChartUrl(source: SourceType, url: string): string { getChartUrl(source: SourceType, url: string): string {