[develop]: Fix options in input component. Add error handler in cache-indicators.

monitor-admin/utils/cache-indicators/cache-indicators.component.ts

@@ -1,16 +1,31 @@
-import {Component, Inject, Input, OnChanges, OnDestroy, OnInit, PLATFORM_ID, SimpleChanges} from "@angular/core";
+import {
+  Component,
+  Inject,
+  InjectionToken,
+  Input,
+  OnChanges,
+  OnDestroy,
+  OnInit,
+  PLATFORM_ID,
+  SimpleChanges
+} from "@angular/core";
 import {Report} from "./cache-indicators";
 import {CacheIndicatorsService} from "./cache-indicators.service";
 import {interval, Subject, Subscription} from "rxjs";
 import {map, switchMap, takeUntil} from "rxjs/operators";
+import {isPlatformBrowser} from "@angular/common";
 
 @Component({
   selector: 'cache-indicators',
   template: `
       <div *ngIf="report" class="cache-progress">
           <div class="uk-position-relative" [attr.uk-tooltip]="'Caching indicators process for ' + alias">
-            <div class="uk-progress-circle" [attr.percentage]="report.percentage?report.percentage:0" [style]="'--percentage: ' + (report.percentage?report.percentage:0)"></div>
+              <div class="uk-progress-circle" [attr.percentage]="report.percentage?report.percentage:0"
-            <button *ngIf="report.percentage === 100" (click)="clear()" class="uk-icon-button uk-icon-button-xsmall uk-button-default uk-position-top-right"><icon name="close" [flex]="true" ratio="0.8"></icon></button>
+                   [style]="'--percentage: ' + (report.percentage?report.percentage:0)"></div>
+              <button *ngIf="report.percentage === 100" (click)="clear()"
+                      class="uk-icon-button uk-icon-button-xsmall uk-button-default uk-position-top-right">
+                  <icon name="close" [flex]="true" ratio="0.8"></icon>
+              </button>
           </div>
       </div>
   `,
@@ -24,7 +39,7 @@ export class CacheIndicatorsComponent implements OnInit, OnChanges, OnDestroy {
   @Input() alias: string;
 
   constructor(private cacheIndicatorsService: CacheIndicatorsService,
-              @Inject(PLATFORM_ID) private platformId) {
+              @Inject(PLATFORM_ID) private platformId: any) {
   }
 
   ngOnInit() {
@@ -33,14 +48,16 @@ export class CacheIndicatorsComponent implements OnInit, OnChanges, OnDestroy {
 
   ngOnChanges(changes: SimpleChanges) {
     if (changes.alias) {
+      this.clear();
       this.getReport();
     }
   }
 
   getReport() {
-    this.clear();
     this.subscriptions.push(this.cacheIndicatorsService.getReport(this.alias).subscribe(report => {
       this.getReportInterval(report);
+    }, error => {
+      this.report = null;
     }));
   }
 
@@ -50,8 +67,8 @@ export class CacheIndicatorsComponent implements OnInit, OnChanges, OnDestroy {
       this.subscriptions.push(interval(this.interval).pipe(
           map(() => this.cacheIndicatorsService.getReport(this.alias)),
           switchMap(report => report),
-          takeUntil(this.destroy$)).subscribe(report => {
+          takeUntil(this.destroy$)).
-            console.log(this.alias);
+      subscribe(report => {
         this.report = report;
         if (this.report.completed) {
           this.destroy$.next();
@@ -62,14 +79,15 @@ export class CacheIndicatorsComponent implements OnInit, OnChanges, OnDestroy {
 
   clear() {
     this.subscriptions.forEach(subscription => {
+      if (subscription instanceof Subscription) {
         subscription.unsubscribe();
-    })
+      }
+    });
     this.report = null;
   }
 
-
   get isBrowser() {
-    return this.platformId === 'browser';
+    return isPlatformBrowser(this.platformId);
   }
 
   ngOnDestroy() {

sharedComponents/input/input.component.ts

@@ -374,6 +374,7 @@ export class InputComponent implements OnInit, OnDestroy, AfterViewInit, OnChang
 
   @Input()
   set options(options: (Option | string | number) []) {
+    if(options) {
       this.optionsArray = options.map(option => {
         if (option === null) {
           return {
@@ -389,6 +390,9 @@ export class InputComponent implements OnInit, OnDestroy, AfterViewInit, OnChang
           return option;
         }
       });
+    } else {
+      this.optionsArray = [];
+    }
     if (!this.tooltip) {
       this.tooltip = this.optionsArray.length > 0;
     }