fix(sync-actions): changing order of actions (#1662)

Author: danrleyt

packages/sync-actions/src/product-actions.js

@@ -437,18 +437,23 @@ export function actionsMapMeta(diff, oldObj, newObj) {
   })
 }
 
-export function actionsMapVariants(diff, oldObj, newObj) {
+export function actionsMapAddVariants(diff, oldObj, newObj) {
   const handler = createBuildArrayActions('variants', {
     [ADD_ACTIONS]: (newObject) => ({
       ...newObject,
       action: 'addVariant',
     }),
+  })
+  return handler(diff, oldObj, newObj)
+}
+
+export function actionsMapRemoveVariants(diff, oldObj, newObj) {
+  const handler = createBuildArrayActions('variants', {
     [REMOVE_ACTIONS]: ({ id }) => ({
       action: 'removeVariant',
       id,
     }),
   })
-
   return handler(diff, oldObj, newObj)
 }
 

packages/sync-actions/src/products.js

@@ -65,7 +65,15 @@ function createProductMapActions(
 
     allActions.push(
       mapActionGroup('variants', (): Array<UpdateAction> =>
-        productActions.actionsMapVariants(diff, oldObj, newObj)
+        productActions.actionsMapAddVariants(diff, oldObj, newObj)
+      )
+    )
+
+    allActions.push(productActions.actionsMapMasterVariant(oldObj, newObj))
+
+    allActions.push(
+      mapActionGroup('variants', (): Array<UpdateAction> =>
+        productActions.actionsMapRemoveVariants(diff, oldObj, newObj)
       )
     )
 
@@ -87,8 +95,6 @@ function createProductMapActions(
       )
     )
 
-    allActions.push(productActions.actionsMapMasterVariant(oldObj, newObj))
-
     allActions.push(
       mapActionGroup('images', (): Array<UpdateAction> =>
         productActions.actionsMapImages(diff, oldObj, newObj, variantHashMap)

packages/sync-actions/test/product-sync-images.spec.js

@@ -304,14 +304,14 @@ describe('Actions', () => {
       }
       const actions = productsSync.buildActions(now, before)
       expect(actions).toEqual([
-        {
-          action: 'removeVariant',
-          id: 10,
-        },
         {
           action: 'changeMasterVariant',
           variantId: 1,
         },
+        {
+          action: 'removeVariant',
+          id: 10,
+        },
         {
           action: 'moveImageToPosition',
           variantId: 1,
@@ -454,14 +454,14 @@ describe('Actions', () => {
 
       const actions = productsSync.buildActions(now, before)
       expect(actions).toEqual([
-        {
-          action: 'removeVariant',
-          id: 10,
-        },
         {
           action: 'changeMasterVariant',
           variantId: 1,
         },
+        {
+          action: 'removeVariant',
+          id: 10,
+        },
         {
           action: 'removeImage',
           imageUrl:

packages/sync-actions/test/product-sync-variants.spec.js

@@ -269,8 +269,8 @@ describe('Actions', () => {
     const actions = productsSync.buildActions(now, before)
 
     expect(actions).toEqual([
-      { action: 'removeVariant', id: 3 },
       { action: 'addVariant', ...newVariant },
+      { action: 'removeVariant', id: 3 },
     ])
   })
 
@@ -524,14 +524,14 @@ describe('Actions', () => {
           const actions = productsSync.buildActions(now, before)
 
           expect(actions).toEqual([
-            { action: 'removeVariant', id: 1 },
             {
               action: 'addVariant',
               attributes: [{ name: 'foo', value: 'bar' }],
               id: 2,
               sku: 'v1',
             },
             { action: 'changeMasterVariant', variantId: 2 },
+            { action: 'removeVariant', id: 1 },
           ])
         })
       })