Merge branch 'develop' into feat.salesforce-auth

rudderlabs · Nov 7, 2023 · 61fc9fb · 61fc9fb
2 parents 73a92b1 + 5dcc9f2
commit 61fc9fb
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,22 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.49.0](https://github.com/rudderlabs/rudder-transformer/compare/v1.48.0...v1.49.0) (2023-11-06)
+
+
+### Features
+
+* add new destination tiktok_audience ([#2710](https://github.com/rudderlabs/rudder-transformer/issues/2710)) ([9bc0fd8](https://github.com/rudderlabs/rudder-transformer/commit/9bc0fd8efcee44871a190bd6cb9e89c5cf035ff8))
+* onboard one signal to router transform ([#2785](https://github.com/rudderlabs/rudder-transformer/issues/2785)) ([818858e](https://github.com/rudderlabs/rudder-transformer/commit/818858e046ce5f9735bbb97715c43a959ad3aa3c))
+* onboard revenuecat as a source ([#2774](https://github.com/rudderlabs/rudder-transformer/issues/2774)) ([55f9637](https://github.com/rudderlabs/rudder-transformer/commit/55f96374b4d73db7013c1d5e72bfc9c8257b224b))
+
+
+### Bug Fixes
+
+* add check to remove null and undefined properties before sending ([#2796](https://github.com/rudderlabs/rudder-transformer/issues/2796)) ([6e89cd3](https://github.com/rudderlabs/rudder-transformer/commit/6e89cd3f67ea887ba17c1cd5ffbca6675f54d96c))
+* allow support for full url from UI in freshsales and freshmarketer ([#2780](https://github.com/rudderlabs/rudder-transformer/issues/2780)) ([570532c](https://github.com/rudderlabs/rudder-transformer/commit/570532ce790c05a69621d9289758a1b1a7acda8c))
+* busgnag issues for klaviyo, freshsales, customeio  ([#2795](https://github.com/rudderlabs/rudder-transformer/issues/2795)) ([11fb7c4](https://github.com/rudderlabs/rudder-transformer/commit/11fb7c47910681833e37d25a1573d2005e62742b))
+
 ## [1.48.0](https://github.com/rudderlabs/rudder-transformer/compare/v1.47.0...v1.48.0) (2023-11-02)
 
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rudder-transformer",
-  "version": "1.48.0",
+  "version": "1.49.0",
   "description": "",
   "homepage": "https://github.com/rudderlabs/rudder-transformer#readme",
   "bugs": {

diff --git a/src/v0/destinations/am/transform.js b/src/v0/destinations/am/transform.js
@@ -196,7 +196,7 @@ const getScreenevTypeAndUpdatedProperties = (message, CATEGORY_KEY) => {
   const name = message.name || message.event || get(message, CATEGORY_KEY);
   const updatedName = name ? `${name} ` : '';
   return {
-    evType: `Viewed ${updatedName}Screen`,
+    eventType: `Viewed ${updatedName}Screen`,
     updatedProperties: {
       ...message.properties,
       name,
@@ -589,8 +589,7 @@ const processSingleMessage = (message, destination) => {
   // To be used for track/page calls to associate the event to a group in AM
   let groupInfo = get(message, 'integrations.Amplitude.groups') || undefined;
   let category = ConfigCategory.DEFAULT;
-  let { properties } = message;
-  const { name, event } = message;
+  const { name, event, properties } = message;
   const messageType = message.type.toLowerCase();
   const CATEGORY_KEY = 'properties.category';
   const { useUserDefinedPageEventName, userProvidedPageEventString } = destination.Config;
@@ -623,18 +622,21 @@ const processSingleMessage = (message, destination) => {
         evType = `Viewed ${updatedName || ''}Page`;
       }
       message.properties = {
-        ...message.properties,
+        ...properties,
         name: name || get(message, CATEGORY_KEY),
       };
       category = ConfigCategory.PAGE;
       break;
     case EventType.SCREEN:
-      ({ evType, updatedProperties: properties } = getScreenevTypeAndUpdatedProperties(
-        message,
-        CATEGORY_KEY,
-      ));
-      message.properties = properties;
-      category = ConfigCategory.SCREEN;
+      {
+        const { eventType, updatedProperties } = getScreenevTypeAndUpdatedProperties(
+          message,
+          CATEGORY_KEY,
+        );
+        evType = eventType;
+        message.properties = updatedProperties;
+        category = ConfigCategory.SCREEN;
+      }
       break;
     case EventType.GROUP:
       evType = 'group';
@@ -664,9 +666,9 @@ const processSingleMessage = (message, destination) => {
         throw new InstrumentationError('Event not present. Please send event field');
       }
       if (
-        message.properties &&
-        isDefinedAndNotNull(message.properties?.revenue) &&
-        isDefinedAndNotNull(message.properties?.revenue_type)
+        properties &&
+        isDefinedAndNotNull(properties?.revenue) &&
+        isDefinedAndNotNull(properties?.revenue_type)
       ) {
         // if properties has revenue and revenue_type fields
         // consider the event as revenue event directly