From af82a749bc844b6cc0de4ebcc9de47e37bbc291b Mon Sep 17 00:00:00 2001 From: rubikscraft Date: Thu, 24 Mar 2022 22:26:23 +0100 Subject: [PATCH] extract uifriendly permission to frontend --- frontend/src/app/i18n/permissions.i18n.ts | 16 ++++++++++++++++ .../settings-roles-edit.component.ts | 4 ++-- .../settings/roles/settings-roles.component.ts | 4 ++-- .../settings-users-edit.component.ts | 2 +- shared/src/dto/permissions.ts | 17 ----------------- 5 files changed, 21 insertions(+), 22 deletions(-) create mode 100644 frontend/src/app/i18n/permissions.i18n.ts diff --git a/frontend/src/app/i18n/permissions.i18n.ts b/frontend/src/app/i18n/permissions.i18n.ts new file mode 100644 index 0000000..e77bb40 --- /dev/null +++ b/frontend/src/app/i18n/permissions.i18n.ts @@ -0,0 +1,16 @@ +export const UIFriendlyPermissions: { + [key in string]: string; +} = { + 'image-view': 'View Images', + 'image-upload': 'Upload Images', + + 'user-login': 'Login', + 'user-keep-login': 'Stay Logged In', + 'user-register': 'Register', + + settings: 'View settings', + + 'user-manage': 'Manage users', + 'role-manage': 'Manage roles', + 'syspref-manage': 'Manage system', +}; 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 f37117a..982281d 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 @@ -5,10 +5,10 @@ import { MatChipInputEvent } from '@angular/material/chips'; import { ActivatedRoute, Router } from '@angular/router'; import { Permission, - PermissionsList, - UIFriendlyPermissions + PermissionsList } from 'picsur-shared/dist/dto/permissions'; import { HasFailed } from 'picsur-shared/dist/types'; +import { UIFriendlyPermissions } from 'src/app/i18n/permissions.i18n'; import { UpdateRoleControl } from 'src/app/models/forms/updaterole.control'; import { SnackBarType } from 'src/app/models/snack-bar-type'; import { RolesService } from 'src/app/services/api/roles.service'; 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 236f90a..614d85c 100644 --- a/frontend/src/app/routes/settings/roles/settings-roles.component.ts +++ b/frontend/src/app/routes/settings/roles/settings-roles.component.ts @@ -3,11 +3,11 @@ import { MatPaginator } from '@angular/material/paginator'; import { MatTableDataSource } from '@angular/material/table'; import { Router } from '@angular/router'; import { - Permission, - UIFriendlyPermissions + Permission } from 'picsur-shared/dist/dto/permissions'; import { ERole } from 'picsur-shared/dist/entities/role.entity'; import { HasFailed } from 'picsur-shared/dist/types'; +import { UIFriendlyPermissions } from 'src/app/i18n/permissions.i18n'; import { SnackBarType } from 'src/app/models/snack-bar-type'; import { RolesService } from 'src/app/services/api/roles.service'; import { UtilService } from 'src/app/util/util.service'; 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 7ffd934..93fc7b4 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,8 +3,8 @@ 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 { UIFriendlyPermissions } from 'picsur-shared/dist/dto/permissions'; import { HasFailed } from 'picsur-shared/dist/types'; +import { UIFriendlyPermissions } from 'src/app/i18n/permissions.i18n'; import { UpdateUserControl } from 'src/app/models/forms/updateuser.control'; import { SnackBarType } from 'src/app/models/snack-bar-type'; import { RolesService } from 'src/app/services/api/roles.service'; diff --git a/shared/src/dto/permissions.ts b/shared/src/dto/permissions.ts index 663bcc9..8ddc1c9 100644 --- a/shared/src/dto/permissions.ts +++ b/shared/src/dto/permissions.ts @@ -27,20 +27,3 @@ export const AdminDashboardPermissions: Permissions = [ Permission.RoleManage, Permission.SysPrefManage, ]; - -export const UIFriendlyPermissions: { - [key in Permission]: string; -} = { - [Permission.ImageView]: 'View images', - [Permission.ImageUpload]: 'Upload images', - - [Permission.UserLogin]: 'Login', - [Permission.UserKeepLogin]: 'Stay Logged In', - [Permission.UserRegister]: 'Register', - - [Permission.Settings]: 'View settings', - - [Permission.UserManage]: 'Manage users', - [Permission.RoleManage]: 'Manage roles', - [Permission.SysPrefManage]: 'Manage system', -};