split form validators in seperate folders

This commit is contained in:
rubikscraft 2022-03-28 17:12:35 +02:00
parent 5aa590c553
commit dfe2237a1b
No known key found for this signature in database
GPG key ID: 1463EBE9200A5CD4
18 changed files with 24 additions and 21 deletions

View file

@ -1,12 +1,12 @@
import { FormControl } from '@angular/forms';
import { Fail, Failable } from 'picsur-shared/dist/types';
import { UserPassModel } from '../dto/userpass.dto';
import {
CreatePasswordError,
CreateUsernameError,
PasswordValidators,
UsernameValidators
} from './user-validators';
import { UserPassModel } from './userpass.model';
} from '../validators/user.validator';
export class LoginControl {
public username = new FormControl('', UsernameValidators);

View file

@ -1,13 +1,10 @@
import { FormControl } from '@angular/forms';
import { Fail, Failable } from 'picsur-shared/dist/types';
import { Compare } from './compare.validator';
import { UserPassModel } from '../dto/userpass.dto';
import { Compare } from '../validators/compare.validator';
import {
CreatePasswordError,
CreateUsernameError,
PasswordValidators,
UsernameValidators
} from './user-validators';
import { UserPassModel } from './userpass.model';
CreatePasswordError, CreateUsernameError, PasswordValidators, UsernameValidators
} from '../validators/user.validator';
export class RegisterControl {
public username = new FormControl('', UsernameValidators);

View file

@ -1,9 +1,9 @@
import { FormControl } from '@angular/forms';
import Fuse from 'fuse.js';
import { BehaviorSubject, Subscription } from 'rxjs';
import { RoleNameValidators } from './role-validators';
import { RoleModel } from './role.model';
import { CreateUsernameError } from './user-validators';
import { RoleModel } from '../dto/role.dto';
import { RoleNameValidators } from '../validators/role.validator';
import { CreateUsernameError } from '../validators/user.validator';
export class UpdateRoleControl {
// Set once

View file

@ -2,13 +2,13 @@ import { FormControl } from '@angular/forms';
import Fuse from 'fuse.js';
import { ERole } from 'picsur-shared/dist/entities/role.entity';
import { BehaviorSubject, Subscription } from 'rxjs';
import { FullUserModel } from './fulluser.model';
import { FullUserModel } from '../dto/fulluser.dto';
import {
CreatePasswordError,
CreateUsernameError,
PasswordValidators,
UsernameValidators
} from './user-validators';
} from '../validators/user.validator';
export class UpdateUserControl {
// Special roles

View file

@ -3,6 +3,7 @@ import { Component, OnInit } from '@angular/core';
import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete';
import { MatChipInputEvent } from '@angular/material/chips';
import { ActivatedRoute, Router } from '@angular/router';
import { Permission } from 'picsur-shared/dist/dto/permissions.dto';
import { HasFailed } from 'picsur-shared/dist/types';
import { UIFriendlyPermissions } from 'src/app/i18n/permissions.i18n';
import { UpdateRoleControl } from 'src/app/models/forms/updaterole.control';
@ -98,7 +99,7 @@ export class SettingsRolesEditComponent implements OnInit {
}
uiFriendlyPermission(permission: string) {
return UIFriendlyPermissions[permission];
return UIFriendlyPermissions[permission as Permission] ?? permission;
}
async updateUser() {

View file

@ -2,6 +2,7 @@ import { AfterViewInit, Component, OnInit, ViewChild } from '@angular/core';
import { MatPaginator } from '@angular/material/paginator';
import { MatTableDataSource } from '@angular/material/table';
import { Router } from '@angular/router';
import { Permission } from 'picsur-shared/dist/dto/permissions.dto';
import { ERole } from 'picsur-shared/dist/entities/role.entity';
import { HasFailed } from 'picsur-shared/dist/types';
import { UIFriendlyPermissions } from 'src/app/i18n/permissions.i18n';
@ -86,7 +87,7 @@ export class SettingsRolesComponent implements OnInit, AfterViewInit {
}
uiFriendlyPermission(permission: string) {
return UIFriendlyPermissions[permission];
return UIFriendlyPermissions[permission as Permission] ?? permission;
}
isSystem(role: ERole) {

View file

@ -3,6 +3,7 @@ import { Component, OnInit } from '@angular/core';
import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete';
import { MatChipInputEvent } from '@angular/material/chips';
import { ActivatedRoute, Router } from '@angular/router';
import { Permission } from 'picsur-shared/dist/dto/permissions.dto';
import { HasFailed } from 'picsur-shared/dist/types';
import { UIFriendlyPermissions } from 'src/app/i18n/permissions.i18n';
import { UpdateUserControl } from 'src/app/models/forms/updateuser.control';
@ -93,7 +94,10 @@ export class SettingsUsersEditComponent implements OnInit {
getEffectivePermissions() {
return this.model
.getEffectivePermissions()
.map((permission) => UIFriendlyPermissions[permission]);
.map(
(permission) =>
UIFriendlyPermissions[permission as Permission] ?? permission
);
}
removeRole(role: string) {

View file

@ -3,12 +3,12 @@ import { Router } from '@angular/router';
import { AutoUnsubscribe } from 'ngx-auto-unsubscribe-decorator';
import { Permission } from 'picsur-shared/dist/dto/permissions.dto';
import { HasFailed } from 'picsur-shared/dist/types';
import { UserPassModel } from 'src/app/models/dto/userpass.dto';
import { SnackBarType } from 'src/app/models/snack-bar-type';
import { PermissionService } from 'src/app/services/api/permission.service';
import { UserService } from 'src/app/services/api/user.service';
import { UtilService } from 'src/app/util/util.service';
import { LoginControl } from '../../../models/forms/login.control';
import { UserPassModel } from '../../../models/forms/userpass.model';
@Component({
templateUrl: './login.component.html',

View file

@ -3,7 +3,7 @@ import { Router } from '@angular/router';
import { AutoUnsubscribe } from 'ngx-auto-unsubscribe-decorator';
import { Permission } from 'picsur-shared/dist/dto/permissions.dto';
import { HasFailed } from 'picsur-shared/dist/types';
import { UserPassModel } from 'src/app/models/forms/userpass.model';
import { UserPassModel } from 'src/app/models/dto/userpass.dto';
import { SnackBarType } from 'src/app/models/snack-bar-type';
import { PermissionService } from 'src/app/services/api/permission.service';
import { UserService } from 'src/app/services/api/user.service';

View file

@ -13,7 +13,7 @@ import {
} from 'picsur-shared/dist/dto/api/roles.dto';
import { ERole } from 'picsur-shared/dist/entities/role.entity';
import { AsyncFailable, HasFailed } from 'picsur-shared/dist/types';
import { RoleModel } from 'src/app/models/forms/role.model';
import { RoleModel } from 'src/app/models/dto/role.dto';
import { ApiService } from './api.service';
import { CacheService } from './cache.service';

View file

@ -14,7 +14,7 @@ import {
} from 'picsur-shared/dist/dto/api/usermanage.dto';
import { EUser } from 'picsur-shared/dist/entities/user.entity';
import { AsyncFailable, HasFailed } from 'picsur-shared/dist/types';
import { FullUserModel } from 'src/app/models/forms/fulluser.model';
import { FullUserModel } from 'src/app/models/dto/fulluser.dto';
import { ApiService } from './api.service';
import { CacheService } from './cache.service';