Skip to content

armgit / papra

Public Imported from GitHub
0

The minimalistic document archiving platform.

refactor(queries): normalize query key structure (#1273)

Corentin Thomassetf76a778a16aa
diff --git a/apps/papra-client/src/modules/document-share-links/pages/shared-document.page.tsx b/apps/papra-client/src/modules/document-share-links/pages/shared-document.page.tsx
index ba58e59b..5d39ce3b 100644
--- a/apps/papra-client/src/modules/document-share-links/pages/shared-document.page.tsx
+++ b/apps/papra-client/src/modules/document-share-links/pages/shared-document.page.tsx
@@ -170,7 +170,7 @@ export const SharedDocumentPage: Component = () => {
const aboutDialog = useAboutDialog();
const documentQuery = useQuery(() => ({
- queryKey: ['share-link', params.token, getAccessToken()],
+ queryKey: ['share-link', params.token, 'document', getAccessToken()],
queryFn: () => fetchSharedDocument({ token: params.token, accessToken: getAccessToken() }),
retry: false,
}));
diff --git a/apps/papra-client/src/modules/document-views/pages/document-view.page.tsx b/apps/papra-client/src/modules/document-views/pages/document-view.page.tsx
index 9588e1a7..3db8f0be 100644
--- a/apps/papra-client/src/modules/document-views/pages/document-view.page.tsx
+++ b/apps/papra-client/src/modules/document-views/pages/document-view.page.tsx
@@ -91,6 +91,7 @@ export const DocumentViewPage: Component = () => {
'documents',
'document-view',
params.documentViewId,
+ documentViewQuery.data?.documentView?.query ?? '',
getPagination(),
],
queryFn: () =>
diff --git a/apps/papra-client/src/modules/webhooks/pages/create-webhook.page.tsx b/apps/papra-client/src/modules/webhooks/pages/create-webhook.page.tsx
index 2b3fe8dc..7f3e952a 100644
--- a/apps/papra-client/src/modules/webhooks/pages/create-webhook.page.tsx
+++ b/apps/papra-client/src/modules/webhooks/pages/create-webhook.page.tsx
@@ -24,7 +24,9 @@ export const CreateWebhookPage: Component = () => {
const createWebhookMutation = useMutation(() => ({
mutationFn: createWebhook,
onSuccess: async () => {
- await queryClient.invalidateQueries({ queryKey: ['webhooks', params.organizationId] });
+ await queryClient.invalidateQueries({
+ queryKey: ['organizations', params.organizationId, 'webhooks'],
+ });
createToast({
type: 'success',
diff --git a/apps/papra-client/src/modules/webhooks/pages/edit-webhook.page.tsx b/apps/papra-client/src/modules/webhooks/pages/edit-webhook.page.tsx
index 57264f18..d836cc34 100644
--- a/apps/papra-client/src/modules/webhooks/pages/edit-webhook.page.tsx
+++ b/apps/papra-client/src/modules/webhooks/pages/edit-webhook.page.tsx
@@ -50,9 +50,11 @@ export const EditWebhookForm: Component<{ webhook: Webhook }> = (props) => {
throw createI18nApiError({ error });
}
- await queryClient.invalidateQueries({ queryKey: ['webhooks', params.organizationId] });
await queryClient.invalidateQueries({
- queryKey: ['webhook', params.organizationId, params.webhookId],
+ queryKey: ['organizations', params.organizationId, 'webhooks'],
+ });
+ await queryClient.invalidateQueries({
+ queryKey: ['organizations', params.organizationId, 'webhooks', params.webhookId],
});
createToast({
@@ -202,7 +204,7 @@ export const EditWebhookPage: Component = () => {
const params = useParams();
const webhookQuery = useQuery(() => ({
- queryKey: ['webhook', params.organizationId, params.webhookId],
+ queryKey: ['organizations', params.organizationId, 'webhooks', params.webhookId],
queryFn: () =>
fetchWebhook({
organizationId: params.organizationId,
diff --git a/apps/papra-client/src/modules/webhooks/pages/webhooks.page.tsx b/apps/papra-client/src/modules/webhooks/pages/webhooks.page.tsx
index 042eba1c..d181fbfb 100644
--- a/apps/papra-client/src/modules/webhooks/pages/webhooks.page.tsx
+++ b/apps/papra-client/src/modules/webhooks/pages/webhooks.page.tsx
@@ -19,7 +19,9 @@ export const WebhookCard: Component<{ webhook: Webhook }> = (props) => {
const deleteWebhookMutation = useMutation(() => ({
mutationFn: deleteWebhook,
onSuccess: () => {
- void queryClient.invalidateQueries({ queryKey: ['webhooks', params.organizationId] });
+ void queryClient.invalidateQueries({
+ queryKey: ['organizations', params.organizationId, 'webhooks'],
+ });
createToast({
message: t('webhooks.delete.success'),
});
@@ -97,7 +99,7 @@ export const WebhooksPage: Component = () => {
const { t } = useI18n();
const params = useParams();
const query = useQuery(() => ({
- queryKey: ['webhooks', params.organizationId],
+ queryKey: ['organizations', params.organizationId, 'webhooks'],
queryFn: () => fetchWebhooks({ organizationId: params.organizationId }),
}));