Skip to content

Commit dc94a84

Browse files
authored
Merge pull request #4018 from Cookiezaurs/master-bugfix
[views]Prevent errors on empty segmentation values in views [SER-590]
2 parents d8d81e4 + a4b38d1 commit dc94a84

File tree

1 file changed

+18
-13
lines changed

1 file changed

+18
-13
lines changed

plugins/views/api/api.js

+18-13
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const escapedViewSegments = { "name": true, "segment": true, "height": true, "wi
2020

2121
plugins.setConfigs("views", {
2222
view_limit: 50000,
23-
view_name_limit: 100,
23+
view_name_limit: 128,
2424
segment_value_limit: 10,
2525
segment_limit: 100
2626
});
@@ -1868,24 +1868,29 @@ const escapedViewSegments = { "name": true, "segment": true, "height": true, "wi
18681868
if (forbiddenSegValues.indexOf(tmpSegVal) !== -1) {
18691869
tmpSegVal = "[CLY]" + tmpSegVal;
18701870
}
1871-
currEvent.segmentation[segKey] = tmpSegVal;
18721871

1873-
if (viewInfo.segments[segKey]) {
1874-
if (viewInfo.segments[segKey][tmpSegVal]) {
1875-
segmentList.push(segKey);
1876-
}
1877-
else {
1878-
if (Object.keys(viewInfo.segments[segKey]).length >= plugins.getConfig("views").segment_value_limit) {
1879-
delete currEvent.segmentation[segKey];
1872+
if (tmpSegVal) {
1873+
currEvent.segmentation[segKey] = tmpSegVal;
1874+
if (viewInfo.segments[segKey]) {
1875+
if (viewInfo.segments[segKey][tmpSegVal]) {
1876+
segmentList.push(segKey);
18801877
}
18811878
else {
1882-
viewInfo.segments[segKey][segKey] = true;
1883-
segmentList.push(segKey);
1884-
addToSetRules["segments." + segKey + "." + tmpSegVal] = true;
1885-
save_structure = true;
1879+
if (Object.keys(viewInfo.segments[segKey]).length >= plugins.getConfig("views").segment_value_limit) {
1880+
delete currEvent.segmentation[segKey];
1881+
}
1882+
else {
1883+
viewInfo.segments[segKey][segKey] = true;
1884+
segmentList.push(segKey);
1885+
addToSetRules["segments." + segKey + "." + tmpSegVal] = true;
1886+
save_structure = true;
1887+
}
18861888
}
18871889
}
18881890
}
1891+
else {
1892+
delete currEvent.segmentation[segKey];
1893+
}
18891894
}
18901895
}
18911896
}

0 commit comments

Comments
 (0)