import { ActivatedRoute, Router } from '@angular/router'
import { ConfigService } from '@app/+admin/config/shared/config.service'
import { AuthService, Notifier, ScreenService, ServerService, UserService } from '@app/core'
-import { FormValidatorService, UserValidatorsService } from '@app/shared/shared-forms'
+import {
+ USER_CHANNEL_NAME_VALIDATOR,
+ USER_EMAIL_VALIDATOR,
+ USER_PASSWORD_OPTIONAL_VALIDATOR,
+ USER_PASSWORD_VALIDATOR,
+ USER_ROLE_VALIDATOR,
+ USER_USERNAME_VALIDATOR,
+ USER_VIDEO_QUOTA_DAILY_VALIDATOR,
+ USER_VIDEO_QUOTA_VALIDATOR
+} from '@app/shared/form-validators/user-validators'
+import { FormValidatorService } from '@app/shared/shared-forms'
import { UserCreate, UserRole } from '@shared/models'
import { UserEdit } from './user-edit'
protected configService: ConfigService,
protected screenService: ScreenService,
protected auth: AuthService,
- private userValidatorsService: UserValidatorsService,
private route: ActivatedRoute,
private router: Router,
private notifier: Notifier,
const defaultValues = {
role: UserRole.USER.toString(),
- videoQuota: '-1',
- videoQuotaDaily: '-1'
+ videoQuota: -1,
+ videoQuotaDaily: -1
}
this.buildForm({
- username: this.userValidatorsService.USER_USERNAME,
- channelName: this.userValidatorsService.USER_CHANNEL_NAME,
- email: this.userValidatorsService.USER_EMAIL,
- password: this.isPasswordOptional() ? this.userValidatorsService.USER_PASSWORD_OPTIONAL : this.userValidatorsService.USER_PASSWORD,
- role: this.userValidatorsService.USER_ROLE,
- videoQuota: this.userValidatorsService.USER_VIDEO_QUOTA,
- videoQuotaDaily: this.userValidatorsService.USER_VIDEO_QUOTA_DAILY,
+ username: USER_USERNAME_VALIDATOR,
+ channelName: USER_CHANNEL_NAME_VALIDATOR,
+ email: USER_EMAIL_VALIDATOR,
+ password: this.isPasswordOptional() ? USER_PASSWORD_OPTIONAL_VALIDATOR : USER_PASSWORD_VALIDATOR,
+ role: USER_ROLE_VALIDATOR,
+ videoQuota: USER_VIDEO_QUOTA_VALIDATOR,
+ videoQuotaDaily: USER_VIDEO_QUOTA_DAILY_VALIDATOR,
byPassAutoBlock: null
}, defaultValues)
}