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
@@ -13,7 +13,6 @@ import { TemplatesService } from '../templates.service';
*/
@Injectable()
export class CreateTemplateResolver implements Resolve<Object> {
/**
* @param {TemplatesService} templatesService Templates service.
*/
@@ -26,5 +25,4 @@ export class CreateTemplateResolver implements Resolve<Object> {
resolve(): Observable<any> {
return this.templatesService.getCreateTemplateData();
}
}
@@ -13,7 +13,6 @@ import { TemplatesService } from '../templates.service';
*/
@Injectable()
export class EditTemplateResolver implements Resolve<Object> {
/**
* @param {TemplatesService} templatesService Templates service.
*/
@@ -27,5 +26,4 @@ export class EditTemplateResolver implements Resolve<Object> {
const templateId = route.paramMap.get('id');
return this.templatesService.getEditTemplateData(templateId);
}
}
@@ -13,7 +13,6 @@ import { TemplatesService } from '../templates.service';
*/
@Injectable()
export class TemplateResolver implements Resolve<Object> {
/**
* @param {TemplatesService} templatesService Templates service.
*/
@@ -27,5 +26,4 @@ export class TemplateResolver implements Resolve<Object> {
const templateId = route.paramMap.get('id');
return this.templatesService.getTemplate(templateId);
}
}
@@ -13,7 +13,6 @@ import { TemplatesService } from '../templates.service';
*/
@Injectable()
export class TemplatesResolver implements Resolve<Object> {
/**
* @param {TemplatesService} templatesService Templates service.
*/
@@ -26,5 +25,4 @@ export class TemplatesResolver implements Resolve<Object> {
resolve(): Observable<any> {
return this.templatesService.getTemplates();
}
}
@@ -8,9 +8,8 @@ describe('CreateTemplateComponent', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ CreateTemplateComponent ]
})
.compileComponents();
declarations: [CreateTemplateComponent]
}).compileComponents();
}));
beforeEach(() => {
@@ -21,7 +21,6 @@ import { TemplatesService } from '../templates.service';
styleUrls: ['./create-template.component.scss']
})
export class CreateTemplateComponent implements OnInit {
/** CKEditor5 */
public Editor = ClassicEditor;
/** CKEditor5 Template Reference */
@@ -50,10 +49,12 @@ export class CreateTemplateComponent implements OnInit {
* @param {Router} router Router for navigation.
* @param {TemplateService} templateService Templates Service
*/
constructor(private formBuilder: UntypedFormBuilder,
private route: ActivatedRoute,
private router: Router,
private templateService: TemplatesService) {
constructor(
private formBuilder: UntypedFormBuilder,
private route: ActivatedRoute,
private router: Router,
private templateService: TemplatesService
) {
this.route.data.subscribe((data: { createTemplateData: any }) => {
this.createTemplateData = data.createTemplateData;
});
@@ -69,9 +70,18 @@ export class CreateTemplateComponent implements OnInit {
*/
createTemplateForm() {
this.templateForm = this.formBuilder.group({
'entity': ['', Validators.required],
'type': ['', Validators.required],
'name': ['', Validators.required]
entity: [
'',
Validators.required
],
type: [
'',
Validators.required
],
name: [
'',
Validators.required
]
});
}
@@ -81,17 +91,19 @@ export class CreateTemplateComponent implements OnInit {
buildDependencies() {
const tenantIdentifier = 'default'; // update once global settings are setup.
this.templateForm.get('entity').valueChanges.subscribe((value: any) => {
if (value === 0) { // client
if (value === 0) {
// client
this.mappers.splice(0, 1, {
mappersorder: 0,
mapperskey: new UntypedFormControl('client'),
mappersvalue: new UntypedFormControl('clients/{{clientId}}?tenantIdentifier=' + tenantIdentifier)
});
} else { // loan
} else {
// loan
this.mappers.splice(0, 1, {
mappersorder: 0,
mapperskey: new UntypedFormControl('loan'),
mappersvalue: new UntypedFormControl('loans/{{loanId}}?associations=all&tenantIdentifier=' + tenantIdentifier )
mappersvalue: new UntypedFormControl('loans/{{loanId}}?associations=all&tenantIdentifier=' + tenantIdentifier)
});
}
this.setEditorContent('');
@@ -127,7 +139,7 @@ export class CreateTemplateComponent implements OnInit {
this.ckEditor.editorInstance.model.change((writer: any) => {
const insertPosition = this.ckEditor.editorInstance.model.document.selection.getFirstPosition();
writer.insertText(label, insertPosition);
} );
});
}
}
@@ -166,8 +178,13 @@ export class CreateTemplateComponent implements OnInit {
text: this.getEditorContent()
};
this.templateService.createTemplate(template).subscribe((response: any) => {
this.router.navigate(['../', response.resourceId], { relativeTo: this.route });
this.router.navigate(
[
'../',
response.resourceId
],
{ relativeTo: this.route }
);
});
}
}
@@ -8,9 +8,8 @@ describe('EditTemplateComponent', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ EditTemplateComponent ]
})
.compileComponents();
declarations: [EditTemplateComponent]
}).compileComponents();
}));
beforeEach(() => {
@@ -21,7 +21,6 @@ import { TemplatesService } from '../templates.service';
styleUrls: ['./edit-template.component.scss']
})
export class EditTemplateComponent implements OnInit {
/** CKEditor5 */
public Editor = ClassicEditor;
/** CKEditor5 Template Reference */
@@ -50,18 +49,19 @@ export class EditTemplateComponent implements OnInit {
* @param {Router} router Router for navigation.
* @param {TemplateService} templateService Templates Service
*/
constructor(private formBuilder: UntypedFormBuilder,
private route: ActivatedRoute,
private router: Router,
private templateService: TemplatesService) {
constructor(
private formBuilder: UntypedFormBuilder,
private route: ActivatedRoute,
private router: Router,
private templateService: TemplatesService
) {
this.route.data.subscribe((data: { editTemplateData: any }) => {
this.editTemplateData = data.editTemplateData;
this.mappers = this.editTemplateData.template.mappers
.map((mapper: any) => ({
mappersorder: mapper.mapperorder,
mapperskey: new UntypedFormControl(mapper.mapperkey),
mappersvalue: new UntypedFormControl(mapper.mappervalue)
}));
this.mappers = this.editTemplateData.template.mappers.map((mapper: any) => ({
mappersorder: mapper.mapperorder,
mapperskey: new UntypedFormControl(mapper.mapperkey),
mappersvalue: new UntypedFormControl(mapper.mappervalue)
}));
});
}
@@ -75,9 +75,11 @@ export class EditTemplateComponent implements OnInit {
*/
createTemplateForm() {
this.templateForm = this.formBuilder.group({
'entity': [this.editTemplateData.entities.find((entity: any) => entity.name === this.editTemplateData.template.entity).id],
'type': [this.editTemplateData.types.find((type: any) => type.name === this.editTemplateData.template.type).id],
'name': [this.editTemplateData.template.name]
entity: [
this.editTemplateData.entities.find((entity: any) => entity.name === this.editTemplateData.template.entity).id
],
type: [this.editTemplateData.types.find((type: any) => type.name === this.editTemplateData.template.type).id],
name: [this.editTemplateData.template.name]
});
}
@@ -87,17 +89,19 @@ export class EditTemplateComponent implements OnInit {
buildDependencies() {
const tenantIdentifier = 'default'; // update once global settings are setup.
this.templateForm.get('entity').valueChanges.subscribe((value: any) => {
if (value === 0) { // client
if (value === 0) {
// client
this.mappers.splice(0, 1, {
mappersorder: 0,
mapperskey: new UntypedFormControl('client'),
mappersvalue: new UntypedFormControl('clients/{{clientId}}?tenantIdentifier=' + tenantIdentifier)
});
} else { // loan
} else {
// loan
this.mappers.splice(0, 1, {
mappersorder: 0,
mapperskey: new UntypedFormControl('loan'),
mappersvalue: new UntypedFormControl('loans/{{loanId}}?associations=all&tenantIdentifier=' + tenantIdentifier )
mappersvalue: new UntypedFormControl('loans/{{loanId}}?associations=all&tenantIdentifier=' + tenantIdentifier)
});
}
this.setEditorContent('');
@@ -132,7 +136,7 @@ export class EditTemplateComponent implements OnInit {
this.ckEditor.editorInstance.model.change((writer: any) => {
const insertPosition = this.ckEditor.editorInstance.model.document.selection.getFirstPosition();
writer.insertText(label, insertPosition);
} );
});
}
}
@@ -174,5 +178,4 @@ export class EditTemplateComponent implements OnInit {
this.router.navigate(['../'], { relativeTo: this.route });
});
}
}
@@ -1,4 +1,4 @@
export const clientParameterLabels = [
export const clientParameterLabels = [
'{{client.accountNo}}',
'{{client.status.value}}',
'{{client.fullname}}',
@@ -8,7 +8,7 @@ export const clientParameterLabels = [
'{{/client.groups}}'
];
export const loanParameterLabels = [
export const loanParameterLabels = [
'{{loan.accountNo}}',
'{{loan.status.value}}',
'{{loan.loanProductId}}',
@@ -16,7 +16,7 @@ export const loanParameterLabels = [
'{{loan.loanProductDescription}}'
];
export const repaymentParameterLabels = [
export const repaymentParameterLabels = [
'{{loan.repaymentSchedule.loanTermInDays}}',
'{{loan.repaymentSchedule.totalPrincipalDisbursed}}',
'{{loan.repaymentSchedule.totalPrincipalExpected}}',
@@ -63,6 +63,7 @@ const routes: Routes = [
]
}
])
];
/**
@@ -80,4 +81,4 @@ const routes: Routes = [
CreateTemplateResolver
]
})
export class TemplatesRoutingModule { }
export class TemplatesRoutingModule {}
@@ -8,9 +8,8 @@ describe('TemplatesComponent', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ TemplatesComponent ]
})
.compileComponents();
declarations: [TemplatesComponent]
}).compileComponents();
}));
beforeEach(() => {
+6 -4
View File
@@ -14,11 +14,14 @@ import { ActivatedRoute } from '@angular/router';
styleUrls: ['./templates.component.scss']
})
export class TemplatesComponent implements OnInit {
/** Templates data. */
templatesData: any;
/** Columns to be displayed in templates table. */
displayedColumns: string[] = ['entity', 'type', 'name'];
displayedColumns: string[] = [
'entity',
'type',
'name'
];
/** Data source for templates table. */
dataSource: MatTableDataSource<any>;
@@ -32,7 +35,7 @@ export class TemplatesComponent implements OnInit {
* @param {ActivatedRoute} route Activated Route.
*/
constructor(private route: ActivatedRoute) {
this.route.data.subscribe(( data: { templates: any }) => {
this.route.data.subscribe((data: { templates: any }) => {
this.templatesData = data.templates;
});
}
@@ -60,5 +63,4 @@ export class TemplatesComponent implements OnInit {
this.dataSource.paginator = this.paginator;
this.dataSource.sort = this.sort;
}
}
+2 -2
View File
@@ -29,7 +29,7 @@ import { CreateTemplateComponent } from './create-template/create-template.compo
TemplatesComponent,
ViewTemplateComponent,
EditTemplateComponent,
CreateTemplateComponent,
CreateTemplateComponent
]
})
export class TemplatesModule { }
export class TemplatesModule {}
+3 -5
View File
@@ -12,11 +12,10 @@ import { Observable } from 'rxjs';
providedIn: 'root'
})
export class TemplatesService {
/**
* @param {HttpClient} http Http Client to send requests.
*/
constructor(private http: HttpClient) { }
constructor(private http: HttpClient) {}
/**
* @returns {Observable<any>} Templates data
@@ -53,7 +52,7 @@ export class TemplatesService {
* @param templateId Template Id.
* @returns {Observable<any>}.
*/
createTemplate(templateData: any): Observable<any> {
createTemplate(templateData: any): Observable<any> {
return this.http.post(`/templates`, templateData);
}
@@ -62,7 +61,7 @@ export class TemplatesService {
* @param templateId Template Id.
* @returns {Observable<any>}.
*/
updateTemplate(templateData: any, templateId: any): Observable<any> {
updateTemplate(templateData: any, templateId: any): Observable<any> {
return this.http.put(`/templates/${templateId}`, templateData);
}
@@ -73,5 +72,4 @@ export class TemplatesService {
deleteTemplate(templateId: string): Observable<any> {
return this.http.delete(`/templates/${templateId}`);
}
}
@@ -8,9 +8,8 @@ describe('ViewTemplateComponent', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ ViewTemplateComponent ]
})
.compileComponents();
declarations: [ViewTemplateComponent]
}).compileComponents();
}));
beforeEach(() => {
@@ -18,7 +18,6 @@ import { DeleteDialogComponent } from 'app/shared/delete-dialog/delete-dialog.co
styleUrls: ['./view-template.component.scss']
})
export class ViewTemplateComponent {
/** Template Data */
templateData: any;
@@ -29,10 +28,12 @@ export class ViewTemplateComponent {
* @param {Router} router Router for navigation.
* @param {MatDialog} dialog Dialog reference.
*/
constructor(private route: ActivatedRoute,
private templatesService: TemplatesService,
private router: Router,
private dialog: MatDialog) {
constructor(
private route: ActivatedRoute,
private templatesService: TemplatesService,
private router: Router,
private dialog: MatDialog
) {
this.route.data.subscribe((data: { template: any }) => {
this.templateData = data.template;
});
@@ -47,12 +48,10 @@ export class ViewTemplateComponent {
});
deleteTemplateDialogRef.afterClosed().subscribe((response: any) => {
if (response.delete) {
this.templatesService.deleteTemplate(this.templateData.id)
.subscribe(() => {
this.router.navigate(['/templates']);
});
this.templatesService.deleteTemplate(this.templateData.id).subscribe(() => {
this.router.navigate(['/templates']);
});
}
});
}
}