refactor: use tanstack query to refactor user-related fetching (#3548)

#### What type of PR is this?

/kind improvement

#### What this PR does / why we need it:

使用 [TanStack Query](https://github.com/TanStack/query) 重构用户相关数据请求的相关逻辑。

#### Which issue(s) this PR fixes:

Ref https://github.com/halo-dev/halo/issues/3360

#### Special notes for your reviewer:

测试方式:

1. 测试用户管理列表的数据请求 + 条件筛选是否正常。
2. 测试修改当前登录用户和其他用户的信息和密码是否正常。

#### Does this PR introduce a user-facing change?

```release-note
None
```
pull/3563/head^2
Ryan Wang 2023-03-23 21:44:34 +08:00 committed by GitHub
parent 0503c5ff2e
commit 4ce5d0c2cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 123 additions and 157 deletions

View File

@ -24,9 +24,9 @@ import {
import UserEditingModal from "./components/UserEditingModal.vue"; import UserEditingModal from "./components/UserEditingModal.vue";
import UserPasswordChangeModal from "./components/UserPasswordChangeModal.vue"; import UserPasswordChangeModal from "./components/UserPasswordChangeModal.vue";
import GrantPermissionModal from "./components/GrantPermissionModal.vue"; import GrantPermissionModal from "./components/GrantPermissionModal.vue";
import { computed, onMounted, onUnmounted, ref, watch } from "vue"; import { computed, onMounted, ref, watch } from "vue";
import { apiClient } from "@/utils/api-client"; import { apiClient } from "@/utils/api-client";
import type { Role, User, ListedUserList } from "@halo-dev/api-client"; import type { Role, User, ListedUser } from "@halo-dev/api-client";
import { rbacAnnotations } from "@/constants/annotations"; import { rbacAnnotations } from "@/constants/annotations";
import { formatDatetime } from "@/utils/date"; import { formatDatetime } from "@/utils/date";
import { useRouteQuery } from "@vueuse/router"; import { useRouteQuery } from "@vueuse/router";
@ -36,6 +36,7 @@ import { getNode } from "@formkit/core";
import FilterTag from "@/components/filter/FilterTag.vue"; import FilterTag from "@/components/filter/FilterTag.vue";
import { useFetchRole } from "../roles/composables/use-role"; import { useFetchRole } from "../roles/composables/use-role";
import FilterCleanButton from "@/components/filter/FilterCleanButton.vue"; import FilterCleanButton from "@/components/filter/FilterCleanButton.vue";
import { useQuery } from "@tanstack/vue-query";
import { useI18n } from "vue-i18n"; import { useI18n } from "vue-i18n";
const { currentUserHasPermission } = usePermission(); const { currentUserHasPermission } = usePermission();
@ -46,46 +47,86 @@ const editingModal = ref<boolean>(false);
const passwordChangeModal = ref<boolean>(false); const passwordChangeModal = ref<boolean>(false);
const grantPermissionModal = ref<boolean>(false); const grantPermissionModal = ref<boolean>(false);
const users = ref<ListedUserList>({
page: 1,
size: 20,
total: 0,
items: [],
first: true,
last: false,
hasNext: false,
hasPrevious: false,
totalPages: 0,
});
const loading = ref(false);
const selectedUserNames = ref<string[]>([]); const selectedUserNames = ref<string[]>([]);
const selectedUser = ref<User>(); const selectedUser = ref<User>();
const keyword = ref(""); const keyword = ref("");
const refreshInterval = ref();
const userStore = useUserStore(); const userStore = useUserStore();
const ANONYMOUSUSER_NAME = "anonymousUser"; const ANONYMOUSUSER_NAME = "anonymousUser";
const DELETEDUSER_NAME = "ghost"; const DELETEDUSER_NAME = "ghost";
const handleFetchUsers = async (options?: { // Filters
mute?: boolean; function handleKeywordChange() {
page?: number; const keywordNode = getNode("keywordInput");
}) => { if (keywordNode) {
try { keyword.value = keywordNode._value as string;
clearInterval(refreshInterval.value); }
page.value = 1;
}
if (!options?.mute) { function handleClearKeyword() {
loading.value = true; keyword.value = "";
} page.value = 1;
}
if (options?.page) { interface SortItem {
users.value.page = options.page; label: string;
} value: string;
}
const SortItems: SortItem[] = [
{
label: t("core.user.filters.sort.items.create_time_desc"),
value: "creationTimestamp,desc",
},
{
label: t("core.user.filters.sort.items.create_time_asc"),
value: "creationTimestamp,asc",
},
];
const selectedSortItem = ref<SortItem>();
function handleSortItemChange(sortItem?: SortItem) {
selectedSortItem.value = sortItem;
page.value = 1;
}
const { roles } = useFetchRole();
const selectedRole = ref<Role>();
function handleRoleChange(role?: Role) {
selectedRole.value = role;
page.value = 1;
}
function handleClearFilters() {
selectedRole.value = undefined;
selectedSortItem.value = undefined;
keyword.value = "";
page.value = 1;
}
const hasFilters = computed(() => {
return selectedRole.value || selectedSortItem.value || keyword.value;
});
const page = ref(1);
const size = ref(20);
const total = ref(0);
const {
data: users,
isLoading,
isFetching,
refetch,
} = useQuery<ListedUser[]>({
queryKey: ["users", page, size, keyword, selectedSortItem, selectedRole],
queryFn: async () => {
const { data } = await apiClient.user.listUsers({ const { data } = await apiClient.user.listUsers({
page: users.value.page, page: page.value,
size: users.value.size, size: size.value,
keyword: keyword.value, keyword: keyword.value,
fieldSelector: [ fieldSelector: [
`name!=${ANONYMOUSUSER_NAME}`, `name!=${ANONYMOUSUSER_NAME}`,
@ -97,36 +138,22 @@ const handleFetchUsers = async (options?: {
role: selectedRole.value?.metadata.name, role: selectedRole.value?.metadata.name,
}); });
users.value = data; total.value = data.total;
const deletedUsers = users.value.items.filter( return data.items;
},
refetchOnWindowFocus: false,
refetchInterval(data) {
const deletingUsers = data?.filter(
(user) => !!user.user.metadata.deletionTimestamp (user) => !!user.user.metadata.deletionTimestamp
); );
if (deletedUsers.length) { return deletingUsers?.length ? 3000 : false;
refreshInterval.value = setInterval(() => { },
handleFetchUsers({ mute: true }); onSuccess() {
}, 3000);
}
} catch (e) {
console.error("Failed to fetch users", e);
} finally {
selectedUser.value = undefined; selectedUser.value = undefined;
loading.value = false; },
} });
};
const handlePaginationChange = async ({
page,
size,
}: {
page: number;
size: number;
}) => {
users.value.page = page;
users.value.size = size;
await handleFetchUsers();
};
const handleDelete = async (user: User) => { const handleDelete = async (user: User) => {
Dialog.warning({ Dialog.warning({
@ -145,7 +172,7 @@ const handleDelete = async (user: User) => {
} catch (e) { } catch (e) {
console.error("Failed to delete user", e); console.error("Failed to delete user", e);
} finally { } finally {
await handleFetchUsers(); await refetch();
} }
}, },
}); });
@ -169,7 +196,7 @@ const handleDeleteInBatch = async () => {
}); });
}) })
); );
await handleFetchUsers(); await refetch();
selectedUserNames.value.length = 0; selectedUserNames.value.length = 0;
Toast.success(t("core.common.toast.delete_success")); Toast.success(t("core.common.toast.delete_success"));
}, },
@ -177,7 +204,7 @@ const handleDeleteInBatch = async () => {
}; };
watch(selectedUserNames, (newValue) => { watch(selectedUserNames, (newValue) => {
checkedAll.value = newValue.length === users.value.items?.length; checkedAll.value = newValue.length === users.value?.length;
}); });
const checkSelection = (user: User) => { const checkSelection = (user: User) => {
@ -192,7 +219,7 @@ const handleCheckAllChange = (e: Event) => {
if (checked) { if (checked) {
selectedUserNames.value = selectedUserNames.value =
users.value.items.map((user) => { users.value?.map((user) => {
return user.user.metadata.name; return user.user.metadata.name;
}) || []; }) || [];
} else { } else {
@ -207,7 +234,7 @@ const handleOpenCreateModal = (user: User) => {
const onEditingModalClose = () => { const onEditingModalClose = () => {
routeQueryAction.value = undefined; routeQueryAction.value = undefined;
handleFetchUsers(); refetch();
}; };
const handleOpenPasswordChangeModal = (user: User) => { const handleOpenPasswordChangeModal = (user: User) => {
@ -220,14 +247,6 @@ const handleOpenGrantPermissionModal = (user: User) => {
grantPermissionModal.value = true; grantPermissionModal.value = true;
}; };
onMounted(() => {
handleFetchUsers();
});
onUnmounted(() => {
clearInterval(refreshInterval.value);
});
// Route query action // Route query action
const routeQueryAction = useRouteQuery<string | undefined>("action"); const routeQueryAction = useRouteQuery<string | undefined>("action");
@ -239,62 +258,6 @@ onMounted(() => {
editingModal.value = true; editingModal.value = true;
} }
}); });
// Filters
function handleKeywordChange() {
const keywordNode = getNode("keywordInput");
if (keywordNode) {
keyword.value = keywordNode._value as string;
}
handleFetchUsers({ page: 1 });
}
function handleClearKeyword() {
keyword.value = "";
handleFetchUsers({ page: 1 });
}
interface SortItem {
label: string;
value: string;
}
const SortItems: SortItem[] = [
{
label: t("core.user.filters.sort.items.create_time_desc"),
value: "creationTimestamp,desc",
},
{
label: t("core.user.filters.sort.items.create_time_asc"),
value: "creationTimestamp,asc",
},
];
const selectedSortItem = ref<SortItem>();
function handleSortItemChange(sortItem?: SortItem) {
selectedSortItem.value = sortItem;
handleFetchUsers({ page: 1 });
}
const { roles } = useFetchRole();
const selectedRole = ref<Role>();
function handleRoleChange(role?: Role) {
selectedRole.value = role;
handleFetchUsers({ page: 1 });
}
function handleClearFilters() {
selectedRole.value = undefined;
selectedSortItem.value = undefined;
keyword.value = "";
handleFetchUsers({ page: 1 });
}
const hasFilters = computed(() => {
return selectedRole.value || selectedSortItem.value || keyword.value;
});
</script> </script>
<template> <template>
<UserEditingModal <UserEditingModal
@ -306,13 +269,13 @@ const hasFilters = computed(() => {
<UserPasswordChangeModal <UserPasswordChangeModal
v-model:visible="passwordChangeModal" v-model:visible="passwordChangeModal"
:user="selectedUser" :user="selectedUser"
@close="handleFetchUsers" @close="refetch"
/> />
<GrantPermissionModal <GrantPermissionModal
v-model:visible="grantPermissionModal" v-model:visible="grantPermissionModal"
:user="selectedUser" :user="selectedUser"
@close="handleFetchUsers" @close="refetch"
/> />
<VPageHeader :title="$t('core.user.title')"> <VPageHeader :title="$t('core.user.title')">
@ -491,11 +454,13 @@ const hasFilters = computed(() => {
<div class="flex flex-row gap-2"> <div class="flex flex-row gap-2">
<div <div
class="group cursor-pointer rounded p-1 hover:bg-gray-200" class="group cursor-pointer rounded p-1 hover:bg-gray-200"
@click="handleFetchUsers()" @click="refetch()"
> >
<IconRefreshLine <IconRefreshLine
v-tooltip="$t('core.common.buttons.refresh')" v-tooltip="$t('core.common.buttons.refresh')"
:class="{ 'animate-spin text-gray-900': loading }" :class="{
'animate-spin text-gray-900': isFetching,
}"
class="h-4 w-4 text-gray-600 group-hover:text-gray-900" class="h-4 w-4 text-gray-600 group-hover:text-gray-900"
/> />
</div> </div>
@ -506,16 +471,16 @@ const hasFilters = computed(() => {
</div> </div>
</template> </template>
<VLoading v-if="loading" /> <VLoading v-if="isLoading" />
<Transition v-else-if="!users.total" appear name="fade"> <Transition v-else-if="!users?.length" appear name="fade">
<VEmpty <VEmpty
:message="$t('core.user.empty.message')" :message="$t('core.user.empty.message')"
:title="$t('core.user.empty.title')" :title="$t('core.user.empty.title')"
> >
<template #actions> <template #actions>
<VSpace> <VSpace>
<VButton @click="handleFetchUsers()"> <VButton @click="refetch()">
{{ $t("core.common.buttons.refresh") }} {{ $t("core.common.buttons.refresh") }}
</VButton> </VButton>
<VButton <VButton
@ -538,7 +503,7 @@ const hasFilters = computed(() => {
class="box-border h-full w-full divide-y divide-gray-100" class="box-border h-full w-full divide-y divide-gray-100"
role="list" role="list"
> >
<li v-for="(user, index) in users.items" :key="index"> <li v-for="(user, index) in users" :key="index">
<VEntity :is-selected="checkSelection(user.user)"> <VEntity :is-selected="checkSelection(user.user)">
<template <template
v-if="currentUserHasPermission(['system:users:manage'])" v-if="currentUserHasPermission(['system:users:manage'])"
@ -657,13 +622,12 @@ const hasFilters = computed(() => {
<template #footer> <template #footer>
<div class="bg-white sm:flex sm:items-center sm:justify-end"> <div class="bg-white sm:flex sm:items-center sm:justify-end">
<VPagination <VPagination
:page="users.page" v-model:page="page"
:size="users.size" v-model:size="size"
:total="users.total" :total="total"
:page-label="$t('core.components.pagination.page_label')" :page-label="$t('core.components.pagination.page_label')"
:size-label="$t('core.components.pagination.size_label')" :size-label="$t('core.components.pagination.size_label')"
:size-options="[20, 30, 50, 100]" :size-options="[20, 30, 50, 100]"
@change="handlePaginationChange"
/> />
</div> </div>
</template> </template>

View File

@ -68,6 +68,11 @@ const creationModalTitle = computed(() => {
: t("core.user.editing_modal.titles.create"); : t("core.user.editing_modal.titles.create");
}); });
const handleResetForm = () => {
formState.value = cloneDeep(initialFormState);
reset("user-form");
};
watch( watch(
() => props.visible, () => props.visible,
(visible) => { (visible) => {
@ -87,6 +92,9 @@ watch(
} else { } else {
handleResetForm(); handleResetForm();
} }
},
{
immediate: true,
} }
); );
@ -97,11 +105,6 @@ const onVisibleChange = (visible: boolean) => {
} }
}; };
const handleResetForm = () => {
formState.value = cloneDeep(initialFormState);
reset("user-form");
};
const annotationsFormRef = ref<InstanceType<typeof AnnotationsForm>>(); const annotationsFormRef = ref<InstanceType<typeof AnnotationsForm>>();
const handleCreateUser = async () => { const handleCreateUser = async () => {

View File

@ -17,6 +17,7 @@ import UserEditingModal from "../components/UserEditingModal.vue";
import UserPasswordChangeModal from "../components/UserPasswordChangeModal.vue"; import UserPasswordChangeModal from "../components/UserPasswordChangeModal.vue";
import { usePermission } from "@/utils/permission"; import { usePermission } from "@/utils/permission";
import { useUserStore } from "@/stores/user"; import { useUserStore } from "@/stores/user";
import { useQuery } from "@tanstack/vue-query";
import { useI18n } from "vue-i18n"; import { useI18n } from "vue-i18n";
const { currentUserHasPermission } = usePermission(); const { currentUserHasPermission } = usePermission();
@ -36,31 +37,30 @@ const tabs = [
// }, // },
]; ];
const user = ref<DetailedUser>();
const loading = ref();
const editingModal = ref(false); const editingModal = ref(false);
const passwordChangeModal = ref(false); const passwordChangeModal = ref(false);
const { params } = useRoute(); const { params } = useRoute();
const handleFetchUser = async () => { const {
try { data: user,
loading.value = true; isLoading,
refetch,
} = useQuery({
queryKey: ["user-detail", params.name],
queryFn: async () => {
if (params.name === "-") { if (params.name === "-") {
const { data } = await apiClient.user.getCurrentUserDetail(); const { data } = await apiClient.user.getCurrentUserDetail();
user.value = data; return data;
} else { } else {
const { data } = await apiClient.user.getUserDetail({ const { data } = await apiClient.user.getUserDetail({
name: params.name as string, name: params.name as string,
}); });
user.value = data; return data;
} }
} catch (e) { },
console.error(e); refetchOnWindowFocus: false,
} finally { });
loading.value = false;
}
};
const isCurrentUser = computed(() => { const isCurrentUser = computed(() => {
if (params.name === "-") { if (params.name === "-") {
@ -81,7 +81,6 @@ const router = useRouter();
// set default active tab // set default active tab
onMounted(() => { onMounted(() => {
handleFetchUser();
const tab = tabs.find((tab) => tab.routeName === route.name); const tab = tabs.find((tab) => tab.routeName === route.name);
activeTab.value = tab ? tab.id : tabs[0].id; activeTab.value = tab ? tab.id : tabs[0].id;
}); });
@ -106,12 +105,12 @@ const handleTabChange = (id: string) => {
<UserEditingModal <UserEditingModal
v-model:visible="editingModal" v-model:visible="editingModal"
:user="user?.user" :user="user?.user"
@close="handleFetchUser" @close="refetch"
/> />
<UserPasswordChangeModal <UserPasswordChangeModal
v-model:visible="passwordChangeModal" v-model:visible="passwordChangeModal"
:user="user?.user" :user="user?.user"
@close="handleFetchUser" @close="refetch"
/> />
<header class="bg-white"> <header class="bg-white">
<div class="p-4"> <div class="p-4">
@ -132,7 +131,7 @@ const handleTabChange = (id: string) => {
<h1 class="truncate text-lg font-bold text-gray-900"> <h1 class="truncate text-lg font-bold text-gray-900">
{{ user?.user.spec.displayName }} {{ user?.user.spec.displayName }}
</h1> </h1>
<span v-if="!loading" class="text-sm text-gray-600"> <span v-if="!isLoading" class="text-sm text-gray-600">
@{{ user?.user.metadata.name }} @{{ user?.user.metadata.name }}
</span> </span>
</div> </div>