Merge pull request #20 from stape-io/filter-override-values

filter override values
stape-io · Apr 17, 2024 · 80e343f · 80e343f
2 parents f815e10 + d1d6762
commit 80e343f
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 6 deletions.
diff --git a/metadata.yaml b/metadata.yaml
@@ -1,5 +1,7 @@
 homepage: "https://stape.io/"
 versions:
+  - sha: 8349b1683ead309df1c9472d01a29a801ff3dd85
+    changeNotes: Added filter for override values.
   - sha: 7f38905d9da155cd8e125bfcf3f4d0228cbf97b2
     changeNotes: Consent settings section.
   - sha: 0d86e9a4a5fc5add1109cf5b1a8b9f020a862dcf

diff --git a/template.js b/template.js
@@ -247,7 +247,9 @@ function addPropertiesData(eventData, mappedData) {
 
   if (data.customDataList) {
     data.customDataList.forEach((d) => {
-      mappedData.properties[d.name] = d.value;
+      if (isValidValue(d.value)) {
+        mappedData.properties[d.name] = d.value;
+      }
     });
   }
 
@@ -316,7 +318,9 @@ function addUserData(eventData, mappedData, eventSource) {
 
   if (data.userDataList) {
     data.userDataList.forEach((d) => {
-      mappedData.user[d.name] = d.value;
+      if (isValidValue(d.value)) {
+        mappedData.user[d.name] = d.value;
+      }
     });
   }
 
@@ -456,7 +460,9 @@ function addAppData(mappedData, eventData) {
 
   if (data.adDataList) {
     data.adDataList.forEach((d) => {
-      mappedData.ad[d.name] = d.value;
+      if (isValidValue(d.value)) {
+        mappedData.ad[d.name] = d.value;
+      }
     });
   }
 
@@ -481,3 +487,8 @@ function isConsentGivenOrNotRequired() {
   const xGaGcs = eventData['x-ga-gcs'] || ''; // x-ga-gcs is a string like "G110"
   return xGaGcs[2] === '1';
 }
+
+function isValidValue(value) {
+  const valueType = getType(value);
+  return valueType !== 'null' && valueType !== 'undefined' && value !== '';
+}
diff --git a/template.tpl b/template.tpl
@@ -838,7 +838,9 @@ function addPropertiesData(eventData, mappedData) {
 
   if (data.customDataList) {
     data.customDataList.forEach((d) => {
-      mappedData.properties[d.name] = d.value;
+      if (isValidValue(d.value)) {
+        mappedData.properties[d.name] = d.value;
+      }
     });
   }
 
@@ -907,7 +909,9 @@ function addUserData(eventData, mappedData, eventSource) {
 
   if (data.userDataList) {
     data.userDataList.forEach((d) => {
-      mappedData.user[d.name] = d.value;
+      if (isValidValue(d.value)) {
+        mappedData.user[d.name] = d.value;
+      }
     });
   }
 
@@ -1047,7 +1051,9 @@ function addAppData(mappedData, eventData) {
 
   if (data.adDataList) {
     data.adDataList.forEach((d) => {
-      mappedData.ad[d.name] = d.value;
+      if (isValidValue(d.value)) {
+        mappedData.ad[d.name] = d.value;
+      }
     });
   }
 
@@ -1073,6 +1079,11 @@ function isConsentGivenOrNotRequired() {
   return xGaGcs[2] === '1';
 }
 
+function isValidValue(value) {
+  const valueType = getType(value);
+  return valueType !== 'null' && valueType !== 'undefined' && value !== '';
+}
+
 
 ___SERVER_PERMISSIONS___