[views]Prevent errors on empty segmentation values in views [SER-590]

Cookiezaurs · Cookiezaurs · commit a4b38d1e83d9 · 2023-03-07T10:54:51.000+02:00
diff --git a/plugins/views/api/api.js b/plugins/views/api/api.js
@@ -1868,24 +1868,29 @@ const escapedViewSegments = { "name": true, "segment": true, "height": true, "wi
                     if (forbiddenSegValues.indexOf(tmpSegVal) !== -1) {
                         tmpSegVal = "[CLY]" + tmpSegVal;
                     }
-                    currEvent.segmentation[segKey] = tmpSegVal;
 
-                    if (viewInfo.segments[segKey]) {
-                        if (viewInfo.segments[segKey][tmpSegVal]) {
-                            segmentList.push(segKey);
-                        }
-                        else {
-                            if (Object.keys(viewInfo.segments[segKey]).length >= plugins.getConfig("views").segment_value_limit) {
-                                delete currEvent.segmentation[segKey];
+                    if (tmpSegVal) {
+                        currEvent.segmentation[segKey] = tmpSegVal;
+                        if (viewInfo.segments[segKey]) {
+                            if (viewInfo.segments[segKey][tmpSegVal]) {
+                                segmentList.push(segKey);
                             }
                             else {
-                                viewInfo.segments[segKey][segKey] = true;
-                                segmentList.push(segKey);
-                                addToSetRules["segments." + segKey + "." + tmpSegVal] = true;
-                                save_structure = true;
+                                if (Object.keys(viewInfo.segments[segKey]).length >= plugins.getConfig("views").segment_value_limit) {
+                                    delete currEvent.segmentation[segKey];
+                                }
+                                else {
+                                    viewInfo.segments[segKey][segKey] = true;
+                                    segmentList.push(segKey);
+                                    addToSetRules["segments." + segKey + "." + tmpSegVal] = true;
+                                    save_structure = true;
+                                }
                             }
                         }
                     }
+                    else {
+                        delete currEvent.segmentation[segKey];
+                    }
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -1868,24 +1868,29 @@ const escapedViewSegments = { "name": true, "segment": true, "height": true, "wi`
`1868`	`1868`	`if (forbiddenSegValues.indexOf(tmpSegVal) !== -1) {`
`1869`	`1869`	`tmpSegVal = "[CLY]" + tmpSegVal;`
`1870`	`1870`	`}`
`1871`		`- currEvent.segmentation[segKey] = tmpSegVal;`
`1872`	`1871`
`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);`
`1880`	`1877`	`}`
`1881`	`1878`	`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`	`+ }`
`1886`	`1888`	`}`
`1887`	`1889`	`}`
`1888`	`1890`	`}`
	`1891`	`+ else {`
	`1892`	`+ delete currEvent.segmentation[segKey];`
	`1893`	`+ }`
`1889`	`1894`	`}`
`1890`	`1895`	`}`
`1891`	`1896`	`}`