diff --git a/console/package.json b/console/package.json index 0b1889c98..4667f7a30 100644 --- a/console/package.json +++ b/console/package.json @@ -46,7 +46,7 @@ "@halo-dev/components": "workspace:*", "@halo-dev/console-shared": "workspace:*", "@halo-dev/richtext-editor": "0.0.0-alpha.22", - "@tanstack/vue-query": "^4.24.10", + "@tanstack/vue-query": "^4.29.1", "@tiptap/extension-character-count": "^2.0.0-beta.220", "@uppy/core": "^3.1.1", "@uppy/dashboard": "^3.3.1", diff --git a/console/pnpm-lock.yaml b/console/pnpm-lock.yaml index 7f10d06fb..a9567e8b3 100644 --- a/console/pnpm-lock.yaml +++ b/console/pnpm-lock.yaml @@ -23,7 +23,7 @@ importers: '@rushstack/eslint-patch': ^1.2.0 '@tailwindcss/aspect-ratio': ^0.4.2 '@tailwindcss/container-queries': ^0.1.0 - '@tanstack/vue-query': ^4.24.10 + '@tanstack/vue-query': ^4.29.1 '@tiptap/extension-character-count': ^2.0.0-beta.220 '@types/jsdom': ^20.0.1 '@types/lodash.clonedeep': 4.5.7 @@ -121,7 +121,7 @@ importers: '@halo-dev/components': link:packages/components '@halo-dev/console-shared': link:packages/shared '@halo-dev/richtext-editor': 0.0.0-alpha.22_4cvzv64gtscmble2r6ekkqbslu - '@tanstack/vue-query': 4.24.10_vue@3.2.45 + '@tanstack/vue-query': 4.29.1_vue@3.2.45 '@tiptap/extension-character-count': 2.0.0-beta.220_zz2rudi4omymftayy4ta3vci2y '@uppy/core': 3.1.1 '@uppy/dashboard': 3.3.1_@uppy+core@3.1.1 @@ -2766,7 +2766,7 @@ packages: dependencies: '@jridgewell/set-array': 1.1.2 '@jridgewell/sourcemap-codec': 1.4.14 - '@jridgewell/trace-mapping': 0.3.15 + '@jridgewell/trace-mapping': 0.3.17 dev: true /@jridgewell/resolve-uri/3.1.0: @@ -3308,12 +3308,12 @@ packages: remove-accents: 0.4.2 dev: false - /@tanstack/query-core/4.24.10: - resolution: {integrity: sha512-2QywqXEAGBIUoTdgn1lAB4/C8QEqwXHj2jrCLeYTk2xVGtLiPEUD8jcMoeB2noclbiW2mMt4+Fq7fZStuz3wAQ==} + /@tanstack/query-core/4.29.1: + resolution: {integrity: sha512-vkPewLEG8ua0efo3SsVT0BcBtkq5RZX8oPhDAyKL+k/rdOYSQTEocfGEXSaBwIwsXeOGBUpfKqI+UmHvNqdWXg==} dev: false - /@tanstack/vue-query/4.24.10_vue@3.2.45: - resolution: {integrity: sha512-K9mtij3WpQquySsaNhyN5ZQT3oO6Y69J+OT2/NYQYvYCI1AL1S5/sQ1n2FtpyslgrJn9khSerFB7icbYcbcubA==} + /@tanstack/vue-query/4.29.1_vue@3.2.45: + resolution: {integrity: sha512-2/F12lOHQw3YQbHVKGZUTEuwxrws6UR3VEXNX/Obw2NLupmCYR7+dcBwwHQ75zUQngxLFQwHCJKX7Ne1Wyk/HA==} peerDependencies: '@vue/composition-api': ^1.1.2 vue: ^2.5.0 || ^3.0.0 @@ -3322,8 +3322,8 @@ packages: optional: true dependencies: '@tanstack/match-sorter-utils': 8.7.6 - '@tanstack/query-core': 4.24.10 - '@vue/devtools-api': 6.4.5 + '@tanstack/query-core': 4.29.1 + '@vue/devtools-api': 6.5.0 vue: 3.2.45 vue-demi: 0.13.11_vue@3.2.45 dev: false @@ -5947,7 +5947,7 @@ packages: is-shared-array-buffer: 1.0.2 is-string: 1.0.7 is-weakref: 1.0.2 - object-inspect: 1.12.2 + object-inspect: 1.12.3 object-keys: 1.1.1 object.assign: 4.1.4 regexp.prototype.flags: 1.4.3 @@ -8680,12 +8680,8 @@ packages: resolution: {integrity: sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==} engines: {node: '>= 6'} - /object-inspect/1.12.2: - resolution: {integrity: sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==} - /object-inspect/1.12.3: resolution: {integrity: sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==} - dev: true /object-keys/1.1.1: resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==} @@ -9856,7 +9852,7 @@ packages: dependencies: call-bind: 1.0.2 get-intrinsic: 1.1.3 - object-inspect: 1.12.2 + object-inspect: 1.12.3 /signal-exit/3.0.7: resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==} diff --git a/console/src/composables/use-global-info.ts b/console/src/composables/use-global-info.ts index c4c1fc461..13734e360 100644 --- a/console/src/composables/use-global-info.ts +++ b/console/src/composables/use-global-info.ts @@ -15,7 +15,6 @@ export function useGlobalInfoFetch() { return data; }, - refetchOnWindowFocus: false, }); return { diff --git a/console/src/main.ts b/console/src/main.ts index b3853bc82..1c51e50b7 100644 --- a/console/src/main.ts +++ b/console/src/main.ts @@ -21,15 +21,15 @@ import { useThemeStore } from "./stores/theme"; import { useSystemStatesStore } from "./stores/system-states"; import { useUserStore } from "./stores/user"; import { useSystemConfigMapStore } from "./stores/system-configmap"; -import { VueQueryPlugin } from "@tanstack/vue-query"; +import { setupVueQuery } from "./setup/setupVueQuery"; const app = createApp(App); setupComponents(app); setupI18n(app); +setupVueQuery(app); app.use(createPinia()); -app.use(VueQueryPlugin); function registerModule(pluginModule: PluginModule, core: boolean) { if (pluginModule.components) { diff --git a/console/src/modules/contents/attachments/components/AttachmentDetailModal.vue b/console/src/modules/contents/attachments/components/AttachmentDetailModal.vue index 9b84eaa1d..3bf583acd 100644 --- a/console/src/modules/contents/attachments/components/AttachmentDetailModal.vue +++ b/console/src/modules/contents/attachments/components/AttachmentDetailModal.vue @@ -56,7 +56,6 @@ const { data: policy } = useQuery({ return data; }, - refetchOnWindowFocus: false, enabled: computed(() => !!policyName.value), }); diff --git a/console/src/modules/contents/attachments/composables/use-attachment-group.ts b/console/src/modules/contents/attachments/composables/use-attachment-group.ts index 6cdef44f6..1b1a77aa7 100644 --- a/console/src/modules/contents/attachments/composables/use-attachment-group.ts +++ b/console/src/modules/contents/attachments/composables/use-attachment-group.ts @@ -24,7 +24,6 @@ export function useFetchAttachmentGroup(): useFetchAttachmentGroupReturn { return deletingGroups?.length ? 1000 : false; }, - refetchOnWindowFocus: false, }); return { diff --git a/console/src/modules/contents/attachments/composables/use-attachment-policy.ts b/console/src/modules/contents/attachments/composables/use-attachment-policy.ts index ac9864653..4c986dd89 100644 --- a/console/src/modules/contents/attachments/composables/use-attachment-policy.ts +++ b/console/src/modules/contents/attachments/composables/use-attachment-policy.ts @@ -29,7 +29,6 @@ export function useFetchAttachmentPolicy(): useFetchAttachmentPolicyReturn { ); return deletingPolicies?.length ? 1000 : false; }, - refetchOnWindowFocus: false, }); return { @@ -47,7 +46,6 @@ export function useFetchAttachmentPolicyTemplate(): useFetchAttachmentPolicyTemp await apiClient.extension.storage.policyTemplate.liststorageHaloRunV1alpha1PolicyTemplate(); return data.items; }, - refetchOnWindowFocus: false, }); return { diff --git a/console/src/modules/contents/attachments/composables/use-attachment.ts b/console/src/modules/contents/attachments/composables/use-attachment.ts index c9e0274ca..60b51b85b 100644 --- a/console/src/modules/contents/attachments/composables/use-attachment.ts +++ b/console/src/modules/contents/attachments/composables/use-attachment.ts @@ -78,7 +78,6 @@ export function useAttachmentControl(filterOptions: { ); return deletingAttachments?.length ? 3000 : false; }, - refetchOnWindowFocus: false, }); const handleSelectPrevious = async () => { diff --git a/console/src/modules/contents/comments/CommentList.vue b/console/src/modules/contents/comments/CommentList.vue index aeeec34c6..d320c81e9 100644 --- a/console/src/modules/contents/comments/CommentList.vue +++ b/console/src/modules/contents/comments/CommentList.vue @@ -170,7 +170,6 @@ const { return data.items; }, - refetchOnWindowFocus: false, refetchInterval(data) { const deletingComments = data?.filter( (comment) => !!comment.comment.metadata.deletionTimestamp diff --git a/console/src/modules/contents/comments/components/CommentListItem.vue b/console/src/modules/contents/comments/components/CommentListItem.vue index 5e21a1763..77d969656 100644 --- a/console/src/modules/contents/comments/components/CommentListItem.vue +++ b/console/src/modules/contents/comments/components/CommentListItem.vue @@ -154,7 +154,6 @@ const { }); return data.items; }, - refetchOnWindowFocus: false, refetchInterval(data) { const deletingReplies = data?.filter( (reply) => !!reply.reply.metadata.deletionTimestamp diff --git a/console/src/modules/contents/pages/DeletedSinglePageList.vue b/console/src/modules/contents/pages/DeletedSinglePageList.vue index d2cce1157..ecd4dbcb9 100644 --- a/console/src/modules/contents/pages/DeletedSinglePageList.vue +++ b/console/src/modules/contents/pages/DeletedSinglePageList.vue @@ -60,7 +60,6 @@ const { return data.items; }, - refetchOnWindowFocus: false, refetchInterval(data) { const deletedSinglePages = data?.filter( (singlePage) => diff --git a/console/src/modules/contents/pages/SinglePageList.vue b/console/src/modules/contents/pages/SinglePageList.vue index 57a49e2d1..680b38665 100644 --- a/console/src/modules/contents/pages/SinglePageList.vue +++ b/console/src/modules/contents/pages/SinglePageList.vue @@ -230,7 +230,6 @@ const { return data.items; }, - refetchOnWindowFocus: false, refetchInterval(data) { const abnormalSinglePages = data?.filter((singlePage) => { const { spec, metadata, status } = singlePage.page; diff --git a/console/src/modules/contents/posts/DeletedPostList.vue b/console/src/modules/contents/posts/DeletedPostList.vue index cbbce00da..12855ebae 100644 --- a/console/src/modules/contents/posts/DeletedPostList.vue +++ b/console/src/modules/contents/posts/DeletedPostList.vue @@ -60,7 +60,6 @@ const { return data.items; }, - refetchOnWindowFocus: false, refetchInterval: (data) => { const deletingPosts = data?.filter( (post) => diff --git a/console/src/modules/contents/posts/PostList.vue b/console/src/modules/contents/posts/PostList.vue index f54ee3772..df241e2c7 100644 --- a/console/src/modules/contents/posts/PostList.vue +++ b/console/src/modules/contents/posts/PostList.vue @@ -279,7 +279,6 @@ const { return abnormalPosts?.length ? 3000 : false; }, - refetchOnWindowFocus: false, }); const handleOpenSettingModal = async (post: Post) => { diff --git a/console/src/modules/contents/posts/categories/composables/use-post-category.ts b/console/src/modules/contents/posts/categories/composables/use-post-category.ts index d486fae71..676b1aded 100644 --- a/console/src/modules/contents/posts/categories/composables/use-post-category.ts +++ b/console/src/modules/contents/posts/categories/composables/use-post-category.ts @@ -43,7 +43,6 @@ export function usePostCategory(): usePostCategoryReturn { ); return abnormalCategories?.length ? 3000 : false; }, - refetchOnWindowFocus: false, onSuccess(data) { categoriesTree.value = buildCategoriesTree(data); }, diff --git a/console/src/modules/contents/posts/tags/composables/use-post-tag.ts b/console/src/modules/contents/posts/tags/composables/use-post-tag.ts index aa5ae94eb..1a28421bf 100644 --- a/console/src/modules/contents/posts/tags/composables/use-post-tag.ts +++ b/console/src/modules/contents/posts/tags/composables/use-post-tag.ts @@ -36,7 +36,6 @@ export function usePostTag(): usePostTagReturn { ); return abnormalTags?.length ? 3000 : false; }, - refetchOnWindowFocus: false, }); const handleDelete = async (tag: Tag) => { diff --git a/console/src/modules/contents/posts/widgets/RecentPublishedWidget.vue b/console/src/modules/contents/posts/widgets/RecentPublishedWidget.vue index 773aa6dad..4c4bb74f7 100644 --- a/console/src/modules/contents/posts/widgets/RecentPublishedWidget.vue +++ b/console/src/modules/contents/posts/widgets/RecentPublishedWidget.vue @@ -28,7 +28,6 @@ const { data } = useQuery({ }); return data.items; }, - refetchOnWindowFocus: false, });