completed ng14 migration

This commit is contained in:
Mathias Beaulieu-Duncan 2024-08-26 01:17:24 -04:00
parent ae968f00e7
commit c3136478c2
Signed by: mathias
GPG Key ID: 1C16CF05BAF9162D
12 changed files with 1160 additions and 1308 deletions

View File

@ -213,6 +213,6 @@
} }
} }
} }
}}, }
"defaultProject": "demo" }
} }

View File

@ -15,14 +15,14 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/animations": "~13.4.0", "@angular/animations": "^14.3.0",
"@angular/common": "~13.4.0", "@angular/common": "^14.3.0",
"@angular/compiler": "~13.4.0", "@angular/compiler": "^14.3.0",
"@angular/core": "~13.4.0", "@angular/core": "^14.3.0",
"@angular/forms": "~13.4.0", "@angular/forms": "^14.3.0",
"@angular/platform-browser": "~13.4.0", "@angular/platform-browser": "^14.3.0",
"@angular/platform-browser-dynamic": "~13.4.0", "@angular/platform-browser-dynamic": "^14.3.0",
"@angular/router": "~13.4.0", "@angular/router": "^14.3.0",
"@ng-select/ng-select": "^13.0.0", "@ng-select/ng-select": "^13.0.0",
"@openharbor/ngx-data": "^18.0.0-alpha.3", "@openharbor/ngx-data": "^18.0.0-alpha.3",
"@poweredsoft/data": "^0.0.36", "@poweredsoft/data": "^0.0.36",
@ -41,10 +41,10 @@
"zone.js": "~0.11.4" "zone.js": "~0.11.4"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "~13.3.11", "@angular-devkit/build-angular": "^14.2.13",
"@angular/cli": "~13.3.11", "@angular/cli": "^14.2.13",
"@angular/compiler-cli": "~13.4.0", "@angular/compiler-cli": "^14.3.0",
"@angular/language-service": "~13.4.0", "@angular/language-service": "^14.3.0",
"@types/jasmine": "~3.6.0", "@types/jasmine": "~3.6.0",
"@types/jasminewd2": "~2.0.3", "@types/jasminewd2": "~2.0.3",
"@types/node": "^12.11.1", "@types/node": "^12.11.1",
@ -56,14 +56,14 @@
"karma-coverage-istanbul-reporter": "~3.0.2", "karma-coverage-istanbul-reporter": "~3.0.2",
"karma-jasmine": "~4.0.0", "karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.5.0", "karma-jasmine-html-reporter": "^1.5.0",
"ng-packagr": "^13.3.1", "ng-packagr": "^14.2.2",
"npm-run-all": "^4.1.5", "npm-run-all": "^4.1.5",
"protractor": "~7.0.0", "protractor": "~7.0.0",
"rimraf": "^3.0.2", "rimraf": "^3.0.2",
"ts-node": "~8.3.0", "ts-node": "~8.3.0",
"tslint": "~6.1.0", "tslint": "~6.1.0",
"typescript": "~4.6.4", "typescript": "~4.8",
"wait-on": "^5.0.1" "wait-on": "^5.0.1"
}, },
"packageManager": "yarn@1.22.22+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610" "packageManager": "yarn@1.22.22+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610"
} }

View File

@ -2,7 +2,7 @@ import {Directive, EventEmitter, HostListener, Inject, Input, Output, TemplateRe
import {IDataSource} from '@poweredsoft/data'; import {IDataSource} from '@poweredsoft/data';
import {BsModalService} from 'ngx-bootstrap/modal'; import {BsModalService} from 'ngx-bootstrap/modal';
import {FormGroupCommandModalComponent} from '../form-group-command-modal/form-group-command-modal.component'; import {FormGroupCommandModalComponent} from '../form-group-command-modal/form-group-command-modal.component';
import {FormGroup} from '@angular/forms'; import {UntypedFormGroup} from '@angular/forms';
export interface IModelFormCreateEvent export interface IModelFormCreateEvent
{ {
@ -10,7 +10,7 @@ export interface IModelFormCreateEvent
viewModel: any; viewModel: any;
commandName: string; commandName: string;
commandModel: any; commandModel: any;
formGroup?: FormGroup; formGroup?: UntypedFormGroup;
} }
@Directive({ @Directive({

View File

@ -3,7 +3,7 @@ import {BsModalRef} from 'ngx-bootstrap/modal';
import {IDataSource} from '@poweredsoft/data'; import {IDataSource} from '@poweredsoft/data';
import {finalize} from 'rxjs/operators'; import {finalize} from 'rxjs/operators';
import {Subscription} from 'rxjs' import {Subscription} from 'rxjs'
import {FormGroup} from '@angular/forms'; import {UntypedFormGroup} from '@angular/forms';
@Component({ @Component({
selector: 'bsx-form-group-command-modal', selector: 'bsx-form-group-command-modal',
@ -13,7 +13,7 @@ import {FormGroup} from '@angular/forms';
export class FormGroupCommandModalComponent implements OnInit, OnDestroy { export class FormGroupCommandModalComponent implements OnInit, OnDestroy {
@Inject(BsModalRef) public modalRef!: BsModalRef; @Inject(BsModalRef) public modalRef!: BsModalRef;
modelForm: FormGroup; modelForm: UntypedFormGroup;
title: string; title: string;
template: TemplateRef<any>; template: TemplateRef<any>;
command: string; command: string;

View File

@ -3,7 +3,7 @@
"compilerOptions": { "compilerOptions": {
"outDir": "../../../out-tsc/lib", "outDir": "../../../out-tsc/lib",
"declarationMap": true, "declarationMap": true,
"target": "es2015", "target": "es2020",
"declaration": true, "declaration": true,
"inlineSources": true, "inlineSources": true,
"types": [], "types": [],

View File

@ -3,7 +3,7 @@
"compilerOptions": { "compilerOptions": {
"outDir": "../../../out-tsc/lib", "outDir": "../../../out-tsc/lib",
"declarationMap": true, "declarationMap": true,
"target": "es2015", "target": "es2020",
"declaration": true, "declaration": true,
"inlineSources": true, "inlineSources": true,
"types": [], "types": [],

View File

@ -3,7 +3,7 @@
"compilerOptions": { "compilerOptions": {
"outDir": "../../../out-tsc/lib", "outDir": "../../../out-tsc/lib",
"declarationMap": true, "declarationMap": true,
"target": "es2015", "target": "es2020",
"declaration": true, "declaration": true,
"inlineSources": true, "inlineSources": true,
"types": [], "types": [],

View File

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

View File

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

View File

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

View File

@ -10,7 +10,7 @@
"module": "es2020", "module": "es2020",
"moduleResolution": "node", "moduleResolution": "node",
"importHelpers": true, "importHelpers": true,
"target": "es2015", "target": "es2020",
"lib": [ "lib": [
"es2018", "es2018",
"dom" "dom"

2404
yarn.lock

File diff suppressed because it is too large Load Diff