completed ng14 migration

src/app/form-group-modal-demo/form-group-modal-demo/form-group-modal-demo.component.ts

@@ -2,7 +2,7 @@ import {Component, OnDestroy, OnInit} from '@angular/core';
 import {IDataSource} from '@poweredsoft/data';
 import {IMerchant} from 'src/app/data/services/IMerchant';
 import {MerchantService} from 'src/app/data/services/merchant.service';
-import {FormBuilder, Validators} from '@angular/forms';
+import {UntypedFormBuilder, Validators} from '@angular/forms';
 import {Subscription} from 'rxjs';
 import {IModelFormCreateEvent} from "@openharbor/ngx-data-bootstrap-ui";
 
@@ -22,7 +22,7 @@ export class FormGroupModalDemoComponent implements OnInit,OnDestroy {
     return this.merchantService.createDataSource();
   }
 
-  constructor(private merchantService: MerchantService, private fb: FormBuilder) {
+  constructor(private merchantService: MerchantService, private fb: UntypedFormBuilder) {
     this.merchantDataSource = this.createDataSource();
   }
 

src/app/list-view-demo/list-view-demo-home/list-view-demo-home.component.ts

@@ -1,7 +1,7 @@
 import {Component, OnInit} from '@angular/core';
 import {IDataSource} from '@poweredsoft/data';
 import {MerchantService} from 'src/app/data/services/merchant.service';
-import {FormBuilder, Validators} from '@angular/forms';
+import {UntypedFormBuilder, Validators} from '@angular/forms';
 import {IModelFormCreateEvent} from "@openharbor/ngx-data-bootstrap-ui";
 
 
@@ -21,7 +21,7 @@ export class ListViewDemoHomeComponent implements OnInit {
   merchantDataSource: IDataSource<ISchool>;
 
 
-  constructor(merchantService: MerchantService, private fb: FormBuilder) {
+  constructor(merchantService: MerchantService, private fb: UntypedFormBuilder) {
     // this.dataSource = hdss.builder<ISchool, string>()
     //   .defaultCriteria({
     //     page: 1,

src/app/ng-select-demo/ng-select-demo/ng-select-demo.component.ts

@@ -2,7 +2,7 @@ import {Component} from '@angular/core';
 import {MerchantService} from 'src/app/data/services/merchant.service';
 import {IMerchant} from 'src/app/data/services/IMerchant';
 import {IDataSource} from '@poweredsoft/data';
-import {FormBuilder, FormGroup} from '@angular/forms';
+import {UntypedFormBuilder, UntypedFormGroup} from '@angular/forms';
 
 @Component({
   selector: 'ps-ng-select-demo',
@@ -18,13 +18,13 @@ export class NgSelectDemoComponent {
 
   selectedValue: IMerchant;
 
-  myForm: FormGroup;
+  myForm: UntypedFormGroup;
   myValue: string;
   myValue2: string;
   myValue3: string;
   myValue4: string;
 
-  constructor(private merchantService: MerchantService, private fb: FormBuilder
+  constructor(private merchantService: MerchantService, private fb: UntypedFormBuilder
               ) {
     this.merchantDataSource = merchantService.createDataSource(); //Assign the dataSource
     this.merchantDataSource2 = merchantService.createDataSource();