From 1cded7a5816f689033de4586f41ee2f073431192 Mon Sep 17 00:00:00 2001 From: Ryan Wang Date: Tue, 19 Jul 2022 11:41:05 +0800 Subject: [PATCH] feat: refine roles management Signed-off-by: Ryan Wang --- src/modules/system/roles/RoleDetail.vue | 7 +------ src/modules/system/roles/components/RoleCreationModal.vue | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/modules/system/roles/RoleDetail.vue b/src/modules/system/roles/RoleDetail.vue index e32eab7e9..c77e4a63b 100644 --- a/src/modules/system/roles/RoleDetail.vue +++ b/src/modules/system/roles/RoleDetail.vue @@ -16,7 +16,6 @@ import type { Role, User } from "@halo-dev/api-client"; interface RoleTemplateGroup { module: string | null | undefined; - displayName: string | null | undefined; roles: Role[]; } @@ -71,10 +70,6 @@ const roleTemplateGroups = computed(() => { groups.push({ module: role.metadata.annotations?.["rbac.authorization.halo.run/module"], - displayName: - role.metadata.annotations?.[ - "rbac.authorization.halo.run/display-name" - ], roles: [role], }); } @@ -304,7 +299,7 @@ onMounted(() => { class="bg-white px-4 py-5 hover:bg-gray-50 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6" >
- {{ group.displayName }} + {{ group.module }}
    diff --git a/src/modules/system/roles/components/RoleCreationModal.vue b/src/modules/system/roles/components/RoleCreationModal.vue index 6ca7f8a61..1d627762d 100644 --- a/src/modules/system/roles/components/RoleCreationModal.vue +++ b/src/modules/system/roles/components/RoleCreationModal.vue @@ -6,7 +6,6 @@ import type { Role } from "@halo-dev/api-client"; interface RoleTemplateGroup { module: string | null | undefined; - displayName: string | null | undefined; roles: Role[]; } @@ -67,10 +66,6 @@ const roleTemplateGroups = computed(() => { groups.push({ module: role.metadata.annotations?.["rbac.authorization.halo.run/module"], - displayName: - role.metadata.annotations?.[ - "rbac.authorization.halo.run/display-name" - ], roles: [role], }); } @@ -165,7 +160,7 @@ watch( class="bg-white px-4 py-5 hover:bg-gray-50 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6" >
    - {{ group.displayName }} + {{ group.module }}