From 62b672d6d9dec6bb8ddaf0d6b64dfec2b3d18155 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Alberto=20Hern=C3=A1ndez?= <44206706+josehernandezfintecheandomx@users.noreply.github.com> Date: Tue, 7 Mar 2023 22:15:56 -0600 Subject: [PATCH] Upgrade to node 19 (#1696) Co-authored-by: Jose Alberto Hernandez --- .github/workflows/build.yml | 6 +++--- angular.json | 21 +++++++++++++------ .../make-account-transfers.component.html | 2 +- src/app/loans/loans-routing.module.ts | 2 +- src/app/savings/savings-routing.module.ts | 2 +- .../cob-workflow/cob-workflow.component.html | 4 ++++ .../loan-locked/loan-locked.component.html | 0 .../loan-locked/loan-locked.component.scss | 0 .../loan-locked/loan-locked.component.spec.ts | 0 .../loan-locked/loan-locked.component.ts | 4 +--- .../loan-locked/loan-locked.resolver.spec.ts | 0 .../loan-locked/loan-locked.resolver.ts | 0 src/app/system/system.module.ts | 4 +++- .../checker-inbox-and-tasks.component.html | 4 ---- src/app/tasks/tasks-routing.module.ts | 10 --------- src/app/tasks/tasks.module.ts | 4 +--- 16 files changed, 30 insertions(+), 33 deletions(-) rename src/app/{tasks/checker-inbox-and-tasks-tabs => system/manage-jobs/cob-workflow}/loan-locked/loan-locked.component.html (100%) rename src/app/{tasks/checker-inbox-and-tasks-tabs => system/manage-jobs/cob-workflow}/loan-locked/loan-locked.component.scss (100%) rename src/app/{tasks/checker-inbox-and-tasks-tabs => system/manage-jobs/cob-workflow}/loan-locked/loan-locked.component.spec.ts (100%) rename src/app/{tasks/checker-inbox-and-tasks-tabs => system/manage-jobs/cob-workflow}/loan-locked/loan-locked.component.ts (97%) rename src/app/{tasks/checker-inbox-and-tasks-tabs => system/manage-jobs/cob-workflow}/loan-locked/loan-locked.resolver.spec.ts (100%) rename src/app/{tasks/checker-inbox-and-tasks-tabs => system/manage-jobs/cob-workflow}/loan-locked/loan-locked.resolver.ts (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 99d56ab48..2ef5c5814 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,13 +21,13 @@ jobs: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v2 - - name: Use Node.js 16 + - name: Use Node.js 19 uses: actions/setup-node@v1 with: # no support for lts as of now with github actions. # issue link : https://github.com/actions/setup-node/issues/26 - # lts/gallium node v16.15.1 (npm v8.11.0) - node-version: '16.15.1' + # lts/gallium node v19.7.0 (npm v9.5.0) + node-version: '19.7.0' - name: Angular CLI install run : npm install -g --silent @angular/cli@13.3.10 diff --git a/angular.json b/angular.json index f66a81d3a..44ef55cde 100644 --- a/angular.json +++ b/angular.json @@ -92,15 +92,24 @@ "with": "src/environments/environment.prod.ts" } ], - "outputHashing": "all" + "optimization": true, + "sourceMap": true, + "namedChunks": true, + "outputHashing": "all", + "extractLicenses": true, + "aot": true, + "buildOptimizer": true, + "vendorChunk": false }, "development": { - "buildOptimizer": false, - "optimization": false, - "vendorChunk": true, - "extractLicenses": false, + "optimization": true, "sourceMap": true, - "namedChunks": true + "namedChunks": true, + "outputHashing": "all", + "extractLicenses": true, + "aot": true, + "buildOptimizer": true, + "vendorChunk": false } }, "defaultConfiguration": "production" diff --git a/src/app/account-transfers/make-account-transfers/make-account-transfers.component.html b/src/app/account-transfers/make-account-transfers/make-account-transfers.component.html index 6964e2a77..ffcdfc7c8 100644 --- a/src/app/account-transfers/make-account-transfers/make-account-transfers.component.html +++ b/src/app/account-transfers/make-account-transfers/make-account-transfers.component.html @@ -132,7 +132,7 @@ - + diff --git a/src/app/loans/loans-routing.module.ts b/src/app/loans/loans-routing.module.ts index 9b2b41d9d..9dc76d242 100644 --- a/src/app/loans/loans-routing.module.ts +++ b/src/app/loans/loans-routing.module.ts @@ -287,7 +287,7 @@ const routes: Routes = [ } }, { - path: 'transfer-funds', + path: ':loanId/transfer-funds', loadChildren: () => import('../account-transfers/account-transfers.module').then(m => m.AccountTransfersModule) }, { diff --git a/src/app/savings/savings-routing.module.ts b/src/app/savings/savings-routing.module.ts index 41a114e54..b450c58d2 100644 --- a/src/app/savings/savings-routing.module.ts +++ b/src/app/savings/savings-routing.module.ts @@ -190,7 +190,7 @@ const routes: Routes = [ } }, { - path: 'transfer-funds', + path: ':savingAccountId/transfer-funds', loadChildren: () => import('../account-transfers/account-transfers.module').then(m => m.AccountTransfersModule) }, { diff --git a/src/app/system/manage-jobs/cob-workflow/cob-workflow.component.html b/src/app/system/manage-jobs/cob-workflow/cob-workflow.component.html index d949b6ad3..e915d0b5d 100644 --- a/src/app/system/manage-jobs/cob-workflow/cob-workflow.component.html +++ b/src/app/system/manage-jobs/cob-workflow/cob-workflow.component.html @@ -8,3 +8,7 @@ Run Catch-Up + +
+ +
diff --git a/src/app/tasks/checker-inbox-and-tasks-tabs/loan-locked/loan-locked.component.html b/src/app/system/manage-jobs/cob-workflow/loan-locked/loan-locked.component.html similarity index 100% rename from src/app/tasks/checker-inbox-and-tasks-tabs/loan-locked/loan-locked.component.html rename to src/app/system/manage-jobs/cob-workflow/loan-locked/loan-locked.component.html diff --git a/src/app/tasks/checker-inbox-and-tasks-tabs/loan-locked/loan-locked.component.scss b/src/app/system/manage-jobs/cob-workflow/loan-locked/loan-locked.component.scss similarity index 100% rename from src/app/tasks/checker-inbox-and-tasks-tabs/loan-locked/loan-locked.component.scss rename to src/app/system/manage-jobs/cob-workflow/loan-locked/loan-locked.component.scss diff --git a/src/app/tasks/checker-inbox-and-tasks-tabs/loan-locked/loan-locked.component.spec.ts b/src/app/system/manage-jobs/cob-workflow/loan-locked/loan-locked.component.spec.ts similarity index 100% rename from src/app/tasks/checker-inbox-and-tasks-tabs/loan-locked/loan-locked.component.spec.ts rename to src/app/system/manage-jobs/cob-workflow/loan-locked/loan-locked.component.spec.ts diff --git a/src/app/tasks/checker-inbox-and-tasks-tabs/loan-locked/loan-locked.component.ts b/src/app/system/manage-jobs/cob-workflow/loan-locked/loan-locked.component.ts similarity index 97% rename from src/app/tasks/checker-inbox-and-tasks-tabs/loan-locked/loan-locked.component.ts rename to src/app/system/manage-jobs/cob-workflow/loan-locked/loan-locked.component.ts index 7910f8455..fa2b1fca4 100644 --- a/src/app/tasks/checker-inbox-and-tasks-tabs/loan-locked/loan-locked.component.ts +++ b/src/app/system/manage-jobs/cob-workflow/loan-locked/loan-locked.component.ts @@ -46,9 +46,6 @@ export class LoanLockedComponent implements OnInit { private systemService: SystemService, private tasksService: TasksService, private dialog: MatDialog) { - this.route.data.subscribe((data: { loansData: any }) => { - this.loans = data.loansData.content; - }); } ngOnInit(): void { @@ -56,6 +53,7 @@ export class LoanLockedComponent implements OnInit { this.dataSource.paginator = this.paginator; this.selection = new SelectionModel(true, []); this.allowRunInlineJob = false; + this.getLoansLocked(this.currentPage); } applyFilter(filterValue: string = '') { diff --git a/src/app/tasks/checker-inbox-and-tasks-tabs/loan-locked/loan-locked.resolver.spec.ts b/src/app/system/manage-jobs/cob-workflow/loan-locked/loan-locked.resolver.spec.ts similarity index 100% rename from src/app/tasks/checker-inbox-and-tasks-tabs/loan-locked/loan-locked.resolver.spec.ts rename to src/app/system/manage-jobs/cob-workflow/loan-locked/loan-locked.resolver.spec.ts diff --git a/src/app/tasks/checker-inbox-and-tasks-tabs/loan-locked/loan-locked.resolver.ts b/src/app/system/manage-jobs/cob-workflow/loan-locked/loan-locked.resolver.ts similarity index 100% rename from src/app/tasks/checker-inbox-and-tasks-tabs/loan-locked/loan-locked.resolver.ts rename to src/app/system/manage-jobs/cob-workflow/loan-locked/loan-locked.resolver.ts diff --git a/src/app/system/system.module.ts b/src/app/system/system.module.ts index 29006747b..130dc54d7 100644 --- a/src/app/system/system.module.ts +++ b/src/app/system/system.module.ts @@ -71,6 +71,7 @@ import { WorkflowJobsComponent } from './manage-jobs/workflow-jobs/workflow-jobs import { DragDropModule } from '@angular/cdk/drag-drop'; import { ManageExternalEventsComponent } from './manage-external-events/manage-external-events.component'; import { CobWorkflowComponent } from './manage-jobs/cob-workflow/cob-workflow.component'; +import { LoanLockedComponent } from './manage-jobs/cob-workflow/loan-locked/loan-locked.component'; @NgModule({ imports: [ @@ -141,7 +142,8 @@ import { CobWorkflowComponent } from './manage-jobs/cob-workflow/cob-workflow.co WorkflowJobsComponent, WorkflowDiagramComponent, ManageExternalEventsComponent, - CobWorkflowComponent + CobWorkflowComponent, + LoanLockedComponent ], }) export class SystemModule { } diff --git a/src/app/tasks/checker-inbox-and-tasks/checker-inbox-and-tasks.component.html b/src/app/tasks/checker-inbox-and-tasks/checker-inbox-and-tasks.component.html index 0ba1cacae..100e45fc3 100644 --- a/src/app/tasks/checker-inbox-and-tasks/checker-inbox-and-tasks.component.html +++ b/src/app/tasks/checker-inbox-and-tasks/checker-inbox-and-tasks.component.html @@ -25,10 +25,6 @@ [active]="rescheduleLoan.isActive" *mifosxHasPermission="'RESCHEDULE_LOAN'"> Reschedule Loan - - Loan Locked - diff --git a/src/app/tasks/tasks-routing.module.ts b/src/app/tasks/tasks-routing.module.ts index 544e054f1..39f17900c 100644 --- a/src/app/tasks/tasks-routing.module.ts +++ b/src/app/tasks/tasks-routing.module.ts @@ -25,8 +25,6 @@ import { GetLoans } from './common-resolvers/getLoans.resolver'; import { GetRescheduleLoans } from './common-resolvers/getRescheduleLoans.resolver'; import { MakerCheckerTemplate } from './common-resolvers/makerCheckerTemplate.resolver'; import { GetCheckerInboxDetailResolver } from './common-resolvers/getCheckerInboxDetail.resolver'; -import { LoanLockedComponent } from './checker-inbox-and-tasks-tabs/loan-locked/loan-locked.component'; -import { LoanLockedResolver } from './checker-inbox-and-tasks-tabs/loan-locked/loan-locked.resolver'; /** Tasks Routes */ const routes: Routes = [ @@ -70,14 +68,6 @@ const routes: Routes = [ loansData: GetLoans } }, - { - path: 'loan-locked', - component: LoanLockedComponent, - data: { title: extract('Loan Locked') }, - resolve: { - loansData: LoanLockedResolver - } - }, { path: 'reschedule-loan', component: RescheduleLoanComponent, diff --git a/src/app/tasks/tasks.module.ts b/src/app/tasks/tasks.module.ts index 872d74b06..b6db52531 100644 --- a/src/app/tasks/tasks.module.ts +++ b/src/app/tasks/tasks.module.ts @@ -14,7 +14,6 @@ import { LoanApprovalComponent } from './checker-inbox-and-tasks-tabs/loan-appro import { LoanDisbursalComponent } from './checker-inbox-and-tasks-tabs/loan-disbursal/loan-disbursal.component'; import { RescheduleLoanComponent } from './checker-inbox-and-tasks-tabs/reschedule-loan/reschedule-loan.component'; import { ViewCheckerInboxComponent } from './view-checker-inbox/view-checker-inbox.component'; -import { LoanLockedComponent } from './checker-inbox-and-tasks-tabs/loan-locked/loan-locked.component'; /** * Tasks Module @@ -33,8 +32,7 @@ import { LoanLockedComponent } from './checker-inbox-and-tasks-tabs/loan-locked/ LoanApprovalComponent, LoanDisbursalComponent, RescheduleLoanComponent, - ViewCheckerInboxComponent, - LoanLockedComponent + ViewCheckerInboxComponent ], providers: [ ] })