style: fix form ts errors

Author: mledour

.idea/inspectionProfiles/Project_Default.xml

@@ -1,65 +1,63 @@
 import { AfterContentInit, Component, ContentChild, Input, OnDestroy } from '@angular/core';
+import { NgControl } from '@angular/forms';
 
-import { removeSubscriptions } from '../../helpers';
+import { Subscription } from 'rxjs';
 
+import { removeSubscriptions } from '../../helpers';
 import {
   InputGroupAddonLeftDirective,
   InputGroupAddonRightDirective,
   InputGroupContentDirective,
   InputGroupLabelDirective
 } from './input-group.directive';
-
 import { InputTextDirective } from '../input-text/input-text.directive';
-import { NgControl } from '@angular/forms';
-import { Subscription } from 'rxjs';
 
 
-/*
- *
- */
 @Component({
   selector: 'mk-input-group',
   templateUrl: './input-group.component.html'
 })
 export class InputGroupComponent implements AfterContentInit, OnDestroy {
-  private subscriptions: Array<Subscription> = [];
-
-  public currentColor: string;
-  public currentFontColor: string;
-
-  @Input() addonLeft: string;
-  @Input() addonRight: string;
+  @Input() addonLeft?: string;
+  @Input() addonRight?: string;
   @Input() inputColor = 'default';
-  @Input() inputFontColor: string;
+  @Input() inputFontColor?: string;
   @Input() inputErrorColor = 'danger';
-  @Input() inputErrorFontColor: string;
+  @Input() inputErrorFontColor?: string;
   @Input() inputValidColor = 'success';
-  @Input() inputValidFontColor: string;
-  @Input() label: string;
+  @Input() inputValidFontColor?: string;
+  @Input() label?: string;
   @Input() wrapperClasses = 'form-group';
 
-  @ContentChild(InputGroupLabelDirective) public inputGroupLabelDirective: InputGroupLabelDirective;
-  @ContentChild(InputGroupAddonLeftDirective) public inputGroupAddonLeftDirective: InputGroupAddonLeftDirective;
-  @ContentChild(InputGroupAddonRightDirective) public inputGroupAddonRightDirective: InputGroupAddonRightDirective;
-  @ContentChild(InputGroupContentDirective) public inputGroupContentDirective: InputGroupContentDirective;
-  @ContentChild(InputTextDirective) public inputTextDirective: InputTextDirective;
-
-  ngAfterContentInit() {
-    this.subscriptions.push(this.inputTextDirective.onKeyup.subscribe((value: NgControl) => {
-      if (value.invalid) {
-        this.currentColor = this.inputErrorColor;
-        this.currentFontColor = this.inputErrorFontColor;
-      } else if (!value.invalid) {
-        this.currentColor = this.inputValidColor;
-        this.currentFontColor = this.inputValidFontColor;
-      } else {
-        this.currentColor = this.inputColor;
-        this.currentFontColor = this.inputFontColor;
-      }
-    }));
+  @ContentChild(InputGroupLabelDirective) public inputGroupLabelDirective?: InputGroupLabelDirective;
+  @ContentChild(InputGroupAddonLeftDirective) public inputGroupAddonLeftDirective?: InputGroupAddonLeftDirective;
+  @ContentChild(InputGroupAddonRightDirective) public inputGroupAddonRightDirective?: InputGroupAddonRightDirective;
+  @ContentChild(InputGroupContentDirective) public inputGroupContentDirective?: InputGroupContentDirective;
+  @ContentChild(InputTextDirective) public inputTextDirective?: InputTextDirective;
+
+  private subscriptions: Subscription[] = [];
+
+  public currentColor?: string;
+  public currentFontColor?: string;
+
+  ngAfterContentInit(): void {
+    if (this.inputTextDirective) {
+      this.subscriptions.push(this.inputTextDirective.onKeyup.subscribe((value: NgControl) => {
+        if (value.invalid) {
+          this.currentColor = this.inputErrorColor;
+          this.currentFontColor = this.inputErrorFontColor;
+        } else if (!value.invalid) {
+          this.currentColor = this.inputValidColor;
+          this.currentFontColor = this.inputValidFontColor;
+        } else {
+          this.currentColor = this.inputColor;
+          this.currentFontColor = this.inputFontColor;
+        }
+      }));
+    }
   }
 
-  ngOnDestroy() {
+  ngOnDestroy(): void {
     removeSubscriptions(this.subscriptions);
   }
 }

library/angular-admin-lte/src/lib/form/input-group/input-group.component.ts

@@ -1,36 +1,27 @@
 import { Directive } from '@angular/core';
 
 
-/*
- *
- */
 @Directive({
   /* tslint:disable-next-line:directive-selector */
   selector: 'mk-input-group-label'
 })
 export class InputGroupLabelDirective {}
 
-/*
- *
- */
+
 @Directive({
   /* tslint:disable-next-line:directive-selector */
   selector: 'mk-input-group-addon-left'
 })
 export class InputGroupAddonLeftDirective {}
 
-/*
- *
- */
+
 @Directive({
   /* tslint:disable-next-line:directive-selector */
   selector: 'mk-input-group-addon-right'
 })
 export class InputGroupAddonRightDirective {}
 
-/*
- *
- */
+
 @Directive({
   /* tslint:disable-next-line:directive-selector */
   selector: 'mk-input-group-content'

library/angular-admin-lte/src/lib/form/input-group/input-group.directive.ts

@@ -3,7 +3,6 @@ import {FormsModule} from '@angular/forms';
 import {CommonModule} from '@angular/common';
 
 import {ColorModule} from '../../color/color.module';
-
 import {InputGroupComponent} from './input-group.component';
 import {
   InputGroupAddonLeftDirective,

library/angular-admin-lte/src/lib/form/input-group/input-group.module.ts

@@ -13,14 +13,8 @@ import { ClassService } from '../../services/class.service';
   providers: [ColorService, ClassService]
 })
 export class InputTextDirective implements OnInit {
-  private defaultClass = 'form-control';
-  private isSetClass: boolean;
-  private onKeyUp = new Subject<NgControl>();
-
-  public onKeyup: Observable<NgControl> = this.onKeyUp.asObservable();
-
   @Input() set borderColor(color: string) {
-    this.colorService.setBackgroundColor(color, true, 'border-color', null);
+    this.colorService.setBackgroundColor(color, true, 'border-color', '');
   }
   @Input() set class(className: string) {
     this.isSetClass = true;
@@ -30,14 +24,16 @@ export class InputTextDirective implements OnInit {
     this.colorService.setFontColor(color);
   }
 
-  /**
-   * @method constructor
-   * @param  elementRef   [description]
-   * @param  renderer2    [description]
-   * @param  ngControl    [description]
-   * @param  colorService [description]
-   * @param  classService [description]
-   */
+  private defaultClass = 'form-control';
+  private isSetClass = false;
+  private onKeyUp = new Subject<NgControl>();
+
+  public onKeyup: Observable<NgControl> = this.onKeyUp.asObservable();
+
+  @HostListener('keyup') keyUpListener(): void {
+    this.onKeyUp.next(this.ngControl);
+  }
+
   constructor(
     public elementRef: ElementRef,
     public renderer2: Renderer2,
@@ -46,16 +42,9 @@ export class InputTextDirective implements OnInit {
     private classService: ClassService
   ) {}
 
-  /**
-   * @method ngOnInit
-   */
-  ngOnInit() {
+  ngOnInit(): void {
     if (!this.isSetClass) {
       this.classService.applyClasses(this.defaultClass);
     }
   }
-
-  @HostListener('keyup') keyUpListener() {
-    this.onKeyUp.next(this.ngControl);
-  }
 }