CBSNexora/cbsnexora
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

build: Use prettier for typescript

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
src/app/reports/run-report/chart/chart.component.spec.ts
+2 -3
View File
@@ -8,9 +8,8 @@ describe('ChartComponent', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ ChartComponent ]
})
.compileComponents();
declarations: [ChartComponent]
}).compileComponents();
}));
beforeEach(() => {
src/app/reports/run-report/chart/chart.component.ts
+31 -26
View File
@@ -16,10 +16,9 @@ import Chart from 'chart.js';
@Component({
selector: 'mifosx-chart',
templateUrl: './chart.component.html',
styleUrls: ['./chart.component.scss' ]
styleUrls: ['./chart.component.scss']
})
export class ChartComponent implements OnChanges {
/** Run Report Data */
@Input() dataObject: any;
@@ -33,7 +32,7 @@ export class ChartComponent implements OnChanges {
/**
* @param {ReportsService} reportsService Reports Service
*/
constructor(private reportsService: ReportsService) { }
constructor(private reportsService: ReportsService) {}
/**
* Fetches run report data post changes in run report form.
@@ -43,12 +42,13 @@ export class ChartComponent implements OnChanges {
}
getRunReportData() {
this.reportsService.getChartRunReportData(this.dataObject.report.name, this.dataObject.formData)
.subscribe((response: ChartData) => {
this.inputData = response;
this.setPieChart(this.inputData);
this.hideOutput = false;
});
this.reportsService
.getChartRunReportData(this.dataObject.report.name, this.dataObject.formData)
.subscribe((response: ChartData) => {
this.inputData = response;
this.setPieChart(this.inputData);
this.hideOutput = false;
});
}
/**
@@ -62,12 +62,14 @@ export class ChartComponent implements OnChanges {
this.chart = new Chart('output', {
type: 'pie',
data: {
labels: inputData.keys,
datasets: [{
label: inputData.valuesLabel,
data: inputData.values,
backgroundColor: this.randomColorArray(inputData.values.length)
}]
labels: inputData.keys,
datasets: [
{
label: inputData.valuesLabel,
data: inputData.values,
backgroundColor: this.randomColorArray(inputData.values.length)
}
]
},
options: {
title: {
@@ -90,24 +92,28 @@ export class ChartComponent implements OnChanges {
type: 'bar',
data: {
labels: inputData.keys,
datasets: [{
datasets: [
{
label: inputData.valuesLabel,
data: inputData.values,
backgroundColor: this.randomColorArray(inputData.values.length)
}]
}
]
},
options: {
legend: { display: false },
scales: {
xAxes: [{
scaleLabel: {
display: true,
labelString: inputData.keysLabel
},
ticks: {
beginAtZero: true
xAxes: [
{
scaleLabel: {
display: true,
labelString: inputData.keysLabel
},
ticks: {
beginAtZero: true
}
}
}]
]
}
}
});
@@ -135,5 +141,4 @@ export class ChartComponent implements OnChanges {
const b = Math.floor(Math.random() * 255);
return `rgb(${r},${g},${b},0.6)`;
}
}
src/app/reports/run-report/pentaho/pentaho.component.spec.ts
+2 -3
View File
@@ -8,9 +8,8 @@ describe('PentahoComponent', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ PentahoComponent ]
})
.compileComponents();
declarations: [PentahoComponent]
}).compileComponents();
}));
beforeEach(() => {
src/app/reports/run-report/pentaho/pentaho.component.ts
+16 -9
View File
@@ -16,7 +16,6 @@ import { ProgressBarService } from 'app/core/progress-bar/progress-bar.service';
styleUrls: ['./pentaho.component.scss']
})
export class PentahoComponent implements OnChanges {
/** Run Report Data */
@Input() dataObject: any;
@@ -30,10 +29,12 @@ export class PentahoComponent implements OnChanges {
* @param {ReportsService} reportsService Reports Service
* @param {SettingsService} settingsService Settings Service
*/
constructor(private sanitizer: DomSanitizer,
private reportsService: ReportsService,
private settingsService: SettingsService,
private progressBarService: ProgressBarService) { }
constructor(
private sanitizer: DomSanitizer,
private reportsService: ReportsService,
private settingsService: SettingsService,
private progressBarService: ProgressBarService
) {}
/**
* Fetches run report data post changes in run report form.
@@ -44,15 +45,21 @@ export class PentahoComponent implements OnChanges {
}
getRunReportData() {
this.reportsService.getPentahoRunReportData(this.dataObject.report.name, this.dataObject.formData, 'default', this.settingsService.language.code, this.settingsService.dateFormat)
.subscribe( (res: any) => {
this.reportsService
.getPentahoRunReportData(
this.dataObject.report.name,
this.dataObject.formData,
'default',
this.settingsService.language.code,
this.settingsService.dateFormat
)
.subscribe((res: any) => {
const contentType = res.headers.get('Content-Type');
const file = new Blob([res.body], {type: contentType});
const file = new Blob([res.body], { type: contentType });
const filecontent = URL.createObjectURL(file);
this.pentahoUrl = this.sanitizer.bypassSecurityTrustResourceUrl(filecontent);
this.hideOutput = false;
this.progressBarService.decrease();
});
}
}
src/app/reports/run-report/run-report.component.spec.ts
+2 -3
View File
@@ -8,9 +8,8 @@ describe('RunReportComponent', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ RunReportComponent ]
})
.compileComponents();
declarations: [RunReportComponent]
}).compileComponents();
}));
beforeEach(() => {
src/app/reports/run-report/run-report.component.ts
+54 -52
View File
@@ -25,7 +25,6 @@ import { AlertService } from 'app/core/alert/alert.service';
styleUrls: ['./run-report.component.scss']
})
export class RunReportComponent implements OnInit {
/** Minimum date allowed. */
minDate = new Date(2000, 0, 1);
/** Maximum date allowed. */
@@ -51,9 +50,9 @@ export class RunReportComponent implements OnInit {
isCollapsed = false;
/** Toggles Table output. */
hideTable = true;
/** Toggles Chart output */
/** Toggles Chart output */
hideChart = true;
/** Toggles Pentaho output */
/** Toggles Pentaho output */
hidePentaho = true;
/** Report uses dates */
reportUsesDates = false;
@@ -71,17 +70,19 @@ export class RunReportComponent implements OnInit {
* @param {SettingsService} settingsService Settings Service
* @param {Dates} dateUtils Date Utils
*/
constructor(private route: ActivatedRoute,
private reportsService: ReportsService,
private settingsService: SettingsService,
private alertService: AlertService,
private dateUtils: Dates) {
constructor(
private route: ActivatedRoute,
private reportsService: ReportsService,
private settingsService: SettingsService,
private alertService: AlertService,
private dateUtils: Dates
) {
this.report.name = this.route.snapshot.params['name'];
this.route.queryParams.subscribe((queryParams: { type: any, id: any }) => {
this.route.queryParams.subscribe((queryParams: { type: any; id: any }) => {
this.report.type = queryParams.type;
this.report.id = queryParams.id;
});
this.route.data.subscribe((data: { reportParameters: ReportParameter[], configurations: any }) => {
this.route.data.subscribe((data: { reportParameters: ReportParameter[]; configurations: any }) => {
this.paramData = data.reportParameters;
if (this.isTableReport()) {
data.configurations.globalConfiguration.forEach((config: GlobalConfiguration) => {
@@ -95,11 +96,11 @@ export class RunReportComponent implements OnInit {
}
isTableReport(): boolean {
return (this.report.type === 'Table');
return this.report.type === 'Table';
}
isPentahoReport(): boolean {
return (this.report.type === 'Pentaho');
return this.report.type === 'Pentaho';
}
/**
@@ -115,30 +116,30 @@ export class RunReportComponent implements OnInit {
* Fetches dropdown options and builds child dependencies.
*/
createRunReportForm() {
this.paramData.forEach(
(param: ReportParameter) => {
if (!param.parentParameterName) { // Non Child Parameter
this.reportForm.addControl(param.name, new UntypedFormControl('', Validators.required));
if (param.displayType === 'select') {
this.fetchSelectOptions(param, param.name);
}
} else { // Child Parameter
const parent: ReportParameter = this.paramData
.find((entry: any) => entry.name === param.parentParameterName);
if (parent != null) {
parent.childParameters.push(param);
this.updateParentParameters(parent);
}
this.paramData.forEach((param: ReportParameter) => {
if (!param.parentParameterName) {
// Non Child Parameter
this.reportForm.addControl(param.name, new UntypedFormControl('', Validators.required));
if (param.displayType === 'select') {
this.fetchSelectOptions(param, param.name);
}
});
} else {
// Child Parameter
const parent: ReportParameter = this.paramData.find((entry: any) => entry.name === param.parentParameterName);
if (parent != null) {
parent.childParameters.push(param);
this.updateParentParameters(parent);
}
}
});
if (this.isPentahoReport()) {
this.reportForm.addControl('outputType', new UntypedFormControl('', Validators.required));
this.outputTypeOptions = [
{ 'name': 'PDF format', 'value': 'PDF' },
{ 'name': 'Normal format', 'value': 'HTML' },
{ 'name': 'Excel format', 'value': 'XLS' },
{ 'name': 'Excel 2007 format', 'value': 'XLSX' },
{ 'name': 'CSV format', 'value': 'CSV' }
{ name: 'PDF format', value: 'PDF' },
{ name: 'Normal format', value: 'HTML' },
{ name: 'Excel format', value: 'XLS' },
{ name: 'Excel 2007 format', value: 'XLSX' },
{ name: 'CSV format', value: 'CSV' }
];
this.mapPentahoParams();
}
@@ -154,10 +155,12 @@ export class RunReportComponent implements OnInit {
* @param {ReportParameter} parent Parent report parameter
*/
updateParentParameters(parent: ReportParameter) {
const parentNames = this.parentParameters.map(parameter => parameter.name);
if (!parentNames.includes(parent.name)) { // Parent's first child.
const parentNames = this.parentParameters.map((parameter) => parameter.name);
if (!parentNames.includes(parent.name)) {
// Parent's first child.
this.parentParameters.push(parent);
} else { // Parent already has a child
} else {
// Parent already has a child
const index = parentNames.indexOf(parent.name);
this.parentParameters[index] = parent;
}
@@ -169,8 +172,7 @@ export class RunReportComponent implements OnInit {
mapPentahoParams() {
this.reportsService.getPentahoParams(this.report.id).subscribe((data: any) => {
data.forEach((entry: any) => {
const param: ReportParameter = this.paramData
.find((_entry: any) => _entry.name === entry.parameterName);
const param: ReportParameter = this.paramData.find((_entry: any) => _entry.name === entry.parameterName);
param.pentahoName = `R_${entry.reportParameterName}`;
});
});
@@ -206,7 +208,7 @@ export class RunReportComponent implements OnInit {
this.reportsService.getSelectOptions(inputstring).subscribe((options: SelectOption[]) => {
param.selectOptions = options;
if (param.selectAll === 'Y') {
param.selectOptions.push({id: '-1', name: 'All'});
param.selectOptions.push({ id: '-1', name: 'All' });
}
});
}
@@ -219,7 +221,10 @@ export class RunReportComponent implements OnInit {
const formattedResponse: any = {};
let newKey: string;
this.reportToBeExportedInRepository = false;
for (const [key, value] of Object.entries(response)) {
for (const [
key,
value
] of Object.entries(response)) {
if (key === 'outputType') {
formattedResponse['output-type'] = value;
continue;
@@ -228,8 +233,7 @@ export class RunReportComponent implements OnInit {
continue;
}
const param: ReportParameter = this.paramData
.find((_entry: any) => _entry.name === key);
const param: ReportParameter = this.paramData.find((_entry: any) => _entry.name === key);
newKey = this.isPentahoReport() ? param.pentahoName : param.inputName;
switch (param.displayType) {
case 'text':
@@ -261,7 +265,7 @@ export class RunReportComponent implements OnInit {
this.isCollapsed = true;
const userResponseValues = this.formatUserResponse(this.reportForm.value);
let formData = {
...userResponseValues,
...userResponseValues
};
if (this.reportUsesDates) {
let dateFormat = this.settingsService.dateFormat;
@@ -286,13 +290,13 @@ export class RunReportComponent implements OnInit {
case 'SMS':
case 'Table':
this.hideTable = false;
break;
break;
case 'Chart':
this.hideChart = false;
break;
break;
case 'Pentaho':
this.hidePentaho = false;
break;
break;
}
}
@@ -304,13 +308,12 @@ export class RunReportComponent implements OnInit {
const reportName = this.report.name;
const payload = {
...userResponseValues,
decimalChoice: this.decimalChoice.value,
decimalChoice: this.decimalChoice.value
// exportCSV: true
};
this.reportsService.getRunReportData(reportName, payload)
.subscribe( (res: any) => {
this.reportsService.getRunReportData(reportName, payload).subscribe((res: any) => {
if (res.data.length > 0) {
this.alertService.alert({type: 'Report generation', message: `Report: ${reportName} data generated`});
this.alertService.alert({ type: 'Report generation', message: `Report: ${reportName} data generated` });
const displayedColumns: string[] = [];
res.columnHeaders.forEach((header: any) => {
@@ -319,7 +322,7 @@ export class RunReportComponent implements OnInit {
this.exportToXLS(reportName, res.data, displayedColumns);
} else {
this.alertService.alert({type: 'Report generation', message: `Report: ${reportName} without data generated`});
this.alertService.alert({ type: 'Report generation', message: `Report: ${reportName} without data generated` });
}
this.isProcessing = false;
});
@@ -334,10 +337,9 @@ export class RunReportComponent implements OnInit {
}
return row;
});
const ws: XLSX.WorkSheet = XLSX.utils.json_to_sheet(data, {header: displayedColumns});
const ws: XLSX.WorkSheet = XLSX.utils.json_to_sheet(data, { header: displayedColumns });
const wb: XLSX.WorkBook = XLSX.utils.book_new();
XLSX.utils.book_append_sheet(wb, ws, 'report');
XLSX.writeFile(wb, fileName);
}
}
src/app/reports/run-report/table-and-sms/table-and-sms.component.spec.ts
+2 -3
View File
@@ -8,9 +8,8 @@ describe('TableAndSmsComponent', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ TableAndSmsComponent ]
})
.compileComponents();
declarations: [TableAndSmsComponent]
}).compileComponents();
}));
beforeEach(() => {
src/app/reports/run-report/table-and-sms/table-and-sms.component.ts
+29 -27
View File
@@ -25,7 +25,6 @@ import * as XLSX from 'xlsx';
styleUrls: ['./table-and-sms.component.scss']
})
export class TableAndSmsComponent implements OnChanges {
/** Run Report Data */
@Input() dataObject: any;
@@ -49,10 +48,12 @@ export class TableAndSmsComponent implements OnChanges {
* @param {ReportsService} reportsService Reports Service
* @param {DecimalPipe} decimalPipe Decimal Pipe
*/
constructor(private reportsService: ReportsService,
public dialog: MatDialog,
private decimalPipe: DecimalPipe,
private progressBarService: ProgressBarService) { }
constructor(
private reportsService: ReportsService,
public dialog: MatDialog,
private decimalPipe: DecimalPipe,
private progressBarService: ProgressBarService
) {}
/**
* Fetches run report data post changes in run report form.
@@ -66,21 +67,22 @@ export class TableAndSmsComponent implements OnChanges {
getRunReportData() {
const exportS3 = this.dataObject.formData.exportS3;
this.reportsService.getRunReportData(this.dataObject.report.name, this.dataObject.formData)
.subscribe( (res: any) => {
this.toBeExportedToRepo = exportS3;
if (!this.toBeExportedToRepo) {
this.csvData = res.data;
this.notExistsReportData = (res.data.length === 0);
this.setOutputTable(res.data);
res.columnHeaders.forEach((header: any) => {
this.columnTypes.push(header.columnDisplayType);
this.displayedColumns.push(header.columnName);
});
}
this.hideOutput = false;
this.progressBarService.decrease();
});
this.reportsService
.getRunReportData(this.dataObject.report.name, this.dataObject.formData)
.subscribe((res: any) => {
this.toBeExportedToRepo = exportS3;
if (!this.toBeExportedToRepo) {
this.csvData = res.data;
this.notExistsReportData = res.data.length === 0;
this.setOutputTable(res.data);
res.columnHeaders.forEach((header: any) => {
this.columnTypes.push(header.columnDisplayType);
this.displayedColumns.push(header.columnName);
});
}
this.hideOutput = false;
this.progressBarService.decrease();
});
}
/**
@@ -99,11 +101,11 @@ export class TableAndSmsComponent implements OnChanges {
*/
exportFile() {
const delimiterOptions: any[] = [
{name: 'Comma (,)', char: ','},
{name: 'Colon (:)', char: ':'},
{name: 'SemiColon (;)', char: ';'},
{name: 'Pipe (|)', char: '|'},
{name: 'Space ( )', char: ' '},
{ name: 'Comma (,)', char: ',' },
{ name: 'Colon (:)', char: ':' },
{ name: 'SemiColon (;)', char: ';' },
{ name: 'Pipe (|)', char: '|' },
{ name: 'Space ( )', char: ' ' }
];
const fileName = `${this.dataObject.report.name}.csv`;
const formfields: FormfieldBase[] = [
@@ -123,6 +125,7 @@ export class TableAndSmsComponent implements OnChanges {
required: true,
order: 2
})
];
const data = {
title: 'Export data to File',
@@ -146,7 +149,7 @@ export class TableAndSmsComponent implements OnChanges {
}
return row;
});
const ws: XLSX.WorkSheet = XLSX.utils.json_to_sheet(data, {header: this.displayedColumns});
const ws: XLSX.WorkSheet = XLSX.utils.json_to_sheet(data, { header: this.displayedColumns });
const wb: XLSX.WorkBook = XLSX.utils.book_new();
XLSX.utils.book_append_sheet(wb, ws, 'Report');
XLSX.writeFile(wb, fileName);
@@ -184,5 +187,4 @@ export class TableAndSmsComponent implements OnChanges {
isDecimal(index: number) {
return this.columnTypes[index] === 'DECIMAL';
}
}