Fix in products view routes (#1643)

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

src/app/savings/savings-account-stepper/savings-account-charges-step/savings-account-charges-step.component.html

@@ -12,7 +12,7 @@
 
   <div fxFlex="48%" fxFlexAlign="center">
     <button type="button" mat-raised-button color="primary" (click)="addCharge(charge)" [disabled]="!charge.value">
-      <fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;
+      <fa-icon icon="plus" class="m-r-10"></fa-icon>
       Add
     </button>
   </div>
@@ -110,31 +110,31 @@
               <mat-checkbox (change)="toggleSelect()" [(ngModel)]="element.selected"></mat-checkbox>
           </td>
       </ng-container>
-  
+
       <!-- Position Column -->
       <ng-container matColumnDef="id">
         <th mat-header-cell *matHeaderCellDef> Client ID </th>
         <td mat-cell *matCellDef="let element"> {{element.id}} </td>
       </ng-container>
-  
+
       <!-- Name Column -->
       <ng-container matColumnDef="name">
         <th mat-header-cell *matHeaderCellDef> Client Name </th>
         <td mat-cell *matCellDef="let element"> {{element.displayName}} </td>
       </ng-container>
-  
-  
+
+
       <tr mat-header-row *matHeaderRowDef="displayedColumn"></tr>
       <tr mat-row *matRowDef="let row; columns: displayedColumn;"></tr>
     </table>
   </div>
-  
+
 
 </div>
 
 <div fxLayout="row" class="margin-t" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="2%">
   <button mat-raised-button matStepperPrevious>
-    <fa-icon icon="arrow-left"></fa-icon>&nbsp;&nbsp;
+    <fa-icon icon="arrow-left" class="m-r-10"></fa-icon>
     Previous
   </button>
   <button mat-raised-button matStepperNext>

src/app/savings/savings-account-stepper/savings-account-details-step/savings-account-details-step.component.html

@@ -43,7 +43,7 @@
 
   <div fxLayout="row" class="margin-t" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="2%">
     <button mat-raised-button matStepperPrevious disabled>
-      <fa-icon icon="arrow-left"></fa-icon>&nbsp;&nbsp;
+      <fa-icon icon="arrow-left" class="m-r-10"></fa-icon>
       Previous
     </button>
     <button mat-raised-button matStepperNext>

src/app/savings/savings-account-stepper/savings-account-preview-step/savings-account-preview-step.component.html

@@ -151,20 +151,20 @@
           <span *ngIf="charge.chargeTimeType.value === 'Monthly Fee' || charge.chargeTimeType.value === 'Annual Fee'">
             {{(charge.feeOnMonthDay  | dateFormat) || 'Unassigned'}}
           </span>
-          <span 
+          <span
             *ngIf="!(charge.chargeTimeType.value === 'Monthly Fee' || charge.chargeTimeType.value === 'Annual Fee'
               || charge.chargeTimeType.value === 'Specified due date' || charge.chargeTimeType.value === 'Weekly Fee')">
             N/A
           </span>
         </td>
       </ng-container>
-  
+
       <ng-container matColumnDef="repaymentsEvery">
         <th mat-header-cell *matHeaderCellDef> Repayments Every </th>
         <td mat-cell *matCellDef="let charge">
-          {{ charge.feeInterval || 'Not Provided' }} 
+          {{ charge.feeInterval || 'Not Provided' }}
         </td>
-      </ng-container>  
+      </ng-container>
 
       <ng-container matColumnDef="chargeTimeType">
         <th mat-header-cell *matHeaderCellDef> Collected On </th>
@@ -184,7 +184,7 @@
 
 <div fxLayout="row" class="margin-t" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="2%">
   <button mat-raised-button matStepperPrevious>
-    <fa-icon icon="arrow-left"></fa-icon>&nbsp;&nbsp;
+    <fa-icon icon="arrow-left" class="m-r-10"></fa-icon>
     Previous
   </button>
   <button mat-raised-button [routerLink]="['../']">

src/app/savings/savings-account-stepper/savings-account-terms-step/savings-account-terms-step.component.html

@@ -145,7 +145,7 @@
 
   <div fxLayout="row" class="margin-t" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="2%">
     <button mat-raised-button matStepperPrevious disabled>
-      <fa-icon icon="arrow-left"></fa-icon>&nbsp;&nbsp;
+      <fa-icon icon="arrow-left" class="m-r-10"></fa-icon>
       Previous
     </button>
     <button mat-raised-button matStepperNext>

src/app/savings/savings-account-view/transactions-tab/export-transactions/export-transactions.component.html

@@ -27,7 +27,7 @@
   <div class="generate-button" fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5%">
     <button type="button" mat-raised-button [routerLink]="['../']">Cancel</button>
     <button mat-raised-button color="primary" [disabled]="!transactionsReportForm.valid">
-    <fa-icon icon="cogs"></fa-icon>&nbsp;&nbsp;Generate Report &nbsp;</button>
+    <fa-icon icon="cogs" class="m-r-10"></fa-icon>Generate Report &nbsp;</button>
   </div>
 
 </form>

src/app/savings/savings-account-view/transactions/view-reciept/view-reciept.component.html

@@ -2,9 +2,9 @@
 
   <div class="back-button">
     <button type="button" color="primary" mat-raised-button [routerLink]="['../../']">
-      <fa-icon icon="arrow-left"></fa-icon>&nbsp;&nbsp;Back</button>
+      <fa-icon icon="arrow-left" class="m-r-10"></fa-icon>Back</button>
   </div>
-  
+
   <iframe [src]="pentahoUrl" frameborder="0" width=100% height="600px;"></iframe>
 
 </mat-card>

src/app/savings/savings-account-view/view-charge/view-charge.component.html

@@ -3,16 +3,16 @@
 <div *ngIf="savingsAccountData.status.value === 'Active' && chargeData.amountOutstanding !== 0"
   fxLayout="row" fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column" class="container m-b-20">
     <button mat-raised-button color="accent" *mifosxHasPermission="'PAY_SAVINGSACCOUNTCHARGE'" (click)="payCharge()">
-      <fa-icon icon="dollar-sign"></fa-icon>&nbsp;&nbsp;
+      <fa-icon icon="dollar-sign" class="m-r-10"></fa-icon>
       Pay
     </button>
     <button mat-raised-button color="primary" *mifosxHasPermission="'WAIVE_SAVINGSACCOUNTCHARGE'" (click)="waiveCharge()">
-      <fa-icon icon="flag"></fa-icon>&nbsp;&nbsp;
+      <fa-icon icon="flag" class="m-r-10"></fa-icon>
       Waive
     </button>
     <span *ngIf="isRecurringCharge()">
       <button mat-raised-button color="warn" *mifosxHasPermission="'INACTIVATE_SAVINGSACCOUNTCHARGE'" (click)="inactivateCharge()">
-        <fa-icon icon="trash"></fa-icon>&nbsp;&nbsp;
+        <fa-icon icon="trash" class="m-r-10"></fa-icon>
         Inactivate
       </button>
     </span>
@@ -21,11 +21,11 @@
 <div *ngIf="savingsAccountData.status.value === 'Submitted and pending approval'"
   fxLayout="row" fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column" class="container m-b-20">
     <button mat-raised-button color="primary" *mifosxHasPermission="'UPDATE_SAVINGSACCOUNTCHARGE'" (click)="editCharge()">
-      <fa-icon icon="edit"></fa-icon>&nbsp;&nbsp;
+      <fa-icon icon="edit" class="m-r-10"></fa-icon>
       Edit
     </button>
     <button mat-raised-button color="warn" *mifosxHasPermission="'DELETE_SAVINGSACCOUNTCHARGE'" (click)="deleteCharge()">
-      <fa-icon icon="trash"></fa-icon>&nbsp;&nbsp;
+      <fa-icon icon="trash" class="m-r-10"></fa-icon>
       Delete
     </button>
 </div>
@@ -45,7 +45,7 @@
         <div fxFlex="50%">
           {{ chargeData.name }}
         </div>
-        
+
         <div fxFlex="50%" class="mat-body-strong">
           Charge Type
         </div>
@@ -85,7 +85,7 @@
         <div fxFlex="50%">
           {{ chargeData.chargeCalculationType.value }}
         </div>
-        
+
         <div fxFlex="50%" class="mat-body-strong">
           Due
         </div>

src/app/savings/savings-routing.module.ts

@@ -41,6 +41,7 @@ import { SavingsDocumentsTabComponent } from './savings-account-view/savings-doc
 import { NotesTabComponent } from './savings-account-view/notes-tab/notes-tab.component';
 import { SavingNotesResolver } from './common-resolvers/saving-notes.resolver';
 import { SavingDocumentsResolver } from './common-resolvers/saving-documents.resolver';
+
 /** Savings Routes */
 const routes: Routes = [
   {
@@ -58,9 +59,6 @@ const routes: Routes = [
       {
         path: ':savingAccountId',
         data: { title: extract('Saving Account View'), routeParamBreadcrumb: 'savingAccountId' },
-        resolve: {
-          savingsAccountData: SavingsAccountViewResolver
-        },
         children: [
           {
             path: '',
@@ -70,6 +68,11 @@ const routes: Routes = [
               savingsDatatables: SavingsDatatablesResolver
             },
             children: [
+              {
+                path: '',
+                redirectTo: 'transactions',
+                pathMatch: 'full'
+              },
               {
                 path: 'transactions',
                 data: { title: extract('Savings Account Transactions'), breadcrumb: 'Transactions', routeParamBreadcrumb: false },
@@ -77,7 +80,6 @@ const routes: Routes = [
                   {
                     path: '',
                     component: TransactionsTabComponent
-
                   },
                   {
                     path: 'export',