+import { Subscription } from 'rxjs'
import { Component, OnDestroy, OnInit } from '@angular/core'
import { ActivatedRoute, Router } from '@angular/router'
-import { Subscription } from 'rxjs'
-import { AuthService, Notifier } from '@app/core'
-import { ServerService } from '../../../core'
-import { UserEdit } from './user-edit'
-import { User, UserUpdate } from '../../../../../../shared'
-import { I18n } from '@ngx-translate/i18n-polyfill'
-import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
-import { UserValidatorsService } from '@app/shared/forms/form-validators/user-validators.service'
import { ConfigService } from '@app/+admin/config/shared/config.service'
-import { UserService } from '@app/shared'
-import { UserAdminFlag } from '@shared/models/users/user-flag.model'
+import { AuthService, Notifier, ScreenService, ServerService, User, UserService } from '@app/core'
+import { FormValidatorService, UserValidatorsService } from '@app/shared/shared-forms'
+import { I18n } from '@ngx-translate/i18n-polyfill'
+import { User as UserType, UserAdminFlag, UserRole, UserUpdate } from '@shared/models'
+import { UserEdit } from './user-edit'
@Component({
selector: 'my-user-update',
})
export class UserUpdateComponent extends UserEdit implements OnInit, OnDestroy {
error: string
- userId: number
- userEmail: string
- username: string
private paramsSub: Subscription
protected formValidatorService: FormValidatorService,
protected serverService: ServerService,
protected configService: ConfigService,
+ protected screenService: ScreenService,
protected auth: AuthService,
private userValidatorsService: UserValidatorsService,
private route: ActivatedRoute,
ngOnInit () {
super.ngOnInit()
- const defaultValues = { videoQuota: '-1', videoQuotaDaily: '-1' }
+ const defaultValues = {
+ role: UserRole.USER.toString(),
+ videoQuota: '-1',
+ videoQuotaDaily: '-1'
+ }
+
this.buildForm({
email: this.userValidatorsService.USER_EMAIL,
role: this.userValidatorsService.USER_ROLE,
videoQuota: this.userValidatorsService.USER_VIDEO_QUOTA,
videoQuotaDaily: this.userValidatorsService.USER_VIDEO_QUOTA_DAILY,
- byPassAutoBlacklist: null
+ byPassAutoBlock: null
}, defaultValues)
this.paramsSub = this.route.params.subscribe(routeParams => {
const userId = routeParams['id']
- this.userService.getUser(userId).subscribe(
+ this.userService.getUser(userId, true).subscribe(
user => this.onUserFetched(user),
err => this.error = err.message
userUpdate.videoQuota = parseInt(this.form.value['videoQuota'], 10)
userUpdate.videoQuotaDaily = parseInt(this.form.value['videoQuotaDaily'], 10)
- this.userService.updateUser(this.userId, userUpdate).subscribe(
+ this.userService.updateUser(this.user.id, userUpdate).subscribe(
() => {
- this.notifier.success(this.i18n('User {{username}} updated.', { username: this.username }))
+ this.notifier.success(this.i18n('User {{username}} updated.', { username: this.user.username }))
this.router.navigate([ '/admin/users/list' ])
},
}
resetPassword () {
- this.userService.askResetPassword(this.userEmail).subscribe(
+ this.userService.askResetPassword(this.user.email).subscribe(
() => {
this.notifier.success(
- this.i18n('An email asking for password reset has been sent to {{username}}.', { username: this.username })
+ this.i18n('An email asking for password reset has been sent to {{username}}.', { username: this.user.username })
)
},
)
}
- private onUserFetched (userJson: User) {
- this.userId = userJson.id
- this.username = userJson.username
- this.userEmail = userJson.email
+ private onUserFetched (userJson: UserType) {
+ this.user = new User(userJson)
this.form.patchValue({
email: userJson.email,
- role: userJson.role,
+ role: userJson.role.toString(),
videoQuota: userJson.videoQuota,
videoQuotaDaily: userJson.videoQuotaDaily,
- byPassAutoBlacklist: userJson.adminFlags & UserAdminFlag.BY_PASS_VIDEO_AUTO_BLACKLIST
+ byPassAutoBlock: userJson.adminFlags & UserAdminFlag.BYPASS_VIDEO_AUTO_BLACKLIST
})
}
}