From cb055d3fb8a540a2dbee9bf5736c1099379a3451 Mon Sep 17 00:00:00 2001
From: Halo Dev Bot <87291978+halo-dev-bot@users.noreply.github.com>
Date: Wed, 15 Feb 2023 14:24:11 +0800
Subject: [PATCH] [release-2.2] fix: the issue that role display name (#856)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is an automated cherry-pick of #847

/assign ruibaby

```release-note
优化 Console 端用户角色标识的显示名称。
```
---
 src/layouts/BasicLayout.vue             | 18 +++++++----
 src/main.ts                             |  3 ++
 src/modules/system/roles/RoleList.vue   |  4 +++
 src/modules/system/users/UserDetail.vue |  9 +++++-
 src/modules/system/users/UserList.vue   |  8 ++++-
 src/stores/role.ts                      | 42 +++++++++++++++++--------
 6 files changed, 63 insertions(+), 21 deletions(-)

diff --git a/src/layouts/BasicLayout.vue b/src/layouts/BasicLayout.vue
index 9092c952..cc2629e7 100644
--- a/src/layouts/BasicLayout.vue
+++ b/src/layouts/BasicLayout.vue
@@ -27,6 +27,7 @@ import sortBy from "lodash.sortby";
 import { useRoleStore } from "@/stores/role";
 import { hasPermission } from "@/utils/permission";
 import { useUserStore } from "@/stores/user";
+import { rbacAnnotations } from "@/constants/annotations";
 
 const route = useRoute();
 const router = useRouter();
@@ -56,11 +57,16 @@ const handleLogout = () => {
 };
 
 const currentRole = computed(() => {
-  return JSON.parse(
-    userStore.currentUser?.metadata.annotations?.[
-      "rbac.authorization.halo.run/role-names"
-    ] || "[]"
-  )[0];
+  const names = JSON.parse(
+    userStore.currentUser?.metadata.annotations?.[rbacAnnotations.ROLE_NAMES] ||
+      "[]"
+  );
+
+  if (names.length === 0) {
+    return;
+  }
+
+  return roleStore.getRoleDisplayName(names[0]);
 });
 
 // Global Search
@@ -228,7 +234,7 @@ onMounted(generateMenus);
             <div class="flex text-sm font-medium">
               {{ userStore.currentUser?.spec.displayName }}
             </div>
-            <div class="flex">
+            <div v-if="currentRole" class="flex">
               <VTag>
                 <template #leftIcon>
                   <IconUserSettings />
diff --git a/src/main.ts b/src/main.ts
index d76759bf..1809e970 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -240,6 +240,9 @@ async function initApp() {
 
     await loadUserPermissions();
 
+    const roleStore = useRoleStore();
+    await roleStore.fetchRoles();
+
     try {
       await loadPluginModules();
     } catch (e) {
diff --git a/src/modules/system/roles/RoleList.vue b/src/modules/system/roles/RoleList.vue
index a7da6169..78e608f3 100644
--- a/src/modules/system/roles/RoleList.vue
+++ b/src/modules/system/roles/RoleList.vue
@@ -36,7 +36,9 @@ import Fuse from "fuse.js";
 import { usePermission } from "@/utils/permission";
 import { roleLabels } from "@/constants/labels";
 import { SUPER_ROLE_NAME } from "@/constants/constants";
+import { useRoleStore } from "@/stores/role";
 
+const roleStore = useRoleStore();
 const { currentUserHasPermission } = usePermission();
 
 const editingModal = ref<boolean>(false);
@@ -90,6 +92,7 @@ const handleOpenEditingModal = (role: Role) => {
 const onEditingModalClose = () => {
   selectedRole.value = undefined;
   handleFetchRoles();
+  roleStore.fetchRoles();
 };
 
 const handleCloneRole = async (role: Role) => {
@@ -139,6 +142,7 @@ const handleDelete = async (role: Role) => {
         console.error("Failed to delete role", e);
       } finally {
         handleFetchRoles();
+        roleStore.fetchRoles();
       }
     },
   });
diff --git a/src/modules/system/users/UserDetail.vue b/src/modules/system/users/UserDetail.vue
index 0410e496..fd710a1a 100644
--- a/src/modules/system/users/UserDetail.vue
+++ b/src/modules/system/users/UserDetail.vue
@@ -6,13 +6,20 @@ import { useRouter } from "vue-router";
 import type { User } from "@halo-dev/api-client";
 import { rbacAnnotations } from "@/constants/annotations";
 import { formatDatetime } from "@/utils/date";
+import { useRoleStore } from "@/stores/role";
 
 const user = inject<Ref<User>>("user");
 
+const roleStore = useRoleStore();
+
 const roles = computed(() => {
-  return JSON.parse(
+  const names = JSON.parse(
     user?.value?.metadata?.annotations?.[rbacAnnotations.ROLE_NAMES] || "[]"
   );
+
+  return names.map((name: string) => {
+    return roleStore.getRoleDisplayName(name);
+  });
 });
 
 const router = useRouter();
diff --git a/src/modules/system/users/UserList.vue b/src/modules/system/users/UserList.vue
index e1883c3b..a316eb2b 100644
--- a/src/modules/system/users/UserList.vue
+++ b/src/modules/system/users/UserList.vue
@@ -30,6 +30,7 @@ import { useRouteQuery } from "@vueuse/router";
 import Fuse from "fuse.js";
 import { usePermission } from "@/utils/permission";
 import { useUserStore } from "@/stores/user";
+import { useRoleStore } from "@/stores/role";
 
 const { currentUserHasPermission } = usePermission();
 
@@ -55,6 +56,7 @@ const selectedUser = ref<User>();
 const refreshInterval = ref();
 
 const userStore = useUserStore();
+const roleStore = useRoleStore();
 
 let fuse: Fuse<User> | undefined = undefined;
 
@@ -208,9 +210,13 @@ const handleOpenGrantPermissionModal = (user: User) => {
 };
 
 const getRoles = (user: User) => {
-  return JSON.parse(
+  const names = JSON.parse(
     user.metadata.annotations?.[rbacAnnotations.ROLE_NAMES] || "[]"
   );
+
+  return names.map((name: string) => {
+    return roleStore.getRoleDisplayName(name);
+  });
 };
 
 onMounted(() => {
diff --git a/src/stores/role.ts b/src/stores/role.ts
index c4265ae3..2ce4546e 100644
--- a/src/stores/role.ts
+++ b/src/stores/role.ts
@@ -1,18 +1,34 @@
 import { defineStore } from "pinia";
 import type { Role, UserPermission } from "@halo-dev/api-client";
+import { ref } from "vue";
+import { apiClient } from "@/utils/api-client";
+import { roleLabels } from "@/constants/labels";
+import { rbacAnnotations } from "@/constants/annotations";
 
-interface RoleStoreState {
-  roles: Role[]; // all roles
-  permissions: UserPermission; // current user's permissions
-}
-
-export const useRoleStore = defineStore({
-  id: "role",
-  state: (): RoleStoreState => ({
+export const useRoleStore = defineStore("role", () => {
+  const roles = ref<Role[]>([]);
+  const permissions = ref<UserPermission>({
     roles: [],
-    permissions: {
-      roles: [],
-      uiPermissions: [],
-    },
-  }),
+    uiPermissions: [],
+  });
+
+  async function fetchRoles() {
+    try {
+      const { data } = await apiClient.extension.role.listv1alpha1Role({
+        page: 0,
+        size: 0,
+        labelSelector: [`!${roleLabels.TEMPLATE}`],
+      });
+      roles.value = data.items;
+    } catch (error) {
+      console.error("Failed to fetch roles", error);
+    }
+  }
+
+  function getRoleDisplayName(name: string) {
+    const role = roles.value.find((role) => role.metadata.name === name);
+    return role?.metadata.annotations?.[rbacAnnotations.DISPLAY_NAME] || name;
+  }
+
+  return { roles, permissions, fetchRoles, getRoleDisplayName };
 });