fix: invalidate children key on reorder (#359)

* fix: invalidate children key on reorder
graasp · Jul 25, 2023 · 15005b9 · 15005b9
1 parent 375c0be
commit 15005b9
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 1 deletion.
diff --git a/src/mutations/item.test.ts b/src/mutations/item.test.ts
@@ -257,6 +257,47 @@ describe('Items Mutations', () => {
       expect(queryClient.getQueryState(parentKey)?.isInvalidated).toBeTruthy();
     });
 
+    it('Edit item extra children order invalidate children key', async () => {
+      // set default data
+      const editedItem = ITEMS.get(3)!;
+      const editedItemKey = buildItemKey(editedItem.id);
+      const editPayload = {
+        id: editedItem.id,
+        extra: { folder: { childrenOrder: [1, 2] } },
+      };
+      const childrenKey = buildItemChildrenKey(editedItem.id);
+      queryClient.setQueryData(childrenKey, List([ITEMS.get(1)!]));
+      queryClient.setQueryData(editedItemKey, editedItem);
+
+      const route = `/${buildEditItemRoute(editedItem.id)}`;
+      const response = item;
+      const endpoints = [
+        {
+          response,
+          method: HttpMethod.PATCH,
+          route,
+        },
+      ];
+
+      const mockedMutation = await mockMutation({
+        endpoints,
+        mutation,
+        wrapper,
+      });
+
+      await act(async () => {
+        await mockedMutation.mutate(editPayload);
+        await waitForMutation();
+      });
+
+      expect(
+        queryClient.getQueryState(editedItemKey)?.isInvalidated,
+      ).toBeTruthy();
+      expect(
+        queryClient.getQueryState(childrenKey)?.isInvalidated,
+      ).toBeTruthy();
+    });
+
     it('Unauthorized', async () => {
       const route = `/${buildEditItemRoute(item.id)}`;
       queryClient.setQueryData(itemKey, item);

diff --git a/src/mutations/item.ts b/src/mutations/item.ts
@@ -3,8 +3,10 @@ import { QueryClient, useMutation, useQueryClient } from 'react-query';
 
 import {
   DiscriminatedItem,
+  FolderItemExtra,
   Item,
   ItemSettings,
+  ItemType,
   MAX_TARGETS_FOR_MODIFY_REQUEST,
   ThumbnailSize,
   UUID,
@@ -231,7 +233,7 @@ export default (queryConfig: QueryClientConfig) => {
           queryClient.setQueryData(itemKey, context?.item);
           notifier?.({ type: editItemRoutine.FAILURE, payload: { error } });
         },
-        onSettled: (_newItem, _error, { id }, context) => {
+        onSettled: (_newItem, _error, { id, extra }, context) => {
           const prevItem = context?.item;
           if (prevItem) {
             const parentKey = getKeyForParentId(
@@ -240,6 +242,11 @@ export default (queryConfig: QueryClientConfig) => {
             queryClient.invalidateQueries(parentKey);
           }
 
+          // reorder affect children to change
+          if ((extra as FolderItemExtra)?.[ItemType.FOLDER]?.childrenOrder) {
+            queryClient.invalidateQueries(buildItemChildrenKey(id));
+          }
+
           const itemKey = buildItemKey(id);
           queryClient.invalidateQueries(itemKey);
         },