B: Fix cache invalidation logic

This commit is contained in:
Ivan 2025-08-08 11:26:04 +03:00
parent 48c1c61647
commit 7ec53509b1
22 changed files with 27 additions and 76 deletions

View File

@ -4,17 +4,14 @@ import { KEYS } from '@/backend/configuration';
import { libraryApi } from './api';
import { type ICreateVersionDTO } from './types';
import { useUpdateTimestamp } from './use-update-timestamp';
export const useCreateVersion = () => {
const client = useQueryClient();
const { updateTimestamp } = useUpdateTimestamp();
const mutation = useMutation({
mutationKey: [KEYS.global_mutation, libraryApi.baseKey, 'create-version'],
mutationFn: libraryApi.createVersion,
onSuccess: data => {
client.setQueryData(KEYS.composite.rsItem({ itemID: data.schema.id }), data.schema);
updateTimestamp(data.schema.id);
},
onError: () => client.invalidateQueries()
});

View File

@ -9,11 +9,11 @@ export function useUpdateTimestamp() {
const client = useQueryClient();
const libraryKey = useLibraryListKey();
return {
updateTimestamp: (target: number, timestamp?: string) =>
updateTimestamp: (target: number, timestamp: string) =>
client.setQueryData(
libraryKey, //
(prev: RO<ILibraryItem[]> | undefined) =>
prev?.map(item => (item.id === target ? { ...item, time_update: timestamp ?? Date() } : item))
prev?.map(item => (item.id === target ? { ...item, time_update: timestamp } : item))
)
};
}

View File

@ -1,7 +1,5 @@
import { useMutation, useQueryClient } from '@tanstack/react-query';
import { useUpdateTimestamp } from '@/features/library/backend/use-update-timestamp';
import { KEYS } from '@/backend/configuration';
import { ossApi } from './api';
@ -9,13 +7,12 @@ import { type ICloneSchemaDTO } from './types';
export const useCloneSchema = () => {
const client = useQueryClient();
const { updateTimestamp } = useUpdateTimestamp();
const mutation = useMutation({
mutationKey: [KEYS.global_mutation, ossApi.baseKey, 'clone-schema'],
mutationFn: ossApi.cloneSchema,
onSuccess: data => {
updateTimestamp(data.oss.id, data.oss.time_update);
onSuccess: async data => {
client.setQueryData(ossApi.getOssQueryOptions({ itemID: data.oss.id }).queryKey, data.oss);
await client.invalidateQueries({ queryKey: KEYS.composite.libraryList });
},
onError: () => client.invalidateQueries()
});

View File

@ -1,7 +1,5 @@
import { useMutation, useQueryClient } from '@tanstack/react-query';
import { useUpdateTimestamp } from '@/features/library/backend/use-update-timestamp';
import { KEYS } from '@/backend/configuration';
import { ossApi } from './api';
@ -9,12 +7,10 @@ import { type ITargetOperation } from './types';
export const useCreateInput = () => {
const client = useQueryClient();
const { updateTimestamp } = useUpdateTimestamp();
const mutation = useMutation({
mutationKey: [KEYS.global_mutation, ossApi.baseKey, 'create-input'],
mutationFn: ossApi.createInput,
onSuccess: async data => {
updateTimestamp(data.oss.id, data.oss.time_update);
client.setQueryData(ossApi.getOssQueryOptions({ itemID: data.oss.id }).queryKey, data.oss);
await Promise.allSettled([
client.invalidateQueries({ queryKey: KEYS.composite.libraryList }),

View File

@ -1,7 +1,5 @@
import { useMutation, useQueryClient } from '@tanstack/react-query';
import { useUpdateTimestamp } from '@/features/library/backend/use-update-timestamp';
import { KEYS } from '@/backend/configuration';
import { ossApi } from './api';
@ -9,13 +7,12 @@ import { type ICreateSchemaDTO } from './types';
export const useCreateSchema = () => {
const client = useQueryClient();
const { updateTimestamp } = useUpdateTimestamp();
const mutation = useMutation({
mutationKey: [KEYS.global_mutation, ossApi.baseKey, 'create-schema'],
mutationFn: ossApi.createSchema,
onSuccess: data => {
updateTimestamp(data.oss.id, data.oss.time_update);
onSuccess: async data => {
client.setQueryData(ossApi.getOssQueryOptions({ itemID: data.oss.id }).queryKey, data.oss);
await client.invalidateQueries({ queryKey: KEYS.composite.libraryList });
},
onError: () => client.invalidateQueries()
});

View File

@ -1,7 +1,5 @@
import { useMutation, useQueryClient } from '@tanstack/react-query';
import { useUpdateTimestamp } from '@/features/library/backend/use-update-timestamp';
import { KEYS } from '@/backend/configuration';
import { ossApi } from './api';
@ -9,13 +7,12 @@ import { type ICreateSynthesisDTO } from './types';
export const useCreateSynthesis = () => {
const client = useQueryClient();
const { updateTimestamp } = useUpdateTimestamp();
const mutation = useMutation({
mutationKey: [KEYS.global_mutation, ossApi.baseKey, 'create-synthesis'],
mutationFn: ossApi.createSynthesis,
onSuccess: data => {
updateTimestamp(data.oss.id, data.oss.time_update);
onSuccess: async data => {
client.setQueryData(ossApi.getOssQueryOptions({ itemID: data.oss.id }).queryKey, data.oss);
await client.invalidateQueries({ queryKey: KEYS.composite.libraryList });
},
onError: () => client.invalidateQueries()
});

View File

@ -21,10 +21,6 @@ export const useDeleteBlock = () => {
}
updateTimestamp(data.id, data.time_update);
client.setQueryData(ossApi.getOssQueryOptions({ itemID: data.id }).queryKey, data);
await Promise.allSettled([
client.invalidateQueries({ queryKey: KEYS.composite.libraryList }),
client.invalidateQueries({ queryKey: [KEYS.rsform] })
]);
},
onError: () => client.invalidateQueries()
});

View File

@ -1,7 +1,5 @@
import { useMutation, useQueryClient } from '@tanstack/react-query';
import { useUpdateTimestamp } from '@/features/library/backend/use-update-timestamp';
import { KEYS } from '@/backend/configuration';
import { PARAMETER } from '@/utils/constants';
@ -10,7 +8,6 @@ import { type IDeleteOperationDTO } from './types';
export const useDeleteOperation = () => {
const client = useQueryClient();
const { updateTimestamp } = useUpdateTimestamp();
const mutation = useMutation({
mutationKey: [KEYS.global_mutation, ossApi.baseKey, 'delete-operation'],
mutationFn: ossApi.deleteOperation,
@ -19,7 +16,6 @@ export const useDeleteOperation = () => {
variables.beforeUpdate();
await new Promise(resolve => setTimeout(resolve, PARAMETER.minimalTimeout));
}
updateTimestamp(data.id, data.time_update);
client.setQueryData(ossApi.getOssQueryOptions({ itemID: data.id }).queryKey, data);
await Promise.allSettled([
client.invalidateQueries({ queryKey: KEYS.composite.libraryList }),

View File

@ -1,7 +1,5 @@
import { useMutation, useQueryClient } from '@tanstack/react-query';
import { useUpdateTimestamp } from '@/features/library/backend/use-update-timestamp';
import { KEYS } from '@/backend/configuration';
import { PARAMETER } from '@/utils/constants';
@ -10,7 +8,6 @@ import { type IDeleteReplicaDTO } from './types';
export const useDeleteReplica = () => {
const client = useQueryClient();
const { updateTimestamp } = useUpdateTimestamp();
const mutation = useMutation({
mutationKey: [KEYS.global_mutation, ossApi.baseKey, 'delete-replica'],
mutationFn: ossApi.deleteReplica,
@ -19,7 +16,6 @@ export const useDeleteReplica = () => {
variables.beforeUpdate();
await new Promise(resolve => setTimeout(resolve, PARAMETER.minimalTimeout));
}
updateTimestamp(data.id, data.time_update);
client.setQueryData(ossApi.getOssQueryOptions({ itemID: data.id }).queryKey, data);
await Promise.allSettled([
client.invalidateQueries({ queryKey: KEYS.composite.libraryList }),

View File

@ -1,7 +1,5 @@
import { useMutation, useQueryClient } from '@tanstack/react-query';
import { useUpdateTimestamp } from '@/features/library/backend/use-update-timestamp';
import { KEYS } from '@/backend/configuration';
import { ossApi } from './api';
@ -9,12 +7,10 @@ import { type ITargetOperation } from './types';
export const useExecuteOperation = () => {
const client = useQueryClient();
const { updateTimestamp } = useUpdateTimestamp();
const mutation = useMutation({
mutationKey: [KEYS.global_mutation, ossApi.baseKey, 'execute-operation'],
mutationFn: ossApi.executeOperation,
onSuccess: async data => {
updateTimestamp(data.id, data.time_update);
client.setQueryData(ossApi.getOssQueryOptions({ itemID: data.id }).queryKey, data);
await Promise.allSettled([
client.invalidateQueries({ queryKey: KEYS.composite.libraryList }),

View File

@ -1,7 +1,5 @@
import { useMutation, useQueryClient } from '@tanstack/react-query';
import { useUpdateTimestamp } from '@/features/library/backend/use-update-timestamp';
import { KEYS } from '@/backend/configuration';
import { ossApi } from './api';
@ -9,13 +7,12 @@ import { type IImportSchemaDTO } from './types';
export const useImportSchema = () => {
const client = useQueryClient();
const { updateTimestamp } = useUpdateTimestamp();
const mutation = useMutation({
mutationKey: [KEYS.global_mutation, ossApi.baseKey, 'import-schema'],
mutationFn: ossApi.importSchema,
onSuccess: data => {
updateTimestamp(data.oss.id, data.oss.time_update);
onSuccess: async data => {
client.setQueryData(ossApi.getOssQueryOptions({ itemID: data.oss.id }).queryKey, data.oss);
await client.invalidateQueries({ queryKey: KEYS.composite.libraryList });
},
onError: () => client.invalidateQueries()
});

View File

@ -13,13 +13,9 @@ export const useMoveItems = () => {
const mutation = useMutation({
mutationKey: [KEYS.global_mutation, ossApi.baseKey, 'move-items'],
mutationFn: ossApi.moveItems,
onSuccess: async data => {
onSuccess: data => {
updateTimestamp(data.id, data.time_update);
client.setQueryData(ossApi.getOssQueryOptions({ itemID: data.id }).queryKey, data);
await Promise.allSettled([
client.invalidateQueries({ queryKey: KEYS.composite.libraryList }),
client.invalidateQueries({ queryKey: [KEYS.rsform] })
]);
},
onError: () => client.invalidateQueries()
});

View File

@ -1,7 +1,5 @@
import { useMutation, useQueryClient } from '@tanstack/react-query';
import { useUpdateTimestamp } from '@/features/library/backend/use-update-timestamp';
import { KEYS } from '@/backend/configuration';
import { ossApi } from './api';
@ -9,12 +7,10 @@ import { type IUpdateInputDTO } from './types';
export const useUpdateInput = () => {
const client = useQueryClient();
const { updateTimestamp } = useUpdateTimestamp();
const mutation = useMutation({
mutationKey: [KEYS.global_mutation, ossApi.baseKey, 'update-input'],
mutationFn: ossApi.updateInput,
onSuccess: async data => {
updateTimestamp(data.id, data.time_update);
client.setQueryData(ossApi.getOssQueryOptions({ itemID: data.id }).queryKey, data);
await Promise.allSettled([
client.invalidateQueries({ queryKey: KEYS.composite.libraryList }),

View File

@ -14,7 +14,7 @@ export const useUpdateOperation = () => {
const mutation = useMutation({
mutationKey: [KEYS.global_mutation, ossApi.baseKey, 'update-operation'],
mutationFn: ossApi.updateOperation,
onSuccess: (data, variables) => {
onSuccess: async (data, variables) => {
updateTimestamp(data.id, data.time_update);
client.setQueryData(KEYS.composite.ossItem({ itemID: data.id }), data);
const schemaID = data.operations.find(item => item.id === variables.data.target)?.result;
@ -28,7 +28,7 @@ export const useUpdateOperation = () => {
item.id === schemaID ? { ...item, ...variables.data.item_data, time_update: Date() } : item
)
);
return client.invalidateQueries({
await client.invalidateQueries({
queryKey: KEYS.composite.rsItem({ itemID: schemaID })
});
},

View File

@ -16,13 +16,10 @@ export const useCreateConstituenta = () => {
onSuccess: async data => {
updateTimestamp(data.schema.id, data.schema.time_update);
client.setQueryData(rsformsApi.getRSFormQueryOptions({ itemID: data.schema.id }).queryKey, data.schema);
await Promise.allSettled([
client.invalidateQueries({ queryKey: [KEYS.oss] }),
client.invalidateQueries({
queryKey: [rsformsApi.baseKey],
predicate: query => query.queryKey.length > 2 && query.queryKey[2] !== String(data.schema.id)
})
]);
await client.invalidateQueries({
queryKey: [rsformsApi.baseKey],
predicate: query => query.queryKey.length > 2 && query.queryKey[2] !== String(data.schema.id)
});
},
onError: () => client.invalidateQueries()
});

View File

@ -17,7 +17,7 @@ export const useDeleteConstituents = () => {
updateTimestamp(data.id, data.time_update);
client.setQueryData(rsformsApi.getRSFormQueryOptions({ itemID: data.id }).queryKey, data);
await Promise.allSettled([
client.invalidateQueries({ queryKey: [KEYS.oss] }),
client.invalidateQueries({ queryKey: [KEYS.oss] }), // substitutions might have changed
client.invalidateQueries({
queryKey: [rsformsApi.baseKey],
predicate: query => query.queryKey.length > 2 && query.queryKey[2] !== String(data.id)

View File

@ -17,7 +17,7 @@ export const useInlineSynthesis = () => {
updateTimestamp(data.id, data.time_update);
client.setQueryData(rsformsApi.getRSFormQueryOptions({ itemID: data.id }).queryKey, data);
await Promise.allSettled([
client.invalidateQueries({ queryKey: [KEYS.oss] }),
client.invalidateQueries({ queryKey: [KEYS.oss] }), // substitutions might have changed
client.invalidateQueries({
queryKey: [rsformsApi.baseKey],
predicate: query => query.queryKey.length > 2 && query.queryKey[2] !== String(data.id)

View File

@ -15,13 +15,10 @@ export const useProduceStructure = () => {
onSuccess: async data => {
updateTimestamp(data.schema.id, data.schema.time_update);
client.setQueryData(rsformsApi.getRSFormQueryOptions({ itemID: data.schema.id }).queryKey, data.schema);
await Promise.allSettled([
client.invalidateQueries({ queryKey: [KEYS.oss] }),
client.invalidateQueries({
queryKey: [rsformsApi.baseKey],
predicate: query => query.queryKey.length > 2 && query.queryKey[2] !== String(data.schema.id)
})
]);
await client.invalidateQueries({
queryKey: [rsformsApi.baseKey],
predicate: query => query.queryKey.length > 2 && query.queryKey[2] !== String(data.schema.id)
});
},
onError: () => client.invalidateQueries()
});

View File

@ -16,7 +16,7 @@ export const useResetAliases = () => {
updateTimestamp(data.id, data.time_update);
client.setQueryData(rsformsApi.getRSFormQueryOptions({ itemID: data.id }).queryKey, data);
await Promise.allSettled([
client.invalidateQueries({ queryKey: [KEYS.oss] }),
client.invalidateQueries({ queryKey: [KEYS.oss] }), // substitutions might have changed
client.invalidateQueries({
queryKey: [rsformsApi.baseKey],
predicate: query => query.queryKey.length > 2 && query.queryKey[2] !== String(data.id)

View File

@ -17,7 +17,7 @@ export const useSubstituteConstituents = () => {
updateTimestamp(data.id, data.time_update);
client.setQueryData(rsformsApi.getRSFormQueryOptions({ itemID: data.id }).queryKey, data);
await Promise.allSettled([
client.invalidateQueries({ queryKey: [KEYS.oss] }),
client.invalidateQueries({ queryKey: [KEYS.oss] }), // substitutions might have changed
client.invalidateQueries({
queryKey: [rsformsApi.baseKey],
predicate: query => query.queryKey.length > 2 && query.queryKey[2] !== String(data.id)

View File

@ -17,7 +17,7 @@ export const useUpdateConstituenta = () => {
updateTimestamp(data.id, data.time_update);
client.setQueryData(rsformsApi.getRSFormQueryOptions({ itemID: data.id }).queryKey, data);
await Promise.allSettled([
client.invalidateQueries({ queryKey: [KEYS.oss] }),
client.invalidateQueries({ queryKey: [KEYS.oss] }), // substitutions might have changed
client.invalidateQueries({
queryKey: [rsformsApi.baseKey],
predicate: query => query.queryKey.length > 2 && query.queryKey[2] !== String(data.id)

View File

@ -19,7 +19,7 @@ export const useUploadTRS = () => {
);
await Promise.allSettled([
client.invalidateQueries({ queryKey: [KEYS.oss] }),
client.invalidateQueries({ queryKey: [KEYS.oss] }), // substitutions might have changed
client.invalidateQueries({
queryKey: [rsformsApi.baseKey],
predicate: query => query.queryKey.length > 2 && query.queryKey[2] !== String(data.id)