fix: missing ui permission condition about users

Signed-off-by: Ryan Wang <i@ryanc.cc>
halo-dev · Sep 18, 2023 · 101da48 · 101da48
1 parent 83cb088
commit 101da48
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 16 deletions.
diff --git a/console/src/components/permission/HasPermission.vue b/console/src/components/permission/HasPermission.vue
@@ -0,0 +1,16 @@
+<script lang="ts" setup>
+import { usePermission } from "@/utils/permission";
+
+withDefaults(
+  defineProps<{
+    permissions: string[];
+  }>(),
+  {}
+);
+
+const { currentUserHasPermission } = usePermission();
+</script>
+
+<template>
+  <slot v-if="currentUserHasPermission(permissions)" />
+</template>
diff --git a/console/src/modules/contents/attachments/AttachmentList.vue b/console/src/modules/contents/attachments/AttachmentList.vue
@@ -356,10 +356,12 @@ onMounted(() => {
                       }) || []),
                     ]"
                   />
-                  <UserFilterDropdown
-                    v-model="selectedUser"
-                    :label="$t('core.attachment.filters.owner.label')"
-                  />
+                  <HasPermission :permissions="['system:users:view']">
+                    <UserFilterDropdown
+                      v-model="selectedUser"
+                      :label="$t('core.attachment.filters.owner.label')"
+                    />
+                  </HasPermission>
                   <FilterDropdown
                     v-model="selectedSort"
                     :label="$t('core.common.filters.labels.sort')"

diff --git a/console/src/modules/contents/comments/CommentList.vue b/console/src/modules/contents/comments/CommentList.vue
@@ -283,10 +283,12 @@ const handleApproveInBatch = async () => {
                   },
                 ]"
               />
-              <UserFilterDropdown
-                v-model="selectedUser"
-                :label="$t('core.comment.filters.owner.label')"
-              />
+              <HasPermission :permissions="['system:users:view']">
+                <UserFilterDropdown
+                  v-model="selectedUser"
+                  :label="$t('core.comment.filters.owner.label')"
+                />
+              </HasPermission>
               <FilterDropdown
                 v-model="selectedSort"
                 :label="$t('core.common.filters.labels.sort')"

diff --git a/console/src/modules/contents/pages/SinglePageList.vue b/console/src/modules/contents/pages/SinglePageList.vue
@@ -379,10 +379,12 @@ watch(selectedPageNames, (newValue) => {
                   },
                 ]"
               />
-              <UserFilterDropdown
-                v-model="selectedContributor"
-                :label="$t('core.page.filters.author.label')"
-              />
+              <HasPermission :permissions="['system:users:view']">
+                <UserFilterDropdown
+                  v-model="selectedContributor"
+                  :label="$t('core.page.filters.author.label')"
+                />
+              </HasPermission>
               <FilterDropdown
                 v-model="selectedSort"
                 :label="$t('core.common.filters.labels.sort')"

diff --git a/console/src/modules/contents/posts/PostList.vue b/console/src/modules/contents/posts/PostList.vue
@@ -393,10 +393,12 @@ watch(selectedPostNames, (newValue) => {
                 v-model="selectedTag"
                 :label="$t('core.post.filters.tag.label')"
               />
-              <UserFilterDropdown
-                v-model="selectedContributor"
-                :label="$t('core.post.filters.author.label')"
-              />
+              <HasPermission :permissions="['system:users:view']">
+                <UserFilterDropdown
+                  v-model="selectedContributor"
+                  :label="$t('core.post.filters.author.label')"
+                />
+              </HasPermission>
               <FilterDropdown
                 v-model="selectedSort"
                 :label="$t('core.common.filters.labels.sort')"

diff --git a/console/src/setup/setupComponents.ts b/console/src/setup/setupComponents.ts
@@ -11,6 +11,7 @@ import FilterCleanButton from "@/components/filter/FilterCleanButton.vue";
 import SearchInput from "@/components/input/SearchInput.vue";
 import AnnotationsForm from "@/components/form/AnnotationsForm.vue";
 import AttachmentFileTypeIcon from "@/components/icon/AttachmentFileTypeIcon.vue";
+import HasPermission from "@/components/permission/HasPermission.vue";
 
 export function setupComponents(app: App) {
   app.use(VueGridLayout);
@@ -37,4 +38,5 @@ export function setupComponents(app: App) {
   app.component("SearchInput", SearchInput);
   app.component("AnnotationsForm", AnnotationsForm);
   app.component("AttachmentFileTypeIcon", AttachmentFileTypeIcon);
+  app.component("HasPermission", HasPermission);
 }