build: Use prettier for typescript
Stop ignoring .ts files in prettier and fix existing issues.
This commit is contained in:
@@ -13,7 +13,6 @@ import { OrganizationService } from 'app/organization/organization.service';
|
||||
*/
|
||||
@Injectable()
|
||||
export class AdhocQueryTemplateResolver implements Resolve<Object> {
|
||||
|
||||
/**
|
||||
* @param {OrganizationService} organizationService Organization service.
|
||||
*/
|
||||
@@ -26,5 +25,4 @@ export class AdhocQueryTemplateResolver implements Resolve<Object> {
|
||||
resolve(): Observable<any> {
|
||||
return this.organizationService.getAdhocQueryTemplate();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -8,9 +8,8 @@ describe('AdhocQueryComponent', () => {
|
||||
|
||||
beforeEach(async(() => {
|
||||
TestBed.configureTestingModule({
|
||||
declarations: [ AdhocQueryComponent ]
|
||||
})
|
||||
.compileComponents();
|
||||
declarations: [AdhocQueryComponent]
|
||||
}).compileComponents();
|
||||
}));
|
||||
|
||||
beforeEach(() => {
|
||||
|
||||
@@ -17,11 +17,18 @@ import { of } from 'rxjs';
|
||||
styleUrls: ['./adhoc-query.component.scss']
|
||||
})
|
||||
export class AdhocQueryComponent implements OnInit {
|
||||
|
||||
/** Adhoc Queries data. */
|
||||
adhocQueriesData: any;
|
||||
/** Columns to be displayed in adhoc queries table. */
|
||||
displayedColumns: string[] = ['name', 'query', 'tableName', 'email', 'reportRunFrequency', 'isActive', 'createdBy'];
|
||||
displayedColumns: string[] = [
|
||||
'name',
|
||||
'query',
|
||||
'tableName',
|
||||
'email',
|
||||
'reportRunFrequency',
|
||||
'isActive',
|
||||
'createdBy'
|
||||
];
|
||||
/** Data source for adhoc queries table. */
|
||||
dataSource: MatTableDataSource<any>;
|
||||
|
||||
@@ -35,7 +42,7 @@ export class AdhocQueryComponent implements OnInit {
|
||||
* @param {ActivatedRoute} route Activated Route.
|
||||
*/
|
||||
constructor(private route: ActivatedRoute) {
|
||||
this.route.data.subscribe(( data: { adhocQueries: any }) => {
|
||||
this.route.data.subscribe((data: { adhocQueries: any }) => {
|
||||
this.adhocQueriesData = data.adhocQueries;
|
||||
});
|
||||
}
|
||||
@@ -77,5 +84,4 @@ export class AdhocQueryComponent implements OnInit {
|
||||
this.dataSource.paginator = this.paginator;
|
||||
this.dataSource.sort = this.sort;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -13,7 +13,6 @@ import { OrganizationService } from '../../organization.service';
|
||||
*/
|
||||
@Injectable()
|
||||
export class AdhocQueriesResolver implements Resolve<Object> {
|
||||
|
||||
/**
|
||||
* @param {OrganizationService} organizationService Organization service.
|
||||
*/
|
||||
@@ -26,5 +25,4 @@ export class AdhocQueriesResolver implements Resolve<Object> {
|
||||
resolve(): Observable<any> {
|
||||
return this.organizationService.getAdhocQueries();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -13,7 +13,6 @@ import { OrganizationService } from 'app/organization/organization.service';
|
||||
*/
|
||||
@Injectable()
|
||||
export class AdhocQueryAndTemplateResolver implements Resolve<Object> {
|
||||
|
||||
/**
|
||||
* @param {OrganizationService} organizationService Organization service.
|
||||
*/
|
||||
@@ -27,5 +26,4 @@ export class AdhocQueryAndTemplateResolver implements Resolve<Object> {
|
||||
const adhocQueryId = route.paramMap.get('id');
|
||||
return this.organizationService.getAdhocQueryAndTemplate(adhocQueryId);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -13,7 +13,6 @@ import { OrganizationService } from 'app/organization/organization.service';
|
||||
*/
|
||||
@Injectable()
|
||||
export class AdhocQueryResolver implements Resolve<Object> {
|
||||
|
||||
/**
|
||||
* @param {OrganizationService} organizationService Organization service.
|
||||
*/
|
||||
@@ -27,5 +26,4 @@ export class AdhocQueryResolver implements Resolve<Object> {
|
||||
const adhocQueryId = route.paramMap.get('id');
|
||||
return this.organizationService.getAdhocQuery(adhocQueryId);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+2
-3
@@ -8,9 +8,8 @@ describe('CreateAdhocQueryComponent', () => {
|
||||
|
||||
beforeEach(async(() => {
|
||||
TestBed.configureTestingModule({
|
||||
declarations: [ CreateAdhocQueryComponent ]
|
||||
})
|
||||
.compileComponents();
|
||||
declarations: [CreateAdhocQueryComponent]
|
||||
}).compileComponents();
|
||||
}));
|
||||
|
||||
beforeEach(() => {
|
||||
|
||||
+42
-16
@@ -15,7 +15,6 @@ import { OrganizationService } from '../../organization.service';
|
||||
styleUrls: ['./create-adhoc-query.component.scss']
|
||||
})
|
||||
export class CreateAdhocQueryComponent implements OnInit {
|
||||
|
||||
/** Adhoc Query form. */
|
||||
adhocQueryForm: UntypedFormGroup;
|
||||
/** Adhoc Query template data. */
|
||||
@@ -30,10 +29,12 @@ export class CreateAdhocQueryComponent implements OnInit {
|
||||
* @param {ActivatedRoute} route Activated Route.
|
||||
* @param {Router} router Router for navigation.
|
||||
*/
|
||||
constructor(private formBuilder: UntypedFormBuilder,
|
||||
private organizationService: OrganizationService,
|
||||
private route: ActivatedRoute,
|
||||
private router: Router) {
|
||||
constructor(
|
||||
private formBuilder: UntypedFormBuilder,
|
||||
private organizationService: OrganizationService,
|
||||
private route: ActivatedRoute,
|
||||
private router: Router
|
||||
) {
|
||||
this.route.data.subscribe((data: { adhocQueryTemplate: any }) => {
|
||||
this.adhocQueryTemplateData = data.adhocQueryTemplate;
|
||||
});
|
||||
@@ -53,13 +54,28 @@ export class CreateAdhocQueryComponent implements OnInit {
|
||||
createAdhocQueryForm() {
|
||||
this.reportRunFrequencyData = this.adhocQueryTemplateData.reportRunFrequencies;
|
||||
this.adhocQueryForm = this.formBuilder.group({
|
||||
'name': ['', Validators.required],
|
||||
'query': ['', Validators.required],
|
||||
'tableName': ['', Validators.required],
|
||||
'tableFields': ['', Validators.required],
|
||||
'email': ['', Validators.email],
|
||||
'reportRunFrequency': [''],
|
||||
'isActive': [false]
|
||||
name: [
|
||||
'',
|
||||
Validators.required
|
||||
],
|
||||
query: [
|
||||
'',
|
||||
Validators.required
|
||||
],
|
||||
tableName: [
|
||||
'',
|
||||
Validators.required
|
||||
],
|
||||
tableFields: [
|
||||
'',
|
||||
Validators.required
|
||||
],
|
||||
email: [
|
||||
'',
|
||||
Validators.email
|
||||
],
|
||||
reportRunFrequency: [''],
|
||||
isActive: [false]
|
||||
});
|
||||
}
|
||||
|
||||
@@ -67,9 +83,14 @@ export class CreateAdhocQueryComponent implements OnInit {
|
||||
* Sets the conditional controls of the adhoc query form
|
||||
*/
|
||||
setConditionalControls() {
|
||||
this.adhocQueryForm.get('reportRunFrequency').valueChanges.subscribe(reportRunFrequencyId => {
|
||||
this.adhocQueryForm.get('reportRunFrequency').valueChanges.subscribe((reportRunFrequencyId) => {
|
||||
if (reportRunFrequencyId === 5) {
|
||||
this.adhocQueryForm.addControl('reportRunEvery', new UntypedFormControl('', [Validators.required, Validators.min(1)]));
|
||||
this.adhocQueryForm.addControl(
|
||||
'reportRunEvery',
|
||||
new UntypedFormControl('', [
|
||||
Validators.required,
|
||||
Validators.min(1)])
|
||||
);
|
||||
} else {
|
||||
this.adhocQueryForm.removeControl('reportRunEvery');
|
||||
}
|
||||
@@ -82,8 +103,13 @@ export class CreateAdhocQueryComponent implements OnInit {
|
||||
*/
|
||||
submit() {
|
||||
this.organizationService.createAdhocQuery(this.adhocQueryForm.value).subscribe((response: any) => {
|
||||
this.router.navigate(['../', response.resourceId], { relativeTo: this.route });
|
||||
this.router.navigate(
|
||||
[
|
||||
'../',
|
||||
response.resourceId
|
||||
],
|
||||
{ relativeTo: this.route }
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+2
-3
@@ -8,9 +8,8 @@ describe('EditAdhocQueryComponent', () => {
|
||||
|
||||
beforeEach(async(() => {
|
||||
TestBed.configureTestingModule({
|
||||
declarations: [ EditAdhocQueryComponent ]
|
||||
})
|
||||
.compileComponents();
|
||||
declarations: [EditAdhocQueryComponent]
|
||||
}).compileComponents();
|
||||
}));
|
||||
|
||||
beforeEach(() => {
|
||||
|
||||
@@ -15,7 +15,6 @@ import { OrganizationService } from '../../organization.service';
|
||||
styleUrls: ['./edit-adhoc-query.component.scss']
|
||||
})
|
||||
export class EditAdhocQueryComponent implements OnInit {
|
||||
|
||||
/** Edit Adhoc Query form. */
|
||||
editAdhocQueryForm: UntypedFormGroup;
|
||||
/** Adhoc Query template data. */
|
||||
@@ -30,10 +29,12 @@ export class EditAdhocQueryComponent implements OnInit {
|
||||
* @param {ActivatedRoute} route Activated Route.
|
||||
* @param {Router} router Router for navigation.
|
||||
*/
|
||||
constructor(private formBuilder: UntypedFormBuilder,
|
||||
private organizationService: OrganizationService,
|
||||
private route: ActivatedRoute,
|
||||
private router: Router) {
|
||||
constructor(
|
||||
private formBuilder: UntypedFormBuilder,
|
||||
private organizationService: OrganizationService,
|
||||
private route: ActivatedRoute,
|
||||
private router: Router
|
||||
) {
|
||||
this.route.data.subscribe((data: { adhocQueryAndTemplate: any }) => {
|
||||
this.adhocQueryTemplateData = data.adhocQueryAndTemplate;
|
||||
});
|
||||
@@ -53,13 +54,28 @@ export class EditAdhocQueryComponent implements OnInit {
|
||||
createEditAdhocQueryForm() {
|
||||
this.reportRunFrequencyData = this.adhocQueryTemplateData.reportRunFrequencies;
|
||||
this.editAdhocQueryForm = this.formBuilder.group({
|
||||
'name': [this.adhocQueryTemplateData.name, Validators.required],
|
||||
'query': [this.adhocQueryTemplateData.query, Validators.required],
|
||||
'tableName': [this.adhocQueryTemplateData.tableName, Validators.required],
|
||||
'tableFields': [this.adhocQueryTemplateData.tableFields, Validators.required],
|
||||
'email': [this.adhocQueryTemplateData.email, Validators.email],
|
||||
'reportRunFrequency': [''],
|
||||
'isActive': [this.adhocQueryTemplateData.isActive]
|
||||
name: [
|
||||
this.adhocQueryTemplateData.name,
|
||||
Validators.required
|
||||
],
|
||||
query: [
|
||||
this.adhocQueryTemplateData.query,
|
||||
Validators.required
|
||||
],
|
||||
tableName: [
|
||||
this.adhocQueryTemplateData.tableName,
|
||||
Validators.required
|
||||
],
|
||||
tableFields: [
|
||||
this.adhocQueryTemplateData.tableFields,
|
||||
Validators.required
|
||||
],
|
||||
email: [
|
||||
this.adhocQueryTemplateData.email,
|
||||
Validators.email
|
||||
],
|
||||
reportRunFrequency: [''],
|
||||
isActive: [this.adhocQueryTemplateData.isActive]
|
||||
});
|
||||
}
|
||||
|
||||
@@ -67,9 +83,14 @@ export class EditAdhocQueryComponent implements OnInit {
|
||||
* Sets the conditional controls of the adhoc query form
|
||||
*/
|
||||
setConditionalControls() {
|
||||
this.editAdhocQueryForm.get('reportRunFrequency').valueChanges.subscribe(reportRunFrequencyId => {
|
||||
this.editAdhocQueryForm.get('reportRunFrequency').valueChanges.subscribe((reportRunFrequencyId) => {
|
||||
if (reportRunFrequencyId === 5) {
|
||||
this.editAdhocQueryForm.addControl('reportRunEvery', new UntypedFormControl('', [Validators.required, Validators.min(1)]));
|
||||
this.editAdhocQueryForm.addControl(
|
||||
'reportRunEvery',
|
||||
new UntypedFormControl('', [
|
||||
Validators.required,
|
||||
Validators.min(1)])
|
||||
);
|
||||
this.editAdhocQueryForm.get('reportRunEvery').patchValue(this.adhocQueryTemplateData.reportRunEvery);
|
||||
} else {
|
||||
this.editAdhocQueryForm.removeControl('reportRunEvery');
|
||||
@@ -83,9 +104,10 @@ export class EditAdhocQueryComponent implements OnInit {
|
||||
* if successful redirects to view adhoc query.
|
||||
*/
|
||||
submit() {
|
||||
this.organizationService.updateAdhocQuery(this.adhocQueryTemplateData.id, this.editAdhocQueryForm.value).subscribe(() => {
|
||||
this.router.navigate(['../'], { relativeTo: this.route });
|
||||
});
|
||||
this.organizationService
|
||||
.updateAdhocQuery(this.adhocQueryTemplateData.id, this.editAdhocQueryForm.value)
|
||||
.subscribe(() => {
|
||||
this.router.navigate(['../'], { relativeTo: this.route });
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+2
-3
@@ -8,9 +8,8 @@ describe('ViewAdhocQueryComponent', () => {
|
||||
|
||||
beforeEach(async(() => {
|
||||
TestBed.configureTestingModule({
|
||||
declarations: [ ViewAdhocQueryComponent ]
|
||||
})
|
||||
.compileComponents();
|
||||
declarations: [ViewAdhocQueryComponent]
|
||||
}).compileComponents();
|
||||
}));
|
||||
|
||||
beforeEach(() => {
|
||||
|
||||
@@ -18,7 +18,6 @@ import { DeleteDialogComponent } from 'app/shared/delete-dialog/delete-dialog.co
|
||||
styleUrls: ['./view-adhoc-query.component.scss']
|
||||
})
|
||||
export class ViewAdhocQueryComponent {
|
||||
|
||||
/** Adhoc query data. */
|
||||
adhocQueryData: any;
|
||||
|
||||
@@ -29,10 +28,12 @@ export class ViewAdhocQueryComponent {
|
||||
* @param {Router} router Router for navigation.
|
||||
* @param {MatDialog} dialog Dialog reference.
|
||||
*/
|
||||
constructor(private organizationService: OrganizationService,
|
||||
private route: ActivatedRoute,
|
||||
private router: Router,
|
||||
private dialog: MatDialog) {
|
||||
constructor(
|
||||
private organizationService: OrganizationService,
|
||||
private route: ActivatedRoute,
|
||||
private router: Router,
|
||||
private dialog: MatDialog
|
||||
) {
|
||||
this.route.data.subscribe((data: { adhocQuery: any }) => {
|
||||
this.adhocQueryData = data.adhocQuery;
|
||||
});
|
||||
@@ -59,12 +60,10 @@ export class ViewAdhocQueryComponent {
|
||||
});
|
||||
deleteAdhocQueryDialogRef.afterClosed().subscribe((response: any) => {
|
||||
if (response.delete) {
|
||||
this.organizationService.deleteAdhocQuery(this.adhocQueryData.id)
|
||||
.subscribe(() => {
|
||||
this.organizationService.deleteAdhocQuery(this.adhocQueryData.id).subscribe(() => {
|
||||
this.router.navigate(['/organization/adhoc-query']);
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user