build: Use prettier for typescript

Stop ignoring .ts files in prettier and fix existing issues.
This commit is contained in:
Ralph Hopman
2025-01-15 11:59:30 +00:00
committed by Adam Saghy
parent 9d6cf1514a
commit cac1d11ad7
1812 changed files with 22516 additions and 16862 deletions
@@ -21,7 +21,7 @@ const routes: Routes = [
path: '',
component: ViewCollateralComponent,
resolve: {
clientCollateralData: ClientCollateralResolver,
clientCollateralData: ClientCollateralResolver
}
},
{
@@ -29,7 +29,7 @@ const routes: Routes = [
data: { title: 'edit', routeParamBreadcrumb: 'edit' },
component: EditCollateralComponent,
resolve: {
clientCollateralData: ClientCollateralResolver,
clientCollateralData: ClientCollateralResolver
}
}
]
@@ -43,7 +43,7 @@ const routes: Routes = [
exports: [RouterModule],
declarations: [],
providers: [
ClientCollateralResolver,
ClientCollateralResolver
]
})
export class CollateralsRoutingModule { }
export class CollateralsRoutingModule {}
+1 -2
View File
@@ -13,7 +13,6 @@ import { CollateralsRoutingModule } from './collaterals-routing.module';
import { ViewCollateralComponent } from './view-collateral/view-collateral.component';
import { EditCollateralComponent } from './edit-collateral/edit-collateral.component';
@NgModule({
declarations: [
ViewCollateralComponent,
@@ -27,4 +26,4 @@ import { EditCollateralComponent } from './edit-collateral/edit-collateral.compo
PipesModule
]
})
export class CollateralsModule { }
export class CollateralsModule {}
+11 -5
View File
@@ -14,9 +14,15 @@ export class CollateralsService {
/**
* @param {HttpClient} http Http Client to send requests.
*/
constructor(private http: HttpClient) { }
constructor(private http: HttpClient) {}
getFilteredClients(orderBy: string, sortOrder: string, orphansOnly: boolean, displayName: string, officeId?: any): Observable<any> {
getFilteredClients(
orderBy: string,
sortOrder: string,
orphansOnly: boolean,
displayName: string,
officeId?: any
): Observable<any> {
let httpParams = new HttpParams()
.set('displayName', displayName)
.set('orphansOnly', orphansOnly.toString())
@@ -31,21 +37,21 @@ export class CollateralsService {
/**
* @returns {Observable<any>} Collaterals data
*/
getClientCollateral(clientId: any, clientCollateralId: any): Observable<any> {
getClientCollateral(clientId: any, clientCollateralId: any): Observable<any> {
return this.http.get(`/clients/${clientId}/collaterals/${clientCollateralId}`);
}
/**
* @returns {Observable<any>} Collaterals data
*/
updateClientCollateral(clientId: any, clientCollateralId: any, clientCollateralData: any): Observable<any> {
updateClientCollateral(clientId: any, clientCollateralId: any, clientCollateralData: any): Observable<any> {
return this.http.put(`/clients/${clientId}/collaterals/${clientCollateralId}`, clientCollateralData);
}
/**
* @returns {Observable<any>} Delete Collaterals data
*/
deleteCollateral(clientId: any, clientCollateralId: any): Observable<any> {
deleteCollateral(clientId: any, clientCollateralId: any): Observable<any> {
return this.http.delete(`/clients/${clientId}/collaterals/${clientCollateralId}`);
}
}
@@ -13,20 +13,18 @@ import { CollateralsService } from '../collaterals.service';
*/
@Injectable()
export class ClientCollateralResolver implements Resolve<Object> {
/**
* @param {CollateralsService} collateralsService Collaterals service.
*/
constructor(private collateralsService: CollateralsService) {}
/**
* @param {CollateralsService} collateralsService Collaterals service.
*/
constructor(private collateralsService: CollateralsService) { }
/**
* Returns the Client Collateral data.
* @returns {Observable<any>}
*/
resolve(route: ActivatedRouteSnapshot): Observable<any> {
const clientId = route.parent.paramMap.get('clientId');
const collateralId = route.parent.paramMap.get('collateralId');
return this.collateralsService.getClientCollateral(clientId, collateralId);
}
/**
* Returns the Client Collateral data.
* @returns {Observable<any>}
*/
resolve(route: ActivatedRouteSnapshot): Observable<any> {
const clientId = route.parent.paramMap.get('clientId');
const collateralId = route.parent.paramMap.get('collateralId');
return this.collateralsService.getClientCollateral(clientId, collateralId);
}
}
@@ -8,9 +8,8 @@ describe('EditCollateralComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ EditCollateralComponent ]
})
.compileComponents();
declarations: [EditCollateralComponent]
}).compileComponents();
});
beforeEach(() => {
@@ -13,8 +13,6 @@ import { CollateralsService } from '../collaterals.service';
styleUrls: ['./edit-collateral.component.scss']
})
export class EditCollateralComponent implements OnInit {
/** Client Collateral Form */
clientCollateralForm: UntypedFormGroup;
/** Client Collateral Options */
@@ -38,12 +36,12 @@ export class EditCollateralComponent implements OnInit {
private router: Router,
private settingsService: SettingsService,
private collateralService: CollateralsService
) {
this.route.data.subscribe((data: { clientCollateralData: any }) => {
this.collateralDetails = data.clientCollateralData;
});
this.clientId = this.route.parent.snapshot.params['clientId'];
}
) {
this.route.data.subscribe((data: { clientCollateralData: any }) => {
this.collateralDetails = data.clientCollateralData;
});
this.clientId = this.route.parent.snapshot.params['clientId'];
}
ngOnInit(): void {
this.createClientCollateralForm();
@@ -54,16 +52,19 @@ export class EditCollateralComponent implements OnInit {
*/
createClientCollateralForm() {
this.clientCollateralForm = this.formBuilder.group({
'quantity': [ '', Validators.required ],
'name': [{ value: '', disabled: true }],
'total': [{value: '', disabled: true}],
'totalCollateral': [{value: '', disabled: true}],
quantity: [
'',
Validators.required
],
name: [{ value: '', disabled: true }],
total: [{ value: '', disabled: true }],
totalCollateral: [{ value: '', disabled: true }]
});
this.clientCollateralForm.patchValue({
'name': this.collateralDetails.name,
'quantity': this.collateralDetails.quantity,
'total': this.collateralDetails.total,
'totalCollateral': this.collateralDetails.totalCollateral,
name: this.collateralDetails.name,
quantity: this.collateralDetails.quantity,
total: this.collateralDetails.total,
totalCollateral: this.collateralDetails.totalCollateral
});
}
@@ -79,8 +80,7 @@ export class EditCollateralComponent implements OnInit {
locale
};
this.collateralService.updateClientCollateral(this.clientId, collateralId, clientCollateralData).subscribe(() => {
this.router.navigate(['../'], {relativeTo: this.route});
this.router.navigate(['../'], { relativeTo: this.route });
});
}
}
@@ -8,9 +8,8 @@ describe('ViewCollateralComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ ViewCollateralComponent ]
})
.compileComponents();
declarations: [ViewCollateralComponent]
}).compileComponents();
});
beforeEach(() => {
@@ -6,17 +6,20 @@ import { MatDialog } from '@angular/material/dialog';
/** Custom Components */
import { DeleteDialogComponent } from '../../shared/delete-dialog/delete-dialog.component';
@Component({
selector: 'mifosx-view-collateral',
templateUrl: './view-collateral.component.html',
styleUrls: ['./view-collateral.component.scss']
})
export class ViewCollateralComponent {
clientCollateralData: any;
collateralColumns: string[] = ['ID', 'Last Repayment', 'Remaining Amount', 'Last Repayment Date'];
collateralColumns: string[] = [
'ID',
'Last Repayment',
'Remaining Amount',
'Last Repayment Date'
];
constructor(
private route: ActivatedRoute,
@@ -24,7 +27,7 @@ export class ViewCollateralComponent {
private router: Router,
private dialog: MatDialog
) {
this.route.data.subscribe((data: {clientCollateralData: any}) => {
this.route.data.subscribe((data: { clientCollateralData: any }) => {
this.clientCollateralData = data.clientCollateralData;
});
}
@@ -32,18 +35,18 @@ export class ViewCollateralComponent {
/**
* Deletes the Collateral and redirects to CLients Page.
*/
deleteCollateral() {
deleteCollateral() {
const deleteCollateralDialogRef = this.dialog.open(DeleteDialogComponent, {
data: { deleteContext: `collateral ${this.clientCollateralData.id}` }
});
deleteCollateralDialogRef.afterClosed().subscribe((response: any) => {
if (response.delete) {
this.collateralsService.deleteCollateral(this.clientCollateralData.clientId, this.clientCollateralData.id)
this.collateralsService
.deleteCollateral(this.clientCollateralData.clientId, this.clientCollateralData.id)
.subscribe(() => {
this.router.navigate(['../../'], { relativeTo: this.route });
});
}
});
}
}