Skip to content

Commit 33472aa

Browse files
markus-azermarkus-azer
authored
Merge branch 'master' into sync-action-for-assets
2 parents accd905 + 6be808c commit 33472aa

File tree

11 files changed

+99
-28
lines changed

11 files changed

+99
-28
lines changed

‎.nvmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
12.19.1
1+
12.20.1

‎CHANGELOG.md‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,63 @@
1+
## @commercetools/sync-actions@4.9.1 (2021-03-09)
2+
3+
#### :bug: Bug Fix
4+
5+
- `sync-actions`
6+
- [#1662](https://github.com/commercetools/nodejs/pull/1662) fix(sync-actions): changing order of actions ([@danrleyt](https://github.com/danrleyt))
7+
8+
#### Committers: 2
9+
10+
- Dan Teixeira ([@danrleyt](https://github.com/danrleyt))
11+
- vineet kumar ([@VineetKumarKushwaha](https://github.com/VineetKumarKushwaha))
12+
13+
## @commercetools/state-importer@3.0.33 (2021-03-09)
14+
15+
#### :bug: Bug Fix
16+
17+
- `sync-actions`
18+
- [#1662](https://github.com/commercetools/nodejs/pull/1662) fix(sync-actions): changing order of actions ([@danrleyt](https://github.com/danrleyt))
19+
20+
#### Committers: 2
21+
22+
- Dan Teixeira ([@danrleyt](https://github.com/danrleyt))
23+
- vineet kumar ([@VineetKumarKushwaha](https://github.com/VineetKumarKushwaha))
24+
25+
## @commercetools/integration-tests@0.1.11 (2021-03-09)
26+
27+
#### :bug: Bug Fix
28+
29+
- `sync-actions`
30+
- [#1662](https://github.com/commercetools/nodejs/pull/1662) fix(sync-actions): changing order of actions ([@danrleyt](https://github.com/danrleyt))
31+
32+
#### Committers: 2
33+
34+
- Dan Teixeira ([@danrleyt](https://github.com/danrleyt))
35+
- vineet kumar ([@VineetKumarKushwaha](https://github.com/VineetKumarKushwaha))
36+
37+
## @commercetools/discount-code-importer@3.0.32 (2021-03-09)
38+
39+
#### :bug: Bug Fix
40+
41+
- `sync-actions`
42+
- [#1662](https://github.com/commercetools/nodejs/pull/1662) fix(sync-actions): changing order of actions ([@danrleyt](https://github.com/danrleyt))
43+
44+
#### Committers: 2
45+
46+
- Dan Teixeira ([@danrleyt](https://github.com/danrleyt))
47+
- vineet kumar ([@VineetKumarKushwaha](https://github.com/VineetKumarKushwaha))
48+
49+
## @commercetools/custom-objects-importer@3.0.33 (2021-03-09)
50+
51+
#### :bug: Bug Fix
52+
53+
- `sync-actions`
54+
- [#1662](https://github.com/commercetools/nodejs/pull/1662) fix(sync-actions): changing order of actions ([@danrleyt](https://github.com/danrleyt))
55+
56+
#### Committers: 2
57+
58+
- Dan Teixeira ([@danrleyt](https://github.com/danrleyt))
59+
- vineet kumar ([@VineetKumarKushwaha](https://github.com/VineetKumarKushwaha))
60+
161
## @commercetools/state-importer@3.0.32 (2021-03-02)
262

363
#### :bug: Bug Fix

‎integration-tests/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"private": true,
33
"name": "@commercetools/integration-tests",
4-
"version": "0.1.10",
4+
"version": "0.1.11",
55
"dependencies": {
66
"@commercetools/api-request-builder": "^5.6.3",
77
"@commercetools/category-exporter": "^3.0.21",
@@ -10,11 +10,11 @@
1010
"@commercetools/csv-parser-price": "^4.0.22",
1111
"@commercetools/csv-parser-state": "^3.0.20",
1212
"@commercetools/custom-objects-exporter": "^3.0.21",
13-
"@commercetools/custom-objects-importer": "^3.0.32",
13+
"@commercetools/custom-objects-importer": "^3.0.33",
1414
"@commercetools/customer-groups-exporter": "^3.0.21",
1515
"@commercetools/discount-code-exporter": "^4.0.21",
1616
"@commercetools/discount-code-generator": "^2.0.9",
17-
"@commercetools/discount-code-importer": "^3.0.31",
17+
"@commercetools/discount-code-importer": "^3.0.32",
1818
"@commercetools/get-credentials": "^3.0.17",
1919
"@commercetools/http-user-agent": "2.x",
2020
"@commercetools/inventories-exporter": "^3.0.22",
@@ -31,8 +31,8 @@
3131
"@commercetools/sdk-middleware-logger": "2.x",
3232
"@commercetools/sdk-middleware-queue": "^2.1.4",
3333
"@commercetools/sdk-middleware-user-agent": "^2.1.5",
34-
"@commercetools/state-importer": "^3.0.32",
35-
"@commercetools/sync-actions": "^4.9.0",
34+
"@commercetools/state-importer": "^3.0.33",
35+
"@commercetools/sync-actions": "^4.9.1",
3636
"@commercetools/typescript-sdk": "^0.0.16",
3737
"bluebird": "^3.5.3",
3838
"common-tags": "^1.8.0",

‎packages/custom-objects-importer/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"access": "public"
55
},
66
"name": "@commercetools/custom-objects-importer",
7-
"version": "3.0.32",
7+
"version": "3.0.33",
88
"description": "Import custom objects to the commercetools platform",
99
"main": "lib/main.js",
1010
"scripts": {
@@ -37,7 +37,7 @@
3737
"@commercetools/sdk-middleware-auth": "^5.1.6",
3838
"@commercetools/sdk-middleware-http": "^6.0.10",
3939
"@commercetools/sdk-middleware-user-agent": "^2.1.5",
40-
"@commercetools/sync-actions": "^4.9.0",
40+
"@commercetools/sync-actions": "^4.9.1",
4141
"common-tags": "^1.8.0",
4242
"lodash.compact": "^3.0.1",
4343
"lodash.isequal": "^4.5.0",

‎packages/discount-code-importer/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"access": "public"
55
},
66
"name": "@commercetools/discount-code-importer",
7-
"version": "3.0.31",
7+
"version": "3.0.32",
88
"description": "Import discount codes to the commercetools platform.",
99
"keywords": [
1010
"commercetools",
@@ -39,7 +39,7 @@
3939
"@commercetools/sdk-middleware-http": "^6.0.10",
4040
"@commercetools/sdk-middleware-queue": "^2.1.4",
4141
"@commercetools/sdk-middleware-user-agent": "^2.1.5",
42-
"@commercetools/sync-actions": "^4.9.0",
42+
"@commercetools/sync-actions": "^4.9.1",
4343
"lodash": "^4.17.11",
4444
"node-fetch": "^2.3.0",
4545
"npmlog": "^4.1.2"

‎packages/state-importer/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"access": "public"
55
},
66
"name": "@commercetools/state-importer",
7-
"version": "3.0.32",
7+
"version": "3.0.33",
88
"description": "Import states to the commercetools platform",
99
"main": "lib/main.js",
1010
"files": [
@@ -39,7 +39,7 @@
3939
"@commercetools/sdk-middleware-auth": "^5.1.6",
4040
"@commercetools/sdk-middleware-http": "^6.0.10",
4141
"@commercetools/sdk-middleware-user-agent": "^2.1.5",
42-
"@commercetools/sync-actions": "^4.9.0",
42+
"@commercetools/sync-actions": "^4.9.1",
4343
"node-fetch": "^2.3.0"
4444
},
4545
"devDependencies": {

‎packages/sync-actions/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"access": "public"
55
},
66
"name": "@commercetools/sync-actions",
7-
"version": "4.9.0",
7+
"version": "4.9.1",
88
"description": "Build API update actions for the commercetools platform.",
99
"keywords": [
1010
"commercetools",

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -488,18 +488,23 @@ export function actionsMapMeta(diff, oldObj, newObj) {
488488
})
489489
}
490490

491-
export function actionsMapVariants(diff, oldObj, newObj) {
491+
export function actionsMapAddVariants(diff, oldObj, newObj) {
492492
const handler = createBuildArrayActions('variants', {
493493
[ADD_ACTIONS]: (newObject) => ({
494494
...newObject,
495495
action: 'addVariant',
496496
}),
497+
})
498+
return handler(diff, oldObj, newObj)
499+
}
500+
501+
export function actionsMapRemoveVariants(diff, oldObj, newObj) {
502+
const handler = createBuildArrayActions('variants', {
497503
[REMOVE_ACTIONS]: ({ id }) => ({
498504
action: 'removeVariant',
499505
id,
500506
}),
501507
})
502-
503508
return handler(diff, oldObj, newObj)
504509
}
505510

‎packages/sync-actions/src/products.js‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,15 @@ function createProductMapActions(
6565

6666
allActions.push(
6767
mapActionGroup('variants', (): Array<UpdateAction> =>
68-
productActions.actionsMapVariants(diff, oldObj, newObj)
68+
productActions.actionsMapAddVariants(diff, oldObj, newObj)
69+
)
70+
)
71+
72+
allActions.push(productActions.actionsMapMasterVariant(oldObj, newObj))
73+
74+
allActions.push(
75+
mapActionGroup('variants', (): Array<UpdateAction> =>
76+
productActions.actionsMapRemoveVariants(diff, oldObj, newObj)
6977
)
7078
)
7179

@@ -87,8 +95,6 @@ function createProductMapActions(
8795
)
8896
)
8997

90-
allActions.push(productActions.actionsMapMasterVariant(oldObj, newObj))
91-
9298
allActions.push(
9399
mapActionGroup('images', (): Array<UpdateAction> =>
94100
productActions.actionsMapImages(diff, oldObj, newObj, variantHashMap)

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -304,14 +304,14 @@ describe('Actions', () => {
304304
}
305305
const actions = productsSync.buildActions(now, before)
306306
expect(actions).toEqual([
307-
{
308-
action: 'removeVariant',
309-
id: 10,
310-
},
311307
{
312308
action: 'changeMasterVariant',
313309
variantId: 1,
314310
},
311+
{
312+
action: 'removeVariant',
313+
id: 10,
314+
},
315315
{
316316
action: 'moveImageToPosition',
317317
variantId: 1,
@@ -454,14 +454,14 @@ describe('Actions', () => {
454454

455455
const actions = productsSync.buildActions(now, before)
456456
expect(actions).toEqual([
457-
{
458-
action: 'removeVariant',
459-
id: 10,
460-
},
461457
{
462458
action: 'changeMasterVariant',
463459
variantId: 1,
464460
},
461+
{
462+
action: 'removeVariant',
463+
id: 10,
464+
},
465465
{
466466
action: 'removeImage',
467467
imageUrl:

0 commit comments

Comments
 (0)