Merge pull request #5749 from Countly/SER-1897

[SER-1897] [FIX] Add option to select features to populate

Author: Cookiezaurs

frontend/express/public/core/onboarding/javascripts/countly.views.js

@@ -99,6 +99,7 @@
                 countlyPopulator.setStartTime(countlyCommon.periodObj.start / 1000);
                 countlyPopulator.setEndTime(countlyCommon.periodObj.end / 1000);
                 countlyPopulator.setSelectedTemplate(selectedAppTemplate);
+                countlyPopulator.setSelectedFeatures("all");
                 countlyPopulator.getTemplate(selectedAppTemplate, function(template) {
                     countlyPopulator.generateUsers(10, template);
                     self.populatorProgress = 0;

plugins/populator/frontend/public/javascripts/countly.models.js

@@ -1106,10 +1106,13 @@
                 if (template && template.events && template.events.length) {
                     events = events.concat(this.getEvent(null, template.events[0]));
                 }
-                req = {timestamp: this.ts, begin_session: 1, metrics: this.metrics, user_details: this.userdetails, events: events, apm: this.getTrace(), ignore_cooldown: '1'};
+                req = {timestamp: this.ts, begin_session: 1, metrics: this.metrics, user_details: this.userdetails, events: events, ignore_cooldown: '1'};
                 req.events = req.events.concat(this.getHeatmapEvents());
                 req.events = req.events.concat(this.getFeedbackEvents());
                 req.events = req.events.concat(this.getScrollmapEvents());
+                if (_featuresToPopulate.includes("performance-monitoring")) {
+                    req.apm = this.getTrace();
+                }
             }
             else {
                 events = this.getEvent("[CLY]_view", template && template.events && template.events["[CLY]_view"], this.ts, true)
@@ -1120,7 +1123,10 @@
                 if (template && template.events && template.events.length) {
                     events = events.concat(this.getEvent(null, template.events[0]));
                 }
-                req = {timestamp: this.ts, begin_session: 1, events: events, apm: this.getTrace(), ignore_cooldown: '1'};
+                req = {timestamp: this.ts, begin_session: 1, events: events, ignore_cooldown: '1'};
+                if (_featuresToPopulate.includes("performance-monitoring")) {
+                    req.apm = this.getTrace();
+                }
             }
 
             if (Math.random() > 0.10) {
@@ -1130,7 +1136,7 @@
                 req[this.platform.toLowerCase() + "_token"] = randomString(8);
             }
 
-            if (Math.random() > 0.50) {
+            if (Math.random() > 0.50 && _featuresToPopulate.includes("crashes")) {
                 req.crash = this.getCrash();
             }
 
@@ -1336,6 +1342,7 @@
     var abExampleCount = 1;
     var abExampleName = "Pricing";
     var _templateType = '';
+    var _allFeatures = ["ab-testing", "attribution", "cohorts", "crashes", "funnels", "performance-monitoring", "push", "star-rating", "surveys"];
     var _featuresToPopulate = [];
     var runCount = 0;
     var completedRequestCount = 0;
@@ -2518,7 +2525,7 @@
             }
         }
 
-        if (countlyGlobal.plugins.indexOf('crash_symbolication') !== -1 && countlyAuth.validateCreate('crash_symbolication') && _featuresToPopulate.includes("crash_symbolication")) {
+        if (countlyGlobal.plugins.indexOf('crash_symbolication') !== -1 && countlyAuth.validateCreate('crash_symbolication') && _featuresToPopulate.includes("crashes")) {
             const crashPlatforms = Object.keys(crashSymbolVersions).filter(key => crashSymbolVersions[key].length);
 
 
@@ -2592,7 +2599,7 @@
     };
 
     countlyPopulator.setSelectedFeatures = function(value) {
-        _featuresToPopulate = value;
+        _featuresToPopulate = (value === "all") ? _allFeatures : value;
     };
 
     countlyPopulator.getTemplate = function(templateId, callback) {

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

@@ -49,18 +49,23 @@
                 ];
             },
             availableFeatures: function() {
-                const plugins = [
+                var plugins = [
                     {value: "ab-testing", label: CV.i18n("ab-testing.title")},
                     {value: "attribution", label: CV.i18n("attribution.title")},
                     {value: "cohorts", label: CV.i18n("cohorts.cohorts")},
-                    {value: "crash_symbolication", label: CV.i18n("crash_symbolication.title")},
+                    {value: "crashes", label: CV.i18n(countlyGlobal.apps[countlyCommon.ACTIVE_APP_ID] && countlyGlobal.apps[countlyCommon.ACTIVE_APP_ID].type === "web" ? "web.crashes.title" : "crashes.title")},
                     {value: "funnels", label: CV.i18n("funnels.plugin-title")},
-                    {value: "push", label: CV.i18n("push-notification.title")},
+                    {value: "performance-monitoring", label: CV.i18n("performance-monitoring.title")},
                     {value: "star-rating", label: CV.i18n("star-rating.plugin-title")},
                     {value: "surveys", label: CV.i18n("surveys.plugin-title")},
                 ];
+                if (countlyGlobal.apps[countlyCommon.ACTIVE_APP_ID] && countlyGlobal.apps[countlyCommon.ACTIVE_APP_ID].type === "mobile") {
+                    plugins.push({value: "push", label: CV.i18n("push-notification.title")});
+                }
                 return plugins.filter(function(plugin) {
                     return CountlyHelpers.isPluginEnabled(plugin.value);
+                }).sort(function(a, b) {
+                    return a.label.localeCompare(b.label);
                 });
             }
         },