fix: missing ui permission condition about users

Signed-off-by: Ryan Wang <i@ryanc.cc>
halo-dev · Sep 18, 2023 · e346bea · e346bea
1 parent 4dcced9
commit e346bea
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 77 deletions.
diff --git a/console/src/modules/contents/_components/ContributorList.vue b/console/src/modules/contents/_components/ContributorList.vue
@@ -0,0 +1,39 @@
+<script lang="ts" setup>
+import { usePermission } from "@/utils/permission";
+import type { Contributor } from "@halo-dev/api-client";
+import { VAvatar } from "@halo-dev/components";
+import { useRouter } from "vue-router";
+
+withDefaults(
+  defineProps<{
+    contributors: Contributor[];
+  }>(),
+  {}
+);
+
+const router = useRouter();
+const { currentUserHasPermission } = usePermission();
+
+function handleRouteToUserDetail(contributor: Contributor) {
+  if (!currentUserHasPermission(["system:users:view"])) {
+    return;
+  }
+  router.push({
+    name: "UserDetail",
+    params: { name: contributor.name },
+  });
+}
+</script>
+
+<template>
+  <VAvatar
+    v-for="(contributor, contributorIndex) in contributors"
+    :key="contributorIndex"
+    v-tooltip="contributor.displayName"
+    size="xs"
+    :src="contributor.avatar"
+    :alt="contributor.displayName"
+    circle
+    @click="handleRouteToUserDetail(contributor)"
+  ></VAvatar>
+</template>
diff --git a/console/src/modules/contents/attachments/AttachmentList.vue b/console/src/modules/contents/attachments/AttachmentList.vue
@@ -612,6 +612,11 @@ onMounted(() => {
                               },
                             }"
                             class="text-xs text-gray-500"
+                            :class="{
+                              'pointer-events-none': !currentUserHasPermission([
+                                'system:users:view',
+                              ]),
+                            }"
                           >
                             {{ attachment.spec.ownerName }}
                           </RouterLink>

diff --git a/console/src/modules/contents/pages/DeletedSinglePageList.vue b/console/src/modules/contents/pages/DeletedSinglePageList.vue
@@ -9,7 +9,6 @@ import {
   VSpace,
   Dialog,
   VEmpty,
-  VAvatar,
   VEntity,
   VEntityField,
   VPageHeader,
@@ -22,11 +21,11 @@ import { ref, watch } from "vue";
 import type { ListedSinglePage, SinglePage } from "@halo-dev/api-client";
 import { apiClient } from "@/utils/api-client";
 import { formatDatetime } from "@/utils/date";
-import { RouterLink } from "vue-router";
 import cloneDeep from "lodash.clonedeep";
 import { usePermission } from "@/utils/permission";
 import { useQuery } from "@tanstack/vue-query";
 import { useI18n } from "vue-i18n";
+import ContributorList from "../_components/ContributorList.vue";
 
 const { currentUserHasPermission } = usePermission();
 const { t } = useI18n();
@@ -338,25 +337,7 @@ watch(
               <template #end>
                 <VEntityField>
                   <template #description>
-                    <RouterLink
-                      v-for="(
-                        contributor, contributorIndex
-                      ) in singlePage.contributors"
-                      :key="contributorIndex"
-                      :to="{
-                        name: 'UserDetail',
-                        params: { name: contributor.name },
-                      }"
-                      class="flex items-center"
-                    >
-                      <VAvatar
-                        v-tooltip="contributor.displayName"
-                        size="xs"
-                        :src="contributor.avatar"
-                        :alt="contributor.displayName"
-                        circle
-                      ></VAvatar>
-                    </RouterLink>
+                    <ContributorList :contributors="singlePage.contributors" />
                   </template>
                 </VEntityField>
                 <VEntityField v-if="!singlePage?.page?.spec.deleted">

diff --git a/console/src/modules/contents/pages/components/SinglePageListItem.vue b/console/src/modules/contents/pages/components/SinglePageListItem.vue
@@ -5,7 +5,6 @@ import {
   IconExternalLinkLine,
   VSpace,
   Dialog,
-  VAvatar,
   VStatusDot,
   VEntity,
   VEntityField,
@@ -25,6 +24,7 @@ import { useMutation, useQueryClient } from "@tanstack/vue-query";
 import { useI18n } from "vue-i18n";
 import { inject } from "vue";
 import type { Ref } from "vue";
+import ContributorList from "../../_components/ContributorList.vue";
 
 const { currentUserHasPermission } = usePermission();
 const { t } = useI18n();
@@ -189,23 +189,7 @@ const handleDelete = async () => {
     <template #end>
       <VEntityField>
         <template #description>
-          <RouterLink
-            v-for="(contributor, contributorIndex) in singlePage.contributors"
-            :key="contributorIndex"
-            :to="{
-              name: 'UserDetail',
-              params: { name: contributor.name },
-            }"
-            class="flex items-center"
-          >
-            <VAvatar
-              v-tooltip="contributor.displayName"
-              size="xs"
-              :src="contributor.avatar"
-              :alt="contributor.displayName"
-              circle
-            ></VAvatar>
-          </RouterLink>
+          <ContributorList :contributors="singlePage.contributors" />
         </template>
       </VEntityField>
       <VEntityField :description="publishStatus">

diff --git a/console/src/modules/contents/posts/DeletedPostList.vue b/console/src/modules/contents/posts/DeletedPostList.vue
@@ -10,7 +10,6 @@ import {
   VPageHeader,
   VPagination,
   VSpace,
-  VAvatar,
   VStatusDot,
   VEntity,
   VEntityField,
@@ -27,6 +26,7 @@ import { usePermission } from "@/utils/permission";
 import cloneDeep from "lodash.clonedeep";
 import { useQuery } from "@tanstack/vue-query";
 import { useI18n } from "vue-i18n";
+import ContributorList from "../_components/ContributorList.vue";
 
 const { currentUserHasPermission } = usePermission();
 const { t } = useI18n();
@@ -353,25 +353,7 @@ watch(
               <template #end>
                 <VEntityField>
                   <template #description>
-                    <RouterLink
-                      v-for="(
-                        contributor, contributorIndex
-                      ) in post.contributors"
-                      :key="contributorIndex"
-                      :to="{
-                        name: 'UserDetail',
-                        params: { name: contributor.name },
-                      }"
-                      class="flex items-center"
-                    >
-                      <VAvatar
-                        v-tooltip="contributor.displayName"
-                        size="xs"
-                        :src="contributor.avatar"
-                        :alt="contributor.displayName"
-                        circle
-                      ></VAvatar>
-                    </RouterLink>
+                    <ContributorList :contributors="post.contributors" />
                   </template>
                 </VEntityField>
                 <VEntityField v-if="!post?.post?.spec.deleted">

diff --git a/console/src/modules/contents/posts/components/entity-fields/ContributorsField.vue b/console/src/modules/contents/posts/components/entity-fields/ContributorsField.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup>
-import { VAvatar, VEntityField } from "@halo-dev/components";
+import { VEntityField } from "@halo-dev/components";
 import type { ListedPost } from "@halo-dev/api-client";
+import ContributorList from "@/modules/contents/_components/ContributorList.vue";
 
 withDefaults(
   defineProps<{
@@ -13,23 +14,7 @@ withDefaults(
 <template>
   <VEntityField>
     <template #description>
-      <RouterLink
-        v-for="(contributor, contributorIndex) in post.contributors"
-        :key="contributorIndex"
-        :to="{
-          name: 'UserDetail',
-          params: { name: contributor.name },
-        }"
-        class="flex items-center"
-      >
-        <VAvatar
-          v-tooltip="contributor.displayName"
-          size="xs"
-          :src="contributor.avatar"
-          :alt="contributor.displayName"
-          circle
-        ></VAvatar>
-      </RouterLink>
+      <ContributorList :contributors="post.contributors" />
     </template>
   </VEntityField>
 </template>