From c5b9bc547b02aa028a273edcd252266c61f77679 Mon Sep 17 00:00:00 2001
From: assureclaims <84139537+assureclaims@users.noreply.github.com>
Date: Thu, 13 Apr 2023 12:45:42 +0530
Subject: [PATCH] rebase issue

---
 .../src/app/pages/crud-grid/crud-grid.component.ts          | 6 +++---
 .../src/app/pages/date/date-info.component.ts               | 6 +++---
 .../src/lib/dxc-select/common-behaviors/error-state.ts      | 4 ++--
 .../dxc-ngx-cdk/src/lib/dxc-select/error/error-options.ts   | 6 +++---
 .../src/lib/dxc-textarea/dxc-textarea.component.ts          | 4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/projects/dxc-ngx-cdk-examples/src/app/pages/crud-grid/crud-grid.component.ts b/projects/dxc-ngx-cdk-examples/src/app/pages/crud-grid/crud-grid.component.ts
index 4eb25af5f..036f52d2d 100644
--- a/projects/dxc-ngx-cdk-examples/src/app/pages/crud-grid/crud-grid.component.ts
+++ b/projects/dxc-ngx-cdk-examples/src/app/pages/crud-grid/crud-grid.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { UntypedFormBuilder, FormControl, UntypedFormGroup } from '@angular/forms';
+import { FormBuilder, FormControl, FormGroup } from '@angular/forms';
 import { List } from 'immutable';
 import { Button, DxcCrudTableComponent, DxcResizeService } from '@dxc-technology/halstack-angular';
 import { EFieldsType, EMethod, IFieldsBaseProperties, IRequest, ITextEditorproperties } from '@dxc-technology/halstack-angular';
@@ -11,12 +11,12 @@ import { EFieldsType, EMethod, IFieldsBaseProperties, IRequest, ITextEditorprope
 })
 export class CrudGridComponent implements OnInit {
   @ViewChild('crudgridcomponent', {static: false}) crudGridComponent: DxcCrudTableComponent;
-  testForm: UntypedFormGroup;
+  testForm: FormGroup;
   message:{ [key: string]: string };
   columns: Array<string>;
   gridToolbarList: List<Button>;
 
-  constructor( private fb: UntypedFormBuilder, private resizeSvc: DxcResizeService ) {
+  constructor( private fb: FormBuilder, private resizeSvc: DxcResizeService ) {
     
    }
 
diff --git a/projects/dxc-ngx-cdk-examples/src/app/pages/date/date-info.component.ts b/projects/dxc-ngx-cdk-examples/src/app/pages/date/date-info.component.ts
index 2459a6142..292bf7954 100644
--- a/projects/dxc-ngx-cdk-examples/src/app/pages/date/date-info.component.ts
+++ b/projects/dxc-ngx-cdk-examples/src/app/pages/date/date-info.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { UntypedFormGroup, UntypedFormBuilder, Validators, AbstractControl, ValidatorFn } from '@angular/forms';
+import { FormGroup, FormBuilder, Validators, AbstractControl, ValidatorFn } from '@angular/forms';
 
 @Component({
   selector: 'date-info',
@@ -7,13 +7,13 @@ import { UntypedFormGroup, UntypedFormBuilder, Validators, AbstractControl, Vali
   styleUrls: ['./date-info.component.scss']
 })
 export class DateInfoComponent implements OnInit {
-  public pageForm: UntypedFormGroup;
+  public pageForm: FormGroup;
   customOutput: boolean = true;
   inputValue: string = "1995/12/03";
 
   isInvalidDate: boolean = false;
 
-  constructor(private fb: UntypedFormBuilder) { 
+  constructor(private fb: FormBuilder) { 
     this.pageForm = this.fb.group({
       dateCtrl: ['19951203']
     });
diff --git a/projects/dxc-ngx-cdk/src/lib/dxc-select/common-behaviors/error-state.ts b/projects/dxc-ngx-cdk/src/lib/dxc-select/common-behaviors/error-state.ts
index c779f421f..ba9223b74 100644
--- a/projects/dxc-ngx-cdk/src/lib/dxc-select/common-behaviors/error-state.ts
+++ b/projects/dxc-ngx-cdk/src/lib/dxc-select/common-behaviors/error-state.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { UntypedFormControl, NgControl, NgForm } from '@angular/forms';
+import { FormControl, NgControl, NgForm } from '@angular/forms';
 import { Subject } from 'rxjs';
 import { ErrorStateMatcher } from '../error/error-options';
 import { Constructor } from './constructor';
@@ -52,7 +52,7 @@ export function mixinErrorState<T extends Constructor<HasErrorState>>(base: T)
       const oldState = this.errorState;
       const parent = this._parentForm;
       const matcher = this.errorStateMatcher || this._defaultErrorStateMatcher;
-      const control = this.ngControl ? this.ngControl.control as UntypedFormControl : null;
+      const control = this.ngControl ? this.ngControl.control as FormControl : null;
       const newState = matcher.isErrorState(control, parent);
 
       if (newState !== oldState) {
diff --git a/projects/dxc-ngx-cdk/src/lib/dxc-select/error/error-options.ts b/projects/dxc-ngx-cdk/src/lib/dxc-select/error/error-options.ts
index bd1565710..35c6ba983 100644
--- a/projects/dxc-ngx-cdk/src/lib/dxc-select/error/error-options.ts
+++ b/projects/dxc-ngx-cdk/src/lib/dxc-select/error/error-options.ts
@@ -7,12 +7,12 @@
  */
 
 import { Injectable } from '@angular/core';
-import { NgForm, UntypedFormControl } from '@angular/forms';
+import { NgForm, FormControl } from '@angular/forms';
 
 /** Error state matcher that matches when a control is invalid and dirty. */
 @Injectable()
 export class ShowOnDirtyErrorStateMatcher implements ErrorStateMatcher {
-  isErrorState(control: UntypedFormControl | null, form: NgForm | null): boolean {
+  isErrorState(control: FormControl | null, form: NgForm | null): boolean {
     return !!(control && control.invalid && (control.dirty || (form && form.submitted)));
   }
 }
@@ -20,7 +20,7 @@ export class ShowOnDirtyErrorStateMatcher implements ErrorStateMatcher {
 /** Provider that defines how form controls behave with regards to displaying error messages. */
 @Injectable({ providedIn: 'root' })
 export class ErrorStateMatcher {
-  isErrorState(control: UntypedFormControl | null, form: NgForm | null): boolean {
+  isErrorState(control: FormControl | null, form: NgForm | null): boolean {
     return !!(control && control.invalid && (control.touched || (form && form.submitted)));
   }
 }
diff --git a/projects/dxc-ngx-cdk/src/lib/dxc-textarea/dxc-textarea.component.ts b/projects/dxc-ngx-cdk/src/lib/dxc-textarea/dxc-textarea.component.ts
index 5b45e708a..2d0c8daaf 100644
--- a/projects/dxc-ngx-cdk/src/lib/dxc-textarea/dxc-textarea.component.ts
+++ b/projects/dxc-ngx-cdk/src/lib/dxc-textarea/dxc-textarea.component.ts
@@ -13,7 +13,7 @@ import {
 } from "@angular/core";
 import { css } from "emotion";
 import { BehaviorSubject } from "rxjs";
-import { UntypedFormControl } from "@angular/forms";
+import { FormControl } from "@angular/forms";
 import { CssUtils } from "../utils";
 import { coerceNumberProperty, coerceBooleanProperty } from "@angular/cdk/coercion";
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
@@ -124,7 +124,7 @@ export class DxcTextareaComponent
     tabIndexValue: 0
   });
 
-  public formControl = new UntypedFormControl();
+  public formControl = new FormControl();
 
   constructor(private utils: CssUtils) {
     this.numRows = 4;