From a5e7d806df998e7e6c05f21f89c9525066ccd2ef Mon Sep 17 00:00:00 2001 From: Kanwar Ujjaval Singh <4216199+kanwarujjaval@users.noreply.github.com> Date: Tue, 21 Mar 2023 11:57:48 +0000 Subject: [PATCH 01/21] give event manifest to mycountly --- plugins/pluginManager.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins/pluginManager.js b/plugins/pluginManager.js index e7ea179198d..59e4b46e676 100644 --- a/plugins/pluginManager.js +++ b/plugins/pluginManager.js @@ -686,6 +686,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 From e8495b4a5216777ce5ce892bbe0c4b29e370098e Mon Sep 17 00:00:00 2001 From: Kanwar Ujjaval Singh <4216199+kanwarujjaval@users.noreply.github.com> Date: Thu, 23 Mar 2023 20:41:15 +0000 Subject: [PATCH 02/21] add check for mycountly in countlyGloba --- frontend/express/app.js | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/frontend/express/app.js b/frontend/express/app.js index 96ec2fd7733..ef8b7c6c9c0 100644 --- a/frontend/express/app.js +++ b/frontend/express/app.js @@ -866,7 +866,7 @@ Promise.all([plugins.dbConnection(countlyConfig), plugins.dbConnection("countly_ **/ function renderDashboard(req, res, next, member, adminOfApps, userOfApps, countlyGlobalApps, countlyGlobalAdminApps) { var configs = plugins.getConfig("frontend", member.settings), - licenseNotification, licenseError; + licenseNotification, licenseError, isMyCountly = false; configs.export_limit = plugins.getConfig("api").export_limit; app.loadThemeFiles(configs.theme, function(theme) { if (configs._user.theme) { @@ -895,6 +895,18 @@ Promise.all([plugins.dbConnection(countlyConfig), plugins.dbConnection("countly_ } } + if (fs.existsSync(path.resolve('/opt/deployment_env.json'))) { + const deploymentConf = fs.readFileSync('/opt/deployment_env.json', 'utf8'); + try { + if (JSON.parse(deploymentConf).DEPLOYMENT_ID) { + isMyCountly = true; + } + } + catch (e) { + isMyCountly = false; + } + } + member._id += ""; delete member.password; @@ -940,7 +952,8 @@ Promise.all([plugins.dbConnection(countlyConfig), plugins.dbConnection("countly_ documentationLink: COUNTLY_DOCUMENTATION_LINK, helpCenterLink: COUNTLY_HELPCENTER_LINK, featureRequestLink: COUNTLY_FEATUREREQUEST_LINK, - } + }, + mycountly: isMyCountly, }; var toDashboard = { From 067ab71085557b675f5d48cea9b9c273088bd136 Mon Sep 17 00:00:00 2001 From: Kanwar Ujjaval Singh <4216199+kanwarujjaval@users.noreply.github.com> Date: Thu, 23 Mar 2023 20:54:54 +0000 Subject: [PATCH 03/21] hide features in mycly --- .../public/javascripts/countly.views.js | 2234 +++++++++-------- 1 file changed, 1118 insertions(+), 1116 deletions(-) diff --git a/plugins/plugins/frontend/public/javascripts/countly.views.js b/plugins/plugins/frontend/public/javascripts/countly.views.js index 8a7aeded973..f9056e00467 100644 --- a/plugins/plugins/frontend/public/javascripts/countly.views.js +++ b/plugins/plugins/frontend/public/javascripts/countly.views.js @@ -1,1300 +1,1302 @@ /*global countlyAuth, _,$,countlyPlugins,jQuery,countlyGlobal,app,countlyCommon,CountlyHelpers,countlyVue,CV */ -(function() { - var PluginsView = countlyVue.views.create({ - template: CV.T('/plugins/templates/plugins.html'), - data: function() { - return { - scope: {}, - highlightedRows: {}, - curRow: {}, - curDependents: [], - components: {}, - defaultSort: {prop: 1, order: "asc"}, - loading: false, - tryCount: 0, - pluginsData: [], - localTableTrackedFields: ['enabled'], - filterValue: "all", - changes: {}, - dialog: {type: "", showDialog: false, saveButtonLabel: "", cancelButtonLabel: "", title: "", text: ""} - }; - }, - beforeCreate: function() { - var self = this; - return $.when(countlyPlugins.initialize()).then( - function() { - try { - self.pluginsData = JSON.parse(JSON.stringify(countlyPlugins.getData())); - } - catch (ex) { - self.pluginsData = []; - } - for (var i = 0; i < self.pluginsData.length; i++) { - self.formatRow(self.pluginsData[i]); - } - } - ); - }, - mounted: function() { - this.loadComponents(); - }, - methods: { - refresh: function() { +if (!countlyGlobal.mycountly && countlyGlobal.plugins.indexOf('my-countly') === -1) { + (function() { + var PluginsView = countlyVue.views.create({ + template: CV.T('/plugins/templates/plugins.html'), + data: function() { + return { + scope: {}, + highlightedRows: {}, + curRow: {}, + curDependents: [], + components: {}, + defaultSort: {prop: 1, order: "asc"}, + loading: false, + tryCount: 0, + pluginsData: [], + localTableTrackedFields: ['enabled'], + filterValue: "all", + changes: {}, + dialog: {type: "", showDialog: false, saveButtonLabel: "", cancelButtonLabel: "", title: "", text: ""} + }; + }, + beforeCreate: function() { var self = this; return $.when(countlyPlugins.initialize()).then( function() { try { - var plugins = JSON.parse(JSON.stringify(countlyPlugins.getData())); - self.pluginsData = plugins.filter(function(row) { - self.formatRow(row); - if (self.filterValue === "enabled") { - return row.enabled; - } - else if (self.filterValue === "disabled") { - return !row.enabled; - } - return true; - }); + self.pluginsData = JSON.parse(JSON.stringify(countlyPlugins.getData())); } catch (ex) { self.pluginsData = []; } + for (var i = 0; i < self.pluginsData.length; i++) { + self.formatRow(self.pluginsData[i]); + } } ); }, - updateRow: function(code) { - this.highlightedRows[code] = true; - this.refresh(); - }, - loadComponents: function() { - var cc = countlyVue.container.dataMixin({ - 'pluginComponents': '/plugins/header' - }); - cc = cc.data(); - var allComponents = cc.pluginComponents; - for (var i = 0; i < allComponents.length; i++) { - if (allComponents[i]._id && allComponents[i].component) { - this.components[allComponents[i]._id] = allComponents[i]; - } - } - this.components = Object.assign({}, this.components); + mounted: function() { + this.loadComponents(); }, - tableRowClassName: function(ob) { - if (this.highlightedRows[ob.row.code]) { - return "plugin-highlighted-row"; - } - }, - formatRow: function(row) { - row._id = row.code; - row.name = jQuery.i18n.map[row.code + ".plugin-title"] || jQuery.i18n.map[row.code + ".title"] || row.title; - row.desc = jQuery.i18n.map[row.code + ".plugin-description"] || jQuery.i18n.map[row.code + ".description"] || row.description; - row.deps = Object.keys(row.dependents).map(function(item) { - return countlyPlugins.getTitle(item); - }).join(", "); - }, - updateStatus: function(scope) { - this.scope = scope; - var diff = scope.diff; - this.changes = {}; - var self = this; - diff.forEach(function(item) { - self.changes[item.key] = item.newValue; - }); - this.dialog = { - type: "save", - showDialog: true, - saveButtonLabel: CV.i18n('plugins.yes-i-want-to-apply-changes'), - cancelButtonLabel: CV.i18n('common.no-dont-continue'), - title: CV.i18n('plugins-apply-changes-to-plugins'), - text: CV.i18n('plugins.confirm') - }; - }, - checkProcess: function() { - this.tryCount++; - var self = this; - $.ajax({ - type: "GET", - url: countlyCommon.API_URL + "/o/plugins-check?app_id=" + countlyCommon.ACTIVE_APP_ID, - data: { t: this.tryCount }, - success: function(state) { - if (state.result === "completed") { - self.showPluginProcessMessage(jQuery.i18n.map["plugins.success"], jQuery.i18n.map["plugins.applying"], jQuery.i18n.map["plugins.finish"], 3000, false, 'green', true); + methods: { + refresh: function() { + var self = this; + return $.when(countlyPlugins.initialize()).then( + function() { + try { + var plugins = JSON.parse(JSON.stringify(countlyPlugins.getData())); + self.pluginsData = plugins.filter(function(row) { + self.formatRow(row); + if (self.filterValue === "enabled") { + return row.enabled; + } + else if (self.filterValue === "disabled") { + return !row.enabled; + } + return true; + }); + } + catch (ex) { + self.pluginsData = []; + } } - else if (state.result === "failed") { - self.showPluginProcessMessage(jQuery.i18n.map["plugins.errors"], jQuery.i18n.map["plugins.errors-msg"], '', 3000, false, 'warning', true); + ); + }, + updateRow: function(code) { + this.highlightedRows[code] = true; + this.refresh(); + }, + loadComponents: function() { + var cc = countlyVue.container.dataMixin({ + 'pluginComponents': '/plugins/header' + }); + cc = cc.data(); + var allComponents = cc.pluginComponents; + for (var i = 0; i < allComponents.length; i++) { + if (allComponents[i]._id && allComponents[i].component) { + this.components[allComponents[i]._id] = allComponents[i]; } - else { + } + this.components = Object.assign({}, this.components); + }, + tableRowClassName: function(ob) { + if (this.highlightedRows[ob.row.code]) { + return "plugin-highlighted-row"; + } + }, + formatRow: function(row) { + row._id = row.code; + row.name = jQuery.i18n.map[row.code + ".plugin-title"] || jQuery.i18n.map[row.code + ".title"] || row.title; + row.desc = jQuery.i18n.map[row.code + ".plugin-description"] || jQuery.i18n.map[row.code + ".description"] || row.description; + row.deps = Object.keys(row.dependents).map(function(item) { + return countlyPlugins.getTitle(item); + }).join(", "); + }, + updateStatus: function(scope) { + this.scope = scope; + var diff = scope.diff; + this.changes = {}; + var self = this; + diff.forEach(function(item) { + self.changes[item.key] = item.newValue; + }); + this.dialog = { + type: "save", + showDialog: true, + saveButtonLabel: CV.i18n('plugins.yes-i-want-to-apply-changes'), + cancelButtonLabel: CV.i18n('common.no-dont-continue'), + title: CV.i18n('plugins-apply-changes-to-plugins'), + text: CV.i18n('plugins.confirm') + }; + }, + checkProcess: function() { + this.tryCount++; + var self = this; + $.ajax({ + type: "GET", + url: countlyCommon.API_URL + "/o/plugins-check?app_id=" + countlyCommon.ACTIVE_APP_ID, + data: { t: this.tryCount }, + success: function(state) { + if (state.result === "completed") { + self.showPluginProcessMessage(jQuery.i18n.map["plugins.success"], jQuery.i18n.map["plugins.applying"], jQuery.i18n.map["plugins.finish"], 3000, false, 'green', true); + } + else if (state.result === "failed") { + self.showPluginProcessMessage(jQuery.i18n.map["plugins.errors"], jQuery.i18n.map["plugins.errors-msg"], '', 3000, false, 'warning', true); + } + else { + setTimeout(self.checkProcess, 10000); + } + }, + error: function() { setTimeout(self.checkProcess, 10000); } - }, - error: function() { - setTimeout(self.checkProcess, 10000); - } - }); - }, - togglePlugin: function(plugins) { - this.loading = true; - var self = this; - this.$loading({ - lock: true, - background: 'rgba(0, 0, 0, 0.7)' - }); + }); + }, + togglePlugin: function(plugins) { + this.loading = true; + var self = this; + this.$loading({ + lock: true, + background: 'rgba(0, 0, 0, 0.7)' + }); - countlyPlugins.toggle(plugins, function(res) { - if (res.result === "started") { + 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.success"], jQuery.i18n.map["plugins.applying"], jQuery.i18n.map["plugins.finish"], 3000, false, 'green', true); + self.showPluginProcessMessage(jQuery.i18n.map["plugins.success"], jQuery.i18n.map["plugins.applying"], jQuery.i18n.map["plugins.finish"], 3000, false, 'green', true); + } + else { + self.showPluginProcessMessage(jQuery.i18n.map["plugins.error"], res, jQuery.i18n.map["plugins.retry"], 5000, false, 'error', true); + } + }); + }, + showPluginProcessMessage: function(title, message, info, delay, sticky, type, reload) { + CountlyHelpers.notify({clearAll: true, type: type, title: title, message: message, info: info, delay: delay, sticky: sticky}); + if (reload) { + setTimeout(function() { + window.location.reload(true); + }, 5000); } - else { - self.showPluginProcessMessage(jQuery.i18n.map["plugins.error"], res, jQuery.i18n.map["plugins.retry"], 5000, false, 'error', true); + }, + submitConfirmDialog: function() { + if (this.dialog.type === "save") { + var msg = { title: jQuery.i18n.map["plugins.processing"], message: jQuery.i18n.map["plugins.wait"], info: jQuery.i18n.map["plugins.hold-on"], sticky: true }; + CountlyHelpers.notify(msg); + this.togglePlugin(this.changes); } - }); - }, - showPluginProcessMessage: function(title, message, info, delay, sticky, type, reload) { - CountlyHelpers.notify({clearAll: true, type: type, title: title, message: message, info: info, delay: delay, sticky: sticky}); - if (reload) { - setTimeout(function() { - window.location.reload(true); - }, 5000); - } - }, - submitConfirmDialog: function() { - if (this.dialog.type === "save") { - var msg = { title: jQuery.i18n.map["plugins.processing"], message: jQuery.i18n.map["plugins.wait"], info: jQuery.i18n.map["plugins.hold-on"], sticky: true }; - CountlyHelpers.notify(msg); - this.togglePlugin(this.changes); - } - else if (this.dialog.type === "check") { - for (var i = 0; i < this.pluginsData.length; i++) { - if (this.curDependents.indexOf(this.pluginsData[i].code) !== -1) { - this.scope.patch(this.pluginsData[i], {enabled: !this.curRow.enabled}); + else if (this.dialog.type === "check") { + for (var i = 0; i < this.pluginsData.length; i++) { + if (this.curDependents.indexOf(this.pluginsData[i].code) !== -1) { + this.scope.patch(this.pluginsData[i], {enabled: !this.curRow.enabled}); + } } } - } - this.dialog = {type: "", showDialog: false, saveButtonLabel: "", cancelButtonLabel: "", title: "", text: ""}; - }, - closeConfirmDialog: function() { - if (this.dialog.type === "check") { - this.scope.unpatch(this.curRow); - } - this.dialog = {type: "", showDialog: false, saveButtonLabel: "", cancelButtonLabel: "", title: "", text: ""}; - }, - filter: function(type) { - this.filterValue = type; - try { - var self = this; - var plugins = JSON.parse(JSON.stringify(countlyPlugins.getData())); - this.pluginsData = plugins.filter(function(row) { - self.formatRow(row); - if (type === "enabled") { - return row.enabled; + this.dialog = {type: "", showDialog: false, saveButtonLabel: "", cancelButtonLabel: "", title: "", text: ""}; + }, + closeConfirmDialog: function() { + if (this.dialog.type === "check") { + this.scope.unpatch(this.curRow); + } + this.dialog = {type: "", showDialog: false, saveButtonLabel: "", cancelButtonLabel: "", title: "", text: ""}; + }, + filter: function(type) { + this.filterValue = type; + try { + var self = this; + var plugins = JSON.parse(JSON.stringify(countlyPlugins.getData())); + this.pluginsData = plugins.filter(function(row) { + self.formatRow(row); + if (type === "enabled") { + return row.enabled; + } + else if (type === "disabled") { + return !row.enabled; + } + return true; + }); + } + catch (ex) { + this.pluginsData = []; + } + }, + onToggle: function(scope, row) { + this.scope = scope; + this.curRow = row; + scope.patch(row, {enabled: !row.enabled}); + var plugin = row.code; + var plugins = []; + var changes = {}; + var i; + for (i = 0; i < scope.diff.length; i++) { + changes[scope.diff[i].key] = scope.diff[i].newValue; + } + for (i = 0; i < this.pluginsData.length; i++) { + if (changes[this.pluginsData[i].code]) { + plugins.push(this.pluginsData[i].code); } - else if (type === "disabled") { - return !row.enabled; + else if (typeof changes[this.pluginsData[i].code] === "undefined" && this.pluginsData[i].enabled) { + plugins.push(this.pluginsData[i].code); } - return true; - }); - } - catch (ex) { - this.pluginsData = []; - } - }, - onToggle: function(scope, row) { - this.scope = scope; - this.curRow = row; - scope.patch(row, {enabled: !row.enabled}); - var plugin = row.code; - var plugins = []; - var changes = {}; - var i; - for (i = 0; i < scope.diff.length; i++) { - changes[scope.diff[i].key] = scope.diff[i].newValue; - } - for (i = 0; i < this.pluginsData.length; i++) { - if (changes[this.pluginsData[i].code]) { - plugins.push(this.pluginsData[i].code); } - else if (typeof changes[this.pluginsData[i].code] === "undefined" && this.pluginsData[i].enabled) { - plugins.push(this.pluginsData[i].code); + //diff does not include currently processed plugin + if (!row.enabled) { + plugins.push(row.code); } - } - //diff does not include currently processed plugin - if (!row.enabled) { - plugins.push(row.code); - } - var enabledDescendants = _.intersection(countlyPlugins.getRelativePlugins(plugin, "down"), plugins), - disabledAncestors = _.difference(countlyPlugins.getRelativePlugins(plugin, "up"), plugins, ["___CLY_ROOT___"]); + var enabledDescendants = _.intersection(countlyPlugins.getRelativePlugins(plugin, "down"), plugins), + disabledAncestors = _.difference(countlyPlugins.getRelativePlugins(plugin, "up"), plugins, ["___CLY_ROOT___"]); - if (row.enabled && enabledDescendants.length > 0) { - this.curDependents = enabledDescendants; - this.dialog = { - type: "check", - showDialog: true, - saveButtonLabel: CV.i18n('plugins.yes-i-want-to-continue'), - cancelButtonLabel: CV.i18n('common.no-dont-continue'), - title: CV.i18n('plugins.indirect-status-change'), - text: CV.i18n("plugins.disable-descendants", countlyPlugins.getTitle(plugin), enabledDescendants.map(function(item) { - return countlyPlugins.getTitle(item); - }).join(", ")) - }; - } - else if (!row.enabled && disabledAncestors.length > 0) { - this.curDependents = disabledAncestors; - this.dialog = { - type: "check", - showDialog: true, - saveButtonLabel: CV.i18n('plugins.yes-i-want-to-continue'), - cancelButtonLabel: CV.i18n('common.no-dont-continue'), - title: CV.i18n('plugins.indirect-status-change'), - text: CV.i18n("plugins.enable-ancestors", countlyPlugins.getTitle(plugin), disabledAncestors.map(function(item) { - return countlyPlugins.getTitle(item); - }).join(", ")) - }; + if (row.enabled && enabledDescendants.length > 0) { + this.curDependents = enabledDescendants; + this.dialog = { + type: "check", + showDialog: true, + saveButtonLabel: CV.i18n('plugins.yes-i-want-to-continue'), + cancelButtonLabel: CV.i18n('common.no-dont-continue'), + title: CV.i18n('plugins.indirect-status-change'), + text: CV.i18n("plugins.disable-descendants", countlyPlugins.getTitle(plugin), enabledDescendants.map(function(item) { + return countlyPlugins.getTitle(item); + }).join(", ")) + }; + } + else if (!row.enabled && disabledAncestors.length > 0) { + this.curDependents = disabledAncestors; + this.dialog = { + type: "check", + showDialog: true, + saveButtonLabel: CV.i18n('plugins.yes-i-want-to-continue'), + cancelButtonLabel: CV.i18n('common.no-dont-continue'), + title: CV.i18n('plugins.indirect-status-change'), + text: CV.i18n("plugins.enable-ancestors", countlyPlugins.getTitle(plugin), disabledAncestors.map(function(item) { + return countlyPlugins.getTitle(item); + }).join(", ")) + }; + } } } - } - }); + }); - var ConfigurationsView = countlyVue.views.create({ - template: CV.T('/plugins/templates/configurations.html'), - computed: { - selectedConfigSearchBar: { - get: function() { - return this.selectedConfig; - }, - set: function(value) { - this.selectedConfig = value; - this.diff = []; - this.diff_ = {}; - try { - this.configsData = JSON.parse(JSON.stringify(countlyPlugins.getConfigsData())); - } - catch (ex) { - this.configsData = {}; - } + var ConfigurationsView = countlyVue.views.create({ + template: CV.T('/plugins/templates/configurations.html'), + computed: { + selectedConfigSearchBar: { + get: function() { + return this.selectedConfig; + }, + set: function(value) { + this.selectedConfig = value; + this.diff = []; + this.diff_ = {}; + try { + this.configsData = JSON.parse(JSON.stringify(countlyPlugins.getConfigsData())); + } + catch (ex) { + this.configsData = {}; + } - if (this.configsData.frontend && this.configsData.frontend._user) { - this.configsData.frontend.__user = []; - for (var userProp in this.configsData.frontend._user) { - if (this.configsData.frontend._user[userProp]) { - this.configsData.frontend.__user.push(userProp); + if (this.configsData.frontend && this.configsData.frontend._user) { + this.configsData.frontend.__user = []; + for (var userProp in this.configsData.frontend._user) { + if (this.configsData.frontend._user[userProp]) { + this.configsData.frontend.__user.push(userProp); + } } } + app.navigate("#/manage/configurations/" + value); } - app.navigate("#/manage/configurations/" + value); + }, + selectedConfigName: function() { + return this.getLabel(this.selectedConfig); } }, - selectedConfigName: function() { - return this.getLabel(this.selectedConfig); - } - }, - data: function() { - return { - back: this.$route.params.namespace === "search", - configsData: {}, - configsList: [], - coreDefaults: ['api', 'frontend', 'logs', 'security'], - diff: [], - diff_: {}, - selectedConfig: this.$route.params.namespace || "api", - searchPlaceholder: CV.i18n("configs.search-settings"), - predefinedLabels: app.configurationsView.predefinedLabels, - predefinedInputs: app.configurationsView.predefinedInputs, - predefinedStructure: app.configurationsView.predefinedStructure, - searchQuery: this.$route.params.searchQuery || "", - searchResultStructure: {}, - }; - }, - beforeCreate: function() { - var self = this; - if (this.$route.params.success) { - CountlyHelpers.notify({ - title: jQuery.i18n.map["configs.changed"], - message: jQuery.i18n.map["configs.saved"] - }); - this.$route.params.success = false; - app.noHistory("#/manage/configurations/" + this.$route.params.namespace || "api"); - } - return $.when(countlyPlugins.initializeConfigs()) - .then(function() { - try { - self.configsData = JSON.parse(JSON.stringify(countlyPlugins.getConfigsData())); - self.removeNonGlobalConfigs(self.configsData); - } - catch (error) { + data: function() { + return { + back: this.$route.params.namespace === "search", + configsData: {}, + configsList: [], + coreDefaults: ['api', 'frontend', 'logs', 'security'], + diff: [], + diff_: {}, + selectedConfig: this.$route.params.namespace || "api", + searchPlaceholder: CV.i18n("configs.search-settings"), + predefinedLabels: app.configurationsView.predefinedLabels, + predefinedInputs: app.configurationsView.predefinedInputs, + predefinedStructure: app.configurationsView.predefinedStructure, + searchQuery: this.$route.params.searchQuery || "", + searchResultStructure: {}, + }; + }, + beforeCreate: function() { + var self = this; + if (this.$route.params.success) { + CountlyHelpers.notify({ + title: jQuery.i18n.map["configs.changed"], + message: jQuery.i18n.map["configs.saved"] + }); + this.$route.params.success = false; + app.noHistory("#/manage/configurations/" + this.$route.params.namespace || "api"); + } + return $.when(countlyPlugins.initializeConfigs()) + .then(function() { + try { + self.configsData = JSON.parse(JSON.stringify(countlyPlugins.getConfigsData())); + self.removeNonGlobalConfigs(self.configsData); + } + catch (error) { // eslint-disable-next-line no-console - console.error(error); - self.configsData = {}; - } + console.error(error); + self.configsData = {}; + } - if (self.configsData.frontend && self.configsData.frontend._user && !self.predefinedInputs["frontend.__user"]) { - var list = []; - self.configsData.frontend.__user = []; - for (var userProp in self.configsData.frontend._user) { - list.push({value: userProp, label: self.getLabelName(userProp, "frontend")}); - if (self.configsData.frontend._user[userProp]) { - self.configsData.frontend.__user.push(userProp); + if (self.configsData.frontend && self.configsData.frontend._user && !self.predefinedInputs["frontend.__user"]) { + var list = []; + self.configsData.frontend.__user = []; + for (var userProp in self.configsData.frontend._user) { + list.push({value: userProp, label: self.getLabelName(userProp, "frontend")}); + if (self.configsData.frontend._user[userProp]) { + self.configsData.frontend.__user.push(userProp); + } } + app.configurationsView.registerInput("frontend.__user", {input: "el-select", attrs: {multiple: true}, list: list}); } - app.configurationsView.registerInput("frontend.__user", {input: "el-select", attrs: {multiple: true}, list: list}); - } - self.configsList.push({ - "label": self.getLabel("core"), - "group": true, - "value": "core" - }); - self.coreDefaults.forEach(function(key) { self.configsList.push({ - "label": self.getLabel(key, true), - "value": key + "label": self.getLabel("core"), + "group": true, + "value": "core" }); - }); - self.configsList.push({ - "label": self.getLabel("plugins"), - "group": true, - "value": "plugins" - }); - var plugins = []; - for (var key in self.configsData) { - if (self.coreDefaults.indexOf(key) === -1 && countlyGlobal.plugins.indexOf(key) !== -1) { - plugins.push(key); - } - if (!self.predefinedStructure[key]) { - self.predefinedStructure[key] = {groups: []}; - } - var otherStructure = []; - for (var subkey in self.configsData[key]) { - if (!self.predefinedInputs[key + "." + subkey]) { - var type = typeof self.configsData[key][subkey]; - if (type === "string") { - app.configurationsView.registerInput(key + "." + subkey, {input: "el-input", attrs: {}}); - } - else if (type === "number") { - app.configurationsView.registerInput(key + "." + subkey, {input: "el-input-number", attrs: {}}); - } - else if (type === "boolean") { - app.configurationsView.registerInput(key + "." + subkey, {input: "el-switch", attrs: {}}); - } + self.coreDefaults.forEach(function(key) { + self.configsList.push({ + "label": self.getLabel(key, true), + "value": key + }); + }); + self.configsList.push({ + "label": self.getLabel("plugins"), + "group": true, + "value": "plugins" + }); + var plugins = []; + for (var key in self.configsData) { + if (self.coreDefaults.indexOf(key) === -1 && countlyGlobal.plugins.indexOf(key) !== -1) { + plugins.push(key); } - if (!self.predefinedStructure[key].groups.length) { - otherStructure.push(subkey); + if (!self.predefinedStructure[key]) { + self.predefinedStructure[key] = {groups: []}; } - else { - var found = false; - for (var i = 0; i < self.predefinedStructure[key].groups.length; i++) { - if (self.predefinedStructure[key].groups[i].list.indexOf(subkey) !== -1) { - found = true; - break; + var otherStructure = []; + for (var subkey in self.configsData[key]) { + if (!self.predefinedInputs[key + "." + subkey]) { + var type = typeof self.configsData[key][subkey]; + if (type === "string") { + app.configurationsView.registerInput(key + "." + subkey, {input: "el-input", attrs: {}}); + } + else if (type === "number") { + app.configurationsView.registerInput(key + "." + subkey, {input: "el-input-number", attrs: {}}); + } + else if (type === "boolean") { + app.configurationsView.registerInput(key + "." + subkey, {input: "el-switch", attrs: {}}); } } - if (!found) { + if (!self.predefinedStructure[key].groups.length) { otherStructure.push(subkey); } + else { + var found = false; + for (var i = 0; i < self.predefinedStructure[key].groups.length; i++) { + if (self.predefinedStructure[key].groups[i].list.indexOf(subkey) !== -1) { + found = true; + break; + } + } + if (!found) { + otherStructure.push(subkey); + } + } + } + if (otherStructure.length) { + self.predefinedStructure[key].groups.push({label: "", list: otherStructure}); } } - if (otherStructure.length) { - self.predefinedStructure[key].groups.push({label: "", list: otherStructure}); - } - } - plugins.sort(); - plugins.forEach(function(k) { - self.configsList.push({ - "label": self.getLabel(k, true), - "value": k + plugins.sort(); + plugins.forEach(function(k) { + self.configsList.push({ + "label": self.getLabel(k, true), + "value": k + }); }); + if (self.searchQuery !== "") { + self.onEnterSearch(); + window.scrollTo({top: 0, behavior: "smooth"}); + } }); - if (self.searchQuery !== "") { - self.onEnterSearch(); - window.scrollTo({top: 0, behavior: "smooth"}); - } - }); - }, - updated: function() { - if (this.$route.params.section) { - this.scrollToSection(this.$route.params.section); - } - }, - methods: { - removeNonGlobalConfigs: function(configData) { - Object.keys(configData).forEach(function(configKey) { - if ((configData[configKey].use_google || configData[configKey].google_maps_api_key) && configKey === 'frontend') { - delete configData[configKey].use_google; - delete configData[configKey].google_maps_api_key; - } - if (configData[configKey].rate && configKey === 'push') { - delete configData[configKey].rate; // Note: push notification rate is app level config only - } - if (configData[configKey].test && configKey === 'push') { - delete configData[configKey].test; // Note: push notification test is app level config only - } - }); }, - onChange: function(key, value, config) { - var configsData = countlyPlugins.getConfigsData(); - - config = config || this.selectedConfig; - if (!this.diff_[config]) { - this.diff_[config] = []; + updated: function() { + if (this.$route.params.section) { + this.scrollToSection(this.$route.params.section); } + }, + methods: { + removeNonGlobalConfigs: function(configData) { + Object.keys(configData).forEach(function(configKey) { + if ((configData[configKey].use_google || configData[configKey].google_maps_api_key) && configKey === 'frontend') { + delete configData[configKey].use_google; + delete configData[configKey].google_maps_api_key; + } + if (configData[configKey].rate && configKey === 'push') { + delete configData[configKey].rate; // Note: push notification rate is app level config only + } + if (configData[configKey].test && configKey === 'push') { + delete configData[configKey].test; // Note: push notification test is app level config only + } + }); + }, + onChange: function(key, value, config) { + var configsData = countlyPlugins.getConfigsData(); - //delete value from diff if it already exists - var index = this.diff.indexOf(key); - if (index > -1) { - this.diff.splice(index, 1); - index = this.diff_[config].indexOf(key); - this.diff_[config].splice(index, 1); - } + config = config || this.selectedConfig; + if (!this.diff_[config]) { + this.diff_[config] = []; + } - 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 - this.configsData[config].city_data = false; - //if city data tracking was originally enabled, note the change - index = this.diff.indexOf("city_data"); + //delete value from diff if it already exists + var index = this.diff.indexOf(key); if (index > -1) { this.diff.splice(index, 1); - index = this.diff_[config].indexOf("city_data"); + index = this.diff_[config].indexOf(key); this.diff_[config].splice(index, 1); } - if (configsData[config].city_data === true) { - this.diff.push("city_data"); - this.diff_[config].push("city_data"); + + 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 + this.configsData[config].city_data = false; + //if city data tracking was originally enabled, note the change + index = this.diff.indexOf("city_data"); + if (index > -1) { + this.diff.splice(index, 1); + index = this.diff_[config].indexOf("city_data"); + this.diff_[config].splice(index, 1); + } + if (configsData[config].city_data === true) { + this.diff.push("city_data"); + this.diff_[config].push("city_data"); + } } - } - //when user enables city data tracking while country data tracking is disabled - if (key === "city_data" && value === true && this.configsData[config].country_data === false) { + //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 - this.configsData[config].country_data = true; - //if country data tracking was originally disabled, note the change - index = this.diff.indexOf("country_data"); - if (index > -1) { - this.diff.splice(index, 1); - index = this.diff_[config].indexOf("country_data"); - this.diff_[config].splice(index, 1); - } - if (configsData[config].country_data === false) { - this.diff.push("country_data"); - this.diff_[config].push("country_data"); + this.configsData[config].country_data = true; + //if country data tracking was originally disabled, note the change + index = this.diff.indexOf("country_data"); + if (index > -1) { + this.diff.splice(index, 1); + index = this.diff_[config].indexOf("country_data"); + this.diff_[config].splice(index, 1); + } + if (configsData[config].country_data === false) { + this.diff.push("country_data"); + this.diff_[config].push("country_data"); + } } - } - if (Array.isArray(value) && Array.isArray(configsData[config][key])) { - value.sort(); - configsData[config][key].sort(); + if (Array.isArray(value) && Array.isArray(configsData[config][key])) { + value.sort(); + configsData[config][key].sort(); - if (JSON.stringify(value) !== JSON.stringify(configsData[config][key])) { + if (JSON.stringify(value) !== JSON.stringify(configsData[config][key])) { + this.diff.push(key); + this.diff_[config].push(key); + } + } + else if (configsData[config][key] !== value) { this.diff.push(key); this.diff_[config].push(key); } - } - else if (configsData[config][key] !== value) { - this.diff.push(key); - this.diff_[config].push(key); - } - }, - getLabel: function(id) { - return app.configurationsView.getInputLabel(id); - }, - getLabelName: function(id, ns) { - ns = ns || this.selectedConfig; - if (ns !== "frontend" && ns !== "api" && ns !== "apps" && ns !== "logs" && ns !== "security" && countlyGlobal.plugins.indexOf(ns) === -1) { - return null; - } + }, + getLabel: function(id) { + return app.configurationsView.getInputLabel(id); + }, + getLabelName: function(id, ns) { + ns = ns || this.selectedConfig; + if (ns !== "frontend" && ns !== "api" && ns !== "apps" && ns !== "logs" && ns !== "security" && countlyGlobal.plugins.indexOf(ns) === -1) { + return null; + } - if (id === "__user") { - return jQuery.i18n.map["configs.user-level-configuration"]; - } + if (id === "__user") { + return jQuery.i18n.map["configs.user-level-configuration"]; + } - return app.configurationsView.getInputLabel(ns + "." + id); - }, - getHelperLabel: function(id, ns) { - ns = ns || this.selectedConfig; - return app.configurationsView.getHelperLabel(id, ns); - }, - getInputType: function(id, configId) { - configId = configId || this.selectedConfig; - return app.configurationsView.getInputType(configId + "." + id); - }, - getConfigType: function(id) { - return this.coreDefaults.includes(id) ? "Core" : "Plugins"; - }, - checkIfOverwritten: function(id, ns) { - ns = ns || this.selectedConfig; - var configsData = countlyPlugins.getConfigsData(); - 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]) { + return app.configurationsView.getInputLabel(ns + "." + id); + }, + getHelperLabel: function(id, ns) { + ns = ns || this.selectedConfig; + return app.configurationsView.getHelperLabel(id, ns); + }, + getInputType: function(id, configId) { + configId = configId || this.selectedConfig; + return app.configurationsView.getInputType(configId + "." + id); + }, + getConfigType: function(id) { + return this.coreDefaults.includes(id) ? "Core" : "Plugins"; + }, + checkIfOverwritten: function(id, ns) { + ns = ns || this.selectedConfig; + var configsData = countlyPlugins.getConfigsData(); + 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 - 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"}; - } - } - //check if config overwritten on app level - else if (plugs && plugs[ns] && typeof plugs[ns][id] !== "undefined") { - return {label: jQuery.i18n.map["configs.overwritten.app"], href: "#/manage/apps"}; - } - }, - unpatch: function() { - try { - this.configsData = JSON.parse(JSON.stringify(countlyPlugins.getConfigsData())); - } - catch (ex) { - this.configsData = {}; - } - this.diff = []; - this.diff_ = {}; - if (this.configsData.frontend && this.configsData.frontend._user) { - this.configsData.frontend.__user = []; - for (var userProp in this.configsData.frontend._user) { - if (this.configsData.frontend._user[userProp]) { - this.configsData.frontend.__user.push(userProp); + 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"}; } } - } - }, - save: function() { - var changes = {}; - var self = this; - for (var i = 0; i < Object.keys(self.diff_).length; i++) { - var config = Object.keys(self.diff_)[i]; - changes[config] = {}; - for (var j = 0; j < self.diff_[config].length; j++) { - if (self.diff_[config][j] === "__user") { - if (!changes[config]._user) { - changes[config]._user = {}; + //check if config overwritten on app level + else if (plugs && plugs[ns] && typeof plugs[ns][id] !== "undefined") { + return {label: jQuery.i18n.map["configs.overwritten.app"], href: "#/manage/apps"}; + } + }, + unpatch: function() { + try { + this.configsData = JSON.parse(JSON.stringify(countlyPlugins.getConfigsData())); + } + catch (ex) { + this.configsData = {}; + } + this.diff = []; + this.diff_ = {}; + if (this.configsData.frontend && this.configsData.frontend._user) { + this.configsData.frontend.__user = []; + for (var userProp in this.configsData.frontend._user) { + if (this.configsData.frontend._user[userProp]) { + this.configsData.frontend.__user.push(userProp); } - for (var userProp in self.configsData[config]._user) { - if (self.configsData[config][self.diff_[config][j]].indexOf(userProp) === -1) { - changes[config]._user[userProp] = false; + } + } + }, + save: function() { + var changes = {}; + var self = this; + for (var i = 0; i < Object.keys(self.diff_).length; i++) { + var config = Object.keys(self.diff_)[i]; + changes[config] = {}; + for (var j = 0; j < self.diff_[config].length; j++) { + if (self.diff_[config][j] === "__user") { + if (!changes[config]._user) { + changes[config]._user = {}; } - else { - changes[config]._user[userProp] = true; + for (var userProp in self.configsData[config]._user) { + if (self.configsData[config][self.diff_[config][j]].indexOf(userProp) === -1) { + changes[config]._user[userProp] = false; + } + else { + changes[config]._user[userProp] = true; + } } } + else { + changes[config][self.diff_[config][j]] = self.configsData[config][self.diff_[config][j]]; + } } - else { - changes[config][self.diff_[config][j]] = self.configsData[config][self.diff_[config][j]]; - } - } - } - countlyPlugins.updateConfigs(changes, function(err) { - if (err) { - CountlyHelpers.notify({ - title: jQuery.i18n.map["configs.not-saved"], - message: jQuery.i18n.map["configs.not-changed"], - type: "error" - }); } - else { - if (self.back) { - location.hash += "/success"; + countlyPlugins.updateConfigs(changes, function(err) { + if (err) { + CountlyHelpers.notify({ + title: jQuery.i18n.map["configs.not-saved"], + message: jQuery.i18n.map["configs.not-changed"], + type: "error" + }); } else { - location.hash = "#/manage/configurations/" + self.selectedConfig + "/success"; + if (self.back) { + location.hash += "/success"; + } + else { + location.hash = "#/manage/configurations/" + self.selectedConfig + "/success"; + } + window.location.reload(true); } - window.location.reload(true); + }); + }, + onFocus: function() { + if (this.searchQuery === "") { + this.back = true; + this.selectedConfigSearchBar = "search"; } - }); - }, - onFocus: function() { - if (this.searchQuery === "") { - this.back = true; - this.selectedConfigSearchBar = "search"; - } - }, - onEnterSearch: function() { - var self = this; - self.unpatch(); - var res = {}; - if (self.searchQuery && self.searchQuery !== "") { - self.searchQuery = self.searchQuery.toLowerCase(); - for (var config in self.predefinedStructure) { - if (config.toLowerCase().includes(self.searchQuery) && CountlyHelpers.isPluginEnabled(config.toLowerCase())) { - res[config] = self.predefinedStructure[config]; - } - else { - let groups = []; - // eslint-disable-next-line no-loop-func - self.predefinedStructure[config].groups.map(function(group) { - if (CountlyHelpers.isPluginEnabled(config.toLowerCase())) { - if (group.label && CV.i18n(group.label).toLowerCase().includes(self.searchQuery)) { - groups.push(group); - } - else { - let list = group.list.filter(function(item) { - let label = self.getLabelName(item, config) || ""; - let helper = self.getHelperLabel(item, config) || ""; - return label.toLowerCase().includes(self.searchQuery) + }, + onEnterSearch: function() { + var self = this; + self.unpatch(); + var res = {}; + if (self.searchQuery && self.searchQuery !== "") { + self.searchQuery = self.searchQuery.toLowerCase(); + for (var config in self.predefinedStructure) { + if (config.toLowerCase().includes(self.searchQuery) && CountlyHelpers.isPluginEnabled(config.toLowerCase())) { + res[config] = self.predefinedStructure[config]; + } + else { + let groups = []; + // eslint-disable-next-line no-loop-func + self.predefinedStructure[config].groups.map(function(group) { + if (CountlyHelpers.isPluginEnabled(config.toLowerCase())) { + if (group.label && CV.i18n(group.label).toLowerCase().includes(self.searchQuery)) { + groups.push(group); + } + else { + let list = group.list.filter(function(item) { + let label = self.getLabelName(item, config) || ""; + let helper = self.getHelperLabel(item, config) || ""; + return label.toLowerCase().includes(self.searchQuery) || helper.toLowerCase().includes(self.searchQuery); - }); - if (list.length > 0) { - let tmp = group; - tmp.list = list; - groups.push(tmp); + }); + if (list.length > 0) { + let tmp = group; + tmp.list = list; + groups.push(tmp); + } } } + }); + if (groups.length > 0) { + res[config] = {groups}; } - }); - if (groups.length > 0) { - res[config] = {groups}; } } + if (Object.keys(res).length === 0) { + res.empty = true; + } + self.searchResultStructure = res; + app.navigate("#/manage/configurations/search/" + self.searchQuery); } - if (Object.keys(res).length === 0) { - res.empty = true; + else { + self.searchResultStructure = {}; } - self.searchResultStructure = res; - app.navigate("#/manage/configurations/search/" + self.searchQuery); - } - else { - self.searchResultStructure = {}; - } - }, - redirectToConfig: function(config, section) { - return section - ? "#/manage/configurations/" + config + "#" + section + "" - : "#/manage/configurations/" + config + ""; - }, - scrollToSection: function(id) { - let element = document.getElementById(id); - element.scrollIntoView({behavior: "smooth"}); - }, - clearSearch: function() { - this.searchQuery = ""; - //this.searchResultStructure = {}; - } - } - }); - - var AccountView = countlyVue.views.create({ - template: CV.T('/plugins/templates/account-settings.html'), - data: function() { - return { - uploadData: { - _csrf: countlyGlobal.csrf_token, - member_image_id: countlyGlobal.member._id }, - changes: {}, - deleteAccount: { - showDialog: false, - title: CV.i18n("configs.delete-account"), - saveButtonLabel: CV.i18n("configs.delete-my-account"), - cancelButtonLabel: CV.i18n("configs.cancel"), - password: "" + redirectToConfig: function(config, section) { + return section + ? "#/manage/configurations/" + config + "#" + section + "" + : "#/manage/configurations/" + config + ""; }, - changePassword: { - showDialog: this.$route.params && this.$route.params.reset || false, - title: CV.i18n("configs.change-password"), - saveButtonLabel: CV.i18n("configs.change-password"), - cancelButtonLabel: CV.i18n("configs.cancel"), - password: "", - newPassword: "", - confirmPassword: "" + scrollToSection: function(id) { + let element = document.getElementById(id); + element.scrollIntoView({behavior: "smooth"}); }, - noaccess: this.$route.params && this.$route.params.noaccess || false, - components: {}, - formId: "account-settings-form", - userData: countlyGlobal.member, - userConfigs: {}, - avatar: this.setDefaultAvatar(countlyGlobal.member.member_image), - initials: this.updateInitials(countlyGlobal.member.full_name), - predefinedLabels: app.configurationsView.predefinedLabels, - predefinedInputs: app.configurationsView.predefinedInputs, - selectedConfig: "frontend", - security: countlyGlobal.security - }; - }, - beforeCreate: function() { - var self = this; - return $.when(countlyPlugins.initializeUserConfigs()) - .then(function() { - try { - self.userConfigs = JSON.parse(JSON.stringify(countlyPlugins.getUserConfigsData())); - } - catch (ex) { - self.userConfigs = {}; - } - if (!self.userConfigs.frontend) { - self.userConfigs.frontend = {}; - } - for (var key in app.configurationsView.predefinedUserInputs) { - var parts = key.split("."); - var val = app.configurationsView.predefinedUserInputs[key]; - if (!self.userConfigs[parts[0]]) { - self.userConfigs[parts[0]] = {}; + clearSearch: function() { + this.searchQuery = ""; + //this.searchResultStructure = {}; + } + } + }); + + var AccountView = countlyVue.views.create({ + template: CV.T('/plugins/templates/account-settings.html'), + data: function() { + return { + uploadData: { + _csrf: countlyGlobal.csrf_token, + member_image_id: countlyGlobal.member._id + }, + changes: {}, + deleteAccount: { + showDialog: false, + title: CV.i18n("configs.delete-account"), + saveButtonLabel: CV.i18n("configs.delete-my-account"), + cancelButtonLabel: CV.i18n("configs.cancel"), + password: "" + }, + changePassword: { + showDialog: this.$route.params && this.$route.params.reset || false, + title: CV.i18n("configs.change-password"), + saveButtonLabel: CV.i18n("configs.change-password"), + cancelButtonLabel: CV.i18n("configs.cancel"), + password: "", + newPassword: "", + confirmPassword: "" + }, + noaccess: this.$route.params && this.$route.params.noaccess || false, + components: {}, + formId: "account-settings-form", + userData: countlyGlobal.member, + userConfigs: {}, + avatar: this.setDefaultAvatar(countlyGlobal.member.member_image), + initials: this.updateInitials(countlyGlobal.member.full_name), + predefinedLabels: app.configurationsView.predefinedLabels, + predefinedInputs: app.configurationsView.predefinedInputs, + selectedConfig: "frontend", + security: countlyGlobal.security + }; + }, + beforeCreate: function() { + var self = this; + return $.when(countlyPlugins.initializeUserConfigs()) + .then(function() { + try { + self.userConfigs = JSON.parse(JSON.stringify(countlyPlugins.getUserConfigsData())); } - if (parts[1]) { - self.userConfigs[parts[0]][parts[1]] = typeof val === "function" ? val() : val; + catch (ex) { + self.userConfigs = {}; } - } - for (var subkey in self.userConfigs[self.selectedConfig]) { - if (!self.predefinedInputs[self.selectedConfig + "." + subkey]) { - var type = typeof self.userConfigs[self.selectedConfig][subkey]; - if (type === "string") { - app.configurationsView.registerInput(self.selectedConfig + "." + subkey, {input: "el-input", attrs: {}}); + if (!self.userConfigs.frontend) { + self.userConfigs.frontend = {}; + } + for (var key in app.configurationsView.predefinedUserInputs) { + var parts = key.split("."); + var val = app.configurationsView.predefinedUserInputs[key]; + if (!self.userConfigs[parts[0]]) { + self.userConfigs[parts[0]] = {}; } - else if (type === "number") { - app.configurationsView.registerInput(self.selectedConfig + "." + subkey, {input: "el-input-number", attrs: {}}); + if (parts[1]) { + self.userConfigs[parts[0]][parts[1]] = typeof val === "function" ? val() : val; } - else if (type === "boolean") { - app.configurationsView.registerInput(self.selectedConfig + "." + subkey, {input: "el-switch", attrs: {}}); + } + for (var subkey in self.userConfigs[self.selectedConfig]) { + if (!self.predefinedInputs[self.selectedConfig + "." + subkey]) { + var type = typeof self.userConfigs[self.selectedConfig][subkey]; + if (type === "string") { + app.configurationsView.registerInput(self.selectedConfig + "." + subkey, {input: "el-input", attrs: {}}); + } + else if (type === "number") { + app.configurationsView.registerInput(self.selectedConfig + "." + subkey, {input: "el-input-number", attrs: {}}); + } + else if (type === "boolean") { + app.configurationsView.registerInput(self.selectedConfig + "." + subkey, {input: "el-switch", attrs: {}}); + } } } + self.loadComponents(); + }); + }, + methods: { + onChange: function(id, key, value) { + if (!this.changes[id]) { + this.changes[id] = {}; } - self.loadComponents(); - }); - }, - methods: { - onChange: function(id, key, value) { - if (!this.changes[id]) { - this.changes[id] = {}; - } - this.changes[id][key] = value; + this.changes[id][key] = value; + + var configsData = countlyPlugins.getUserConfigsData(); - var configsData = countlyPlugins.getUserConfigsData(); + if (!this.changes[id]) { + this.changes[id] = {}; + } - if (!this.changes[id]) { - this.changes[id] = {}; - } + //delete value from diff if it already exists + delete this.changes[id][key]; - //delete value from diff if it already exists - delete this.changes[id][key]; + this.userConfigs[id][key] = value; - this.userConfigs[id][key] = value; + if (Array.isArray(value) && Array.isArray(configsData[id][key])) { + value.sort(); + configsData[id][key].sort(); + if (JSON.stringify(value) !== JSON.stringify(configsData[id][key])) { + this.changes[id][key] = value; + } - if (Array.isArray(value) && Array.isArray(configsData[id][key])) { - value.sort(); - configsData[id][key].sort(); - if (JSON.stringify(value) !== JSON.stringify(configsData[id][key])) { + } + else if (configsData[id][key] !== value) { this.changes[id][key] = value; } + }, + passwordDialog: function() { + var old_pwd = this.changePassword.password; + var new_pwd = this.changePassword.newPassword; + var re_new_pwd = this.changePassword.confirmPassword; - } - else if (configsData[id][key] !== value) { - this.changes[id][key] = value; - } - }, - passwordDialog: function() { - var old_pwd = this.changePassword.password; - var new_pwd = this.changePassword.newPassword; - var re_new_pwd = this.changePassword.confirmPassword; - - if (old_pwd.length > 0 && new_pwd.length > 0 && re_new_pwd.length > 0) { + if (old_pwd.length > 0 && new_pwd.length > 0 && re_new_pwd.length > 0) { + var data = { + _csrf: countlyGlobal.csrf_token, + username: countlyGlobal.member.username, + full_name: countlyGlobal.member.full_name, + api_key: countlyGlobal.member.api_key, + old_pwd: old_pwd, + new_pwd: new_pwd, + re_new_pwd: re_new_pwd + }; + this.saveSettings(data); + } + else { + CountlyHelpers.notify({ + title: jQuery.i18n.map["configs.not-saved"], + message: jQuery.i18n.map["configs.fill-required-fields"], + type: "error" + }); + } + }, + submitDeleteDialog: function() { + var pv = this.deleteAccount.password.trim(); + if (pv === "") { + var msg1 = {title: jQuery.i18n.map["common.error"], message: jQuery.i18n.map["user-settings.password-mandatory"], clearAll: true, type: "error"}; + CountlyHelpers.notify(msg1); + } + else { + countlyPlugins.deleteAccount({password: pv}, function(err, msg) { + if (msg === true || msg === 'true') { + window.location = "/login"; //deleted. go to login + } + else if (msg === 'password not valid' || msg === 'password mandatory' || msg === 'global admin limit') { + CountlyHelpers.notify({title: jQuery.i18n.map["common.error"], message: jQuery.i18n.map["user-settings." + msg], sticky: true, clearAll: true, type: "error"}); + } + else if (err === true) { + var msg2 = {title: jQuery.i18n.map["common.error"], message: msg, sticky: true, clearAll: true, type: "error"}; + CountlyHelpers.notify(msg2); + } + }); + } + }, + getLabelName: function(id, key) { + return app.configurationsView.getInputLabel(id + "." + key); + }, + getInputType: function(id, key) { + return app.configurationsView.getInputType(id + "." + key); + }, + save: function(doc) { var data = { _csrf: countlyGlobal.csrf_token, - username: countlyGlobal.member.username, - full_name: countlyGlobal.member.full_name, - api_key: countlyGlobal.member.api_key, - old_pwd: old_pwd, - new_pwd: new_pwd, - re_new_pwd: re_new_pwd + username: doc.username, + full_name: doc.full_name, + api_key: doc.api_key }; this.saveSettings(data); - } - else { - CountlyHelpers.notify({ - title: jQuery.i18n.map["configs.not-saved"], - message: jQuery.i18n.map["configs.fill-required-fields"], - type: "error" - }); - } - }, - submitDeleteDialog: function() { - var pv = this.deleteAccount.password.trim(); - if (pv === "") { - var msg1 = {title: jQuery.i18n.map["common.error"], message: jQuery.i18n.map["user-settings.password-mandatory"], clearAll: true, type: "error"}; - CountlyHelpers.notify(msg1); - } - else { - countlyPlugins.deleteAccount({password: pv}, function(err, msg) { - if (msg === true || msg === 'true') { - window.location = "/login"; //deleted. go to login - } - else if (msg === 'password not valid' || msg === 'password mandatory' || msg === 'global admin limit') { - CountlyHelpers.notify({title: jQuery.i18n.map["common.error"], message: jQuery.i18n.map["user-settings." + msg], sticky: true, clearAll: true, type: "error"}); - } - else if (err === true) { - var msg2 = {title: jQuery.i18n.map["common.error"], message: msg, sticky: true, clearAll: true, type: "error"}; - CountlyHelpers.notify(msg2); - } - }); - } - }, - getLabelName: function(id, key) { - return app.configurationsView.getInputLabel(id + "." + key); - }, - getInputType: function(id, key) { - return app.configurationsView.getInputType(id + "." + key); - }, - save: function(doc) { - var data = { - _csrf: countlyGlobal.csrf_token, - username: doc.username, - full_name: doc.full_name, - api_key: doc.api_key - }; - this.saveSettings(data); - }, - saveSettings: function(doc) { - var self = this; - $.ajax({ - type: "POST", - url: countlyGlobal.path + "/user/settings", - data: doc, - success: function(result) { - if (result === "username-exists") { - CountlyHelpers.notify({ - title: jQuery.i18n.map["configs.not-saved"], - message: jQuery.i18n.map["management-users.username.exists"], - type: "error" - }); - return true; - } - else if (!result) { - CountlyHelpers.notify({ - title: jQuery.i18n.map["configs.not-saved"], - message: jQuery.i18n.map["user-settings.alert"], - type: "error" - }); - return true; - } - else { - if (!isNaN(parseInt(result))) { - countlyGlobal.member.password_changed = parseInt(result); + }, + saveSettings: function(doc) { + var self = this; + $.ajax({ + type: "POST", + url: countlyGlobal.path + "/user/settings", + data: doc, + success: function(result) { + if (result === "username-exists") { + CountlyHelpers.notify({ + title: jQuery.i18n.map["configs.not-saved"], + message: jQuery.i18n.map["management-users.username.exists"], + type: "error" + }); + return true; } - else if (typeof result === "string") { + else if (!result) { CountlyHelpers.notify({ title: jQuery.i18n.map["configs.not-saved"], - message: jQuery.i18n.map[result], + message: jQuery.i18n.map["user-settings.alert"], type: "error" }); return true; } - - countlyGlobal.member.full_name = doc.full_name; - countlyGlobal.member.username = doc.username; - countlyGlobal.member.api_key = doc.api_key; - } - if (Object.keys(self.changes).length) { - countlyPlugins.updateUserConfigs(self.changes, function(err) { - if (err) { + else { + if (!isNaN(parseInt(result))) { + countlyGlobal.member.password_changed = parseInt(result); + } + else if (typeof result === "string") { CountlyHelpers.notify({ title: jQuery.i18n.map["configs.not-saved"], - message: jQuery.i18n.map["configs.not-changed"], + message: jQuery.i18n.map[result], type: "error" }); + return true; } - else { - window.location.reload(true); - } - }); - } - else { + + countlyGlobal.member.full_name = doc.full_name; + countlyGlobal.member.username = doc.username; + countlyGlobal.member.api_key = doc.api_key; + } + if (Object.keys(self.changes).length) { + countlyPlugins.updateUserConfigs(self.changes, function(err) { + if (err) { + CountlyHelpers.notify({ + title: jQuery.i18n.map["configs.not-saved"], + message: jQuery.i18n.map["configs.not-changed"], + type: "error" + }); + } + else { + window.location.reload(true); + } + }); + } + else { + CountlyHelpers.notify({ + title: jQuery.i18n.map["configs.changed"], + message: jQuery.i18n.map["configs.saved"] + }); + } + }, + error: function() { CountlyHelpers.notify({ - title: jQuery.i18n.map["configs.changed"], - message: jQuery.i18n.map["configs.saved"] + title: jQuery.i18n.map["configs.not-saved"], + message: jQuery.i18n.map["configs.not-changed"], + type: "error" }); } - }, - error: function() { - CountlyHelpers.notify({ - title: jQuery.i18n.map["configs.not-saved"], - message: jQuery.i18n.map["configs.not-changed"], - type: "error" - }); + }); + }, + handleAvatarSuccess: function(url) { + countlyGlobal.member.member_image = url; + this.avatar = this.setDefaultAvatar(countlyGlobal.member.member_image); + this.updateGlobalObject(); + }, + nameChanged: function(val) { + this.initials = this.updateInitials(val); + this.updateGlobalObject(); + }, + updateInitials: function(full_name) { + var name = (full_name || "").trim().split(" "); + if (name.length === 1) { + return name[0][0] || ""; } - }); + return (name[0][0] || "") + (name[name.length - 1][0] || ""); + }, + updateGlobalObject: function() { + var userImage = {}; + var member = countlyGlobal.member; + if (member.member_image) { + userImage.url = member.member_image; + userImage.found = true; + } + else { + var defaultAvatarSelector = (member.created_at || Date.now()) % 10 * -60; + userImage.found = false; + userImage.url = "images/avatar-sprite.png?v2"; + userImage.position = defaultAvatarSelector; + userImage.initials = this.initials; + } + + member.image = userImage; + }, + deleteAvatar: function() { + var self = this; + $.ajax({ + type: "POST", + url: countlyCommon.API_URL + "/user/settings", + data: { + username: countlyGlobal.member.username, + api_key: countlyGlobal.member.api_key, + member_image: "delete", + _csrf: countlyGlobal.csrf_token + }, + success: function() { + countlyGlobal.member.member_image = ""; + self.avatar = self.setDefaultAvatar(countlyGlobal.member.member_image); + self.updateGlobalObject(); + }, + error: function() { + CountlyHelpers.notify({ type: "error", message: jQuery.i18n.map['configs.delete_avatar_failed']}); + } + }); + }, + setDefaultAvatar: function(image) { + if (image) { + return {'background-image': 'url("' + image + '?' + Date.now() + '")', "background-repeat": "no-repeat", "background-size": "auto 100px"}; + } + else { + var defaultAvatarSelector = (countlyGlobal.member.created_at || Date.now()) % 10 * -100; + return {'background-image': 'url("images/avatar-sprite.png?v2")', 'background-position': defaultAvatarSelector + 'px', 'background-size': 'auto 100px'}; + } + }, + loadComponents: function() { + var cc = countlyVue.container.dataMixin({ + 'accountSettingsComponents': '/account/settings' + }); + cc = cc.data(); + var allComponents = cc.accountSettingsComponents; + for (var i = 0; i < allComponents.length; i++) { + if (allComponents[i]._id && allComponents[i].title && allComponents[i].component) { + this.components[allComponents[i]._id] = allComponents[i]; + } + } + } + } + }); + + var getPluginView = function() { + return new countlyVue.views.BackboneWrapper({ + component: PluginsView, + vuex: [] //empty array if none + }); + }; + + var getConfigView = function() { + return new countlyVue.views.BackboneWrapper({ + component: ConfigurationsView, + vuex: [] //empty array if none + }); + }; + + var getAccountView = function() { + return new countlyVue.views.BackboneWrapper({ + component: AccountView, + vuex: [] //empty array if none + }); + }; + + //old global handler + app.configurationsView = { + predefinedInputs: {}, + predefinedLabels: {}, + predefinedStructure: {}, + predefinedUserInputs: {}, + registerInput: function(id, callback) { + this.predefinedInputs[id] = callback; }, - handleAvatarSuccess: function(url) { - countlyGlobal.member.member_image = url; - this.avatar = this.setDefaultAvatar(countlyGlobal.member.member_image); - this.updateGlobalObject(); + registerLabel: function(id, html) { + this.predefinedLabels[id] = html; }, - nameChanged: function(val) { - this.initials = this.updateInitials(val); - this.updateGlobalObject(); + registerStructure: function(id, obj) { + this.predefinedStructure[id] = obj; }, - updateInitials: function(full_name) { - var name = (full_name || "").trim().split(" "); - if (name.length === 1) { - return name[0][0] || ""; - } - return (name[0][0] || "") + (name[name.length - 1][0] || ""); + registerUserInput: function(id, getVal) { + this.predefinedUserInputs[id] = getVal; }, - updateGlobalObject: function() { - var userImage = {}; - var member = countlyGlobal.member; - if (member.member_image) { - userImage.url = member.member_image; - userImage.found = true; + getInputLabel: function(id) { + if (typeof this.predefinedLabels[id] !== "undefined") { + return jQuery.i18n.map[this.predefinedLabels[id]] || this.predefinedLabels[id]; + } + else if (jQuery.i18n.map[id + ".title"]) { + return jQuery.i18n.map[id + ".title"]; + } + else if (jQuery.i18n.map[id + ".plugin-title"]) { + return jQuery.i18n.map[id + ".plugin-title"]; + } + else if (jQuery.i18n.map["configs." + id]) { + return jQuery.i18n.map["configs." + id]; + } + else if (jQuery.i18n.map["configs." + (id).replace(".", "-")]) { + return jQuery.i18n.map["configs." + (id).replace(".", "-")]; + } + else if (jQuery.i18n.map[id]) { + return jQuery.i18n.map[id]; + } + else if (jQuery.i18n.map[(id).replace(".", "-")]) { + return jQuery.i18n.map[(id).replace(".", "-")]; } else { - var defaultAvatarSelector = (member.created_at || Date.now()) % 10 * -60; - userImage.found = false; - userImage.url = "images/avatar-sprite.png?v2"; - userImage.position = defaultAvatarSelector; - userImage.initials = this.initials; + return id; } - - member.image = userImage; - }, - deleteAvatar: function() { - var self = this; - $.ajax({ - type: "POST", - url: countlyCommon.API_URL + "/user/settings", - data: { - username: countlyGlobal.member.username, - api_key: countlyGlobal.member.api_key, - member_image: "delete", - _csrf: countlyGlobal.csrf_token - }, - success: function() { - countlyGlobal.member.member_image = ""; - self.avatar = self.setDefaultAvatar(countlyGlobal.member.member_image); - self.updateGlobalObject(); - }, - error: function() { - CountlyHelpers.notify({ type: "error", message: jQuery.i18n.map['configs.delete_avatar_failed']}); - } - }); }, - setDefaultAvatar: function(image) { - if (image) { - return {'background-image': 'url("' + image + '?' + Date.now() + '")', "background-repeat": "no-repeat", "background-size": "auto 100px"}; + getHelperLabel: function(id, ns) { + if (id === "__user") { + return jQuery.i18n.map["configs.help.user-level-configuration"]; } - else { - var defaultAvatarSelector = (countlyGlobal.member.created_at || Date.now()) % 10 * -100; - return {'background-image': 'url("images/avatar-sprite.png?v2")', 'background-position': defaultAvatarSelector + 'px', 'background-size': 'auto 100px'}; + else if (jQuery.i18n.map["configs.help." + ns + "." + id]) { + return jQuery.i18n.map["configs.help." + ns + "." + id]; + } + else if (jQuery.i18n.map["configs.help." + (ns + "." + id).replace(".", "-")]) { + return jQuery.i18n.map["configs.help." + (ns + "." + id).replace(".", "-")]; + } + else if (this.predefinedInputs[ns + "." + id] && this.predefinedInputs[ns + "." + id].helper) { + return jQuery.i18n.map[this.predefinedInputs[ns + "." + id].helper] || this.predefinedInputs[ns + "." + id].helper; } }, - loadComponents: function() { - var cc = countlyVue.container.dataMixin({ - 'accountSettingsComponents': '/account/settings' - }); - cc = cc.data(); - var allComponents = cc.accountSettingsComponents; - for (var i = 0; i < allComponents.length; i++) { - if (allComponents[i]._id && allComponents[i].title && allComponents[i].component) { - this.components[allComponents[i]._id] = allComponents[i]; - } + getInputType: function(id) { + var input = this.predefinedInputs[id]; + if (typeof input === "function") { + return "function"; + } + if (input && input.input) { + return input.input; } } - } - }); - - var getPluginView = function() { - return new countlyVue.views.BackboneWrapper({ - component: PluginsView, - vuex: [] //empty array if none - }); - }; - - var getConfigView = function() { - return new countlyVue.views.BackboneWrapper({ - component: ConfigurationsView, - vuex: [] //empty array if none - }); - }; + }; - var getAccountView = function() { - return new countlyVue.views.BackboneWrapper({ - component: AccountView, - vuex: [] //empty array if none - }); - }; - - //old global handler - app.configurationsView = { - predefinedInputs: {}, - predefinedLabels: {}, - predefinedStructure: {}, - predefinedUserInputs: {}, - registerInput: function(id, callback) { - this.predefinedInputs[id] = callback; - }, - registerLabel: function(id, html) { - this.predefinedLabels[id] = html; - }, - registerStructure: function(id, obj) { - this.predefinedStructure[id] = obj; - }, - registerUserInput: function(id, getVal) { - this.predefinedUserInputs[id] = getVal; - }, - getInputLabel: function(id) { - if (typeof this.predefinedLabels[id] !== "undefined") { - return jQuery.i18n.map[this.predefinedLabels[id]] || this.predefinedLabels[id]; - } - else if (jQuery.i18n.map[id + ".title"]) { - return jQuery.i18n.map[id + ".title"]; - } - else if (jQuery.i18n.map[id + ".plugin-title"]) { - return jQuery.i18n.map[id + ".plugin-title"]; - } - else if (jQuery.i18n.map["configs." + id]) { - return jQuery.i18n.map["configs." + id]; - } - else if (jQuery.i18n.map["configs." + (id).replace(".", "-")]) { - return jQuery.i18n.map["configs." + (id).replace(".", "-")]; - } - else if (jQuery.i18n.map[id]) { - return jQuery.i18n.map[id]; - } - else if (jQuery.i18n.map[(id).replace(".", "-")]) { - return jQuery.i18n.map[(id).replace(".", "-")]; - } - else { - return id; - } - }, - getHelperLabel: function(id, ns) { - if (id === "__user") { - return jQuery.i18n.map["configs.help.user-level-configuration"]; - } - else if (jQuery.i18n.map["configs.help." + ns + "." + id]) { - return jQuery.i18n.map["configs.help." + ns + "." + id]; - } - else if (jQuery.i18n.map["configs.help." + (ns + "." + id).replace(".", "-")]) { - return jQuery.i18n.map["configs.help." + (ns + "." + id).replace(".", "-")]; - } - else if (this.predefinedInputs[ns + "." + id] && this.predefinedInputs[ns + "." + id].helper) { - return jQuery.i18n.map[this.predefinedInputs[ns + "." + id].helper] || this.predefinedInputs[ns + "." + id].helper; - } - }, - getInputType: function(id) { - var input = this.predefinedInputs[id]; - if (typeof input === "function") { - return "function"; - } - if (input && input.input) { - return input.input; - } + //register inputs + var zones = app.manageAppsView.getTimeZones(); + var countryList = []; + for (var z in zones) { + countryList.push({value: z, label: zones[z].n}); } - }; - - //register inputs - var zones = app.manageAppsView.getTimeZones(); - var countryList = []; - for (var z in zones) { - countryList.push({value: z, label: zones[z].n}); - } - app.configurationsView.registerInput("apps.country", {input: "el-select", attrs: {}, list: countryList}); - - app.configurationsView.registerInput("logs.default", { - input: "el-select", - attrs: {}, - list: [ - {value: 'debug', label: CV.i18n("configs.logs.debug")}, - {value: 'info', label: CV.i18n("configs.logs.info")}, - {value: 'warn', label: CV.i18n("configs.logs.warn")}, - {value: 'error', label: CV.i18n("configs.logs.error")} - ] - }); - - app.configurationsView.registerInput("security.dashboard_additional_headers", {input: "el-input", attrs: {type: "textarea", rows: 5}}); - - app.configurationsView.registerInput("security.robotstxt", {input: "el-input", attrs: {type: "textarea", rows: 5}}); - - app.configurationsView.registerInput("security.api_additional_headers", {input: "el-input", attrs: {type: "textarea", rows: 5}}); + app.configurationsView.registerInput("apps.country", {input: "el-select", attrs: {}, list: countryList}); + app.configurationsView.registerInput("logs.default", { + input: "el-select", + attrs: {}, + list: [ + {value: 'debug', label: CV.i18n("configs.logs.debug")}, + {value: 'info', label: CV.i18n("configs.logs.info")}, + {value: 'warn', label: CV.i18n("configs.logs.warn")}, + {value: 'error', label: CV.i18n("configs.logs.error")} + ] + }); - app.configurationsView.registerInput("api.reports_regenerate_interval", { - input: "el-select", - attrs: {}, - list: [ - {value: 300, label: jQuery.i18n.prop("common.every.minutes", 5)}, - {value: 1800, label: jQuery.i18n.prop("common.every.minutes", 30)}, - {value: 3600, label: jQuery.i18n.prop("common.every.hour", 1)}, - {value: 10800, label: jQuery.i18n.prop("common.every.hours", 3)}, - {value: 43200, label: jQuery.i18n.prop("common.every.hours", 12)}, - {value: 86400, label: jQuery.i18n.prop("common.every.hours", 24)} - ] - }); + app.configurationsView.registerInput("security.dashboard_additional_headers", {input: "el-input", attrs: {type: "textarea", rows: 5}}); - app.configurationsView.registerInput("api.send_test_email", { - input: "el-button", - label: jQuery.i18n.map['common.send'], - attrs: {type: "primary", disabled: false}, - click: function() { - this.attrs.disabled = true; - var self = this; - $.ajax({ - type: "GET", - url: countlyCommon.API_URL + "/o/email_test", - data: {}, - success: function() { - self.attrs.disabled = false; - CountlyHelpers.notify({ type: "ok", message: jQuery.i18n.map['configs.help.api-send_test_email_delivered']}); + app.configurationsView.registerInput("security.robotstxt", {input: "el-input", attrs: {type: "textarea", rows: 5}}); - }, - error: function() { - self.attrs.disabled = false; - CountlyHelpers.notify({ type: "error", message: jQuery.i18n.map['configs.help.api-send_test_email_failed']}); - } - }); - } - }); + app.configurationsView.registerInput("security.api_additional_headers", {input: "el-input", attrs: {type: "textarea", rows: 5}}); - app.configurationsView.registerStructure("api", { - description: "configs.api.description", - groups: [ - {label: "configs.api.batch", list: ["batch_processing", "batch_period", "batch_on_master"]}, - {label: "configs.api.cache", list: ["batch_read_processing", "batch_read_period", "batch_read_ttl", "batch_read_on_master"]}, - {label: "configs.api.limits", list: ["event_limit", "event_segmentation_limit", "event_segmentation_value_limit", "metric_limit", "session_duration_limit", "array_list_limit"]}, - {label: "configs.api.others", list: ["safe", "domain", "export_limit", "offline_mode", "reports_regenerate_interval", "request_threshold", "sync_plugins", "send_test_email", "city_data", "country_data", "session_cooldown", "total_users", "prevent_duplicate_requests", "metric_changes", "data_retention_period"]}, - ] - }); - app.configurationsView.registerStructure("logs", { - description: "", - groups: [ - {label: "configs.logs.modules", list: ["debug", "warn", "info", "error"]}, - {label: "configs.logs.default-level", list: ["default"]} - ] - }); + app.configurationsView.registerInput("api.reports_regenerate_interval", { + input: "el-select", + attrs: {}, + list: [ + {value: 300, label: jQuery.i18n.prop("common.every.minutes", 5)}, + {value: 1800, label: jQuery.i18n.prop("common.every.minutes", 30)}, + {value: 3600, label: jQuery.i18n.prop("common.every.hour", 1)}, + {value: 10800, label: jQuery.i18n.prop("common.every.hours", 3)}, + {value: 43200, label: jQuery.i18n.prop("common.every.hours", 12)}, + {value: 86400, label: jQuery.i18n.prop("common.every.hours", 24)} + ] + }); - var showInAppManagment = { - "api": { - "safe": true, - "session_duration_limit": true, - "country_data": true, - "city_data": true, - "event_limit": true, - "event_segmentation_limit": true, - "event_segmentation_value_limit": true, - "metric_limit": true, - "session_cooldown": true, - "total_users": true, - "prevent_duplicate_requests": true, - "metric_changes": true, - } - }; - if (countlyAuth.validateGlobalAdmin()) { - if (countlyGlobal.plugins.indexOf("drill") !== -1) { - showInAppManagment.drill = {"big_list_limit": true, "record_big_list": true, "cache_threshold": true, "correct_estimation": true, "custom_property_limit": true, "list_limit": true, "projection_limit": true, "record_actions": true, "record_crashes": true, "record_meta": true, "record_pushes": true, "record_sessions": true, "record_star_rating": true, "record_apm": true, "record_views": true}; - } - if (countlyGlobal.plugins.includes("logger")) { - showInAppManagment.logger = {"state": true, "limit": true}; - } + app.configurationsView.registerInput("api.send_test_email", { + input: "el-button", + label: jQuery.i18n.map['common.send'], + attrs: {type: "primary", disabled: false}, + click: function() { + this.attrs.disabled = true; + var self = this; + $.ajax({ + type: "GET", + url: countlyCommon.API_URL + "/o/email_test", + data: {}, + success: function() { + self.attrs.disabled = false; + CountlyHelpers.notify({ type: "ok", message: jQuery.i18n.map['configs.help.api-send_test_email_delivered']}); - app.route('/manage/plugins', 'plugins', function() { - if (countlyGlobal.COUNTLY_CONTAINER === 'frontend') { - app.navigate("#/", true); - } - else { - this.renderWhenReady(getPluginView()); + }, + error: function() { + self.attrs.disabled = false; + CountlyHelpers.notify({ type: "error", message: jQuery.i18n.map['configs.help.api-send_test_email_failed']}); + } + }); } }); - app.route('/manage/configurations', 'configurations', function() { - var view = getConfigView(); - view.params = {namespace: null, success: false}; - this.renderWhenReady(view); + app.configurationsView.registerStructure("api", { + description: "configs.api.description", + groups: [ + {label: "configs.api.batch", list: ["batch_processing", "batch_period", "batch_on_master"]}, + {label: "configs.api.cache", list: ["batch_read_processing", "batch_read_period", "batch_read_ttl", "batch_read_on_master"]}, + {label: "configs.api.limits", list: ["event_limit", "event_segmentation_limit", "event_segmentation_value_limit", "metric_limit", "session_duration_limit", "array_list_limit"]}, + {label: "configs.api.others", list: ["safe", "domain", "export_limit", "offline_mode", "reports_regenerate_interval", "request_threshold", "sync_plugins", "send_test_email", "city_data", "country_data", "session_cooldown", "total_users", "prevent_duplicate_requests", "metric_changes", "data_retention_period"]}, + ] }); - app.route('/manage/configurations/:namespace', 'configurations_namespace', function(namespace) { - var view = getConfigView(); - view.params = {namespace: namespace, success: false}; - this.renderWhenReady(view); + app.configurationsView.registerStructure("logs", { + description: "", + groups: [ + {label: "configs.logs.modules", list: ["debug", "warn", "info", "error"]}, + {label: "configs.logs.default-level", list: ["default"]} + ] }); - app.route('/manage/configurations/:namespace/:status', 'configurations_namespace', function(namespace, status) { - var view = getConfigView(); - if (status === "success" && namespace !== "search") { - view.params = {namespace: namespace, success: true}; - this.renderWhenReady(view); + var showInAppManagment = { + "api": { + "safe": true, + "session_duration_limit": true, + "country_data": true, + "city_data": true, + "event_limit": true, + "event_segmentation_limit": true, + "event_segmentation_value_limit": true, + "metric_limit": true, + "session_cooldown": true, + "total_users": true, + "prevent_duplicate_requests": true, + "metric_changes": true, } - if (namespace === "search") { - view.params = {namespace, success: false, searchQuery: status}; - this.renderWhenReady(view); + }; + if (countlyAuth.validateGlobalAdmin()) { + if (countlyGlobal.plugins.indexOf("drill") !== -1) { + showInAppManagment.drill = {"big_list_limit": true, "record_big_list": true, "cache_threshold": true, "correct_estimation": true, "custom_property_limit": true, "list_limit": true, "projection_limit": true, "record_actions": true, "record_crashes": true, "record_meta": true, "record_pushes": true, "record_sessions": true, "record_star_rating": true, "record_apm": true, "record_views": true}; } - }); + if (countlyGlobal.plugins.includes("logger")) { + showInAppManagment.logger = {"state": true, "limit": true}; + } + + app.route('/manage/plugins', 'plugins', function() { + if (countlyGlobal.COUNTLY_CONTAINER === 'frontend') { + app.navigate("#/", true); + } + else { + this.renderWhenReady(getPluginView()); + } + }); - app.route('/manage/configurations/:namespace/:status/:success', 'configurations_namespace', function(namespace, status, success) { - if (success === "success" && namespace === "search" && status !== "") { + app.route('/manage/configurations', 'configurations', function() { var view = getConfigView(); - view.params = {namespace, success: true, searchQuery: status}; + view.params = {namespace: null, success: false}; this.renderWhenReady(view); - } - }); + }); - app.route('/manage/configurations/:namespace#:section', 'configurations_namespace', function(namespace, section) { - var view = getConfigView(); - view.params = {namespace: namespace, section: section, success: false}; - this.renderWhenReady(view); - }); + app.route('/manage/configurations/:namespace', 'configurations_namespace', function(namespace) { + var view = getConfigView(); + view.params = {namespace: namespace, success: false}; + this.renderWhenReady(view); + }); - countlyPlugins.initializeConfigs().always(function() { - var pluginsData = countlyPlugins.getConfigsData(); - for (var key in showInAppManagment) { - var inputs = {}; - for (var conf in showInAppManagment[key]) { - if (showInAppManagment[key][conf]) { - if (!app.configurationsView.predefinedInputs[key + "." + conf]) { - if (pluginsData[key]) { - var type = typeof pluginsData[key][conf]; - if (type === "string") { - app.configurationsView.registerInput(key + "." + conf, {input: "el-input", attrs: {}}); - } - else if (type === "number") { - app.configurationsView.registerInput(key + "." + conf, {input: "el-input-number", attrs: {}}); - } - else if (type === "boolean") { - app.configurationsView.registerInput(key + "." + conf, {input: "el-switch", attrs: {}}); + app.route('/manage/configurations/:namespace/:status', 'configurations_namespace', function(namespace, status) { + var view = getConfigView(); + if (status === "success" && namespace !== "search") { + view.params = {namespace: namespace, success: true}; + this.renderWhenReady(view); + } + if (namespace === "search") { + view.params = {namespace, success: false, searchQuery: status}; + this.renderWhenReady(view); + } + }); + + app.route('/manage/configurations/:namespace/:status/:success', 'configurations_namespace', function(namespace, status, success) { + if (success === "success" && namespace === "search" && status !== "") { + var view = getConfigView(); + view.params = {namespace, success: true, searchQuery: status}; + this.renderWhenReady(view); + } + }); + + app.route('/manage/configurations/:namespace#:section', 'configurations_namespace', function(namespace, section) { + var view = getConfigView(); + view.params = {namespace: namespace, section: section, success: false}; + this.renderWhenReady(view); + }); + + countlyPlugins.initializeConfigs().always(function() { + var pluginsData = countlyPlugins.getConfigsData(); + for (var key in showInAppManagment) { + var inputs = {}; + for (var conf in showInAppManagment[key]) { + if (showInAppManagment[key][conf]) { + if (!app.configurationsView.predefinedInputs[key + "." + conf]) { + if (pluginsData[key]) { + var type = typeof pluginsData[key][conf]; + if (type === "string") { + app.configurationsView.registerInput(key + "." + conf, {input: "el-input", attrs: {}}); + } + else if (type === "number") { + app.configurationsView.registerInput(key + "." + conf, {input: "el-input-number", attrs: {}}); + } + else if (type === "boolean") { + app.configurationsView.registerInput(key + "." + conf, {input: "el-switch", attrs: {}}); + } } } - } - if (app.configurationsView.predefinedInputs[key + "." + conf]) { - inputs[key + "." + conf] = app.configurationsView.predefinedInputs[key + "." + conf]; + if (app.configurationsView.predefinedInputs[key + "." + conf]) { + inputs[key + "." + conf] = app.configurationsView.predefinedInputs[key + "." + conf]; + } } } + app.addAppManagementInput(key, jQuery.i18n.map['configs.' + key], inputs); } - app.addAppManagementInput(key, jQuery.i18n.map['configs.' + key], inputs); - } - app.configurationsView.registerInput("frontend.theme", {input: "el-select", attrs: {}, list: countlyPlugins.getThemeList()}); - }); - } + app.configurationsView.registerInput("frontend.theme", {input: "el-select", attrs: {}, list: countlyPlugins.getThemeList()}); + }); + } - app.route('/account-settings', 'account-settings', function() { - this.renderWhenReady(getAccountView()); - }); + app.route('/account-settings', 'account-settings', function() { + this.renderWhenReady(getAccountView()); + }); - app.route('/account-settings/reset', 'account-settings', function() { - var view = getAccountView(); - view.params = {reset: true}; - this.renderWhenReady(view); - }); + app.route('/account-settings/reset', 'account-settings', function() { + var view = getAccountView(); + view.params = {reset: true}; + this.renderWhenReady(view); + }); - app.route('/account-settings/no-access', 'account-settings', function() { - var view = getAccountView(); - view.params = {noaccess: true}; - this.renderWhenReady(view); - }); + app.route('/account-settings/no-access', 'account-settings', function() { + var view = getAccountView(); + view.params = {noaccess: true}; + this.renderWhenReady(view); + }); - if (countlyAuth.validateGlobalAdmin()) { - if (countlyGlobal.COUNTLY_CONTAINER !== 'frontend') { - app.addMenu("management", {code: "plugins", pluginName: "plugins", url: "#/manage/plugins", text: "plugins.title", icon: '
', priority: 80}); + if (countlyAuth.validateGlobalAdmin()) { + if (countlyGlobal.COUNTLY_CONTAINER !== 'frontend') { + app.addMenu("management", {code: "plugins", pluginName: "plugins", url: "#/manage/plugins", text: "plugins.title", icon: '
', priority: 80}); + } } - } - if (countlyAuth.validateGlobalAdmin()) { - app.addMenu("management", {code: "configurations", pluginName: "plugins", url: "#/manage/configurations", text: "plugins.configs", icon: '
', priority: 30}); + if (countlyAuth.validateGlobalAdmin()) { + app.addMenu("management", {code: "configurations", pluginName: "plugins", url: "#/manage/configurations", text: "plugins.configs", icon: '
', priority: 30}); - var isCurrentHostnameIP = /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/.test(window.location.hostname); - var isGlobalDomainHasValue = countlyGlobal.domain === "" || typeof countlyGlobal.domain === "undefined" ? false : true; - if (!isCurrentHostnameIP && !isGlobalDomainHasValue) { - countlyPlugins.updateConfigs({"api": {"domain": window.location.protocol + "//" + window.location.hostname}}, function(err) { - if (err) { - // throw err - } - }); + var isCurrentHostnameIP = /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/.test(window.location.hostname); + var isGlobalDomainHasValue = countlyGlobal.domain === "" || typeof countlyGlobal.domain === "undefined" ? false : true; + if (!isCurrentHostnameIP && !isGlobalDomainHasValue) { + countlyPlugins.updateConfigs({"api": {"domain": window.location.protocol + "//" + window.location.hostname}}, function(err) { + if (err) { + // throw err + } + }); + } } - } -})(); \ No newline at end of file + })(); +} \ No newline at end of file From cf0abbb2f61dfbd1f2ab70ab2b311ef480777a14 Mon Sep 17 00:00:00 2001 From: Kanwar Ujjaval Singh <4216199+kanwarujjaval@users.noreply.github.com> Date: Tue, 28 Mar 2023 14:54:34 +0000 Subject: [PATCH 04/21] only remove the plugin management in mycountly --- .../public/javascripts/countly.views.js | 2244 ++++++++--------- 1 file changed, 1122 insertions(+), 1122 deletions(-) diff --git a/plugins/plugins/frontend/public/javascripts/countly.views.js b/plugins/plugins/frontend/public/javascripts/countly.views.js index f9056e00467..5a64978f4a3 100644 --- a/plugins/plugins/frontend/public/javascripts/countly.views.js +++ b/plugins/plugins/frontend/public/javascripts/countly.views.js @@ -1,1302 +1,1302 @@ /*global countlyAuth, _,$,countlyPlugins,jQuery,countlyGlobal,app,countlyCommon,CountlyHelpers,countlyVue,CV */ -if (!countlyGlobal.mycountly && countlyGlobal.plugins.indexOf('my-countly') === -1) { - (function() { - var PluginsView = countlyVue.views.create({ - template: CV.T('/plugins/templates/plugins.html'), - data: function() { - return { - scope: {}, - highlightedRows: {}, - curRow: {}, - curDependents: [], - components: {}, - defaultSort: {prop: 1, order: "asc"}, - loading: false, - tryCount: 0, - pluginsData: [], - localTableTrackedFields: ['enabled'], - filterValue: "all", - changes: {}, - dialog: {type: "", showDialog: false, saveButtonLabel: "", cancelButtonLabel: "", title: "", text: ""} - }; - }, - beforeCreate: function() { +(function() { + var PluginsView = countlyVue.views.create({ + template: CV.T('/plugins/templates/plugins.html'), + data: function() { + return { + scope: {}, + highlightedRows: {}, + curRow: {}, + curDependents: [], + components: {}, + defaultSort: {prop: 1, order: "asc"}, + loading: false, + tryCount: 0, + pluginsData: [], + localTableTrackedFields: ['enabled'], + filterValue: "all", + changes: {}, + dialog: {type: "", showDialog: false, saveButtonLabel: "", cancelButtonLabel: "", title: "", text: ""} + }; + }, + beforeCreate: function() { + var self = this; + return $.when(countlyPlugins.initialize()).then( + function() { + try { + self.pluginsData = JSON.parse(JSON.stringify(countlyPlugins.getData())); + } + catch (ex) { + self.pluginsData = []; + } + for (var i = 0; i < self.pluginsData.length; i++) { + self.formatRow(self.pluginsData[i]); + } + } + ); + }, + mounted: function() { + this.loadComponents(); + }, + methods: { + refresh: function() { var self = this; return $.when(countlyPlugins.initialize()).then( function() { try { - self.pluginsData = JSON.parse(JSON.stringify(countlyPlugins.getData())); + var plugins = JSON.parse(JSON.stringify(countlyPlugins.getData())); + self.pluginsData = plugins.filter(function(row) { + self.formatRow(row); + if (self.filterValue === "enabled") { + return row.enabled; + } + else if (self.filterValue === "disabled") { + return !row.enabled; + } + return true; + }); } catch (ex) { self.pluginsData = []; } - for (var i = 0; i < self.pluginsData.length; i++) { - self.formatRow(self.pluginsData[i]); - } } ); }, - mounted: function() { - this.loadComponents(); + updateRow: function(code) { + this.highlightedRows[code] = true; + this.refresh(); }, - methods: { - refresh: function() { - var self = this; - return $.when(countlyPlugins.initialize()).then( - function() { - try { - var plugins = JSON.parse(JSON.stringify(countlyPlugins.getData())); - self.pluginsData = plugins.filter(function(row) { - self.formatRow(row); - if (self.filterValue === "enabled") { - return row.enabled; - } - else if (self.filterValue === "disabled") { - return !row.enabled; - } - return true; - }); - } - catch (ex) { - self.pluginsData = []; - } - } - ); - }, - updateRow: function(code) { - this.highlightedRows[code] = true; - this.refresh(); - }, - loadComponents: function() { - var cc = countlyVue.container.dataMixin({ - 'pluginComponents': '/plugins/header' - }); - cc = cc.data(); - var allComponents = cc.pluginComponents; - for (var i = 0; i < allComponents.length; i++) { - if (allComponents[i]._id && allComponents[i].component) { - this.components[allComponents[i]._id] = allComponents[i]; - } - } - this.components = Object.assign({}, this.components); - }, - tableRowClassName: function(ob) { - if (this.highlightedRows[ob.row.code]) { - return "plugin-highlighted-row"; + loadComponents: function() { + var cc = countlyVue.container.dataMixin({ + 'pluginComponents': '/plugins/header' + }); + cc = cc.data(); + var allComponents = cc.pluginComponents; + for (var i = 0; i < allComponents.length; i++) { + if (allComponents[i]._id && allComponents[i].component) { + this.components[allComponents[i]._id] = allComponents[i]; } - }, - formatRow: function(row) { - row._id = row.code; - row.name = jQuery.i18n.map[row.code + ".plugin-title"] || jQuery.i18n.map[row.code + ".title"] || row.title; - row.desc = jQuery.i18n.map[row.code + ".plugin-description"] || jQuery.i18n.map[row.code + ".description"] || row.description; - row.deps = Object.keys(row.dependents).map(function(item) { - return countlyPlugins.getTitle(item); - }).join(", "); - }, - updateStatus: function(scope) { - this.scope = scope; - var diff = scope.diff; - this.changes = {}; - var self = this; - diff.forEach(function(item) { - self.changes[item.key] = item.newValue; - }); - this.dialog = { - type: "save", - showDialog: true, - saveButtonLabel: CV.i18n('plugins.yes-i-want-to-apply-changes'), - cancelButtonLabel: CV.i18n('common.no-dont-continue'), - title: CV.i18n('plugins-apply-changes-to-plugins'), - text: CV.i18n('plugins.confirm') - }; - }, - checkProcess: function() { - this.tryCount++; - var self = this; - $.ajax({ - type: "GET", - url: countlyCommon.API_URL + "/o/plugins-check?app_id=" + countlyCommon.ACTIVE_APP_ID, - data: { t: this.tryCount }, - success: function(state) { - if (state.result === "completed") { - self.showPluginProcessMessage(jQuery.i18n.map["plugins.success"], jQuery.i18n.map["plugins.applying"], jQuery.i18n.map["plugins.finish"], 3000, false, 'green', true); - } - else if (state.result === "failed") { - self.showPluginProcessMessage(jQuery.i18n.map["plugins.errors"], jQuery.i18n.map["plugins.errors-msg"], '', 3000, false, 'warning', true); - } - else { - setTimeout(self.checkProcess, 10000); - } - }, - error: function() { - setTimeout(self.checkProcess, 10000); - } - }); - }, - togglePlugin: function(plugins) { - this.loading = true; - var self = this; - this.$loading({ - lock: true, - background: 'rgba(0, 0, 0, 0.7)' - }); - - 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(); + } + this.components = Object.assign({}, this.components); + }, + tableRowClassName: function(ob) { + if (this.highlightedRows[ob.row.code]) { + return "plugin-highlighted-row"; + } + }, + formatRow: function(row) { + row._id = row.code; + row.name = jQuery.i18n.map[row.code + ".plugin-title"] || jQuery.i18n.map[row.code + ".title"] || row.title; + row.desc = jQuery.i18n.map[row.code + ".plugin-description"] || jQuery.i18n.map[row.code + ".description"] || row.description; + row.deps = Object.keys(row.dependents).map(function(item) { + return countlyPlugins.getTitle(item); + }).join(", "); + }, + updateStatus: function(scope) { + this.scope = scope; + var diff = scope.diff; + this.changes = {}; + var self = this; + diff.forEach(function(item) { + self.changes[item.key] = item.newValue; + }); + this.dialog = { + type: "save", + showDialog: true, + saveButtonLabel: CV.i18n('plugins.yes-i-want-to-apply-changes'), + cancelButtonLabel: CV.i18n('common.no-dont-continue'), + title: CV.i18n('plugins-apply-changes-to-plugins'), + text: CV.i18n('plugins.confirm') + }; + }, + checkProcess: function() { + this.tryCount++; + var self = this; + $.ajax({ + type: "GET", + url: countlyCommon.API_URL + "/o/plugins-check?app_id=" + countlyCommon.ACTIVE_APP_ID, + data: { t: this.tryCount }, + success: function(state) { + if (state.result === "completed") { self.showPluginProcessMessage(jQuery.i18n.map["plugins.success"], jQuery.i18n.map["plugins.applying"], jQuery.i18n.map["plugins.finish"], 3000, false, 'green', true); } - else { - self.showPluginProcessMessage(jQuery.i18n.map["plugins.error"], res, jQuery.i18n.map["plugins.retry"], 5000, false, 'error', true); + else if (state.result === "failed") { + self.showPluginProcessMessage(jQuery.i18n.map["plugins.errors"], jQuery.i18n.map["plugins.errors-msg"], '', 3000, false, 'warning', true); } - }); - }, - showPluginProcessMessage: function(title, message, info, delay, sticky, type, reload) { - CountlyHelpers.notify({clearAll: true, type: type, title: title, message: message, info: info, delay: delay, sticky: sticky}); - if (reload) { - setTimeout(function() { - window.location.reload(true); - }, 5000); - } - }, - submitConfirmDialog: function() { - if (this.dialog.type === "save") { - var msg = { title: jQuery.i18n.map["plugins.processing"], message: jQuery.i18n.map["plugins.wait"], info: jQuery.i18n.map["plugins.hold-on"], sticky: true }; - CountlyHelpers.notify(msg); - this.togglePlugin(this.changes); - } - else if (this.dialog.type === "check") { - for (var i = 0; i < this.pluginsData.length; i++) { - if (this.curDependents.indexOf(this.pluginsData[i].code) !== -1) { - this.scope.patch(this.pluginsData[i], {enabled: !this.curRow.enabled}); - } + else { + setTimeout(self.checkProcess, 10000); } + }, + error: function() { + setTimeout(self.checkProcess, 10000); } - this.dialog = {type: "", showDialog: false, saveButtonLabel: "", cancelButtonLabel: "", title: "", text: ""}; - }, - closeConfirmDialog: function() { - if (this.dialog.type === "check") { - this.scope.unpatch(this.curRow); - } - this.dialog = {type: "", showDialog: false, saveButtonLabel: "", cancelButtonLabel: "", title: "", text: ""}; - }, - filter: function(type) { - this.filterValue = type; - try { - var self = this; - var plugins = JSON.parse(JSON.stringify(countlyPlugins.getData())); - this.pluginsData = plugins.filter(function(row) { - self.formatRow(row); - if (type === "enabled") { - return row.enabled; - } - else if (type === "disabled") { - return !row.enabled; - } - return true; - }); + }); + }, + togglePlugin: function(plugins) { + this.loading = true; + var self = this; + this.$loading({ + lock: true, + background: 'rgba(0, 0, 0, 0.7)' + }); + + 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.success"], jQuery.i18n.map["plugins.applying"], jQuery.i18n.map["plugins.finish"], 3000, false, 'green', true); } - catch (ex) { - this.pluginsData = []; + else { + self.showPluginProcessMessage(jQuery.i18n.map["plugins.error"], res, jQuery.i18n.map["plugins.retry"], 5000, false, 'error', true); } - }, - onToggle: function(scope, row) { - this.scope = scope; - this.curRow = row; - scope.patch(row, {enabled: !row.enabled}); - var plugin = row.code; - var plugins = []; - var changes = {}; - var i; - for (i = 0; i < scope.diff.length; i++) { - changes[scope.diff[i].key] = scope.diff[i].newValue; + }); + }, + showPluginProcessMessage: function(title, message, info, delay, sticky, type, reload) { + CountlyHelpers.notify({clearAll: true, type: type, title: title, message: message, info: info, delay: delay, sticky: sticky}); + if (reload) { + setTimeout(function() { + window.location.reload(true); + }, 5000); + } + }, + submitConfirmDialog: function() { + if (this.dialog.type === "save") { + var msg = { title: jQuery.i18n.map["plugins.processing"], message: jQuery.i18n.map["plugins.wait"], info: jQuery.i18n.map["plugins.hold-on"], sticky: true }; + CountlyHelpers.notify(msg); + this.togglePlugin(this.changes); + } + else if (this.dialog.type === "check") { + for (var i = 0; i < this.pluginsData.length; i++) { + if (this.curDependents.indexOf(this.pluginsData[i].code) !== -1) { + this.scope.patch(this.pluginsData[i], {enabled: !this.curRow.enabled}); + } } - for (i = 0; i < this.pluginsData.length; i++) { - if (changes[this.pluginsData[i].code]) { - plugins.push(this.pluginsData[i].code); + } + this.dialog = {type: "", showDialog: false, saveButtonLabel: "", cancelButtonLabel: "", title: "", text: ""}; + }, + closeConfirmDialog: function() { + if (this.dialog.type === "check") { + this.scope.unpatch(this.curRow); + } + this.dialog = {type: "", showDialog: false, saveButtonLabel: "", cancelButtonLabel: "", title: "", text: ""}; + }, + filter: function(type) { + this.filterValue = type; + try { + var self = this; + var plugins = JSON.parse(JSON.stringify(countlyPlugins.getData())); + this.pluginsData = plugins.filter(function(row) { + self.formatRow(row); + if (type === "enabled") { + return row.enabled; } - else if (typeof changes[this.pluginsData[i].code] === "undefined" && this.pluginsData[i].enabled) { - plugins.push(this.pluginsData[i].code); + else if (type === "disabled") { + return !row.enabled; } + return true; + }); + } + catch (ex) { + this.pluginsData = []; + } + }, + onToggle: function(scope, row) { + this.scope = scope; + this.curRow = row; + scope.patch(row, {enabled: !row.enabled}); + var plugin = row.code; + var plugins = []; + var changes = {}; + var i; + for (i = 0; i < scope.diff.length; i++) { + changes[scope.diff[i].key] = scope.diff[i].newValue; + } + for (i = 0; i < this.pluginsData.length; i++) { + if (changes[this.pluginsData[i].code]) { + plugins.push(this.pluginsData[i].code); } - //diff does not include currently processed plugin - if (!row.enabled) { - plugins.push(row.code); + else if (typeof changes[this.pluginsData[i].code] === "undefined" && this.pluginsData[i].enabled) { + plugins.push(this.pluginsData[i].code); } + } + //diff does not include currently processed plugin + if (!row.enabled) { + plugins.push(row.code); + } - var enabledDescendants = _.intersection(countlyPlugins.getRelativePlugins(plugin, "down"), plugins), - disabledAncestors = _.difference(countlyPlugins.getRelativePlugins(plugin, "up"), plugins, ["___CLY_ROOT___"]); + var enabledDescendants = _.intersection(countlyPlugins.getRelativePlugins(plugin, "down"), plugins), + disabledAncestors = _.difference(countlyPlugins.getRelativePlugins(plugin, "up"), plugins, ["___CLY_ROOT___"]); - if (row.enabled && enabledDescendants.length > 0) { - this.curDependents = enabledDescendants; - this.dialog = { - type: "check", - showDialog: true, - saveButtonLabel: CV.i18n('plugins.yes-i-want-to-continue'), - cancelButtonLabel: CV.i18n('common.no-dont-continue'), - title: CV.i18n('plugins.indirect-status-change'), - text: CV.i18n("plugins.disable-descendants", countlyPlugins.getTitle(plugin), enabledDescendants.map(function(item) { - return countlyPlugins.getTitle(item); - }).join(", ")) - }; - } - else if (!row.enabled && disabledAncestors.length > 0) { - this.curDependents = disabledAncestors; - this.dialog = { - type: "check", - showDialog: true, - saveButtonLabel: CV.i18n('plugins.yes-i-want-to-continue'), - cancelButtonLabel: CV.i18n('common.no-dont-continue'), - title: CV.i18n('plugins.indirect-status-change'), - text: CV.i18n("plugins.enable-ancestors", countlyPlugins.getTitle(plugin), disabledAncestors.map(function(item) { - return countlyPlugins.getTitle(item); - }).join(", ")) - }; - } + if (row.enabled && enabledDescendants.length > 0) { + this.curDependents = enabledDescendants; + this.dialog = { + type: "check", + showDialog: true, + saveButtonLabel: CV.i18n('plugins.yes-i-want-to-continue'), + cancelButtonLabel: CV.i18n('common.no-dont-continue'), + title: CV.i18n('plugins.indirect-status-change'), + text: CV.i18n("plugins.disable-descendants", countlyPlugins.getTitle(plugin), enabledDescendants.map(function(item) { + return countlyPlugins.getTitle(item); + }).join(", ")) + }; + } + else if (!row.enabled && disabledAncestors.length > 0) { + this.curDependents = disabledAncestors; + this.dialog = { + type: "check", + showDialog: true, + saveButtonLabel: CV.i18n('plugins.yes-i-want-to-continue'), + cancelButtonLabel: CV.i18n('common.no-dont-continue'), + title: CV.i18n('plugins.indirect-status-change'), + text: CV.i18n("plugins.enable-ancestors", countlyPlugins.getTitle(plugin), disabledAncestors.map(function(item) { + return countlyPlugins.getTitle(item); + }).join(", ")) + }; } } - }); + } + }); - var ConfigurationsView = countlyVue.views.create({ - template: CV.T('/plugins/templates/configurations.html'), - computed: { - selectedConfigSearchBar: { - get: function() { - return this.selectedConfig; - }, - set: function(value) { - this.selectedConfig = value; - this.diff = []; - this.diff_ = {}; - try { - this.configsData = JSON.parse(JSON.stringify(countlyPlugins.getConfigsData())); - } - catch (ex) { - this.configsData = {}; - } + var ConfigurationsView = countlyVue.views.create({ + template: CV.T('/plugins/templates/configurations.html'), + computed: { + selectedConfigSearchBar: { + get: function() { + return this.selectedConfig; + }, + set: function(value) { + this.selectedConfig = value; + this.diff = []; + this.diff_ = {}; + try { + this.configsData = JSON.parse(JSON.stringify(countlyPlugins.getConfigsData())); + } + catch (ex) { + this.configsData = {}; + } - if (this.configsData.frontend && this.configsData.frontend._user) { - this.configsData.frontend.__user = []; - for (var userProp in this.configsData.frontend._user) { - if (this.configsData.frontend._user[userProp]) { - this.configsData.frontend.__user.push(userProp); - } + if (this.configsData.frontend && this.configsData.frontend._user) { + this.configsData.frontend.__user = []; + for (var userProp in this.configsData.frontend._user) { + if (this.configsData.frontend._user[userProp]) { + this.configsData.frontend.__user.push(userProp); } } - app.navigate("#/manage/configurations/" + value); } - }, - selectedConfigName: function() { - return this.getLabel(this.selectedConfig); + app.navigate("#/manage/configurations/" + value); } }, - data: function() { - return { - back: this.$route.params.namespace === "search", - configsData: {}, - configsList: [], - coreDefaults: ['api', 'frontend', 'logs', 'security'], - diff: [], - diff_: {}, - selectedConfig: this.$route.params.namespace || "api", - searchPlaceholder: CV.i18n("configs.search-settings"), - predefinedLabels: app.configurationsView.predefinedLabels, - predefinedInputs: app.configurationsView.predefinedInputs, - predefinedStructure: app.configurationsView.predefinedStructure, - searchQuery: this.$route.params.searchQuery || "", - searchResultStructure: {}, - }; - }, - beforeCreate: function() { - var self = this; - if (this.$route.params.success) { - CountlyHelpers.notify({ - title: jQuery.i18n.map["configs.changed"], - message: jQuery.i18n.map["configs.saved"] - }); - this.$route.params.success = false; - app.noHistory("#/manage/configurations/" + this.$route.params.namespace || "api"); - } - return $.when(countlyPlugins.initializeConfigs()) - .then(function() { - try { - self.configsData = JSON.parse(JSON.stringify(countlyPlugins.getConfigsData())); - self.removeNonGlobalConfigs(self.configsData); - } - catch (error) { - // eslint-disable-next-line no-console - console.error(error); - self.configsData = {}; - } + selectedConfigName: function() { + return this.getLabel(this.selectedConfig); + } + }, + data: function() { + return { + back: this.$route.params.namespace === "search", + configsData: {}, + configsList: [], + coreDefaults: ['api', 'frontend', 'logs', 'security'], + diff: [], + diff_: {}, + selectedConfig: this.$route.params.namespace || "api", + searchPlaceholder: CV.i18n("configs.search-settings"), + predefinedLabels: app.configurationsView.predefinedLabels, + predefinedInputs: app.configurationsView.predefinedInputs, + predefinedStructure: app.configurationsView.predefinedStructure, + searchQuery: this.$route.params.searchQuery || "", + searchResultStructure: {}, + }; + }, + beforeCreate: function() { + var self = this; + if (this.$route.params.success) { + CountlyHelpers.notify({ + title: jQuery.i18n.map["configs.changed"], + message: jQuery.i18n.map["configs.saved"] + }); + this.$route.params.success = false; + app.noHistory("#/manage/configurations/" + this.$route.params.namespace || "api"); + } + return $.when(countlyPlugins.initializeConfigs()) + .then(function() { + try { + self.configsData = JSON.parse(JSON.stringify(countlyPlugins.getConfigsData())); + self.removeNonGlobalConfigs(self.configsData); + } + catch (error) { + // eslint-disable-next-line no-console + console.error(error); + self.configsData = {}; + } - if (self.configsData.frontend && self.configsData.frontend._user && !self.predefinedInputs["frontend.__user"]) { - var list = []; - self.configsData.frontend.__user = []; - for (var userProp in self.configsData.frontend._user) { - list.push({value: userProp, label: self.getLabelName(userProp, "frontend")}); - if (self.configsData.frontend._user[userProp]) { - self.configsData.frontend.__user.push(userProp); - } + if (self.configsData.frontend && self.configsData.frontend._user && !self.predefinedInputs["frontend.__user"]) { + var list = []; + self.configsData.frontend.__user = []; + for (var userProp in self.configsData.frontend._user) { + list.push({value: userProp, label: self.getLabelName(userProp, "frontend")}); + if (self.configsData.frontend._user[userProp]) { + self.configsData.frontend.__user.push(userProp); } - app.configurationsView.registerInput("frontend.__user", {input: "el-select", attrs: {multiple: true}, list: list}); } + app.configurationsView.registerInput("frontend.__user", {input: "el-select", attrs: {multiple: true}, list: list}); + } + self.configsList.push({ + "label": self.getLabel("core"), + "group": true, + "value": "core" + }); + self.coreDefaults.forEach(function(key) { self.configsList.push({ - "label": self.getLabel("core"), - "group": true, - "value": "core" - }); - self.coreDefaults.forEach(function(key) { - self.configsList.push({ - "label": self.getLabel(key, true), - "value": key - }); - }); - self.configsList.push({ - "label": self.getLabel("plugins"), - "group": true, - "value": "plugins" + "label": self.getLabel(key, true), + "value": key }); - var plugins = []; - for (var key in self.configsData) { - if (self.coreDefaults.indexOf(key) === -1 && countlyGlobal.plugins.indexOf(key) !== -1) { - plugins.push(key); + }); + self.configsList.push({ + "label": self.getLabel("plugins"), + "group": true, + "value": "plugins" + }); + var plugins = []; + for (var key in self.configsData) { + if (self.coreDefaults.indexOf(key) === -1 && countlyGlobal.plugins.indexOf(key) !== -1) { + plugins.push(key); + } + if (!self.predefinedStructure[key]) { + self.predefinedStructure[key] = {groups: []}; + } + var otherStructure = []; + for (var subkey in self.configsData[key]) { + if (!self.predefinedInputs[key + "." + subkey]) { + var type = typeof self.configsData[key][subkey]; + if (type === "string") { + app.configurationsView.registerInput(key + "." + subkey, {input: "el-input", attrs: {}}); + } + else if (type === "number") { + app.configurationsView.registerInput(key + "." + subkey, {input: "el-input-number", attrs: {}}); + } + else if (type === "boolean") { + app.configurationsView.registerInput(key + "." + subkey, {input: "el-switch", attrs: {}}); + } } - if (!self.predefinedStructure[key]) { - self.predefinedStructure[key] = {groups: []}; + if (!self.predefinedStructure[key].groups.length) { + otherStructure.push(subkey); } - var otherStructure = []; - for (var subkey in self.configsData[key]) { - if (!self.predefinedInputs[key + "." + subkey]) { - var type = typeof self.configsData[key][subkey]; - if (type === "string") { - app.configurationsView.registerInput(key + "." + subkey, {input: "el-input", attrs: {}}); - } - else if (type === "number") { - app.configurationsView.registerInput(key + "." + subkey, {input: "el-input-number", attrs: {}}); - } - else if (type === "boolean") { - app.configurationsView.registerInput(key + "." + subkey, {input: "el-switch", attrs: {}}); + else { + var found = false; + for (var i = 0; i < self.predefinedStructure[key].groups.length; i++) { + if (self.predefinedStructure[key].groups[i].list.indexOf(subkey) !== -1) { + found = true; + break; } } - if (!self.predefinedStructure[key].groups.length) { + if (!found) { otherStructure.push(subkey); } - else { - var found = false; - for (var i = 0; i < self.predefinedStructure[key].groups.length; i++) { - if (self.predefinedStructure[key].groups[i].list.indexOf(subkey) !== -1) { - found = true; - break; - } - } - if (!found) { - otherStructure.push(subkey); - } - } - } - if (otherStructure.length) { - self.predefinedStructure[key].groups.push({label: "", list: otherStructure}); } } - plugins.sort(); - plugins.forEach(function(k) { - self.configsList.push({ - "label": self.getLabel(k, true), - "value": k - }); - }); - if (self.searchQuery !== "") { - self.onEnterSearch(); - window.scrollTo({top: 0, behavior: "smooth"}); + if (otherStructure.length) { + self.predefinedStructure[key].groups.push({label: "", list: otherStructure}); } + } + plugins.sort(); + plugins.forEach(function(k) { + self.configsList.push({ + "label": self.getLabel(k, true), + "value": k + }); }); + if (self.searchQuery !== "") { + self.onEnterSearch(); + window.scrollTo({top: 0, behavior: "smooth"}); + } + }); + }, + updated: function() { + if (this.$route.params.section) { + this.scrollToSection(this.$route.params.section); + } + }, + methods: { + removeNonGlobalConfigs: function(configData) { + Object.keys(configData).forEach(function(configKey) { + if ((configData[configKey].use_google || configData[configKey].google_maps_api_key) && configKey === 'frontend') { + delete configData[configKey].use_google; + delete configData[configKey].google_maps_api_key; + } + if (configData[configKey].rate && configKey === 'push') { + delete configData[configKey].rate; // Note: push notification rate is app level config only + } + if (configData[configKey].test && configKey === 'push') { + delete configData[configKey].test; // Note: push notification test is app level config only + } + }); }, - updated: function() { - if (this.$route.params.section) { - this.scrollToSection(this.$route.params.section); + onChange: function(key, value, config) { + var configsData = countlyPlugins.getConfigsData(); + + config = config || this.selectedConfig; + if (!this.diff_[config]) { + this.diff_[config] = []; } - }, - methods: { - removeNonGlobalConfigs: function(configData) { - Object.keys(configData).forEach(function(configKey) { - if ((configData[configKey].use_google || configData[configKey].google_maps_api_key) && configKey === 'frontend') { - delete configData[configKey].use_google; - delete configData[configKey].google_maps_api_key; - } - if (configData[configKey].rate && configKey === 'push') { - delete configData[configKey].rate; // Note: push notification rate is app level config only - } - if (configData[configKey].test && configKey === 'push') { - delete configData[configKey].test; // Note: push notification test is app level config only - } - }); - }, - onChange: function(key, value, config) { - var configsData = countlyPlugins.getConfigsData(); - config = config || this.selectedConfig; - if (!this.diff_[config]) { - this.diff_[config] = []; - } + //delete value from diff if it already exists + var index = this.diff.indexOf(key); + if (index > -1) { + this.diff.splice(index, 1); + index = this.diff_[config].indexOf(key); + this.diff_[config].splice(index, 1); + } - //delete value from diff if it already exists - var index = this.diff.indexOf(key); + 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 + this.configsData[config].city_data = false; + //if city data tracking was originally enabled, note the change + index = this.diff.indexOf("city_data"); if (index > -1) { this.diff.splice(index, 1); - index = this.diff_[config].indexOf(key); + index = this.diff_[config].indexOf("city_data"); this.diff_[config].splice(index, 1); } - - 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 - this.configsData[config].city_data = false; - //if city data tracking was originally enabled, note the change - index = this.diff.indexOf("city_data"); - if (index > -1) { - this.diff.splice(index, 1); - index = this.diff_[config].indexOf("city_data"); - this.diff_[config].splice(index, 1); - } - if (configsData[config].city_data === true) { - this.diff.push("city_data"); - this.diff_[config].push("city_data"); - } + if (configsData[config].city_data === true) { + this.diff.push("city_data"); + this.diff_[config].push("city_data"); } - //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 - this.configsData[config].country_data = true; - //if country data tracking was originally disabled, note the change - index = this.diff.indexOf("country_data"); - if (index > -1) { - this.diff.splice(index, 1); - index = this.diff_[config].indexOf("country_data"); - this.diff_[config].splice(index, 1); - } - if (configsData[config].country_data === false) { - this.diff.push("country_data"); - this.diff_[config].push("country_data"); - } + } + //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 + this.configsData[config].country_data = true; + //if country data tracking was originally disabled, note the change + index = this.diff.indexOf("country_data"); + if (index > -1) { + this.diff.splice(index, 1); + index = this.diff_[config].indexOf("country_data"); + this.diff_[config].splice(index, 1); + } + if (configsData[config].country_data === false) { + this.diff.push("country_data"); + this.diff_[config].push("country_data"); } + } - if (Array.isArray(value) && Array.isArray(configsData[config][key])) { - value.sort(); - configsData[config][key].sort(); + if (Array.isArray(value) && Array.isArray(configsData[config][key])) { + value.sort(); + configsData[config][key].sort(); - if (JSON.stringify(value) !== JSON.stringify(configsData[config][key])) { - this.diff.push(key); - this.diff_[config].push(key); - } - } - else if (configsData[config][key] !== value) { + if (JSON.stringify(value) !== JSON.stringify(configsData[config][key])) { this.diff.push(key); this.diff_[config].push(key); } - }, - getLabel: function(id) { - return app.configurationsView.getInputLabel(id); - }, - getLabelName: function(id, ns) { - ns = ns || this.selectedConfig; - if (ns !== "frontend" && ns !== "api" && ns !== "apps" && ns !== "logs" && ns !== "security" && countlyGlobal.plugins.indexOf(ns) === -1) { - return null; - } + } + else if (configsData[config][key] !== value) { + this.diff.push(key); + this.diff_[config].push(key); + } + }, + getLabel: function(id) { + return app.configurationsView.getInputLabel(id); + }, + getLabelName: function(id, ns) { + ns = ns || this.selectedConfig; + if (ns !== "frontend" && ns !== "api" && ns !== "apps" && ns !== "logs" && ns !== "security" && countlyGlobal.plugins.indexOf(ns) === -1) { + return null; + } - if (id === "__user") { - return jQuery.i18n.map["configs.user-level-configuration"]; - } + if (id === "__user") { + return jQuery.i18n.map["configs.user-level-configuration"]; + } - return app.configurationsView.getInputLabel(ns + "." + id); - }, - getHelperLabel: function(id, ns) { - ns = ns || this.selectedConfig; - return app.configurationsView.getHelperLabel(id, ns); - }, - getInputType: function(id, configId) { - configId = configId || this.selectedConfig; - return app.configurationsView.getInputType(configId + "." + id); - }, - getConfigType: function(id) { - return this.coreDefaults.includes(id) ? "Core" : "Plugins"; - }, - checkIfOverwritten: function(id, ns) { - ns = ns || this.selectedConfig; - var configsData = countlyPlugins.getConfigsData(); - 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 - 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"}; - } - } - //check if config overwritten on app level - else if (plugs && plugs[ns] && typeof plugs[ns][id] !== "undefined") { - return {label: jQuery.i18n.map["configs.overwritten.app"], href: "#/manage/apps"}; - } - }, - unpatch: function() { - try { - this.configsData = JSON.parse(JSON.stringify(countlyPlugins.getConfigsData())); - } - catch (ex) { - this.configsData = {}; + return app.configurationsView.getInputLabel(ns + "." + id); + }, + getHelperLabel: function(id, ns) { + ns = ns || this.selectedConfig; + return app.configurationsView.getHelperLabel(id, ns); + }, + getInputType: function(id, configId) { + configId = configId || this.selectedConfig; + return app.configurationsView.getInputType(configId + "." + id); + }, + getConfigType: function(id) { + return this.coreDefaults.includes(id) ? "Core" : "Plugins"; + }, + checkIfOverwritten: function(id, ns) { + ns = ns || this.selectedConfig; + var configsData = countlyPlugins.getConfigsData(); + 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 + 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"}; } - this.diff = []; - this.diff_ = {}; - if (this.configsData.frontend && this.configsData.frontend._user) { - this.configsData.frontend.__user = []; - for (var userProp in this.configsData.frontend._user) { - if (this.configsData.frontend._user[userProp]) { - this.configsData.frontend.__user.push(userProp); - } + } + //check if config overwritten on app level + else if (plugs && plugs[ns] && typeof plugs[ns][id] !== "undefined") { + return {label: jQuery.i18n.map["configs.overwritten.app"], href: "#/manage/apps"}; + } + }, + unpatch: function() { + try { + this.configsData = JSON.parse(JSON.stringify(countlyPlugins.getConfigsData())); + } + catch (ex) { + this.configsData = {}; + } + this.diff = []; + this.diff_ = {}; + if (this.configsData.frontend && this.configsData.frontend._user) { + this.configsData.frontend.__user = []; + for (var userProp in this.configsData.frontend._user) { + if (this.configsData.frontend._user[userProp]) { + this.configsData.frontend.__user.push(userProp); } } - }, - save: function() { - var changes = {}; - var self = this; - for (var i = 0; i < Object.keys(self.diff_).length; i++) { - var config = Object.keys(self.diff_)[i]; - changes[config] = {}; - for (var j = 0; j < self.diff_[config].length; j++) { - if (self.diff_[config][j] === "__user") { - if (!changes[config]._user) { - changes[config]._user = {}; + } + }, + save: function() { + var changes = {}; + var self = this; + for (var i = 0; i < Object.keys(self.diff_).length; i++) { + var config = Object.keys(self.diff_)[i]; + changes[config] = {}; + for (var j = 0; j < self.diff_[config].length; j++) { + if (self.diff_[config][j] === "__user") { + if (!changes[config]._user) { + changes[config]._user = {}; + } + for (var userProp in self.configsData[config]._user) { + if (self.configsData[config][self.diff_[config][j]].indexOf(userProp) === -1) { + changes[config]._user[userProp] = false; } - for (var userProp in self.configsData[config]._user) { - if (self.configsData[config][self.diff_[config][j]].indexOf(userProp) === -1) { - changes[config]._user[userProp] = false; - } - else { - changes[config]._user[userProp] = true; - } + else { + changes[config]._user[userProp] = true; } } - else { - changes[config][self.diff_[config][j]] = self.configsData[config][self.diff_[config][j]]; - } + } + else { + changes[config][self.diff_[config][j]] = self.configsData[config][self.diff_[config][j]]; } } - countlyPlugins.updateConfigs(changes, function(err) { - if (err) { - CountlyHelpers.notify({ - title: jQuery.i18n.map["configs.not-saved"], - message: jQuery.i18n.map["configs.not-changed"], - type: "error" - }); + } + countlyPlugins.updateConfigs(changes, function(err) { + if (err) { + CountlyHelpers.notify({ + title: jQuery.i18n.map["configs.not-saved"], + message: jQuery.i18n.map["configs.not-changed"], + type: "error" + }); + } + else { + if (self.back) { + location.hash += "/success"; } else { - if (self.back) { - location.hash += "/success"; - } - else { - location.hash = "#/manage/configurations/" + self.selectedConfig + "/success"; - } - window.location.reload(true); + location.hash = "#/manage/configurations/" + self.selectedConfig + "/success"; } - }); - }, - onFocus: function() { - if (this.searchQuery === "") { - this.back = true; - this.selectedConfigSearchBar = "search"; + window.location.reload(true); } - }, - onEnterSearch: function() { - var self = this; - self.unpatch(); - var res = {}; - if (self.searchQuery && self.searchQuery !== "") { - self.searchQuery = self.searchQuery.toLowerCase(); - for (var config in self.predefinedStructure) { - if (config.toLowerCase().includes(self.searchQuery) && CountlyHelpers.isPluginEnabled(config.toLowerCase())) { - res[config] = self.predefinedStructure[config]; - } - else { - let groups = []; - // eslint-disable-next-line no-loop-func - self.predefinedStructure[config].groups.map(function(group) { - if (CountlyHelpers.isPluginEnabled(config.toLowerCase())) { - if (group.label && CV.i18n(group.label).toLowerCase().includes(self.searchQuery)) { - groups.push(group); - } - else { - let list = group.list.filter(function(item) { - let label = self.getLabelName(item, config) || ""; - let helper = self.getHelperLabel(item, config) || ""; - return label.toLowerCase().includes(self.searchQuery) - || helper.toLowerCase().includes(self.searchQuery); - }); - if (list.length > 0) { - let tmp = group; - tmp.list = list; - groups.push(tmp); - } + }); + }, + onFocus: function() { + if (this.searchQuery === "") { + this.back = true; + this.selectedConfigSearchBar = "search"; + } + }, + onEnterSearch: function() { + var self = this; + self.unpatch(); + var res = {}; + if (self.searchQuery && self.searchQuery !== "") { + self.searchQuery = self.searchQuery.toLowerCase(); + for (var config in self.predefinedStructure) { + if (config.toLowerCase().includes(self.searchQuery) && CountlyHelpers.isPluginEnabled(config.toLowerCase())) { + res[config] = self.predefinedStructure[config]; + } + else { + let groups = []; + // eslint-disable-next-line no-loop-func + self.predefinedStructure[config].groups.map(function(group) { + if (CountlyHelpers.isPluginEnabled(config.toLowerCase())) { + if (group.label && CV.i18n(group.label).toLowerCase().includes(self.searchQuery)) { + groups.push(group); + } + else { + let list = group.list.filter(function(item) { + let label = self.getLabelName(item, config) || ""; + let helper = self.getHelperLabel(item, config) || ""; + return label.toLowerCase().includes(self.searchQuery) + || helper.toLowerCase().includes(self.searchQuery); + }); + if (list.length > 0) { + let tmp = group; + tmp.list = list; + groups.push(tmp); } } - }); - if (groups.length > 0) { - res[config] = {groups}; } + }); + if (groups.length > 0) { + res[config] = {groups}; } } - if (Object.keys(res).length === 0) { - res.empty = true; - } - self.searchResultStructure = res; - app.navigate("#/manage/configurations/search/" + self.searchQuery); } - else { - self.searchResultStructure = {}; + if (Object.keys(res).length === 0) { + res.empty = true; } - }, - redirectToConfig: function(config, section) { - return section - ? "#/manage/configurations/" + config + "#" + section + "" - : "#/manage/configurations/" + config + ""; - }, - scrollToSection: function(id) { - let element = document.getElementById(id); - element.scrollIntoView({behavior: "smooth"}); - }, - clearSearch: function() { - this.searchQuery = ""; - //this.searchResultStructure = {}; + self.searchResultStructure = res; + app.navigate("#/manage/configurations/search/" + self.searchQuery); } + else { + self.searchResultStructure = {}; + } + }, + redirectToConfig: function(config, section) { + return section + ? "#/manage/configurations/" + config + "#" + section + "" + : "#/manage/configurations/" + config + ""; + }, + scrollToSection: function(id) { + let element = document.getElementById(id); + element.scrollIntoView({behavior: "smooth"}); + }, + clearSearch: function() { + this.searchQuery = ""; + //this.searchResultStructure = {}; } - }); + } + }); - var AccountView = countlyVue.views.create({ - template: CV.T('/plugins/templates/account-settings.html'), - data: function() { - return { - uploadData: { - _csrf: countlyGlobal.csrf_token, - member_image_id: countlyGlobal.member._id - }, - changes: {}, - deleteAccount: { - showDialog: false, - title: CV.i18n("configs.delete-account"), - saveButtonLabel: CV.i18n("configs.delete-my-account"), - cancelButtonLabel: CV.i18n("configs.cancel"), - password: "" - }, - changePassword: { - showDialog: this.$route.params && this.$route.params.reset || false, - title: CV.i18n("configs.change-password"), - saveButtonLabel: CV.i18n("configs.change-password"), - cancelButtonLabel: CV.i18n("configs.cancel"), - password: "", - newPassword: "", - confirmPassword: "" - }, - noaccess: this.$route.params && this.$route.params.noaccess || false, - components: {}, - formId: "account-settings-form", - userData: countlyGlobal.member, - userConfigs: {}, - avatar: this.setDefaultAvatar(countlyGlobal.member.member_image), - initials: this.updateInitials(countlyGlobal.member.full_name), - predefinedLabels: app.configurationsView.predefinedLabels, - predefinedInputs: app.configurationsView.predefinedInputs, - selectedConfig: "frontend", - security: countlyGlobal.security - }; - }, - beforeCreate: function() { - var self = this; - return $.when(countlyPlugins.initializeUserConfigs()) - .then(function() { - try { - self.userConfigs = JSON.parse(JSON.stringify(countlyPlugins.getUserConfigsData())); - } - catch (ex) { - self.userConfigs = {}; + var AccountView = countlyVue.views.create({ + template: CV.T('/plugins/templates/account-settings.html'), + data: function() { + return { + uploadData: { + _csrf: countlyGlobal.csrf_token, + member_image_id: countlyGlobal.member._id + }, + changes: {}, + deleteAccount: { + showDialog: false, + title: CV.i18n("configs.delete-account"), + saveButtonLabel: CV.i18n("configs.delete-my-account"), + cancelButtonLabel: CV.i18n("configs.cancel"), + password: "" + }, + changePassword: { + showDialog: this.$route.params && this.$route.params.reset || false, + title: CV.i18n("configs.change-password"), + saveButtonLabel: CV.i18n("configs.change-password"), + cancelButtonLabel: CV.i18n("configs.cancel"), + password: "", + newPassword: "", + confirmPassword: "" + }, + noaccess: this.$route.params && this.$route.params.noaccess || false, + components: {}, + formId: "account-settings-form", + userData: countlyGlobal.member, + userConfigs: {}, + avatar: this.setDefaultAvatar(countlyGlobal.member.member_image), + initials: this.updateInitials(countlyGlobal.member.full_name), + predefinedLabels: app.configurationsView.predefinedLabels, + predefinedInputs: app.configurationsView.predefinedInputs, + selectedConfig: "frontend", + security: countlyGlobal.security + }; + }, + beforeCreate: function() { + var self = this; + return $.when(countlyPlugins.initializeUserConfigs()) + .then(function() { + try { + self.userConfigs = JSON.parse(JSON.stringify(countlyPlugins.getUserConfigsData())); + } + catch (ex) { + self.userConfigs = {}; + } + if (!self.userConfigs.frontend) { + self.userConfigs.frontend = {}; + } + for (var key in app.configurationsView.predefinedUserInputs) { + var parts = key.split("."); + var val = app.configurationsView.predefinedUserInputs[key]; + if (!self.userConfigs[parts[0]]) { + self.userConfigs[parts[0]] = {}; } - if (!self.userConfigs.frontend) { - self.userConfigs.frontend = {}; + if (parts[1]) { + self.userConfigs[parts[0]][parts[1]] = typeof val === "function" ? val() : val; } - for (var key in app.configurationsView.predefinedUserInputs) { - var parts = key.split("."); - var val = app.configurationsView.predefinedUserInputs[key]; - if (!self.userConfigs[parts[0]]) { - self.userConfigs[parts[0]] = {}; + } + for (var subkey in self.userConfigs[self.selectedConfig]) { + if (!self.predefinedInputs[self.selectedConfig + "." + subkey]) { + var type = typeof self.userConfigs[self.selectedConfig][subkey]; + if (type === "string") { + app.configurationsView.registerInput(self.selectedConfig + "." + subkey, {input: "el-input", attrs: {}}); } - if (parts[1]) { - self.userConfigs[parts[0]][parts[1]] = typeof val === "function" ? val() : val; + else if (type === "number") { + app.configurationsView.registerInput(self.selectedConfig + "." + subkey, {input: "el-input-number", attrs: {}}); } - } - for (var subkey in self.userConfigs[self.selectedConfig]) { - if (!self.predefinedInputs[self.selectedConfig + "." + subkey]) { - var type = typeof self.userConfigs[self.selectedConfig][subkey]; - if (type === "string") { - app.configurationsView.registerInput(self.selectedConfig + "." + subkey, {input: "el-input", attrs: {}}); - } - else if (type === "number") { - app.configurationsView.registerInput(self.selectedConfig + "." + subkey, {input: "el-input-number", attrs: {}}); - } - else if (type === "boolean") { - app.configurationsView.registerInput(self.selectedConfig + "." + subkey, {input: "el-switch", attrs: {}}); - } + else if (type === "boolean") { + app.configurationsView.registerInput(self.selectedConfig + "." + subkey, {input: "el-switch", attrs: {}}); } } - self.loadComponents(); - }); - }, - methods: { - onChange: function(id, key, value) { - if (!this.changes[id]) { - this.changes[id] = {}; } + self.loadComponents(); + }); + }, + methods: { + onChange: function(id, key, value) { + if (!this.changes[id]) { + this.changes[id] = {}; + } - this.changes[id][key] = value; - - var configsData = countlyPlugins.getUserConfigsData(); + this.changes[id][key] = value; - if (!this.changes[id]) { - this.changes[id] = {}; - } + var configsData = countlyPlugins.getUserConfigsData(); - //delete value from diff if it already exists - delete this.changes[id][key]; + if (!this.changes[id]) { + this.changes[id] = {}; + } - this.userConfigs[id][key] = value; + //delete value from diff if it already exists + delete this.changes[id][key]; - if (Array.isArray(value) && Array.isArray(configsData[id][key])) { - value.sort(); - configsData[id][key].sort(); - if (JSON.stringify(value) !== JSON.stringify(configsData[id][key])) { - this.changes[id][key] = value; - } + this.userConfigs[id][key] = value; - } - else if (configsData[id][key] !== value) { + if (Array.isArray(value) && Array.isArray(configsData[id][key])) { + value.sort(); + configsData[id][key].sort(); + if (JSON.stringify(value) !== JSON.stringify(configsData[id][key])) { this.changes[id][key] = value; } - }, - passwordDialog: function() { - var old_pwd = this.changePassword.password; - var new_pwd = this.changePassword.newPassword; - var re_new_pwd = this.changePassword.confirmPassword; - if (old_pwd.length > 0 && new_pwd.length > 0 && re_new_pwd.length > 0) { - var data = { - _csrf: countlyGlobal.csrf_token, - username: countlyGlobal.member.username, - full_name: countlyGlobal.member.full_name, - api_key: countlyGlobal.member.api_key, - old_pwd: old_pwd, - new_pwd: new_pwd, - re_new_pwd: re_new_pwd - }; - this.saveSettings(data); - } - else { - CountlyHelpers.notify({ - title: jQuery.i18n.map["configs.not-saved"], - message: jQuery.i18n.map["configs.fill-required-fields"], - type: "error" - }); - } - }, - submitDeleteDialog: function() { - var pv = this.deleteAccount.password.trim(); - if (pv === "") { - var msg1 = {title: jQuery.i18n.map["common.error"], message: jQuery.i18n.map["user-settings.password-mandatory"], clearAll: true, type: "error"}; - CountlyHelpers.notify(msg1); - } - else { - countlyPlugins.deleteAccount({password: pv}, function(err, msg) { - if (msg === true || msg === 'true') { - window.location = "/login"; //deleted. go to login - } - else if (msg === 'password not valid' || msg === 'password mandatory' || msg === 'global admin limit') { - CountlyHelpers.notify({title: jQuery.i18n.map["common.error"], message: jQuery.i18n.map["user-settings." + msg], sticky: true, clearAll: true, type: "error"}); - } - else if (err === true) { - var msg2 = {title: jQuery.i18n.map["common.error"], message: msg, sticky: true, clearAll: true, type: "error"}; - CountlyHelpers.notify(msg2); - } - }); - } - }, - getLabelName: function(id, key) { - return app.configurationsView.getInputLabel(id + "." + key); - }, - getInputType: function(id, key) { - return app.configurationsView.getInputType(id + "." + key); - }, - save: function(doc) { + } + else if (configsData[id][key] !== value) { + this.changes[id][key] = value; + } + }, + passwordDialog: function() { + var old_pwd = this.changePassword.password; + var new_pwd = this.changePassword.newPassword; + var re_new_pwd = this.changePassword.confirmPassword; + + if (old_pwd.length > 0 && new_pwd.length > 0 && re_new_pwd.length > 0) { var data = { _csrf: countlyGlobal.csrf_token, - username: doc.username, - full_name: doc.full_name, - api_key: doc.api_key + username: countlyGlobal.member.username, + full_name: countlyGlobal.member.full_name, + api_key: countlyGlobal.member.api_key, + old_pwd: old_pwd, + new_pwd: new_pwd, + re_new_pwd: re_new_pwd }; this.saveSettings(data); - }, - saveSettings: function(doc) { - var self = this; - $.ajax({ - type: "POST", - url: countlyGlobal.path + "/user/settings", - data: doc, - success: function(result) { - if (result === "username-exists") { - CountlyHelpers.notify({ - title: jQuery.i18n.map["configs.not-saved"], - message: jQuery.i18n.map["management-users.username.exists"], - type: "error" - }); - return true; + } + else { + CountlyHelpers.notify({ + title: jQuery.i18n.map["configs.not-saved"], + message: jQuery.i18n.map["configs.fill-required-fields"], + type: "error" + }); + } + }, + submitDeleteDialog: function() { + var pv = this.deleteAccount.password.trim(); + if (pv === "") { + var msg1 = {title: jQuery.i18n.map["common.error"], message: jQuery.i18n.map["user-settings.password-mandatory"], clearAll: true, type: "error"}; + CountlyHelpers.notify(msg1); + } + else { + countlyPlugins.deleteAccount({password: pv}, function(err, msg) { + if (msg === true || msg === 'true') { + window.location = "/login"; //deleted. go to login + } + else if (msg === 'password not valid' || msg === 'password mandatory' || msg === 'global admin limit') { + CountlyHelpers.notify({title: jQuery.i18n.map["common.error"], message: jQuery.i18n.map["user-settings." + msg], sticky: true, clearAll: true, type: "error"}); + } + else if (err === true) { + var msg2 = {title: jQuery.i18n.map["common.error"], message: msg, sticky: true, clearAll: true, type: "error"}; + CountlyHelpers.notify(msg2); + } + }); + } + }, + getLabelName: function(id, key) { + return app.configurationsView.getInputLabel(id + "." + key); + }, + getInputType: function(id, key) { + return app.configurationsView.getInputType(id + "." + key); + }, + save: function(doc) { + var data = { + _csrf: countlyGlobal.csrf_token, + username: doc.username, + full_name: doc.full_name, + api_key: doc.api_key + }; + this.saveSettings(data); + }, + saveSettings: function(doc) { + var self = this; + $.ajax({ + type: "POST", + url: countlyGlobal.path + "/user/settings", + data: doc, + success: function(result) { + if (result === "username-exists") { + CountlyHelpers.notify({ + title: jQuery.i18n.map["configs.not-saved"], + message: jQuery.i18n.map["management-users.username.exists"], + type: "error" + }); + return true; + } + else if (!result) { + CountlyHelpers.notify({ + title: jQuery.i18n.map["configs.not-saved"], + message: jQuery.i18n.map["user-settings.alert"], + type: "error" + }); + return true; + } + else { + if (!isNaN(parseInt(result))) { + countlyGlobal.member.password_changed = parseInt(result); } - else if (!result) { + else if (typeof result === "string") { CountlyHelpers.notify({ title: jQuery.i18n.map["configs.not-saved"], - message: jQuery.i18n.map["user-settings.alert"], + message: jQuery.i18n.map[result], type: "error" }); return true; } - else { - if (!isNaN(parseInt(result))) { - countlyGlobal.member.password_changed = parseInt(result); - } - else if (typeof result === "string") { + + countlyGlobal.member.full_name = doc.full_name; + countlyGlobal.member.username = doc.username; + countlyGlobal.member.api_key = doc.api_key; + } + if (Object.keys(self.changes).length) { + countlyPlugins.updateUserConfigs(self.changes, function(err) { + if (err) { CountlyHelpers.notify({ title: jQuery.i18n.map["configs.not-saved"], - message: jQuery.i18n.map[result], + message: jQuery.i18n.map["configs.not-changed"], type: "error" }); - return true; } - - countlyGlobal.member.full_name = doc.full_name; - countlyGlobal.member.username = doc.username; - countlyGlobal.member.api_key = doc.api_key; - } - if (Object.keys(self.changes).length) { - countlyPlugins.updateUserConfigs(self.changes, function(err) { - if (err) { - CountlyHelpers.notify({ - title: jQuery.i18n.map["configs.not-saved"], - message: jQuery.i18n.map["configs.not-changed"], - type: "error" - }); - } - else { - window.location.reload(true); - } - }); - } - else { - CountlyHelpers.notify({ - title: jQuery.i18n.map["configs.changed"], - message: jQuery.i18n.map["configs.saved"] - }); - } - }, - error: function() { - CountlyHelpers.notify({ - title: jQuery.i18n.map["configs.not-saved"], - message: jQuery.i18n.map["configs.not-changed"], - type: "error" + else { + window.location.reload(true); + } }); } - }); - }, - handleAvatarSuccess: function(url) { - countlyGlobal.member.member_image = url; - this.avatar = this.setDefaultAvatar(countlyGlobal.member.member_image); - this.updateGlobalObject(); - }, - nameChanged: function(val) { - this.initials = this.updateInitials(val); - this.updateGlobalObject(); - }, - updateInitials: function(full_name) { - var name = (full_name || "").trim().split(" "); - if (name.length === 1) { - return name[0][0] || ""; - } - return (name[0][0] || "") + (name[name.length - 1][0] || ""); - }, - updateGlobalObject: function() { - var userImage = {}; - var member = countlyGlobal.member; - if (member.member_image) { - userImage.url = member.member_image; - userImage.found = true; - } - else { - var defaultAvatarSelector = (member.created_at || Date.now()) % 10 * -60; - userImage.found = false; - userImage.url = "images/avatar-sprite.png?v2"; - userImage.position = defaultAvatarSelector; - userImage.initials = this.initials; - } - - member.image = userImage; - }, - deleteAvatar: function() { - var self = this; - $.ajax({ - type: "POST", - url: countlyCommon.API_URL + "/user/settings", - data: { - username: countlyGlobal.member.username, - api_key: countlyGlobal.member.api_key, - member_image: "delete", - _csrf: countlyGlobal.csrf_token - }, - success: function() { - countlyGlobal.member.member_image = ""; - self.avatar = self.setDefaultAvatar(countlyGlobal.member.member_image); - self.updateGlobalObject(); - }, - error: function() { - CountlyHelpers.notify({ type: "error", message: jQuery.i18n.map['configs.delete_avatar_failed']}); - } - }); - }, - setDefaultAvatar: function(image) { - if (image) { - return {'background-image': 'url("' + image + '?' + Date.now() + '")', "background-repeat": "no-repeat", "background-size": "auto 100px"}; - } - else { - var defaultAvatarSelector = (countlyGlobal.member.created_at || Date.now()) % 10 * -100; - return {'background-image': 'url("images/avatar-sprite.png?v2")', 'background-position': defaultAvatarSelector + 'px', 'background-size': 'auto 100px'}; - } - }, - loadComponents: function() { - var cc = countlyVue.container.dataMixin({ - 'accountSettingsComponents': '/account/settings' - }); - cc = cc.data(); - var allComponents = cc.accountSettingsComponents; - for (var i = 0; i < allComponents.length; i++) { - if (allComponents[i]._id && allComponents[i].title && allComponents[i].component) { - this.components[allComponents[i]._id] = allComponents[i]; + else { + CountlyHelpers.notify({ + title: jQuery.i18n.map["configs.changed"], + message: jQuery.i18n.map["configs.saved"] + }); } + }, + error: function() { + CountlyHelpers.notify({ + title: jQuery.i18n.map["configs.not-saved"], + message: jQuery.i18n.map["configs.not-changed"], + type: "error" + }); } - } - } - }); - - var getPluginView = function() { - return new countlyVue.views.BackboneWrapper({ - component: PluginsView, - vuex: [] //empty array if none - }); - }; - - var getConfigView = function() { - return new countlyVue.views.BackboneWrapper({ - component: ConfigurationsView, - vuex: [] //empty array if none - }); - }; - - var getAccountView = function() { - return new countlyVue.views.BackboneWrapper({ - component: AccountView, - vuex: [] //empty array if none - }); - }; - - //old global handler - app.configurationsView = { - predefinedInputs: {}, - predefinedLabels: {}, - predefinedStructure: {}, - predefinedUserInputs: {}, - registerInput: function(id, callback) { - this.predefinedInputs[id] = callback; - }, - registerLabel: function(id, html) { - this.predefinedLabels[id] = html; + }); }, - registerStructure: function(id, obj) { - this.predefinedStructure[id] = obj; + handleAvatarSuccess: function(url) { + countlyGlobal.member.member_image = url; + this.avatar = this.setDefaultAvatar(countlyGlobal.member.member_image); + this.updateGlobalObject(); }, - registerUserInput: function(id, getVal) { - this.predefinedUserInputs[id] = getVal; + nameChanged: function(val) { + this.initials = this.updateInitials(val); + this.updateGlobalObject(); }, - getInputLabel: function(id) { - if (typeof this.predefinedLabels[id] !== "undefined") { - return jQuery.i18n.map[this.predefinedLabels[id]] || this.predefinedLabels[id]; - } - else if (jQuery.i18n.map[id + ".title"]) { - return jQuery.i18n.map[id + ".title"]; - } - else if (jQuery.i18n.map[id + ".plugin-title"]) { - return jQuery.i18n.map[id + ".plugin-title"]; - } - else if (jQuery.i18n.map["configs." + id]) { - return jQuery.i18n.map["configs." + id]; - } - else if (jQuery.i18n.map["configs." + (id).replace(".", "-")]) { - return jQuery.i18n.map["configs." + (id).replace(".", "-")]; + updateInitials: function(full_name) { + var name = (full_name || "").trim().split(" "); + if (name.length === 1) { + return name[0][0] || ""; } - else if (jQuery.i18n.map[id]) { - return jQuery.i18n.map[id]; - } - else if (jQuery.i18n.map[(id).replace(".", "-")]) { - return jQuery.i18n.map[(id).replace(".", "-")]; + return (name[0][0] || "") + (name[name.length - 1][0] || ""); + }, + updateGlobalObject: function() { + var userImage = {}; + var member = countlyGlobal.member; + if (member.member_image) { + userImage.url = member.member_image; + userImage.found = true; } else { - return id; + var defaultAvatarSelector = (member.created_at || Date.now()) % 10 * -60; + userImage.found = false; + userImage.url = "images/avatar-sprite.png?v2"; + userImage.position = defaultAvatarSelector; + userImage.initials = this.initials; } + + member.image = userImage; }, - getHelperLabel: function(id, ns) { - if (id === "__user") { - return jQuery.i18n.map["configs.help.user-level-configuration"]; - } - else if (jQuery.i18n.map["configs.help." + ns + "." + id]) { - return jQuery.i18n.map["configs.help." + ns + "." + id]; - } - else if (jQuery.i18n.map["configs.help." + (ns + "." + id).replace(".", "-")]) { - return jQuery.i18n.map["configs.help." + (ns + "." + id).replace(".", "-")]; + deleteAvatar: function() { + var self = this; + $.ajax({ + type: "POST", + url: countlyCommon.API_URL + "/user/settings", + data: { + username: countlyGlobal.member.username, + api_key: countlyGlobal.member.api_key, + member_image: "delete", + _csrf: countlyGlobal.csrf_token + }, + success: function() { + countlyGlobal.member.member_image = ""; + self.avatar = self.setDefaultAvatar(countlyGlobal.member.member_image); + self.updateGlobalObject(); + }, + error: function() { + CountlyHelpers.notify({ type: "error", message: jQuery.i18n.map['configs.delete_avatar_failed']}); + } + }); + }, + setDefaultAvatar: function(image) { + if (image) { + return {'background-image': 'url("' + image + '?' + Date.now() + '")', "background-repeat": "no-repeat", "background-size": "auto 100px"}; } - else if (this.predefinedInputs[ns + "." + id] && this.predefinedInputs[ns + "." + id].helper) { - return jQuery.i18n.map[this.predefinedInputs[ns + "." + id].helper] || this.predefinedInputs[ns + "." + id].helper; + else { + var defaultAvatarSelector = (countlyGlobal.member.created_at || Date.now()) % 10 * -100; + return {'background-image': 'url("images/avatar-sprite.png?v2")', 'background-position': defaultAvatarSelector + 'px', 'background-size': 'auto 100px'}; } }, - getInputType: function(id) { - var input = this.predefinedInputs[id]; - if (typeof input === "function") { - return "function"; - } - if (input && input.input) { - return input.input; + loadComponents: function() { + var cc = countlyVue.container.dataMixin({ + 'accountSettingsComponents': '/account/settings' + }); + cc = cc.data(); + var allComponents = cc.accountSettingsComponents; + for (var i = 0; i < allComponents.length; i++) { + if (allComponents[i]._id && allComponents[i].title && allComponents[i].component) { + this.components[allComponents[i]._id] = allComponents[i]; + } } } - }; - - //register inputs - var zones = app.manageAppsView.getTimeZones(); - var countryList = []; - for (var z in zones) { - countryList.push({value: z, label: zones[z].n}); } - app.configurationsView.registerInput("apps.country", {input: "el-select", attrs: {}, list: countryList}); + }); - app.configurationsView.registerInput("logs.default", { - input: "el-select", - attrs: {}, - list: [ - {value: 'debug', label: CV.i18n("configs.logs.debug")}, - {value: 'info', label: CV.i18n("configs.logs.info")}, - {value: 'warn', label: CV.i18n("configs.logs.warn")}, - {value: 'error', label: CV.i18n("configs.logs.error")} - ] + var getPluginView = function() { + return new countlyVue.views.BackboneWrapper({ + component: PluginsView, + vuex: [] //empty array if none }); + }; - app.configurationsView.registerInput("security.dashboard_additional_headers", {input: "el-input", attrs: {type: "textarea", rows: 5}}); + var getConfigView = function() { + return new countlyVue.views.BackboneWrapper({ + component: ConfigurationsView, + vuex: [] //empty array if none + }); + }; - app.configurationsView.registerInput("security.robotstxt", {input: "el-input", attrs: {type: "textarea", rows: 5}}); + var getAccountView = function() { + return new countlyVue.views.BackboneWrapper({ + component: AccountView, + vuex: [] //empty array if none + }); + }; - app.configurationsView.registerInput("security.api_additional_headers", {input: "el-input", attrs: {type: "textarea", rows: 5}}); + //old global handler + app.configurationsView = { + predefinedInputs: {}, + predefinedLabels: {}, + predefinedStructure: {}, + predefinedUserInputs: {}, + registerInput: function(id, callback) { + this.predefinedInputs[id] = callback; + }, + registerLabel: function(id, html) { + this.predefinedLabels[id] = html; + }, + registerStructure: function(id, obj) { + this.predefinedStructure[id] = obj; + }, + registerUserInput: function(id, getVal) { + this.predefinedUserInputs[id] = getVal; + }, + getInputLabel: function(id) { + if (typeof this.predefinedLabels[id] !== "undefined") { + return jQuery.i18n.map[this.predefinedLabels[id]] || this.predefinedLabels[id]; + } + else if (jQuery.i18n.map[id + ".title"]) { + return jQuery.i18n.map[id + ".title"]; + } + else if (jQuery.i18n.map[id + ".plugin-title"]) { + return jQuery.i18n.map[id + ".plugin-title"]; + } + else if (jQuery.i18n.map["configs." + id]) { + return jQuery.i18n.map["configs." + id]; + } + else if (jQuery.i18n.map["configs." + (id).replace(".", "-")]) { + return jQuery.i18n.map["configs." + (id).replace(".", "-")]; + } + else if (jQuery.i18n.map[id]) { + return jQuery.i18n.map[id]; + } + else if (jQuery.i18n.map[(id).replace(".", "-")]) { + return jQuery.i18n.map[(id).replace(".", "-")]; + } + else { + return id; + } + }, + getHelperLabel: function(id, ns) { + if (id === "__user") { + return jQuery.i18n.map["configs.help.user-level-configuration"]; + } + else if (jQuery.i18n.map["configs.help." + ns + "." + id]) { + return jQuery.i18n.map["configs.help." + ns + "." + id]; + } + else if (jQuery.i18n.map["configs.help." + (ns + "." + id).replace(".", "-")]) { + return jQuery.i18n.map["configs.help." + (ns + "." + id).replace(".", "-")]; + } + else if (this.predefinedInputs[ns + "." + id] && this.predefinedInputs[ns + "." + id].helper) { + return jQuery.i18n.map[this.predefinedInputs[ns + "." + id].helper] || this.predefinedInputs[ns + "." + id].helper; + } + }, + getInputType: function(id) { + var input = this.predefinedInputs[id]; + if (typeof input === "function") { + return "function"; + } + if (input && input.input) { + return input.input; + } + } + }; + //register inputs + var zones = app.manageAppsView.getTimeZones(); + var countryList = []; + for (var z in zones) { + countryList.push({value: z, label: zones[z].n}); + } + app.configurationsView.registerInput("apps.country", {input: "el-select", attrs: {}, list: countryList}); - app.configurationsView.registerInput("api.reports_regenerate_interval", { - input: "el-select", - attrs: {}, - list: [ - {value: 300, label: jQuery.i18n.prop("common.every.minutes", 5)}, - {value: 1800, label: jQuery.i18n.prop("common.every.minutes", 30)}, - {value: 3600, label: jQuery.i18n.prop("common.every.hour", 1)}, - {value: 10800, label: jQuery.i18n.prop("common.every.hours", 3)}, - {value: 43200, label: jQuery.i18n.prop("common.every.hours", 12)}, - {value: 86400, label: jQuery.i18n.prop("common.every.hours", 24)} - ] - }); + app.configurationsView.registerInput("logs.default", { + input: "el-select", + attrs: {}, + list: [ + {value: 'debug', label: CV.i18n("configs.logs.debug")}, + {value: 'info', label: CV.i18n("configs.logs.info")}, + {value: 'warn', label: CV.i18n("configs.logs.warn")}, + {value: 'error', label: CV.i18n("configs.logs.error")} + ] + }); - app.configurationsView.registerInput("api.send_test_email", { - input: "el-button", - label: jQuery.i18n.map['common.send'], - attrs: {type: "primary", disabled: false}, - click: function() { - this.attrs.disabled = true; - var self = this; - $.ajax({ - type: "GET", - url: countlyCommon.API_URL + "/o/email_test", - data: {}, - success: function() { - self.attrs.disabled = false; - CountlyHelpers.notify({ type: "ok", message: jQuery.i18n.map['configs.help.api-send_test_email_delivered']}); + app.configurationsView.registerInput("security.dashboard_additional_headers", {input: "el-input", attrs: {type: "textarea", rows: 5}}); - }, - error: function() { - self.attrs.disabled = false; - CountlyHelpers.notify({ type: "error", message: jQuery.i18n.map['configs.help.api-send_test_email_failed']}); - } - }); - } - }); + app.configurationsView.registerInput("security.robotstxt", {input: "el-input", attrs: {type: "textarea", rows: 5}}); - app.configurationsView.registerStructure("api", { - description: "configs.api.description", - groups: [ - {label: "configs.api.batch", list: ["batch_processing", "batch_period", "batch_on_master"]}, - {label: "configs.api.cache", list: ["batch_read_processing", "batch_read_period", "batch_read_ttl", "batch_read_on_master"]}, - {label: "configs.api.limits", list: ["event_limit", "event_segmentation_limit", "event_segmentation_value_limit", "metric_limit", "session_duration_limit", "array_list_limit"]}, - {label: "configs.api.others", list: ["safe", "domain", "export_limit", "offline_mode", "reports_regenerate_interval", "request_threshold", "sync_plugins", "send_test_email", "city_data", "country_data", "session_cooldown", "total_users", "prevent_duplicate_requests", "metric_changes", "data_retention_period"]}, - ] - }); + app.configurationsView.registerInput("security.api_additional_headers", {input: "el-input", attrs: {type: "textarea", rows: 5}}); - app.configurationsView.registerStructure("logs", { - description: "", - groups: [ - {label: "configs.logs.modules", list: ["debug", "warn", "info", "error"]}, - {label: "configs.logs.default-level", list: ["default"]} - ] - }); - var showInAppManagment = { - "api": { - "safe": true, - "session_duration_limit": true, - "country_data": true, - "city_data": true, - "event_limit": true, - "event_segmentation_limit": true, - "event_segmentation_value_limit": true, - "metric_limit": true, - "session_cooldown": true, - "total_users": true, - "prevent_duplicate_requests": true, - "metric_changes": true, - } - }; - if (countlyAuth.validateGlobalAdmin()) { - if (countlyGlobal.plugins.indexOf("drill") !== -1) { - showInAppManagment.drill = {"big_list_limit": true, "record_big_list": true, "cache_threshold": true, "correct_estimation": true, "custom_property_limit": true, "list_limit": true, "projection_limit": true, "record_actions": true, "record_crashes": true, "record_meta": true, "record_pushes": true, "record_sessions": true, "record_star_rating": true, "record_apm": true, "record_views": true}; - } - if (countlyGlobal.plugins.includes("logger")) { - showInAppManagment.logger = {"state": true, "limit": true}; - } + app.configurationsView.registerInput("api.reports_regenerate_interval", { + input: "el-select", + attrs: {}, + list: [ + {value: 300, label: jQuery.i18n.prop("common.every.minutes", 5)}, + {value: 1800, label: jQuery.i18n.prop("common.every.minutes", 30)}, + {value: 3600, label: jQuery.i18n.prop("common.every.hour", 1)}, + {value: 10800, label: jQuery.i18n.prop("common.every.hours", 3)}, + {value: 43200, label: jQuery.i18n.prop("common.every.hours", 12)}, + {value: 86400, label: jQuery.i18n.prop("common.every.hours", 24)} + ] + }); - app.route('/manage/plugins', 'plugins', function() { - if (countlyGlobal.COUNTLY_CONTAINER === 'frontend') { - app.navigate("#/", true); - } - else { - this.renderWhenReady(getPluginView()); + app.configurationsView.registerInput("api.send_test_email", { + input: "el-button", + label: jQuery.i18n.map['common.send'], + attrs: {type: "primary", disabled: false}, + click: function() { + this.attrs.disabled = true; + var self = this; + $.ajax({ + type: "GET", + url: countlyCommon.API_URL + "/o/email_test", + data: {}, + success: function() { + self.attrs.disabled = false; + CountlyHelpers.notify({ type: "ok", message: jQuery.i18n.map['configs.help.api-send_test_email_delivered']}); + + }, + error: function() { + self.attrs.disabled = false; + CountlyHelpers.notify({ type: "error", message: jQuery.i18n.map['configs.help.api-send_test_email_failed']}); } }); + } + }); - app.route('/manage/configurations', 'configurations', function() { - var view = getConfigView(); - view.params = {namespace: null, success: false}; - this.renderWhenReady(view); - }); + app.configurationsView.registerStructure("api", { + description: "configs.api.description", + groups: [ + {label: "configs.api.batch", list: ["batch_processing", "batch_period", "batch_on_master"]}, + {label: "configs.api.cache", list: ["batch_read_processing", "batch_read_period", "batch_read_ttl", "batch_read_on_master"]}, + {label: "configs.api.limits", list: ["event_limit", "event_segmentation_limit", "event_segmentation_value_limit", "metric_limit", "session_duration_limit", "array_list_limit"]}, + {label: "configs.api.others", list: ["safe", "domain", "export_limit", "offline_mode", "reports_regenerate_interval", "request_threshold", "sync_plugins", "send_test_email", "city_data", "country_data", "session_cooldown", "total_users", "prevent_duplicate_requests", "metric_changes", "data_retention_period"]}, + ] + }); - app.route('/manage/configurations/:namespace', 'configurations_namespace', function(namespace) { - var view = getConfigView(); - view.params = {namespace: namespace, success: false}; - this.renderWhenReady(view); - }); + app.configurationsView.registerStructure("logs", { + description: "", + groups: [ + {label: "configs.logs.modules", list: ["debug", "warn", "info", "error"]}, + {label: "configs.logs.default-level", list: ["default"]} + ] + }); - app.route('/manage/configurations/:namespace/:status', 'configurations_namespace', function(namespace, status) { - var view = getConfigView(); - if (status === "success" && namespace !== "search") { - view.params = {namespace: namespace, success: true}; - this.renderWhenReady(view); - } - if (namespace === "search") { - view.params = {namespace, success: false, searchQuery: status}; - this.renderWhenReady(view); - } - }); + var showInAppManagment = { + "api": { + "safe": true, + "session_duration_limit": true, + "country_data": true, + "city_data": true, + "event_limit": true, + "event_segmentation_limit": true, + "event_segmentation_value_limit": true, + "metric_limit": true, + "session_cooldown": true, + "total_users": true, + "prevent_duplicate_requests": true, + "metric_changes": true, + } + }; + if (countlyAuth.validateGlobalAdmin()) { + if (countlyGlobal.plugins.indexOf("drill") !== -1) { + showInAppManagment.drill = {"big_list_limit": true, "record_big_list": true, "cache_threshold": true, "correct_estimation": true, "custom_property_limit": true, "list_limit": true, "projection_limit": true, "record_actions": true, "record_crashes": true, "record_meta": true, "record_pushes": true, "record_sessions": true, "record_star_rating": true, "record_apm": true, "record_views": true}; + } + if (countlyGlobal.plugins.includes("logger")) { + showInAppManagment.logger = {"state": true, "limit": true}; + } - app.route('/manage/configurations/:namespace/:status/:success', 'configurations_namespace', function(namespace, status, success) { - if (success === "success" && namespace === "search" && status !== "") { - var view = getConfigView(); - view.params = {namespace, success: true, searchQuery: status}; - this.renderWhenReady(view); - } - }); + app.route('/manage/plugins', 'plugins', function() { + if (countlyGlobal.COUNTLY_CONTAINER === 'frontend') { + app.navigate("#/", true); + } + else { + this.renderWhenReady(getPluginView()); + } + }); + + app.route('/manage/configurations', 'configurations', function() { + var view = getConfigView(); + view.params = {namespace: null, success: false}; + this.renderWhenReady(view); + }); + + app.route('/manage/configurations/:namespace', 'configurations_namespace', function(namespace) { + var view = getConfigView(); + view.params = {namespace: namespace, success: false}; + this.renderWhenReady(view); + }); + + app.route('/manage/configurations/:namespace/:status', 'configurations_namespace', function(namespace, status) { + var view = getConfigView(); + if (status === "success" && namespace !== "search") { + view.params = {namespace: namespace, success: true}; + this.renderWhenReady(view); + } + if (namespace === "search") { + view.params = {namespace, success: false, searchQuery: status}; + this.renderWhenReady(view); + } + }); - app.route('/manage/configurations/:namespace#:section', 'configurations_namespace', function(namespace, section) { + app.route('/manage/configurations/:namespace/:status/:success', 'configurations_namespace', function(namespace, status, success) { + if (success === "success" && namespace === "search" && status !== "") { var view = getConfigView(); - view.params = {namespace: namespace, section: section, success: false}; + view.params = {namespace, success: true, searchQuery: status}; this.renderWhenReady(view); - }); + } + }); - countlyPlugins.initializeConfigs().always(function() { - var pluginsData = countlyPlugins.getConfigsData(); - for (var key in showInAppManagment) { - var inputs = {}; - for (var conf in showInAppManagment[key]) { - if (showInAppManagment[key][conf]) { - if (!app.configurationsView.predefinedInputs[key + "." + conf]) { - if (pluginsData[key]) { - var type = typeof pluginsData[key][conf]; - if (type === "string") { - app.configurationsView.registerInput(key + "." + conf, {input: "el-input", attrs: {}}); - } - else if (type === "number") { - app.configurationsView.registerInput(key + "." + conf, {input: "el-input-number", attrs: {}}); - } - else if (type === "boolean") { - app.configurationsView.registerInput(key + "." + conf, {input: "el-switch", attrs: {}}); - } + app.route('/manage/configurations/:namespace#:section', 'configurations_namespace', function(namespace, section) { + var view = getConfigView(); + view.params = {namespace: namespace, section: section, success: false}; + this.renderWhenReady(view); + }); + + countlyPlugins.initializeConfigs().always(function() { + var pluginsData = countlyPlugins.getConfigsData(); + for (var key in showInAppManagment) { + var inputs = {}; + for (var conf in showInAppManagment[key]) { + if (showInAppManagment[key][conf]) { + if (!app.configurationsView.predefinedInputs[key + "." + conf]) { + if (pluginsData[key]) { + var type = typeof pluginsData[key][conf]; + if (type === "string") { + app.configurationsView.registerInput(key + "." + conf, {input: "el-input", attrs: {}}); + } + else if (type === "number") { + app.configurationsView.registerInput(key + "." + conf, {input: "el-input-number", attrs: {}}); + } + else if (type === "boolean") { + app.configurationsView.registerInput(key + "." + conf, {input: "el-switch", attrs: {}}); } - } - if (app.configurationsView.predefinedInputs[key + "." + conf]) { - inputs[key + "." + conf] = app.configurationsView.predefinedInputs[key + "." + conf]; } } + if (app.configurationsView.predefinedInputs[key + "." + conf]) { + inputs[key + "." + conf] = app.configurationsView.predefinedInputs[key + "." + conf]; + } } - app.addAppManagementInput(key, jQuery.i18n.map['configs.' + key], inputs); } - app.configurationsView.registerInput("frontend.theme", {input: "el-select", attrs: {}, list: countlyPlugins.getThemeList()}); - }); - } - - app.route('/account-settings', 'account-settings', function() { - this.renderWhenReady(getAccountView()); + app.addAppManagementInput(key, jQuery.i18n.map['configs.' + key], inputs); + } + app.configurationsView.registerInput("frontend.theme", {input: "el-select", attrs: {}, list: countlyPlugins.getThemeList()}); }); + } - app.route('/account-settings/reset', 'account-settings', function() { - var view = getAccountView(); - view.params = {reset: true}; - this.renderWhenReady(view); - }); + app.route('/account-settings', 'account-settings', function() { + this.renderWhenReady(getAccountView()); + }); - app.route('/account-settings/no-access', 'account-settings', function() { - var view = getAccountView(); - view.params = {noaccess: true}; - this.renderWhenReady(view); - }); + app.route('/account-settings/reset', 'account-settings', function() { + var view = getAccountView(); + view.params = {reset: true}; + this.renderWhenReady(view); + }); + + app.route('/account-settings/no-access', 'account-settings', function() { + var view = getAccountView(); + view.params = {noaccess: true}; + this.renderWhenReady(view); + }); - if (countlyAuth.validateGlobalAdmin()) { - if (countlyGlobal.COUNTLY_CONTAINER !== 'frontend') { + if (countlyAuth.validateGlobalAdmin()) { + if (countlyGlobal.COUNTLY_CONTAINER !== 'frontend') { + if (!countlyGlobal.mycountly && countlyGlobal.plugins.indexOf('my-countly') === -1) { app.addMenu("management", {code: "plugins", pluginName: "plugins", url: "#/manage/plugins", text: "plugins.title", icon: '
', priority: 80}); } } - if (countlyAuth.validateGlobalAdmin()) { - app.addMenu("management", {code: "configurations", pluginName: "plugins", url: "#/manage/configurations", text: "plugins.configs", icon: '
', priority: 30}); + } + if (countlyAuth.validateGlobalAdmin()) { + app.addMenu("management", {code: "configurations", pluginName: "plugins", url: "#/manage/configurations", text: "plugins.configs", icon: '
', priority: 30}); - var isCurrentHostnameIP = /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/.test(window.location.hostname); - var isGlobalDomainHasValue = countlyGlobal.domain === "" || typeof countlyGlobal.domain === "undefined" ? false : true; - if (!isCurrentHostnameIP && !isGlobalDomainHasValue) { - countlyPlugins.updateConfigs({"api": {"domain": window.location.protocol + "//" + window.location.hostname}}, function(err) { - if (err) { - // throw err - } - }); - } + var isCurrentHostnameIP = /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/.test(window.location.hostname); + var isGlobalDomainHasValue = countlyGlobal.domain === "" || typeof countlyGlobal.domain === "undefined" ? false : true; + if (!isCurrentHostnameIP && !isGlobalDomainHasValue) { + countlyPlugins.updateConfigs({"api": {"domain": window.location.protocol + "//" + window.location.hostname}}, function(err) { + if (err) { + // throw err + } + }); } - })(); -} \ No newline at end of file + } +})(); \ No newline at end of file From a692eb1fd44bf8caec6559ef7d22996d35fdfa9a Mon Sep 17 00:00:00 2001 From: Kanwar Ujjaval Singh <4216199+kanwarujjaval@users.noreply.github.com> Date: Tue, 28 Mar 2023 16:31:10 +0000 Subject: [PATCH 05/21] remove log from pluginManager --- plugins/pluginManager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/pluginManager.js b/plugins/pluginManager.js index 398d6ec629f..56c234e9c92 100644 --- a/plugins/pluginManager.js +++ b/plugins/pluginManager.js @@ -116,7 +116,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}}); From a45d31fab155e2cc63eb8591e137ec08e08eb2c9 Mon Sep 17 00:00:00 2001 From: Kanwar Ujjaval Singh <4216199+kanwarujjaval@users.noreply.github.com> Date: Thu, 30 Mar 2023 10:57:00 +0000 Subject: [PATCH 06/21] add mycountly checkes in fe server --- frontend/express/app.js | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/frontend/express/app.js b/frontend/express/app.js index ef8b7c6c9c0..3b122415868 100644 --- a/frontend/express/app.js +++ b/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 isMyCountly = false; + +if (fs.existsSync(path.resolve('/opt/deployment_env.json'))) { + const deploymentConf = fs.readFileSync('/opt/deployment_env.json', 'utf8'); + try { + if (JSON.parse(deploymentConf).DEPLOYMENT_ID) { + isMyCountly = true; + } + } + catch (e) { + isMyCountly = 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'), request = require('countly-request'), flash = require('connect-flash'), @@ -66,7 +80,13 @@ var COUNTLY_NAMED_TYPE = "Countly Community Edition v" + COUNTLY_VERSION; var COUNTLY_TYPE_CE = true; var COUNTLY_TRIAL = (versionInfo.trial) ? true : false; var COUNTLY_TRACK_TYPE = "OSS"; -if (versionInfo.footer) { + +if (isMyCountly) { + COUNTLY_NAMED_TYPE = "Countly v" + COUNTLY_VERSION; + COUNTLY_TYPE_CE = false; + COUNTLY_TRACK_TYPE = "Enterprise"; +} +else if (versionInfo.footer) { COUNTLY_NAMED_TYPE = versionInfo.footer; COUNTLY_TYPE_CE = false; if (COUNTLY_NAMED_TYPE === "Countly Cloud") { @@ -866,7 +886,7 @@ Promise.all([plugins.dbConnection(countlyConfig), plugins.dbConnection("countly_ **/ function renderDashboard(req, res, next, member, adminOfApps, userOfApps, countlyGlobalApps, countlyGlobalAdminApps) { var configs = plugins.getConfig("frontend", member.settings), - licenseNotification, licenseError, isMyCountly = false; + licenseNotification, licenseError; configs.export_limit = plugins.getConfig("api").export_limit; app.loadThemeFiles(configs.theme, function(theme) { if (configs._user.theme) { @@ -895,18 +915,6 @@ Promise.all([plugins.dbConnection(countlyConfig), plugins.dbConnection("countly_ } } - if (fs.existsSync(path.resolve('/opt/deployment_env.json'))) { - const deploymentConf = fs.readFileSync('/opt/deployment_env.json', 'utf8'); - try { - if (JSON.parse(deploymentConf).DEPLOYMENT_ID) { - isMyCountly = true; - } - } - catch (e) { - isMyCountly = false; - } - } - member._id += ""; delete member.password; From adcf5d1d5a532f3acd9e7e325cba6c3811233569 Mon Sep 17 00:00:00 2001 From: Kanwar Ujjaval Singh <4216199+kanwarujjaval@users.noreply.github.com> Date: Sun, 23 Jul 2023 18:07:27 +0000 Subject: [PATCH 07/21] add check for locking in core --- frontend/express/app.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/frontend/express/app.js b/frontend/express/app.js index eb368c27b2a..284c72777a5 100644 --- a/frontend/express/app.js +++ b/frontend/express/app.js @@ -900,8 +900,9 @@ Promise.all([plugins.dbConnection(countlyConfig), plugins.dbConnection("countly_ function renderDashboard(req, res, next, member, adminOfApps, userOfApps, countlyGlobalApps, countlyGlobalAdminApps) { var configs = plugins.getConfig("frontend", member.settings), 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); } @@ -915,6 +916,13 @@ Promise.all([plugins.dbConnection(countlyConfig), plugins.dbConnection("countly_ if (member.upgrade) { countlyDb.collection('members').update({"_id": member._id}, {$unset: {upgrade: ""}}, function() {}); } + if (isMyCountly) { + let locked = await countlyDb.collection('mycountly').findOne({_id: 'lockServer'}); + if (locked?.isLocked === true) { + isLocked = true; + } + + } if (req.session.licenseError) { licenseError = req.session.licenseError; @@ -975,6 +983,7 @@ Promise.all([plugins.dbConnection(countlyConfig), plugins.dbConnection("countly_ featureRequestLink: COUNTLY_FEATUREREQUEST_LINK, }, mycountly: isMyCountly, + isLocked: isLocked, }; var toDashboard = { From 935649bfcdf11ea6776519a670baf816bc76fac4 Mon Sep 17 00:00:00 2001 From: Vedat Can Keklik Date: Thu, 14 Dec 2023 11:14:52 +0300 Subject: [PATCH 08/21] fix: Added IS_FLEX flag --- frontend/express/app.js | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/frontend/express/app.js b/frontend/express/app.js index 4943e48eb38..f68cd5e4f1e 100644 --- a/frontend/express/app.js +++ b/frontend/express/app.js @@ -8,19 +8,7 @@ process.title = "countly: dashboard node " + process.argv[1]; var fs = require('fs'); var path = require('path'); -var isMyCountly = false; - -if (fs.existsSync(path.resolve('/opt/deployment_env.json'))) { - const deploymentConf = fs.readFileSync('/opt/deployment_env.json', 'utf8'); - try { - if (JSON.parse(deploymentConf).DEPLOYMENT_ID) { - isMyCountly = true; - } - } - catch (e) { - isMyCountly = false; - } -} +var IS_FLEX = true; var versionInfo = require('./version.info'), pack = require('../../package.json'), @@ -81,10 +69,10 @@ var COUNTLY_TYPE_CE = true; var COUNTLY_TRIAL = (versionInfo.trial) ? true : false; var COUNTLY_TRACK_TYPE = "OSS"; -if (isMyCountly) { +if (IS_FLEX) { COUNTLY_NAMED_TYPE = "Countly v" + COUNTLY_VERSION; COUNTLY_TYPE_CE = false; - COUNTLY_TRACK_TYPE = "Enterprise"; + COUNTLY_TRACK_TYPE = "Flex"; } else if (versionInfo.footer) { COUNTLY_NAMED_TYPE = versionInfo.footer; @@ -935,7 +923,7 @@ Promise.all([plugins.dbConnection(countlyConfig), plugins.dbConnection("countly_ if (member.upgrade) { countlyDb.collection('members').update({"_id": member._id}, {$unset: {upgrade: ""}}, function() {}); } - if (isMyCountly) { + if (IS_FLEX) { let locked = await countlyDb.collection('mycountly').findOne({_id: 'lockServer'}); if (locked?.isLocked === true) { isLocked = true; @@ -1005,7 +993,7 @@ Promise.all([plugins.dbConnection(countlyConfig), plugins.dbConnection("countly_ helpCenterLink: COUNTLY_HELPCENTER_LINK, featureRequestLink: COUNTLY_FEATUREREQUEST_LINK, }, - mycountly: isMyCountly, + mycountly: IS_FLEX, isLocked: isLocked, }; From e10de7e8076ce8427901ffe77bf41ec6171aa791 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20Ba=C5=9Faran?= Date: Tue, 2 Apr 2024 16:00:21 +0300 Subject: [PATCH 09/21] fix: no more hardcoded IS_FLEX flag. --- frontend/express/app.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/frontend/express/app.js b/frontend/express/app.js index 37ab33b787e..055b0b3c635 100644 --- a/frontend/express/app.js +++ b/frontend/express/app.js @@ -8,7 +8,19 @@ process.title = "countly: dashboard node " + process.argv[1]; var fs = require('fs'); var path = require('path'); -var IS_FLEX = true; +var IS_FLEX = false; + +if (fs.existsSync(path.resolve('/opt/deployment_env.json'))) { + const 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'), From cd4a07783ae694367e60d84d2870435a2bd3c54d Mon Sep 17 00:00:00 2001 From: Arturs Sosins Date: Tue, 7 May 2024 19:09:16 +0300 Subject: [PATCH 10/21] Reduce populator time for flex --- .../express/public/core/onboarding/javascripts/countly.views.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/express/public/core/onboarding/javascripts/countly.views.js b/frontend/express/public/core/onboarding/javascripts/countly.views.js index 00e2f905c4d..6243b2291ab 100644 --- a/frontend/express/public/core/onboarding/javascripts/countly.views.js +++ b/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'), }; From 3e2577ea9266bd20a0dc7e4f31f8d66ab432e102 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20Ba=C5=9Faran?= Date: Mon, 25 Nov 2024 16:06:44 +0300 Subject: [PATCH 11/21] chore: convert const to var for deploymentConf. --- frontend/express/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/express/app.js b/frontend/express/app.js index 691346851ac..da92eb7fef6 100644 --- a/frontend/express/app.js +++ b/frontend/express/app.js @@ -11,7 +11,7 @@ var path = require('path'); var IS_FLEX = false; if (fs.existsSync(path.resolve('/opt/deployment_env.json'))) { - const deploymentConf = fs.readFileSync('/opt/deployment_env.json', 'utf8'); + var deploymentConf = fs.readFileSync('/opt/deployment_env.json', 'utf8'); try { if (JSON.parse(deploymentConf).DEPLOYMENT_ID) { IS_FLEX = true; From 68e6e552319330f6f578221cb254f9b8d462595f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2024 01:12:03 +0000 Subject: [PATCH 12/21] Bump countly-sdk-nodejs from 24.10.0 to 24.10.1 Bumps [countly-sdk-nodejs](https://github.com/Countly/countly-sdk-nodejs) from 24.10.0 to 24.10.1. - [Release notes](https://github.com/Countly/countly-sdk-nodejs/releases) - [Changelog](https://github.com/Countly/countly-sdk-nodejs/blob/master/CHANGELOG.md) - [Commits](https://github.com/Countly/countly-sdk-nodejs/compare/24.10.0...24.10.1) --- updated-dependencies: - dependency-name: countly-sdk-nodejs dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 494ddd543b1..e9177c1f860 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4562,10 +4562,9 @@ "link": true }, "node_modules/countly-sdk-nodejs": { - "version": "24.10.0", - "resolved": "https://registry.npmjs.org/countly-sdk-nodejs/-/countly-sdk-nodejs-24.10.0.tgz", - "integrity": "sha512-Ub3hy3LfF1kV6jLEiUTGAlkMaMhFMOCnLzhQYjpkWCUL/XK/veO+TtDokCYuRYp1D3QM+gkSy+QVPwBUZKVYSA==", - "license": "MIT" + "version": "24.10.1", + "resolved": "https://registry.npmjs.org/countly-sdk-nodejs/-/countly-sdk-nodejs-24.10.1.tgz", + "integrity": "sha512-71XzRzXxpn68D97ysoOUJsE5wj8B7pHUaE0gfX2GiWkEbKTqOeh0isbGE+AmTMnjqY702/EkK3BFm157ZVlIWQ==" }, "node_modules/countly-sdk-web": { "version": "24.11.2", From b6c1a986f9ee6f7cb4f132b552b5c9df02a96376 Mon Sep 17 00:00:00 2001 From: Cihad Tekin Date: Fri, 27 Dec 2024 14:05:45 +0300 Subject: [PATCH 13/21] [system-utility] NamespaceNotFound is thrown when profiler gets run for the first time --- plugins/system-utility/api/system.utility.js | 24 ++++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/plugins/system-utility/api/system.utility.js b/plugins/system-utility/api/system.utility.js index 44e0f298932..da6902503f4 100644 --- a/plugins/system-utility/api/system.utility.js +++ b/plugins/system-utility/api/system.utility.js @@ -471,13 +471,23 @@ async function stopProfiler(processName) { const errors = []; // clear old files - await new Promise( - (res, rej) => countlyFs.gridfs.deleteAll( - PROFILER_DIR, - null, - err => err ? rej(err) : res() - ) - ); + try { + await new Promise( + (res, rej) => countlyFs.gridfs.deleteAll( + PROFILER_DIR, + null, + err => err ? rej(err) : res() + ) + ); + } + catch (err) { + if (err.code === 26) { // NamespaceNotFound: thrown when there's no collection initially + // do nothing... + } + else { + throw err; + } + } // coverage try { From 1c169540f782899e669b0c2597430bb749ba83da Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2025 01:38:04 +0000 Subject: [PATCH 14/21] Bump sass from 1.81.0 to 1.83.1 Bumps [sass](https://github.com/sass/dart-sass) from 1.81.0 to 1.83.1. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](https://github.com/sass/dart-sass/compare/1.81.0...1.83.1) --- updated-dependencies: - dependency-name: sass dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 9 ++++----- package.json | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 494ddd543b1..082e3a1bc54 100644 --- a/package-lock.json +++ b/package-lock.json @@ -60,7 +60,7 @@ "offline-geocoder": "git+https://github.com/Countly/offline-geocoder.git", "properties-parser": "0.6.0", "puppeteer": "^23.8.0", - "sass": "1.81.0", + "sass": "1.83.1", "tslib": "^2.6.3", "uglify-js": "3.19.3", "underscore": "1.13.7", @@ -11260,10 +11260,9 @@ "license": "MIT" }, "node_modules/sass": { - "version": "1.81.0", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.81.0.tgz", - "integrity": "sha512-Q4fOxRfhmv3sqCLoGfvrC9pRV8btc0UtqL9mN6Yrv6Qi9ScL55CVH1vlPP863ISLEEMNLLuu9P+enCeGHlnzhA==", - "license": "MIT", + "version": "1.83.1", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.83.1.tgz", + "integrity": "sha512-EVJbDaEs4Rr3F0glJzFSOvtg2/oy2V/YrGFPqPY24UqcLDWcI9ZY5sN+qyO3c/QCZwzgfirvhXvINiJCE/OLcA==", "dependencies": { "chokidar": "^4.0.0", "immutable": "^5.0.2", diff --git a/package.json b/package.json index 4f02a7f5835..d07a1647833 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "offline-geocoder": "git+https://github.com/Countly/offline-geocoder.git", "properties-parser": "0.6.0", "puppeteer": "^23.8.0", - "sass": "1.81.0", + "sass": "1.83.1", "tslib": "^2.6.3", "uglify-js": "3.19.3", "underscore": "1.13.7", From 49c011cb213c660e64d88e697275307207e2b4b8 Mon Sep 17 00:00:00 2001 From: Arturs Sosins Date: Mon, 6 Jan 2025 12:51:48 +0200 Subject: [PATCH 15/21] Update Changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 683ac4a8831..34fec1261ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## Version xx.xx.xx + +Dependencies: +- Bump sass from 1.81.0 to 1.83.1 + ## Version 24.05.20 Fixes: - [push] Fixed bug where IOS credentials get mixed up while sending messages from different apps at the same time From e66c53852f16c9821d8f792b66e4227d6a1e6bb0 Mon Sep 17 00:00:00 2001 From: Cookiezaurs <> Date: Mon, 6 Jan 2025 16:55:10 +0200 Subject: [PATCH 16/21] [core]Fixes for getting current "day of year" on recording. [views] Fixes for tests --- api/utils/common.js | 8 +++++++- plugins/views/tests.js | 12 +++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/api/utils/common.js b/api/utils/common.js index 1d046fc9848..02cdb26aea2 100644 --- a/api/utils/common.js +++ b/api/utils/common.js @@ -693,7 +693,13 @@ common.getDate = function(timestamp, timezone) { * @returns {number} current day of the year */ common.getDOY = function(timestamp, timezone) { - var endDate = (timestamp) ? moment.unix(timestamp * 1000) : moment(); + var endDate; + if (timestamp && timestamp.toString().length === 13) { + endDate = (timestamp) ? moment.unix(timestamp / 1000) : moment(); + } + else { + endDate = (timestamp) ? moment.unix(timestamp) : moment(); + } if (timezone) { endDate.tz(timezone); diff --git a/plugins/views/tests.js b/plugins/views/tests.js index 8b059571fb7..8ec2675af0f 100644 --- a/plugins/views/tests.js +++ b/plugins/views/tests.js @@ -29,6 +29,7 @@ tableResponse["30days"] = {"iTotalRecords": 0, "iTotalDisplayRecords": 0, "aaDat tableResponse["7days"] = {"iTotalRecords": 0, "iTotalDisplayRecords": 0, "aaData": [{"u": 0, "t": 0, "s": 0, "b": 0, "e": 0, "d-calc": 0, "d": 0, "n": 0, "scr-calc": 0, "scr": 0, "uvalue": 0}]}; tableResponse.month = {"iTotalRecords": 0, "iTotalDisplayRecords": 0, "aaData": [{"u": 0, "t": 0, "s": 0, "b": 0, "e": 0, "d-calc": 0, "d": 0, "n": 0, "scr-calc": 0, "scr": 0, "uvalue": 0}]}; //this year +var userHistory = {}; graphResponse.hour = {}; graphResponse.yesterday = {}; @@ -277,11 +278,14 @@ describe('Testing views plugin', function() { tableResponse["30days"].iTotalRecords += 1; tableResponse["30days"].iTotalDisplayRecords += 1; pushValues("30days", 0, {"u": 1, "t": 1, "s": 1, "uvalue": 1, "n": 1, "view": "testview0"}); + userHistory["user1"] = {}; + userHistory["user1"]["30days"] = true; if (days_this_year > 25) { tableResponse.month.iTotalRecords += 1; tableResponse.month.iTotalDisplayRecords += 1; pushValues("month", 0, {"t": 1, "s": 1, "uvalue": 1, "u": 1, "n": 1, "view": "testview0"}); + userHistory["user1"]["month"] = true; } /* else { tableResponse.month.iTotalRecords = 0; @@ -321,7 +325,13 @@ describe('Testing views plugin', function() { if (days_this_year > 1) { tableResponse.month.iTotalRecords = 1; tableResponse.month.iTotalDisplayRecords = 1; - pushValues("month", 0, {"t": 1, "s": 1}); + if (userHistory["user1"]["month"]) { + pushValues("month", 0, {"t": 1, "s": 1}); + } + else { + pushValues("month", 0, {"u": 1, "uvalue": 1, "t": 1, "s": 1, "view": "testview0"}); + userHistory["user1"]["month"] = true; + } //tableResponse["month"]['aaData'][0]['n']=1; tableResponse.month.aaData[0].uvalue = 1; } From 8440609663eba68ce1d43889ff92719267c89de5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Jan 2025 07:53:05 +0000 Subject: [PATCH 17/21] Bump express-rate-limit from 7.4.1 to 7.5.0 Bumps [express-rate-limit](https://github.com/express-rate-limit/express-rate-limit) from 7.4.1 to 7.5.0. - [Release notes](https://github.com/express-rate-limit/express-rate-limit/releases) - [Commits](https://github.com/express-rate-limit/express-rate-limit/compare/v7.4.1...v7.5.0) --- updated-dependencies: - dependency-name: express-rate-limit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 11 +++++------ package.json | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 082e3a1bc54..0e9dcad2775 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,7 +27,7 @@ "ejs": "3.1.10", "errorhandler": "1.5.1", "express": "4.21.2", - "express-rate-limit": "7.4.1", + "express-rate-limit": "7.5.0", "express-session": "1.18.1", "form-data": "^4.0.0", "formidable": "2.1.1", @@ -5601,10 +5601,9 @@ } }, "node_modules/express-rate-limit": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-7.4.1.tgz", - "integrity": "sha512-KS3efpnpIDVIXopMc65EMbWbUht7qvTCdtCR2dD/IZmi9MIkopYESwyRqLgv8Pfu589+KqDqOdzJWW7AHoACeg==", - "license": "MIT", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-7.5.0.tgz", + "integrity": "sha512-eB5zbQh5h+VenMPM3fh+nw1YExi5nMr6HUCR62ELSP11huvxm/Uir1H1QEyTkk5QX6A58pX6NmaTMceKZ0Eodg==", "engines": { "node": ">= 16" }, @@ -5612,7 +5611,7 @@ "url": "https://github.com/sponsors/express-rate-limit" }, "peerDependencies": { - "express": "4 || 5 || ^5.0.0-beta.1" + "express": "^4.11 || 5 || ^5.0.0-beta.1" } }, "node_modules/express-session": { diff --git a/package.json b/package.json index d07a1647833..625cd3962e8 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "ejs": "3.1.10", "errorhandler": "1.5.1", "express": "4.21.2", - "express-rate-limit": "7.4.1", + "express-rate-limit": "7.5.0", "express-session": "1.18.1", "form-data": "^4.0.0", "formidable": "2.1.1", From 311f6d0926c419ae8135116e1bbc27b26749e0ac Mon Sep 17 00:00:00 2001 From: Arturs Sosins Date: Tue, 7 Jan 2025 10:00:27 +0200 Subject: [PATCH 18/21] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 34fec1261ea..7152418a310 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ Dependencies: - Bump sass from 1.81.0 to 1.83.1 +- Bump countly-sdk-nodejs from 24.10.0 to 24.10.1 ## Version 24.05.20 Fixes: From 3d2a4aacbddb0acdb8d8451653a9abb65de52757 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Jan 2025 08:11:14 +0000 Subject: [PATCH 19/21] Bump puppeteer from 23.10.4 to 23.11.1 Bumps [puppeteer](https://github.com/puppeteer/puppeteer) from 23.10.4 to 23.11.1. - [Release notes](https://github.com/puppeteer/puppeteer/releases) - [Changelog](https://github.com/puppeteer/puppeteer/blob/main/release-please-config.json) - [Commits](https://github.com/puppeteer/puppeteer/compare/puppeteer-v23.10.4...puppeteer-v23.11.1) --- updated-dependencies: - dependency-name: puppeteer dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 138 +++++++++++----------------------------------- 1 file changed, 33 insertions(+), 105 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2f1dbbe5aff..3d63958e2e2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2381,7 +2381,6 @@ "version": "2.6.1", "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.6.1.tgz", "integrity": "sha512-aBSREisdsGH890S2rQqK82qmQYU3uFpSH8wcZWHgHzl3LfzsxAKbLNiAG9mO8v1Y0UICBeClICxPJvyr0rcuxg==", - "license": "Apache-2.0", "dependencies": { "debug": "^4.4.0", "extract-zip": "^2.0.1", @@ -2403,7 +2402,6 @@ "version": "8.0.1", "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", - "license": "ISC", "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.1", @@ -2417,7 +2415,6 @@ "version": "4.4.0", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", - "license": "MIT", "dependencies": { "ms": "^2.1.3" }, @@ -2433,14 +2430,12 @@ "node_modules/@puppeteer/browsers/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "license": "MIT" + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "node_modules/@puppeteer/browsers/node_modules/semver": { "version": "7.6.3", "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", - "license": "ISC", "bin": { "semver": "bin/semver.js" }, @@ -2452,7 +2447,6 @@ "version": "17.7.2", "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", - "license": "MIT", "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", @@ -2470,7 +2464,6 @@ "version": "21.1.1", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", - "license": "ISC", "engines": { "node": ">=12" } @@ -3110,8 +3103,7 @@ "node_modules/@tootallnate/quickjs-emscripten": { "version": "0.23.0", "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz", - "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==", - "license": "MIT" + "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==" }, "node_modules/@types/cacheable-request": { "version": "6.0.3", @@ -3200,7 +3192,6 @@ "version": "2.10.3", "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz", "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==", - "license": "MIT", "optional": true, "dependencies": { "@types/node": "*" @@ -3259,7 +3250,6 @@ "version": "7.1.3", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz", "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==", - "license": "MIT", "engines": { "node": ">= 14" } @@ -3556,7 +3546,6 @@ "version": "0.13.4", "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz", "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==", - "license": "MIT", "dependencies": { "tslib": "^2.0.1" }, @@ -3588,8 +3577,7 @@ "node_modules/b4a": { "version": "1.6.7", "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.7.tgz", - "integrity": "sha512-OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg==", - "license": "Apache-2.0" + "integrity": "sha512-OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg==" }, "node_modules/balanced-match": { "version": "1.0.2", @@ -3598,17 +3586,15 @@ "license": "MIT" }, "node_modules/bare-events": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.5.0.tgz", - "integrity": "sha512-/E8dDe9dsbLyh2qrZ64PEPadOQ0F4gbl1sUJOrmph7xOiIxfY8vwab/4bFLh4Y88/Hk/ujKcrQKc+ps0mv873A==", - "license": "Apache-2.0", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.5.2.tgz", + "integrity": "sha512-KSdMqLj1ZERZMP1PTmnLK7SqJu9z9/SbwUUPZly2puMtfVcytC+jl6mb/9XYiqq0PXcx1rNDS+Qvl1g54Lho6A==", "optional": true }, "node_modules/bare-fs": { "version": "2.3.5", "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.3.5.tgz", "integrity": "sha512-SlE9eTxifPDJrT6YgemQ1WGFleevzwY+XAP1Xqgl56HtcrisC2CHCZ2tq6dBpcH2TnNxwUEUGhweo+lrQtYuiw==", - "license": "Apache-2.0", "optional": true, "dependencies": { "bare-events": "^2.0.0", @@ -3620,14 +3606,12 @@ "version": "2.4.4", "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.4.4.tgz", "integrity": "sha512-z3UiI2yi1mK0sXeRdc4O1Kk8aOa/e+FNWZcTiPB/dfTWyLypuE99LibgRaQki914Jq//yAWylcAt+mknKdixRQ==", - "license": "Apache-2.0", "optional": true }, "node_modules/bare-path": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-2.1.3.tgz", "integrity": "sha512-lh/eITfU8hrj9Ru5quUp0Io1kJWIk1bTjzo7JH1P5dWmQ2EL4hFUlfI8FonAhSlgIfhn63p84CDY/x+PisgcXA==", - "license": "Apache-2.0", "optional": true, "dependencies": { "bare-os": "^2.1.0" @@ -3637,7 +3621,6 @@ "version": "2.6.1", "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.6.1.tgz", "integrity": "sha512-eVZbtKM+4uehzrsj49KtCy3Pbg7kO1pJ3SKZ1SFrIH/0pnj9scuGGgUlNDf/7qS8WKtGdiJY5Kyhs/ivYPTB/g==", - "license": "Apache-2.0", "optional": true, "dependencies": { "streamx": "^2.21.0" @@ -3679,7 +3662,6 @@ "version": "5.0.5", "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.5.tgz", "integrity": "sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg==", - "license": "MIT", "engines": { "node": ">=10.0.0" } @@ -4217,13 +4199,11 @@ } }, "node_modules/chromium-bidi": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.8.0.tgz", - "integrity": "sha512-uJydbGdTw0DEUjhoogGveneJVWX/9YuqkWePzMmkBYwtdAqo5d3J/ovNKFr+/2hWXYmYCr6it8mSSTIj6SS6Ug==", - "license": "Apache-2.0", + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.11.0.tgz", + "integrity": "sha512-6CJWHkNRoyZyjV9Rwv2lYONZf1Xm0IuDyNq97nwSsxxP3wf5Bwy15K5rOvVKMtJ127jJBmxFUanSAOjgFRxgrA==", "dependencies": { "mitt": "3.0.1", - "urlpattern-polyfill": "10.0.0", "zod": "3.23.8" }, "peerDependencies": { @@ -4234,7 +4214,6 @@ "version": "3.23.8", "resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz", "integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==", - "license": "MIT", "funding": { "url": "https://github.com/sponsors/colinhacks" } @@ -4722,7 +4701,6 @@ "version": "6.0.2", "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz", "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==", - "license": "MIT", "engines": { "node": ">= 14" } @@ -4825,7 +4803,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz", "integrity": "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==", - "license": "MIT", "dependencies": { "ast-types": "^0.13.4", "escodegen": "^2.1.0", @@ -4895,8 +4872,7 @@ "node_modules/devtools-protocol": { "version": "0.0.1367902", "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1367902.tgz", - "integrity": "sha512-XxtPuC3PGakY6PD7dG66/o8KwJ/LkH2/EKe19Dcw58w53dv4/vSQEkn/SzuyhHE2q4zPgCkxQBxus3VV4ql+Pg==", - "license": "BSD-3-Clause" + "integrity": "sha512-XxtPuC3PGakY6PD7dG66/o8KwJ/LkH2/EKe19Dcw58w53dv4/vSQEkn/SzuyhHE2q4zPgCkxQBxus3VV4ql+Pg==" }, "node_modules/dezalgo": { "version": "1.0.4", @@ -5193,7 +5169,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz", "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==", - "license": "BSD-2-Clause", "dependencies": { "esprima": "^4.0.1", "estraverse": "^5.2.0", @@ -5214,7 +5189,6 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "license": "BSD-3-Clause", "optional": true, "engines": { "node": ">=0.10.0" @@ -5698,7 +5672,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", - "license": "BSD-2-Clause", "dependencies": { "debug": "^4.1.1", "get-stream": "^5.1.0", @@ -5718,7 +5691,6 @@ "version": "4.4.0", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", - "license": "MIT", "dependencies": { "ms": "^2.1.3" }, @@ -5734,8 +5706,7 @@ "node_modules/extract-zip/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "license": "MIT" + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "node_modules/fast-deep-equal": { "version": "3.1.3", @@ -5747,8 +5718,7 @@ "node_modules/fast-fifo": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz", - "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==", - "license": "MIT" + "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==" }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", @@ -6466,7 +6436,6 @@ "version": "6.0.4", "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.4.tgz", "integrity": "sha512-E1b1lFFLvLgak2whF2xDBcOy6NLVGZBqqjJjsIhvopKfWWEi64pLVTWWehV8KlLerZkfNTA95sTe2OdJKm1OzQ==", - "license": "MIT", "dependencies": { "basic-ftp": "^5.0.2", "data-uri-to-buffer": "^6.0.2", @@ -6480,7 +6449,6 @@ "version": "4.4.0", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", - "license": "MIT", "dependencies": { "ms": "^2.1.3" }, @@ -6496,8 +6464,7 @@ "node_modules/get-uri/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "license": "MIT" + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "node_modules/getobject": { "version": "1.0.2", @@ -7354,7 +7321,6 @@ "version": "7.0.2", "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", - "license": "MIT", "dependencies": { "agent-base": "^7.1.0", "debug": "^4.3.4" @@ -7367,7 +7333,6 @@ "version": "4.4.0", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", - "license": "MIT", "dependencies": { "ms": "^2.1.3" }, @@ -7383,8 +7348,7 @@ "node_modules/http-proxy-agent/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "license": "MIT" + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "node_modules/http2-wrapper": { "version": "1.0.3", @@ -7403,7 +7367,6 @@ "version": "7.0.6", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz", "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==", - "license": "MIT", "dependencies": { "agent-base": "^7.1.2", "debug": "4" @@ -7416,7 +7379,6 @@ "version": "4.4.0", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", - "license": "MIT", "dependencies": { "ms": "^2.1.3" }, @@ -7432,8 +7394,7 @@ "node_modules/https-proxy-agent/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "license": "MIT" + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "node_modules/humanize-ms": { "version": "1.2.1", @@ -9205,8 +9166,7 @@ "node_modules/mitt": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz", - "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==", - "license": "MIT" + "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==" }, "node_modules/mkdirp": { "version": "0.5.6", @@ -9513,7 +9473,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz", "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==", - "license": "MIT", "engines": { "node": ">= 0.4.0" } @@ -10167,7 +10126,6 @@ "version": "7.1.0", "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.1.0.tgz", "integrity": "sha512-Z5FnLVVZSnX7WjBg0mhDtydeRZ1xMcATZThjySQUHqr+0ksP8kqaw23fNKkaaN/Z8gwLUs/W7xdl0I75eP2Xyw==", - "license": "MIT", "dependencies": { "@tootallnate/quickjs-emscripten": "^0.23.0", "agent-base": "^7.1.2", @@ -10186,7 +10144,6 @@ "version": "4.4.0", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", - "license": "MIT", "dependencies": { "ms": "^2.1.3" }, @@ -10202,14 +10159,12 @@ "node_modules/pac-proxy-agent/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "license": "MIT" + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "node_modules/pac-resolver": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.1.tgz", "integrity": "sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==", - "license": "MIT", "dependencies": { "degenerator": "^5.0.0", "netmask": "^2.0.2" @@ -10666,7 +10621,6 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", - "license": "MIT", "engines": { "node": ">=0.4.0" } @@ -10724,7 +10678,6 @@ "version": "6.5.0", "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.5.0.tgz", "integrity": "sha512-TmatMXdr2KlRiA2CyDu8GqR8EjahTG3aY3nXjdzFyoZbmB8hrBsTyMezhULIXKnC0jpfjlmiZ3+EaCzoInSu/A==", - "license": "MIT", "dependencies": { "agent-base": "^7.1.2", "debug": "^4.3.4", @@ -10743,7 +10696,6 @@ "version": "4.4.0", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", - "license": "MIT", "dependencies": { "ms": "^2.1.3" }, @@ -10759,14 +10711,12 @@ "node_modules/proxy-agent/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "license": "MIT" + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "node_modules/proxy-from-env": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", - "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", - "license": "MIT" + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" }, "node_modules/pump": { "version": "3.0.2", @@ -10798,17 +10748,16 @@ } }, "node_modules/puppeteer": { - "version": "23.10.4", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-23.10.4.tgz", - "integrity": "sha512-i0sYIAIjdO9MoRfFqbkoWFnQYZVmNp8msbztTgG46KbOdoYAv4f56MFzdFwtC0lyZHtkP+yl0H7tP0dNg3RQYA==", + "version": "23.11.1", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-23.11.1.tgz", + "integrity": "sha512-53uIX3KR5en8l7Vd8n5DUv90Ae9QDQsyIthaUFVzwV6yU750RjqRznEtNMBT20VthqAdemnJN+hxVdmMHKt7Zw==", "hasInstallScript": true, - "license": "Apache-2.0", "dependencies": { "@puppeteer/browsers": "2.6.1", - "chromium-bidi": "0.8.0", + "chromium-bidi": "0.11.0", "cosmiconfig": "^9.0.0", "devtools-protocol": "0.0.1367902", - "puppeteer-core": "23.10.4", + "puppeteer-core": "23.11.1", "typed-query-selector": "^2.12.0" }, "bin": { @@ -10819,13 +10768,12 @@ } }, "node_modules/puppeteer-core": { - "version": "23.10.4", - "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-23.10.4.tgz", - "integrity": "sha512-pQAY7+IFAndWDkDodsQGguW1/ifV5OMlGXJDspwtK49Asb7poJZ/V5rXJxVSpq57bWrJasjQBZ1X27z1oWVq4Q==", - "license": "Apache-2.0", + "version": "23.11.1", + "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-23.11.1.tgz", + "integrity": "sha512-3HZ2/7hdDKZvZQ7dhhITOUg4/wOrDRjyK2ZBllRB0ZCOi9u0cwq1ACHDjBB+nX+7+kltHjQvBRdeY7+W0T+7Gg==", "dependencies": { "@puppeteer/browsers": "2.6.1", - "chromium-bidi": "0.8.0", + "chromium-bidi": "0.11.0", "debug": "^4.4.0", "devtools-protocol": "0.0.1367902", "typed-query-selector": "^2.12.0", @@ -10839,7 +10787,6 @@ "version": "4.4.0", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", - "license": "MIT", "dependencies": { "ms": "^2.1.3" }, @@ -10855,8 +10802,7 @@ "node_modules/puppeteer-core/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "license": "MIT" + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "node_modules/qs": { "version": "6.13.0", @@ -10897,8 +10843,7 @@ "node_modules/queue-tick": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz", - "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==", - "license": "MIT" + "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==" }, "node_modules/quick-lru": { "version": "5.1.1", @@ -11651,7 +11596,6 @@ "version": "8.0.5", "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz", "integrity": "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==", - "license": "MIT", "dependencies": { "agent-base": "^7.1.2", "debug": "^4.3.4", @@ -11665,7 +11609,6 @@ "version": "4.4.0", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", - "license": "MIT", "dependencies": { "ms": "^2.1.3" }, @@ -11681,8 +11624,7 @@ "node_modules/socks-proxy-agent/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "license": "MIT" + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "node_modules/socks/node_modules/ip-address": { "version": "9.0.5", @@ -11906,7 +11848,6 @@ "version": "2.21.1", "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.21.1.tgz", "integrity": "sha512-PhP9wUnFLa+91CPy3N6tiQsK+gnYyUNuk15S3YG/zjYE7RuPeCjJngqnzpC31ow0lzBHQ+QGO4cNJnd0djYUsw==", - "license": "MIT", "dependencies": { "fast-fifo": "^1.3.2", "queue-tick": "^1.0.1", @@ -12169,7 +12110,6 @@ "version": "3.0.6", "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz", "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==", - "license": "MIT", "dependencies": { "pump": "^3.0.0", "tar-stream": "^3.1.5" @@ -12183,7 +12123,6 @@ "version": "3.1.7", "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz", "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==", - "license": "MIT", "dependencies": { "b4a": "^1.6.4", "fast-fifo": "^1.2.0", @@ -12230,7 +12169,6 @@ "version": "1.2.3", "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.3.tgz", "integrity": "sha512-3/o9z3X0X0fTupwsYvR03pJ/DjWuqqrfwBgTQzdWDiQSm9KitAyz/9WqsT2JQW7KV2m+bC2ol/zqpW37NHxLaA==", - "license": "Apache-2.0", "dependencies": { "b4a": "^1.6.4" } @@ -12245,8 +12183,7 @@ "node_modules/through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", - "license": "MIT" + "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==" }, "node_modules/tiny-lr": { "version": "1.1.1", @@ -12405,8 +12342,7 @@ "node_modules/typed-query-selector": { "version": "2.12.0", "resolved": "https://registry.npmjs.org/typed-query-selector/-/typed-query-selector-2.12.0.tgz", - "integrity": "sha512-SbklCd1F0EiZOyPiW192rrHZzZ5sBijB6xM+cpmrwDqObvdtunOHHIk9fCGsoK5JVIYXoyEp4iEdE3upFH3PAg==", - "license": "MIT" + "integrity": "sha512-SbklCd1F0EiZOyPiW192rrHZzZ5sBijB6xM+cpmrwDqObvdtunOHHIk9fCGsoK5JVIYXoyEp4iEdE3upFH3PAg==" }, "node_modules/typedarray-to-buffer": { "version": "3.1.5", @@ -12453,7 +12389,6 @@ "version": "1.4.3", "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz", "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==", - "license": "MIT", "dependencies": { "buffer": "^5.2.1", "through": "^2.3.8" @@ -12575,12 +12510,6 @@ "node": ">= 0.10" } }, - "node_modules/urlpattern-polyfill": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz", - "integrity": "sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg==", - "license": "MIT" - }, "node_modules/utif2": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/utif2/-/utif2-4.1.0.tgz", @@ -12770,7 +12699,6 @@ "version": "8.18.0", "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz", "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==", - "license": "MIT", "engines": { "node": ">=10.0.0" }, From ea3ed8beb2d4f4ba70918c1f4557a23fa3e5ac6d Mon Sep 17 00:00:00 2001 From: Arturs Sosins Date: Tue, 7 Jan 2025 10:13:23 +0200 Subject: [PATCH 20/21] Update Changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7152418a310..d27eb75cd2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ Dependencies: - Bump sass from 1.81.0 to 1.83.1 - Bump countly-sdk-nodejs from 24.10.0 to 24.10.1 +- Bump express-rate-limit from 7.4.1 to 7.5.0 ## Version 24.05.20 Fixes: From 564d11e476996acc84294470144869d5dfbac053 Mon Sep 17 00:00:00 2001 From: Arturs Sosins Date: Tue, 7 Jan 2025 10:24:00 +0200 Subject: [PATCH 21/21] Update Changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d27eb75cd2a..1bf6bafee49 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ Dependencies: - Bump sass from 1.81.0 to 1.83.1 - Bump countly-sdk-nodejs from 24.10.0 to 24.10.1 - Bump express-rate-limit from 7.4.1 to 7.5.0 +- Bump puppeteer from 23.10.4 to 23.11.1 ## Version 24.05.20 Fixes: