diff --git a/frontend/src/app/models/forms/fulluser.model.ts b/frontend/src/app/models/dto/fulluser.dto.ts similarity index 100% rename from frontend/src/app/models/forms/fulluser.model.ts rename to frontend/src/app/models/dto/fulluser.dto.ts diff --git a/frontend/src/app/models/forms/role.model.ts b/frontend/src/app/models/dto/role.dto.ts similarity index 100% rename from frontend/src/app/models/forms/role.model.ts rename to frontend/src/app/models/dto/role.dto.ts diff --git a/frontend/src/app/models/forms/userpass.model.ts b/frontend/src/app/models/dto/userpass.dto.ts similarity index 100% rename from frontend/src/app/models/forms/userpass.model.ts rename to frontend/src/app/models/dto/userpass.dto.ts diff --git a/frontend/src/app/models/forms/login.control.ts b/frontend/src/app/models/forms/login.control.ts index cffb33c..a6d158c 100644 --- a/frontend/src/app/models/forms/login.control.ts +++ b/frontend/src/app/models/forms/login.control.ts @@ -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); diff --git a/frontend/src/app/models/forms/register.control.ts b/frontend/src/app/models/forms/register.control.ts index 649b71c..136ed34 100644 --- a/frontend/src/app/models/forms/register.control.ts +++ b/frontend/src/app/models/forms/register.control.ts @@ -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); diff --git a/frontend/src/app/models/forms/updaterole.control.ts b/frontend/src/app/models/forms/updaterole.control.ts index 4ad0ada..275a202 100644 --- a/frontend/src/app/models/forms/updaterole.control.ts +++ b/frontend/src/app/models/forms/updaterole.control.ts @@ -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 diff --git a/frontend/src/app/models/forms/updateuser.control.ts b/frontend/src/app/models/forms/updateuser.control.ts index 3662ba4..9a8c802 100644 --- a/frontend/src/app/models/forms/updateuser.control.ts +++ b/frontend/src/app/models/forms/updateuser.control.ts @@ -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 diff --git a/frontend/src/app/models/forms/compare.validator.ts b/frontend/src/app/models/validators/compare.validator.ts similarity index 100% rename from frontend/src/app/models/forms/compare.validator.ts rename to frontend/src/app/models/validators/compare.validator.ts diff --git a/frontend/src/app/models/forms/role-validators.ts b/frontend/src/app/models/validators/role.validator.ts similarity index 100% rename from frontend/src/app/models/forms/role-validators.ts rename to frontend/src/app/models/validators/role.validator.ts diff --git a/frontend/src/app/models/forms/user-validators.ts b/frontend/src/app/models/validators/user.validator.ts similarity index 100% rename from frontend/src/app/models/forms/user-validators.ts rename to frontend/src/app/models/validators/user.validator.ts diff --git a/frontend/src/app/models/forms/util.validator.ts b/frontend/src/app/models/validators/util.validator.ts similarity index 100% rename from frontend/src/app/models/forms/util.validator.ts rename to frontend/src/app/models/validators/util.validator.ts diff --git a/frontend/src/app/routes/settings/roles/settings-roles-edit/settings-roles-edit.component.ts b/frontend/src/app/routes/settings/roles/settings-roles-edit/settings-roles-edit.component.ts index 8189acb..8bef4cc 100644 --- a/frontend/src/app/routes/settings/roles/settings-roles-edit/settings-roles-edit.component.ts +++ b/frontend/src/app/routes/settings/roles/settings-roles-edit/settings-roles-edit.component.ts @@ -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() { diff --git a/frontend/src/app/routes/settings/roles/settings-roles.component.ts b/frontend/src/app/routes/settings/roles/settings-roles.component.ts index c7536b1..f7bc9e7 100644 --- a/frontend/src/app/routes/settings/roles/settings-roles.component.ts +++ b/frontend/src/app/routes/settings/roles/settings-roles.component.ts @@ -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) { diff --git a/frontend/src/app/routes/settings/users/settings-users-edit/settings-users-edit.component.ts b/frontend/src/app/routes/settings/users/settings-users-edit/settings-users-edit.component.ts index 93fc7b4..162b2b4 100644 --- a/frontend/src/app/routes/settings/users/settings-users-edit/settings-users-edit.component.ts +++ b/frontend/src/app/routes/settings/users/settings-users-edit/settings-users-edit.component.ts @@ -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) { diff --git a/frontend/src/app/routes/user/login/login.component.ts b/frontend/src/app/routes/user/login/login.component.ts index 2e47687..e50913c 100644 --- a/frontend/src/app/routes/user/login/login.component.ts +++ b/frontend/src/app/routes/user/login/login.component.ts @@ -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', diff --git a/frontend/src/app/routes/user/register/register.component.ts b/frontend/src/app/routes/user/register/register.component.ts index 4966791..165e76a 100644 --- a/frontend/src/app/routes/user/register/register.component.ts +++ b/frontend/src/app/routes/user/register/register.component.ts @@ -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'; diff --git a/frontend/src/app/services/api/roles.service.ts b/frontend/src/app/services/api/roles.service.ts index fe69170..ae5b0ef 100644 --- a/frontend/src/app/services/api/roles.service.ts +++ b/frontend/src/app/services/api/roles.service.ts @@ -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'; diff --git a/frontend/src/app/services/api/usermanage.service.ts b/frontend/src/app/services/api/usermanage.service.ts index f0e0e13..c7f3b9c 100644 --- a/frontend/src/app/services/api/usermanage.service.ts +++ b/frontend/src/app/services/api/usermanage.service.ts @@ -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';