Merge branch 'flex' into release.24.12

Author: frknbasaran

frontend/express/app.js

@@ -6,6 +6,22 @@
 // Set process name
 process.title = "countly: dashboard node " + process.argv[1];
 
+var fs = require('fs');
+var path = require('path');
+var IS_FLEX = false;
+
+if (fs.existsSync(path.resolve('/opt/deployment_env.json'))) {
+    var deploymentConf = fs.readFileSync('/opt/deployment_env.json', 'utf8');
+    try {
+        if (JSON.parse(deploymentConf).DEPLOYMENT_ID) {
+            IS_FLEX = true;
+        }
+    }
+    catch (e) {
+        IS_FLEX = false;
+    }
+}
+
 var versionInfo = require('./version.info'),
     pack = require('../../package.json'),
     COUNTLY_VERSION = versionInfo.version,
@@ -27,8 +43,6 @@ var versionInfo = require('./version.info'),
         }
     }),
     crypto = require('crypto'),
-    fs = require('fs'),
-    path = require('path'),
     jimp = require('jimp'),
     flash = require('connect-flash'),
     cookieParser = require('cookie-parser'),
@@ -66,7 +80,13 @@ var COUNTLY_NAMED_TYPE = "Countly Lite v" + COUNTLY_VERSION;
 var COUNTLY_TYPE_CE = true;
 var COUNTLY_TRIAL = (versionInfo.trial) ? true : false;
 var COUNTLY_TRACK_TYPE = "OSS";
-if (versionInfo.footer) {
+
+if (IS_FLEX) {
+    COUNTLY_NAMED_TYPE = "Countly v" + COUNTLY_VERSION;
+    COUNTLY_TYPE_CE = false;
+    COUNTLY_TRACK_TYPE = "Flex";
+}
+else if (versionInfo.footer) {
     COUNTLY_NAMED_TYPE = versionInfo.footer;
     COUNTLY_TYPE_CE = false;
     if (COUNTLY_NAMED_TYPE === "Countly Cloud") {
@@ -907,8 +927,9 @@ Promise.all([plugins.dbConnection(countlyConfig), plugins.dbConnection("countly_
             countly_tracking = plugins.isPluginEnabled('tracker') ? true : plugins.getConfig('frontend').countly_tracking,
             countly_domain = plugins.getConfig('api').domain,
             licenseNotification, licenseError;
+        var isLocked = false;
         configs.export_limit = plugins.getConfig("api").export_limit;
-        app.loadThemeFiles(configs.theme, function(theme) {
+        app.loadThemeFiles(configs.theme, async function(theme) {
             if (configs._user.theme) {
                 res.cookie("theme", configs.theme);
             }
@@ -922,6 +943,13 @@ Promise.all([plugins.dbConnection(countlyConfig), plugins.dbConnection("countly_
             if (member.upgrade) {
                 countlyDb.collection('members').update({"_id": member._id}, {$unset: {upgrade: ""}}, function() {});
             }
+            if (IS_FLEX) {
+                let locked = await countlyDb.collection('mycountly').findOne({_id: 'lockServer'});
+                if (locked?.isLocked === true) {
+                    isLocked = true;
+                }
+
+            }
 
             if (req.session.licenseError) {
                 licenseError = req.session.licenseError;
@@ -989,6 +1017,8 @@ Promise.all([plugins.dbConnection(countlyConfig), plugins.dbConnection("countly_
                         helpCenterLink: COUNTLY_HELPCENTER_LINK,
                         featureRequestLink: COUNTLY_FEATUREREQUEST_LINK,
                     },
+                    mycountly: IS_FLEX,
+                    isLocked: isLocked,
                 };
 
 

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

@@ -37,7 +37,7 @@
                 types: Object.keys(app.appTypes),
                 appTemplates: appTemplates,
                 populatorProgress: 0,
-                populatorMaxTime: 60,
+                populatorMaxTime: 30,
                 isPopulatorFinished: false,
                 isCountlyEE: countlyGlobal.plugins.includes('drill'),
                 selectedAppTemplate: null,

plugins/pluginManager.js

@@ -155,7 +155,7 @@ var pluginManager = function pluginManager() {
             }
             db.collection('plugins').updateOne({'_id': 'plugins'}, {'$set': fordb}, function(err1) {
                 if (err1) {
-                    log.e(err1);
+                    console.error(err1);
                 }
                 else {
                     self.dispatch("/systemlogs", {params: params, action: "change_plugins", data: {before: before, update: params.qstring.plugin}});
@@ -826,6 +826,10 @@ var pluginManager = function pluginManager() {
         return used;
     };
 
+    this.returnEventsCopy = function() {
+        return JSON.parse(JSON.stringify(events));
+    };
+
     /**
     * Dispatch specific event on api side and wait until all event handlers have processed the event (legacy)
     * @param {string} event - event to dispatch

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

@@ -145,8 +145,8 @@
 
                 countlyPlugins.toggle(plugins, function(res) {
                     if (res.result === "started") {
-                        //self.showPluginProcessMessage(jQuery.i18n.map["plugins.processing"], jQuery.i18n.map["plugins.will-restart"], jQuery.i18n.map["plugins.please-wait"], 5000, true, 'warning', false);
-                        //self.checkProcess();
+                    //self.showPluginProcessMessage(jQuery.i18n.map["plugins.processing"], jQuery.i18n.map["plugins.will-restart"], jQuery.i18n.map["plugins.please-wait"], 5000, true, 'warning', false);
+                    //self.checkProcess();
                         self.showPluginProcessMessage(jQuery.i18n.map["plugins.success"], jQuery.i18n.map["plugins.applying"], jQuery.i18n.map["plugins.finish"], 3000, false, 'green', true);
                     }
                     else {
@@ -327,7 +327,7 @@
                         self.removeNonGlobalConfigs(self.configsData);
                     }
                     catch (error) {
-                        // eslint-disable-next-line no-console
+                    // eslint-disable-next-line no-console
                         console.error(error);
                         self.configsData = {};
                     }
@@ -463,7 +463,7 @@
                 this.configsData[config][key] = value;
                 //when user disables country data tracking while city data tracking is enabled
                 if (key === "country_data" && value === false && this.configsData[config].city_data === true) {
-                    //disable city data tracking 
+                //disable city data tracking 
                     this.configsData[config].city_data = false;
                     //if city data tracking was originally enabled, note the change
                     index = this.diff.indexOf("city_data");
@@ -479,7 +479,7 @@
                 }
                 //when user enables city data tracking while country data tracking is disabled
                 if (key === "city_data" && value === true && this.configsData[config].country_data === false) {
-                    //enable country data tracking
+                //enable country data tracking
                     this.configsData[config].country_data = true;
                     //if country data tracking was originally disabled, note the change
                     index = this.diff.indexOf("country_data");
@@ -540,7 +540,7 @@
                 var plugs = countlyGlobal.apps[countlyCommon.ACTIVE_APP_ID].plugins;
                 //check if value can be overwritten on user level
                 if (configsData[ns]._user && configsData[ns]._user[id]) {
-                    //check if value is overwritten on user level
+                //check if value is overwritten on user level
                     var sets = countlyGlobal.member.settings;
                     if (sets && sets[ns] && typeof sets[ns][id] !== "undefined") {
                         return {label: jQuery.i18n.map["configs.overwritten.user"], href: "#/account-settings"};
@@ -642,7 +642,7 @@
                                             let label = self.getLabelName(item, config) || "";
                                             let helper = self.getHelperLabel(item, config) || "";
                                             return label.toLowerCase().includes(self.searchQuery)
-                                        || helper.toLowerCase().includes(self.searchQuery);
+                                    || helper.toLowerCase().includes(self.searchQuery);
                                         });
                                         if (list.length > 0) {
                                             let tmp = group;
@@ -678,7 +678,7 @@
             },
             clearSearch: function() {
                 this.searchQuery = "";
-                //this.searchResultStructure = {};
+            //this.searchResultStructure = {};
             }
         }
     });
@@ -1322,7 +1322,9 @@
     });
 
     if (countlyAuth.validateGlobalAdmin()) {
-        app.addMenu("management", {code: "plugins", pluginName: "plugins", url: "#/manage/plugins", text: "plugins.title", icon: '<div class="logo-icon fa fa-puzzle-piece"></div>', priority: 80});
+        if (!countlyGlobal.mycountly && countlyGlobal.plugins.indexOf('my-countly') === -1) {
+            app.addMenu("management", {code: "plugins", pluginName: "plugins", url: "#/manage/plugins", text: "plugins.title", icon: '<div class="logo-icon fa fa-puzzle-piece"></div>', priority: 80});
+        }
     }
     if (countlyAuth.validateGlobalAdmin()) {
         app.addMenu("management", {code: "configurations", pluginName: "plugins", url: "#/manage/configurations", text: "plugins.configs", icon: '<div class="logo-icon ion-android-options"></div>', priority: 30});
@@ -1332,7 +1334,7 @@
         if (!isCurrentHostnameIP && !isGlobalDomainHasValue) {
             countlyPlugins.updateConfigs({"api": {"domain": window.location.protocol + "//" + window.location.hostname}}, function(err) {
                 if (err) {
-                // throw err
+                    // throw err
                 }
             });
         }