Merge branch 'next' into SER-1922-add-audit-logs-to-hook-create-edit-delete-actions

Author: ArtursKadikis

frontend/express/public/core/events/javascripts/countly.details.views.js

@@ -178,11 +178,8 @@
                     byVal: [],
                     executed: false
                 };
-                if (doc.selectedSegment !== "segment") {
-                    URLparams.dbFilter[`sg.${doc.selectedSegment}`] = { "$in": [] };
-                    if (doc.selectedSegmentValues.length > 0) {
-                        URLparams.dbFilter[`sg.${doc.selectedSegment}`].$in = doc.selectedSegmentValues;
-                    }
+                if (doc.selectedSegment !== "segment" && doc.selectedSegmentValues.length > 0) {
+                    URLparams.dbFilter[`sg.${doc.selectedSegment}`] = { "$in": doc.selectedSegmentValues };
                 }
                 //Go to drill page
                 app.navigate("#/drill/" + JSON.stringify(URLparams), true);

plugins/views/frontend/public/javascripts/countly.views.js

@@ -185,7 +185,15 @@
                     URLparams.dbFilter[`sg.name`] = { "$in": doc.selectedViews };
                 }
                 if (doc.selectedSegment !== "all" && doc.selectedSegmentValues.length > 0) {
-                    URLparams.dbFilter[`sg.${doc.selectedSegment}`] = { "$in": doc.selectedSegmentValues };
+                    if (doc.selectedSegment === "segment" || doc.selectedSegment === "platform") {
+                        URLparams.dbFilter.$or = [
+                            { "sg.platform": { "$in": doc.selectedSegmentValues } },
+                            { "sg.segment": { "$in": doc.selectedSegmentValues } }
+                        ];
+                    }
+                    else {
+                        URLparams.dbFilter[`sg.${doc.selectedSegment}`] = { "$in": doc.selectedSegmentValues };
+                    }
                 }
                 //Go to drill page
                 app.navigate("#/drill/" + JSON.stringify(URLparams), true);