fix(utils): rid redundant data at formatDataForMutations

8base · Aug 17, 2021 · 1e6b60b · 1e6b60b
1 parent 6188332
commit 1e6b60b
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 14 deletions.
diff --git a/packages/core/utils/src/formatters/formatDataForMutation.ts b/packages/core/utils/src/formatters/formatDataForMutation.ts
@@ -131,6 +131,14 @@ const formatDataForMutation = (
         formatedFieldData = mutate(formatedFieldData, data[fieldName], fieldSchema);
       }
 
+      if (typeof formatedFieldData === 'string' && formatedFieldData === initialFieldData) {
+        return result;
+      }
+
+      if (Array.isArray(formatedFieldData) && R.equals(formatedFieldData, initialFieldData)) {
+        return result;
+      }
+
       return {
         ...result,
         [fieldName]: formatedFieldData,

diff --git a/packages/core/utils/src/formatters/formatFieldDataList.ts b/packages/core/utils/src/formatters/formatFieldDataList.ts
@@ -63,6 +63,7 @@ export const formatFieldDataList = (
           fieldSchema,
           schema,
           initialData: item.initialData,
+          initialListData: initialData,
         },
         options,
       ),

diff --git a/packages/core/utils/src/formatters/formatFieldDataListItem.ts b/packages/core/utils/src/formatters/formatFieldDataListItem.ts
@@ -11,12 +11,13 @@ interface IFormatFieldDataListItemMeta {
   fieldSchema: FieldSchema;
   schema: Schema;
   initialData?: any;
+  initialListData?: any;
 }
 
 export const formatFieldDataListItem = (
   type: MutationType,
   data: any,
-  { fieldSchema, schema, initialData }: IFormatFieldDataListItemMeta,
+  { fieldSchema, schema, initialData, initialListData }: IFormatFieldDataListItemMeta,
   options?: FormatDataForMutationOptions,
 ) => {
   let nextData = data;
@@ -40,6 +41,10 @@ export const formatFieldDataListItem = (
   }
 
   if (typeof nextData === 'string') {
+    if (Array.isArray(initialListData) && initialListData.includes(nextData)) {
+      return null;
+    }
+
     return {
       data: { id: nextData },
       type: 'connect',

diff --git a/packages/core/utils/test/__tests__/__snapshots__/formatDataForMutation.test.ts.snap b/packages/core/utils/test/__tests__/__snapshots__/formatDataForMutation.test.ts.snap
@@ -63,9 +63,7 @@ Object {
     "update": Array [
       Object {
         "data": Object {
-          "fileId": "file-id",
           "filename": "Screenshot at авг. 13 15-22-49.png",
-          "id": "1234",
         },
         "filter": Object {
           "id": "1234",
@@ -128,7 +126,6 @@ Object {
       },
       Object {
         "data": Object {
-          "id": "relation-list-1",
           "nestedRelation": Object {
             "create": Object {
               "scalar": "New Nested Relation Scalar Value",
@@ -155,7 +152,6 @@ Object {
       },
       Object {
         "data": Object {
-          "id": "relation-list-2",
           "nestedRelation": Object {
             "update": Object {
               "scalar": null,
@@ -165,7 +161,6 @@ Object {
             "update": Array [
               Object {
                 "data": Object {
-                  "id": "nested-relation-2-2",
                   "scalar": "Relation List Nested Relation List Scalar Value",
                   "scalarList": Array [
                     "Relation List Nested Relation List Scalar List Value",

diff --git a/packages/core/utils/test/__tests__/formatDataForMutation.test.ts b/packages/core/utils/test/__tests__/formatDataForMutation.test.ts
@@ -576,7 +576,7 @@ describe('As developer, I can format for update mutation,', () => {
     const data = {
       relation: {
         id: 'id',
-        scalar: 'Relation Scalar Value',
+        scalar: 'New Relation Scalar Value',
         scalarList: ['Relation Scalar List Value'],
       },
     };
@@ -601,7 +601,9 @@ describe('As developer, I can format for update mutation,', () => {
       formatDataForMutation(MUTATION_TYPE.UPDATE, data, { tableName: 'tableSchema', schema: SCHEMA, initialData }),
     ).toEqual({
       relation: {
-        update: R.dissoc('id', data.relation),
+        update: {
+          scalar: data.relation.scalar,
+        },
       },
     });
   });
@@ -715,7 +717,6 @@ describe('As developer, I can format for update mutation,', () => {
       formatDataForMutation(MUTATION_TYPE.UPDATE, data, { tableName: 'tableSchema', schema: SCHEMA, initialData }),
     ).toEqual({
       relationList: {
-        connect: [{ id: '5b32159b66a450c047285628' }],
         disconnect: [{ id: '5b32159b66a450fae928562a' }],
       },
     });
@@ -749,8 +750,8 @@ describe('As developer, I can format for update mutation,', () => {
         'inline-relation-01',
         {
           id: 'update-relation-01',
-          scalar: 'Update relation scalar value',
-          scalarList: ['Update relation scalar list value'],
+          scalar: 'New Update relation scalar value',
+          scalarList: ['Update relation scalar list value', 'New Update relation scalar list value'],
         },
         {
           scalar: 'New relation scalar value',
@@ -777,6 +778,41 @@ describe('As developer, I can format for update mutation,', () => {
       ],
     };
 
+    const expectedRelationListWithoutDisconnectWithInitial = {
+      connect: [
+        {
+          id: 'inline-relation-01',
+        },
+      ],
+      update: [
+        {
+          data: {
+            scalar: 'New Update relation scalar value',
+            scalarList: ['Update relation scalar list value', 'New Update relation scalar list value'],
+          },
+          filter: {
+            id: 'update-relation-01',
+          },
+        },
+        // TODO: For now, it will update despite there no such id in `initialData`.
+        // We probably should connect instead of update in that case.
+        {
+          data: {
+            id: 'connect-relation-01',
+          },
+          filter: {
+            id: 'connect-relation-01',
+          },
+        },
+      ],
+      create: [
+        {
+          scalar: 'New relation scalar value',
+          scalarList: ['New relation scalar list value'],
+        },
+      ],
+    };
+
     const expectedRelationListWithoutDisconnect = {
       connect: [
         {
@@ -787,8 +823,8 @@ describe('As developer, I can format for update mutation,', () => {
         {
           data: {
             id: 'update-relation-01',
-            scalar: 'Update relation scalar value',
-            scalarList: ['Update relation scalar list value'],
+            scalar: 'New Update relation scalar value',
+            scalarList: ['Update relation scalar list value', 'New Update relation scalar list value'],
           },
           filter: {
             id: 'update-relation-01',
@@ -821,7 +857,7 @@ describe('As developer, I can format for update mutation,', () => {
       }),
     ).toEqual({
       relationList: {
-        ...expectedRelationListWithoutDisconnect,
+        ...expectedRelationListWithoutDisconnectWithInitial,
         disconnect: [{ id: 'removed-relation-01' }],
       },
     });