Enhancement in loan and savings account views (#1690)

Co-authored-by: Jose Alberto Hernandez <alberto@MacBook-Pro.local>

src/app/loans/common-resolvers/glim-loan-template.resolver.ts

@@ -23,7 +23,7 @@ export class GLIMLoanTemplateResolver implements Resolve<Object> {
      * @returns {Observable<any>}
      */
     resolve(route: ActivatedRouteSnapshot): Observable<any> {
-        const groupId = route.parent.parent.paramMap.get('groupId');
+        const groupId = route.paramMap.get('groupId');
         return this.loansService.getGLIMLoanAccountTemplate(groupId);
     }
 }

src/app/loans/common-resolvers/loan-action-button.resolver.ts

@@ -24,7 +24,7 @@ export class LoanActionButtonResolver implements Resolve<Object> {
    * @returns {Observable<any>}
    */
   resolve(route: ActivatedRouteSnapshot): Observable<any> {
-    const loanId = route.parent.paramMap.get('loanId');
+    const loanId = route.paramMap.get('loanId') || route.parent.paramMap.get('loanId');
     const loanActionButton = route.paramMap.get('action');
     if (loanActionButton === 'Assign Loan Officer' || loanActionButton === 'Change Loan Officer') {
       return this.loansService.getLoanTemplate(loanId);

src/app/loans/common-resolvers/loan-datatable.resolver.ts

@@ -24,9 +24,9 @@ export class LoanDatatableResolver implements Resolve<Object> {
      * @returns {Observable<any>}
      */
     resolve(route: ActivatedRouteSnapshot): Observable<any> {
-        const loanId = route.parent.parent.paramMap.get('loanId');
-        const datatableName = route.paramMap.get('datatableName');
-        return this.loansService.getLoanDatatable(loanId, datatableName);
+      const loanId = route.paramMap.get('loanId') || route.parent.paramMap.get('loanId');
+      const datatableName = route.paramMap.get('datatableName');
+      return this.loansService.getLoanDatatable(loanId, datatableName);
     }
 
 }

src/app/loans/common-resolvers/loan-delinquency-tags.resolver.ts

@@ -24,8 +24,8 @@ export class LoanDelinquencyTagsResolver implements Resolve<Object> {
      * @returns {Observable<any>}
      */
     resolve(route: ActivatedRouteSnapshot): Observable<any> {
-        const loanId = route.paramMap.get('loanId') || route.parent.paramMap.get('loanId') || route.parent.parent.paramMap.get('loanId');
-        return this.loansService.getDelinquencyTags(loanId);
+      const loanId = route.paramMap.get('loanId') || route.parent.paramMap.get('loanId');
+      return this.loansService.getDelinquencyTags(loanId);
     }
 
 }

src/app/loans/common-resolvers/loan-details-charges.resolver.ts

@@ -24,7 +24,7 @@ export class LoanDetailsChargesResolver implements Resolve<Object> {
      * @returns {Observable<any>}
      */
     resolve(route: ActivatedRouteSnapshot): Observable<any> {
-        const loanId = route.parent.parent.paramMap.get('loanId');
+        const loanId = route.paramMap.get('loanId');
         return this.loansService.getLoanAccountAssociationDetails(loanId);
     }
 

src/app/loans/common-resolvers/loan-details.resolver.ts

@@ -24,8 +24,8 @@ export class LoanDetailsResolver implements Resolve<Object> {
      * @returns {Observable<any>}
      */
     resolve(route: ActivatedRouteSnapshot): Observable<any> {
-        const loanId = route.paramMap.get('loanId') || route.parent.paramMap.get('loanId') || route.parent.parent.paramMap.get('loanId');
-        return this.loansService.getLoanAccountAssociationDetails(loanId);
+      const loanId = route.paramMap.get('loanId') || route.parent.paramMap.get('loanId');
+      return this.loansService.getLoanAccountAssociationDetails(loanId);
     }
 
 }

src/app/loans/common-resolvers/loan-documents.resolver.ts

@@ -24,8 +24,8 @@ export class LoanDocumentsResolver implements Resolve<Object> {
      * @returns {Observable<any>}
      */
     resolve(route: ActivatedRouteSnapshot): Observable<any> {
-        const loanId = route.parent.paramMap.get('loanId');
-        return this.loansService.getLoanDocuments(loanId);
+      const loanId = route.paramMap.get('loanId') || route.parent.paramMap.get('loanId');
+      return this.loansService.getLoanDocuments(loanId);
     }
 
 }

src/app/loans/common-resolvers/loan-notes.resolver.ts

@@ -24,8 +24,8 @@ export class LoanNotesResolver implements Resolve<Object> {
      * @returns {Observable<any>}
      */
     resolve(route: ActivatedRouteSnapshot): Observable<any> {
-        const loanId = route.parent.paramMap.get('loanId');
-        return this.loansService.getLoanNotes(loanId);
+      const loanId = route.paramMap.get('loanId') || route.parent.paramMap.get('loanId');
+      return this.loansService.getLoanNotes(loanId);
     }
 
 }

src/app/loans/common-resolvers/loan-reschedules.resolver.ts

@@ -22,8 +22,8 @@ export class LoanReschedulesResolver implements Resolve<boolean> {
      * @returns {Observable<any>}
      */
     resolve(route: ActivatedRouteSnapshot): Observable<any> {
-        const loanId = route.parent.paramMap.get('loanId');
-        return this.loansService.loanRescheduleRequests(loanId);
+      const loanId = route.paramMap.get('loanId') || route.parent.paramMap.get('loanId');
+      return this.loansService.loanRescheduleRequests(loanId);
     }
 
 }

src/app/loans/common-resolvers/loans-account-and-template.resolver.ts

@@ -23,7 +23,7 @@ export class LoansAccountAndTemplateResolver implements Resolve<Object> {
      * @returns {Observable<any>}
      */
     resolve(route: ActivatedRouteSnapshot): Observable<any> {
-        const loanId = route.parent.paramMap.get('loanId');
-        return this.loansService.getLoansAccountAndTemplateResource(loanId);
+      const loanId = route.paramMap.get('loanId') || route.parent.paramMap.get('loanId');
+      return this.loansService.getLoansAccountAndTemplateResource(loanId);
     }
 }

src/app/loans/common-resolvers/loans-account-charge.resolver.ts

@@ -25,9 +25,9 @@ export class LoansAccountChargeResolver implements Resolve<Object> {
      * @returns {Observable<any>}
      */
     resolve(route: ActivatedRouteSnapshot): Observable<any> {
-        const loanAccountId = route.parent.parent.paramMap.get('loanId');
-        const chargeId = route.paramMap.get('id');
-        return this.loansService.getLoansAccountCharge(loanAccountId, chargeId);
+      const loanId = route.paramMap.get('loanId');
+      const chargeId = route.paramMap.get('id');
+      return this.loansService.getLoansAccountCharge(loanId, chargeId);
     }
 
 }

src/app/loans/common-resolvers/loans-account-transaction-template.resolver.ts

@@ -25,9 +25,9 @@ export class LoansAccountTransactionTemplateResolver implements Resolve<Object>
    * @returns {Observable<any>}
    */
   resolve(route: ActivatedRouteSnapshot): Observable<any> {
-    const loanAccountId = route.parent.parent.parent.paramMap.get('loanId');
+    const loanId = route.paramMap.get('loanId');
     const transactionId = route.paramMap.get('id');
-    return this.loansService.getLoansAccountTransactionTemplate(loanAccountId, transactionId);
+    return this.loansService.getLoansAccountTransactionTemplate(loanId, transactionId);
   }
 
 }

src/app/loans/common-resolvers/loans-account-transaction.resolver.ts

@@ -25,9 +25,9 @@ export class LoansAccountTransactionResolver implements Resolve<Object> {
    * @returns {Observable<any>}
    */
   resolve(route: ActivatedRouteSnapshot): Observable<any> {
-    const loanAccountId = route.parent.parent.parent.paramMap.get('loanId');
+    const loanId = route.paramMap.get('loanId');
     const transactionId = route.paramMap.get('id');
-    return this.loansService.getLoansAccountTransaction(loanAccountId, transactionId);
+    return this.loansService.getLoansAccountTransaction(loanId, transactionId);
   }
 
 }