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
@@ -8,9 +8,8 @@ describe('EditReportComponent', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ EditReportComponent ]
})
.compileComponents();
declarations: [EditReportComponent]
}).compileComponents();
}));
beforeEach(() => {
@@ -23,7 +23,6 @@ import { DeleteDialogComponent } from 'app/shared/delete-dialog/delete-dialog.co
styleUrls: ['./edit-report.component.scss']
})
export class EditReportComponent implements OnInit {
/** Report Data. */
reportData: any;
/** Report Template Data. */
@@ -31,22 +30,31 @@ export class EditReportComponent implements OnInit {
/** Report Parameters Data. */
reportParametersData: any[] = [];
/** Data passed to dialog. */
dataForDialog: { allowedParameters: any[], parameterName: string, reportParameterName: string } =
{
allowedParameters: undefined,
parameterName: undefined,
reportParameterName: undefined
};
dataForDialog: { allowedParameters: any[]; parameterName: string; reportParameterName: string } = {
allowedParameters: undefined,
parameterName: undefined,
reportParameterName: undefined
};
/** Report Form. */
reportForm: UntypedFormGroup;
/** Columns to be displayed in report parameters table. */
displayedColumns: string[] = ['parameterName', 'parameterNamePassed', 'actions'];
displayedColumns: string[] = [
'parameterName',
'parameterNamePassed',
'actions'
];
/** Data source for report parameters table. */
dataSource: MatTableDataSource<any>;
/** Boolean to check if report parameters data is changed or not. */
isReportParametersChanged: Boolean = false;
reportCategoryTypeOptions: string[] = ['Client', 'Loan', 'Savings', 'Fund', 'Accounting'];
reportCategoryTypeOptions: string[] = [
'Client',
'Loan',
'Savings',
'Fund',
'Accounting'
];
/** Paginator for report parameters table. */
@ViewChild(MatPaginator, { static: true }) paginator: MatPaginator;
@@ -61,12 +69,14 @@ export class EditReportComponent implements OnInit {
* @param {Router} router Router for navigation.
* @param {MatDialog} dialog Dialog Reference.
*/
constructor(private formBuilder: UntypedFormBuilder,
private route: ActivatedRoute,
private router: Router,
private systemService: SystemService,
private dialog: MatDialog) {
this.route.data.subscribe((data: { report: any, reportTemplate: any }) => {
constructor(
private formBuilder: UntypedFormBuilder,
private route: ActivatedRoute,
private router: Router,
private systemService: SystemService,
private dialog: MatDialog
) {
this.route.data.subscribe((data: { report: any; reportTemplate: any }) => {
this.reportData = data.report;
this.reportParametersData = data.report.reportParameters ? data.report.reportParameters : [];
this.reportTemplateData = data.reportTemplate;
@@ -97,13 +107,41 @@ export class EditReportComponent implements OnInit {
*/
createReportForm() {
this.reportForm = this.formBuilder.group({
'reportName': [{ value: this.reportData.reportName, disabled: this.reportData.coreReport }, Validators.required],
'reportCategory': [{ value: this.reportData.reportCategory ? this.reportData.reportCategory : '', disabled: this.reportData.coreReport }],
'description': [{ value: this.reportData.description ? this.reportData.description : '', disabled: this.reportData.coreReport }],
'reportType': [{ value: this.reportData.reportType, disabled: this.reportData.coreReport }, Validators.required],
'reportSubType': [{ value: this.reportData.reportSubType ? this.reportData.reportSubType : '', disabled: this.reportData.reportType !== 'Chart' || this.reportData.coreReport }],
'useReport': [this.reportData.useReport ? this.reportData.useReport : false],
'reportSql': [{ value: this.reportData.reportSql, disabled: this.reportData.coreReport || this.reportData.reportType === 'Pentaho' }, Validators.required]
reportName: [
{ value: this.reportData.reportName, disabled: this.reportData.coreReport },
Validators.required
],
reportCategory: [
{
value: this.reportData.reportCategory ? this.reportData.reportCategory : '',
disabled: this.reportData.coreReport
}
],
description: [
{
value: this.reportData.description ? this.reportData.description : '',
disabled: this.reportData.coreReport
}
],
reportType: [
{ value: this.reportData.reportType, disabled: this.reportData.coreReport },
Validators.required
],
reportSubType: [
{
value: this.reportData.reportSubType ? this.reportData.reportSubType : '',
disabled: this.reportData.reportType !== 'Chart' || this.reportData.coreReport
}
],
useReport: [this.reportData.useReport ? this.reportData.useReport : false],
reportSql: [
{
value: this.reportData.reportSql,
disabled: this.reportData.coreReport || this.reportData.reportType === 'Pentaho'
},
Validators.required
]
});
}
@@ -118,10 +156,14 @@ export class EditReportComponent implements OnInit {
});
addReportParameterDialogRef.afterClosed().subscribe((response: any) => {
if (response !== '') {
this.reportParametersData.push({ id: '',
parameterName: this.reportTemplateData.allowedParameters.find((allowedParameter: any) => allowedParameter.id === response.parameterName).parameterName,
parameterId: response.parameterName,
reportParameterName: response.reportParameterName ? response.reportParameterName : undefined });
this.reportParametersData.push({
id: '',
parameterName: this.reportTemplateData.allowedParameters.find(
(allowedParameter: any) => allowedParameter.id === response.parameterName
).parameterName,
parameterId: response.parameterName,
reportParameterName: response.reportParameterName ? response.reportParameterName : undefined
});
this.dataSource.connect().next(this.reportParametersData);
this.isReportParametersChanged = true;
}
@@ -140,10 +182,14 @@ export class EditReportComponent implements OnInit {
});
editReportParameterDialogRef.afterClosed().subscribe((response: any) => {
if (response !== '') {
this.reportParametersData[this.reportParametersData.indexOf(reportParameter)] = { id: reportParameter.id,
parameterName: this.reportTemplateData.allowedParameters.find((allowedParameter: any) => allowedParameter.id === response.parameterName).parameterName,
this.reportParametersData[this.reportParametersData.indexOf(reportParameter)] = {
id: reportParameter.id,
parameterName: this.reportTemplateData.allowedParameters.find(
(allowedParameter: any) => allowedParameter.id === response.parameterName
).parameterName,
parameterId: response.parameterName,
reportParameterName: response.reportParameterName };
reportParameterName: response.reportParameterName
};
this.dataSource.connect().next(this.reportParametersData);
this.isReportParametersChanged = true;
}
@@ -171,22 +217,21 @@ export class EditReportComponent implements OnInit {
* Toggles the visibility status of Report Sub Type dropdown.
*/
toggleVisibility() {
this.reportForm.get('reportType').valueChanges
.subscribe(type => {
switch (type) {
case 'Chart':
this.reportForm.get('reportSubType').enable();
this.reportForm.get('reportSql').enable();
break;
case 'Pentaho':
this.reportForm.get('reportSql').disable();
this.reportForm.get('reportSubType').disable();
break;
default:
this.reportForm.get('reportSql').enable();
this.reportForm.get('reportSubType').disable();
}
});
this.reportForm.get('reportType').valueChanges.subscribe((type) => {
switch (type) {
case 'Chart':
this.reportForm.get('reportSubType').enable();
this.reportForm.get('reportSql').enable();
break;
case 'Pentaho':
this.reportForm.get('reportSql').disable();
this.reportForm.get('reportSubType').disable();
break;
default:
this.reportForm.get('reportSql').enable();
this.reportForm.get('reportSubType').disable();
}
});
}
/**
@@ -198,15 +243,13 @@ export class EditReportComponent implements OnInit {
this.reportForm.value.reportParameters = undefined;
} else {
this.reportForm.value.reportParameters = this.reportParametersData;
this.reportForm.value.reportParameters.map( function(reportParameter: any) {
this.reportForm.value.reportParameters.map(function (reportParameter: any) {
reportParameter.parameterName = undefined;
return reportParameter;
});
}
this.systemService.updateReport(this.reportData.id, this.reportForm.value)
.subscribe(() => {
this.router.navigate(['../'], { relativeTo: this.route });
});
this.systemService.updateReport(this.reportData.id, this.reportForm.value).subscribe(() => {
this.router.navigate(['../'], { relativeTo: this.route });
});
}
}