B: Fix cache invalidation logic

rsconcept/frontend/src/features/library/backend/use-create-version.ts

@@ -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()
   });

rsconcept/frontend/src/features/library/backend/use-update-timestamp.ts

@@ -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))
       )
   };
 }

rsconcept/frontend/src/features/oss/backend/use-clone-schema.ts

@@ -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 => {
+    onSuccess: async data => {
-      updateTimestamp(data.oss.id, data.oss.time_update);
       client.setQueryData(ossApi.getOssQueryOptions({ itemID: data.oss.id }).queryKey, data.oss);
+      await client.invalidateQueries({ queryKey: KEYS.composite.libraryList });
     },
     onError: () => client.invalidateQueries()
   });

rsconcept/frontend/src/features/oss/backend/use-create-input.ts

@@ -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 }),

rsconcept/frontend/src/features/oss/backend/use-create-schema.ts

@@ -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 => {
+    onSuccess: async data => {
-      updateTimestamp(data.oss.id, data.oss.time_update);
       client.setQueryData(ossApi.getOssQueryOptions({ itemID: data.oss.id }).queryKey, data.oss);
+      await client.invalidateQueries({ queryKey: KEYS.composite.libraryList });
     },
     onError: () => client.invalidateQueries()
   });

rsconcept/frontend/src/features/oss/backend/use-create-synthesis.ts

@@ -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 => {
+    onSuccess: async data => {
-      updateTimestamp(data.oss.id, data.oss.time_update);
       client.setQueryData(ossApi.getOssQueryOptions({ itemID: data.oss.id }).queryKey, data.oss);
+      await client.invalidateQueries({ queryKey: KEYS.composite.libraryList });
     },
     onError: () => client.invalidateQueries()
   });

rsconcept/frontend/src/features/oss/backend/use-delete-block.ts

@@ -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()
   });

rsconcept/frontend/src/features/oss/backend/use-delete-operation.ts

@@ -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 }),

rsconcept/frontend/src/features/oss/backend/use-delete-replica.ts

@@ -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 }),

rsconcept/frontend/src/features/oss/backend/use-execute-operation.ts

@@ -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 }),

rsconcept/frontend/src/features/oss/backend/use-import-schema.ts

@@ -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 => {
+    onSuccess: async data => {
-      updateTimestamp(data.oss.id, data.oss.time_update);
       client.setQueryData(ossApi.getOssQueryOptions({ itemID: data.oss.id }).queryKey, data.oss);
+      await client.invalidateQueries({ queryKey: KEYS.composite.libraryList });
     },
     onError: () => client.invalidateQueries()
   });

rsconcept/frontend/src/features/oss/backend/use-move-items.ts

@@ -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()
   });

rsconcept/frontend/src/features/oss/backend/use-update-input.ts

@@ -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 }),

rsconcept/frontend/src/features/oss/backend/use-update-operation.ts

@@ -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 })
       });
     },

rsconcept/frontend/src/features/rsform/backend/use-create-constituenta.ts

@@ -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([
+      await client.invalidateQueries({
-        client.invalidateQueries({ queryKey: [KEYS.oss] }),
+        queryKey: [rsformsApi.baseKey],
-        client.invalidateQueries({
+        predicate: query => query.queryKey.length > 2 && query.queryKey[2] !== String(data.schema.id)
-          queryKey: [rsformsApi.baseKey],
+      });
-          predicate: query => query.queryKey.length > 2 && query.queryKey[2] !== String(data.schema.id)
-        })
-      ]);
     },
     onError: () => client.invalidateQueries()
   });

rsconcept/frontend/src/features/rsform/backend/use-delete-constituents.ts

@@ -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)

rsconcept/frontend/src/features/rsform/backend/use-inline-synthesis.ts

@@ -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)

rsconcept/frontend/src/features/rsform/backend/use-produce-structure.ts

@@ -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([
+      await client.invalidateQueries({
-        client.invalidateQueries({ queryKey: [KEYS.oss] }),
+        queryKey: [rsformsApi.baseKey],
-        client.invalidateQueries({
+        predicate: query => query.queryKey.length > 2 && query.queryKey[2] !== String(data.schema.id)
-          queryKey: [rsformsApi.baseKey],
+      });
-          predicate: query => query.queryKey.length > 2 && query.queryKey[2] !== String(data.schema.id)
-        })
-      ]);
     },
     onError: () => client.invalidateQueries()
   });

rsconcept/frontend/src/features/rsform/backend/use-reset-aliases.ts

@@ -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)

rsconcept/frontend/src/features/rsform/backend/use-substitute-constituents.ts

@@ -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)

rsconcept/frontend/src/features/rsform/backend/use-update-constituenta.ts

@@ -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)

rsconcept/frontend/src/features/rsform/backend/use-upload-trs.ts

@@ -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)