build: Use prettier for typescript
Stop ignoring .ts files in prettier and fix existing issues.
This commit is contained in:
@@ -10,12 +10,11 @@ import { UsersService } from '../users.service';
|
||||
* Edit User Component.
|
||||
*/
|
||||
@Component({
|
||||
selector: 'mifosx-edit-user',
|
||||
templateUrl: './edit-user.component.html',
|
||||
styleUrls: ['./edit-user.component.scss']
|
||||
selector: 'mifosx-edit-user',
|
||||
templateUrl: './edit-user.component.html',
|
||||
styleUrls: ['./edit-user.component.scss']
|
||||
})
|
||||
export class EditUserComponent implements OnInit {
|
||||
|
||||
/** User Data */
|
||||
userData: any;
|
||||
/** Offices Data */
|
||||
@@ -34,11 +33,13 @@ export class EditUserComponent implements OnInit {
|
||||
* @param {ActivatedRoute} route Activated Route.
|
||||
* @param {Router} router Router for navigation.
|
||||
*/
|
||||
constructor(private formBuilder: UntypedFormBuilder,
|
||||
private usersService: UsersService,
|
||||
private route: ActivatedRoute,
|
||||
private router: Router) {
|
||||
this.route.data.subscribe((data: { user: any, usersTemplate: any }) => {
|
||||
constructor(
|
||||
private formBuilder: UntypedFormBuilder,
|
||||
private usersService: UsersService,
|
||||
private route: ActivatedRoute,
|
||||
private router: Router
|
||||
) {
|
||||
this.route.data.subscribe((data: { user: any; usersTemplate: any }) => {
|
||||
this.userData = data.user;
|
||||
this.officesData = data.usersTemplate.allowedOffices;
|
||||
this.rolesData = data.usersTemplate.availableRoles;
|
||||
@@ -56,14 +57,39 @@ export class EditUserComponent implements OnInit {
|
||||
createEditUserForm() {
|
||||
const staffId = this.userData.staff ? this.userData.staff.id : null;
|
||||
this.editUserForm = this.formBuilder.group({
|
||||
'username': [this.userData.username, Validators.required],
|
||||
'email': [this.userData.email, [Validators.required, Validators.email]],
|
||||
'firstname': [this.userData.firstname, [Validators.required, Validators.pattern('(^[A-z]).*')]],
|
||||
'lastname': [this.userData.lastname, [Validators.required, Validators.pattern('(^[A-z]).*')]],
|
||||
'passwordNeverExpires': [this.userData.passwordNeverExpires],
|
||||
'officeId': [this.userData.officeId, Validators.required],
|
||||
'staffId': [staffId],
|
||||
'roles': [this.userData.selectedRoles.map((role: any) => role.id), Validators.required]
|
||||
username: [
|
||||
this.userData.username,
|
||||
Validators.required
|
||||
],
|
||||
email: [
|
||||
this.userData.email,
|
||||
[
|
||||
Validators.required,
|
||||
Validators.email
|
||||
]
|
||||
],
|
||||
firstname: [
|
||||
this.userData.firstname,
|
||||
[
|
||||
Validators.required,
|
||||
Validators.pattern('(^[A-z]).*')]
|
||||
],
|
||||
lastname: [
|
||||
this.userData.lastname,
|
||||
[
|
||||
Validators.required,
|
||||
Validators.pattern('(^[A-z]).*')]
|
||||
],
|
||||
passwordNeverExpires: [this.userData.passwordNeverExpires],
|
||||
officeId: [
|
||||
this.userData.officeId,
|
||||
Validators.required
|
||||
],
|
||||
staffId: [staffId],
|
||||
roles: [
|
||||
this.userData.selectedRoles.map((role: any) => role.id),
|
||||
Validators.required
|
||||
]
|
||||
});
|
||||
}
|
||||
|
||||
@@ -85,8 +111,13 @@ export class EditUserComponent implements OnInit {
|
||||
submit() {
|
||||
const editedUser = this.editUserForm.value;
|
||||
this.usersService.editUser(this.userData.id, editedUser).subscribe((response: any) => {
|
||||
this.router.navigate(['../../', response.resourceId], { relativeTo: this.route });
|
||||
this.router.navigate(
|
||||
[
|
||||
'../../',
|
||||
response.resourceId
|
||||
],
|
||||
{ relativeTo: this.route }
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user