[IT-2819] Show error message if no chart data available

Author: DanielSteger

frontend/src/app/modules/aggregation/aggregation.component.html

@@ -2,7 +2,7 @@
 <p>
   {{ 'frontend.de.iteratec.osm.aggregation.description' | translate }}
 </p>
-<osm-aggregation-chart *ngIf="!isHidden" [barchartAverageData]="barchartAverageData$ | async"
+<osm-aggregation-chart *ngIf="showChart" [barchartAverageData]="barchartAverageData$ | async"
                        [barchartMedianData]="barchartMedianData$ | async"></osm-aggregation-chart>
 <div class="action-row">
   <div class="col-md-12">

frontend/src/app/modules/aggregation/aggregation.component.ts

@@ -1,4 +1,4 @@
-import {Component, EventEmitter, OnInit, Output} from '@angular/core';
+import {Component, OnInit} from '@angular/core';
 import {BarchartDataService} from "./services/barchart-data.service";
 import {ResultSelectionStore} from "../result-selection/services/result-selection.store";
 import {BehaviorSubject} from "rxjs";
@@ -13,7 +13,7 @@ export class AggregationComponent implements OnInit {
 
   barchartAverageData$: BehaviorSubject<any> = new BehaviorSubject<any>([]);
   barchartMedianData$: BehaviorSubject<any> = new BehaviorSubject<any>([]);
-  isHidden: boolean;
+  showChart: boolean = false;
 
   constructor(private barchartDataService: BarchartDataService, private resultSelectionStore: ResultSelectionStore, private aggregationChartDataService: AggregationChartDataService) {
     this.aggregationChartDataService.barchartAverageData$.subscribe((data) => {
@@ -25,14 +25,14 @@ export class AggregationComponent implements OnInit {
   }
 
   ngOnInit() {
-    this.isHidden = true;
+    this.showChart = false;
     if (this.resultSelectionStore.validQuery) {
       this.getBarchartData();
     }
   }
 
   getBarchartData(): void {
-    this.isHidden = false;
+    this.showChart = true;
     this.aggregationChartDataService.getBarchartData(this.resultSelectionStore.resultSelectionCommand, this.resultSelectionStore.remainingResultSelection);
   }
 }

frontend/src/app/modules/aggregation/components/aggregation-chart/aggregation-chart.component.ts

@@ -74,7 +74,11 @@ export class AggregationChartComponent implements OnChanges {
   }
 
   redraw(): void {
-    if (this.barchartAverageData.length < 1 || this.barchartMedianData.length < 1) {
+    if (Object.keys(this.barchartAverageData).length < 1 && Object.keys(this.barchartMedianData).length < 1 && this.barchartAverageData.length != 0 && this.barchartMedianData.length != 0) {
+      this.resultSelectionStore.dataAvailable$.next(false);
+      return;
+    }
+    if (Object.keys(this.barchartAverageData).length < 1 || Object.keys(this.barchartMedianData).length < 1 || this.barchartAverageData.length < 1 && this.barchartMedianData.length < 1) {
       return;
     }
 

frontend/src/app/modules/result-selection/components/submit/submit.component.html

@@ -13,7 +13,8 @@
       (!measurandsRequired || (measurandsOrPerformanceAspectsSelected$ | async))">
     {{ 'frontend.de.iteratec.osm.resultSelection.warning.longProcessingTime' | translate }}
   </p>
-  <p id="unavailable-data" class="bg-danger get-barchart-data-warnings" *ngIf="(resultCount$ | async) == 0">
+  <p id="unavailable-data" class="bg-danger get-barchart-data-warnings"
+     *ngIf="(resultCount$ | async) == 0  || !(dataAvailable$ | async)">
     {{ 'frontend.de.iteratec.osm.resultSelection.warning.noDataAvailable' | translate }}
   </p>
   <p id="no-application-selected" class="bg-danger get-barchart-data-warnings"

frontend/src/app/modules/result-selection/components/submit/submit.component.ts

@@ -15,6 +15,7 @@ export class SubmitComponent implements OnInit {
   pagesOrMeasuredEventsSelected$: BehaviorSubject<boolean> = new BehaviorSubject(false);
   measurandsOrPerformanceAspectsSelected$: BehaviorSubject<boolean> = new BehaviorSubject(false);
   resultCount$: Observable<number>;
+  dataAvailable$: Observable<boolean>;
 
   @Input() applicationsRequired: boolean = false;
   @Input() pagesRequired: boolean = false;
@@ -23,6 +24,7 @@ export class SubmitComponent implements OnInit {
 
   constructor(private resultSelectionStore: ResultSelectionStore) {
     this.resultCount$ = this.resultSelectionStore.resultCount$;
+    this.dataAvailable$ = this.resultSelectionStore.dataAvailable$;
   }
 
   ngOnInit() {

frontend/src/app/modules/result-selection/services/result-selection.store.ts

@@ -51,6 +51,7 @@ export class ResultSelectionStore {
   requestSizes$: BehaviorSubject<MeasurandGroup> = new BehaviorSubject({isLoading: false, name: "", values: []});
   percentages$: BehaviorSubject<MeasurandGroup> = new BehaviorSubject({isLoading: false, name: "", values: []});
   resultCount$: BehaviorSubject<number> = new BehaviorSubject<number>(0);
+  dataAvailable$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(true);
 
   reset$: Subject<void> = new Subject<void>();
 
@@ -188,6 +189,7 @@ export class ResultSelectionStore {
   }
 
   setResultSelectionCommand(newState: ResultSelectionCommand): void {
+    this.dataAvailable$.next(true);
     this._resultSelectionCommand$.next(newState);
     this.loadResultCount(newState);
   }
@@ -213,6 +215,7 @@ export class ResultSelectionStore {
   }
 
   private setRemainingResultSelection(newState: RemainingResultSelection): void {
+    this.dataAvailable$.next(true);
     this._remainingResultSelection$.next(newState);
   }