Skip to content

Commit 1057f4e

Browse files
authored
Merge branch 'develop' into fix.amplitude.datacenter
2 parents 4bce567 + eaa68be commit 1057f4e

File tree

2 files changed

+4
-4
lines changed
  • src/v0/destinations/adobe_analytics
  • test/integrations/destinations/adobe_analytics/processor

2 files changed

+4
-4
lines changed

src/v0/destinations/adobe_analytics/transform.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ const processTrackEvent = (message, adobeEventName, destinationConfig, extras =
340340
return {
341341
...extras,
342342
events: overrideEventString || adobeEventArr.join(','),
343-
products: overrideProductString || prodString,
343+
products: overrideProductString || (Array.isArray(prodString) && prodString.length > 0 ? prodString : undefined),
344344
};
345345
};
346346

test/integrations/destinations/adobe_analytics/processor/data.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1412,7 +1412,7 @@ export const data = [
14121412
JSON_ARRAY: {},
14131413
XML: {
14141414
payload:
1415-
'<?xml version="1.0" encoding="utf-8"?><request><browserHeight>1794</browserHeight><browserWidth>1080</browserWidth><campaign>sales campaign</campaign><channel>web</channel><ipaddress>127.0.0.1</ipaddress><language>en-US</language><userAgent>Dalvik/2.1.0 (Linux; U; Android 9; Android SDK built for x86 Build/PSR1.180720.075)</userAgent><referrer>https://www.google.com/search?q=estore+bestseller</referrer><contextData><roott01>roottval001</roott01></contextData><eVar6>RudderLabs JavaScript SDK &lt;Custom&gt;</eVar6><eVar2>TEDxGROWTH&amp;MARKETING</eVar2><linkType>o</linkType><linkName>Watched Video</linkName><linkURL>https://www.estore.com/best-seller/1</linkURL><prop2>growth</prop2><timestamp>2020-01-09T10:01:53.558Z</timestamp><marketingcloudorgid>mktcloudid001</marketingcloudorgid><events>event1</events><products/><reportSuiteID>footlockerrudderstackpoc</reportSuiteID></request>',
1415+
'<?xml version="1.0" encoding="utf-8"?><request><browserHeight>1794</browserHeight><browserWidth>1080</browserWidth><campaign>sales campaign</campaign><channel>web</channel><ipaddress>127.0.0.1</ipaddress><language>en-US</language><userAgent>Dalvik/2.1.0 (Linux; U; Android 9; Android SDK built for x86 Build/PSR1.180720.075)</userAgent><referrer>https://www.google.com/search?q=estore+bestseller</referrer><contextData><roott01>roottval001</roott01></contextData><eVar6>RudderLabs JavaScript SDK &lt;Custom&gt;</eVar6><eVar2>TEDxGROWTH&amp;MARKETING</eVar2><linkType>o</linkType><linkName>Watched Video</linkName><linkURL>https://www.estore.com/best-seller/1</linkURL><prop2>growth</prop2><timestamp>2020-01-09T10:01:53.558Z</timestamp><marketingcloudorgid>mktcloudid001</marketingcloudorgid><events>event1</events><reportSuiteID>footlockerrudderstackpoc</reportSuiteID></request>',
14161416
},
14171417
FORM: {},
14181418
},
@@ -1582,7 +1582,7 @@ export const data = [
15821582
JSON_ARRAY: {},
15831583
XML: {
15841584
payload:
1585-
'<?xml version="1.0" encoding="utf-8"?><request><browserHeight>1794</browserHeight><browserWidth>1080</browserWidth><campaign>sales campaign</campaign><channel>web</channel><ipaddress>127.0.0.1</ipaddress><language>en-US</language><userAgent>Dalvik/2.1.0 (Linux; U; Android 9; Android SDK built for x86 Build/PSR1.180720.075)</userAgent><referrer>https://www.google.com/search?q=estore+bestseller</referrer><contextData><roott01>roottval001</roott01></contextData><eVar5>Kolkata</eVar5><eVar4>9935400932</eVar4><eVar6>RudderLabs JavaScript SDK</eVar6><linkType>o</linkType><linkName>page view</linkName><linkURL>https://www.estore.com/best-seller/1</linkURL><list1>r15,faze90R</list1><list2>ciaz,hummer,thar</list2><prop1>custompropval1</prop1><prop2>custompropval2</prop2><timestamp>2020-01-09T10:01:53.558Z</timestamp><marketingcloudorgid>mktcloudid001</marketingcloudorgid><events>event2</events><products/><reportSuiteID>footlockerrudderstackpoc</reportSuiteID></request>',
1585+
'<?xml version="1.0" encoding="utf-8"?><request><browserHeight>1794</browserHeight><browserWidth>1080</browserWidth><campaign>sales campaign</campaign><channel>web</channel><ipaddress>127.0.0.1</ipaddress><language>en-US</language><userAgent>Dalvik/2.1.0 (Linux; U; Android 9; Android SDK built for x86 Build/PSR1.180720.075)</userAgent><referrer>https://www.google.com/search?q=estore+bestseller</referrer><contextData><roott01>roottval001</roott01></contextData><eVar5>Kolkata</eVar5><eVar4>9935400932</eVar4><eVar6>RudderLabs JavaScript SDK</eVar6><linkType>o</linkType><linkName>page view</linkName><linkURL>https://www.estore.com/best-seller/1</linkURL><list1>r15,faze90R</list1><list2>ciaz,hummer,thar</list2><prop1>custompropval1</prop1><prop2>custompropval2</prop2><timestamp>2020-01-09T10:01:53.558Z</timestamp><marketingcloudorgid>mktcloudid001</marketingcloudorgid><events>event2</events><reportSuiteID>footlockerrudderstackpoc</reportSuiteID></request>',
15861586
},
15871587
FORM: {},
15881588
},
@@ -3044,7 +3044,7 @@ export const data = [
30443044
JSON_ARRAY: {},
30453045
XML: {
30463046
payload:
3047-
'<?xml version="1.0" encoding="utf-8"?><request><browserHeight>1794</browserHeight><browserWidth>1080</browserWidth><campaign>sales campaign</campaign><channel>web</channel><ipaddress>127.0.0.1</ipaddress><language>en-US</language><userAgent>Dalvik/2.1.0 (Linux; U; Android 9; Android SDK built for x86 Build/PSR1.180720.075)</userAgent><referrer>https://www.google.com/search?q=estore+bestseller</referrer><contextData><roott01>roottval001</roott01></contextData><eVar6>RudderLabs JavaScript SDK</eVar6><linkType>o</linkType><linkName>random unmapped event</linkName><linkURL>https://www.estore.com/best-seller/1</linkURL><timestamp>2020-01-09T10:01:53.558Z</timestamp><marketingcloudorgid>mktcloudid001</marketingcloudorgid><events>override event</events><products/><reportSuiteID>footlockerrudderstackpoc</reportSuiteID></request>',
3047+
'<?xml version="1.0" encoding="utf-8"?><request><browserHeight>1794</browserHeight><browserWidth>1080</browserWidth><campaign>sales campaign</campaign><channel>web</channel><ipaddress>127.0.0.1</ipaddress><language>en-US</language><userAgent>Dalvik/2.1.0 (Linux; U; Android 9; Android SDK built for x86 Build/PSR1.180720.075)</userAgent><referrer>https://www.google.com/search?q=estore+bestseller</referrer><contextData><roott01>roottval001</roott01></contextData><eVar6>RudderLabs JavaScript SDK</eVar6><linkType>o</linkType><linkName>random unmapped event</linkName><linkURL>https://www.estore.com/best-seller/1</linkURL><timestamp>2020-01-09T10:01:53.558Z</timestamp><marketingcloudorgid>mktcloudid001</marketingcloudorgid><events>override event</events><reportSuiteID>footlockerrudderstackpoc</reportSuiteID></request>',
30483048
},
30493049
FORM: {},
30503050
},

0 commit comments

Comments
 (0)