Merge branch 'master' into ar2rsawseen/feature/tracking

ar2rsawseen · web-flow · commit 1bdf9398ea8e · 2025-10-14T15:42:57.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,14 @@
 ## Version 25.03.xx
 Fixes:
-- [mail] add smtp debug option for mail module
+- [mail] Add smtp debug option for mail module
+
+Enterprise Fixes:
+- [users] Fixed uploading user profile pictures
+- [funnels] Show notification if funnel results are from cache/task manager
+- [block] Fixed filter for consent events
+- [drill] [survey] Fix survey answer in drill
+- [users] Add survey section to user feedback page
+
 
 ## Version 25.03.22
 Fixes:
diff --git a/api/utils/pdf.js b/api/utils/pdf.js
@@ -42,7 +42,7 @@ exports.renderPDF = async function(html, callback, options = null, puppeteerArgs
         }
         const updatedTimeout = 240000;
         const page = await browser.newPage();
-
+        await page.setBypassCSP(true);
         page.on('console', (msg) => {
             log.d("Headless chrome page log", msg.text());
         });
@@ -74,6 +74,16 @@ exports.renderPDF = async function(html, callback, options = null, puppeteerArgs
             await page.setContent(html);
         }
 
+        const contentHeight = await page.evaluate(() => {
+            /*global document*/
+            return document.body.scrollHeight;
+        });
+
+        options.width = '210mm'; // A4 width, for example
+        options.height = `${contentHeight}px`; // full content height
+        options.printBackground = true;
+        options.preferCSSPageSize = true;
+
         await page.pdf(options).then(callback, function(error) {
             log.d('pdf generation error', error);
         });
diff --git a/api/utils/render.js b/api/utils/render.js
@@ -68,7 +68,7 @@ exports.renderView = function(options, cb) {
                     XDG_CONFIG_HOME: pathModule.resolve(__dirname, "../../.cache/chrome/tmp/.chromium"),
                     XDG_CACHE_HOME: pathModule.resolve(__dirname, "../../.cache/chrome/tmp/.chromium")
                 },
-                args: ['--no-sandbox', '--disable-setuid-sandbox', '--ignore-certificate-errors'],
+                args: ['--no-sandbox', '--disable-setuid-sandbox', '--ignore-certificate-errors', '--disable-web-security'],
                 ignoreHTTPSErrors: true,
                 userDataDir: pathModule.resolve(__dirname, "../../dump/chrome/" + Date.now())
             };
@@ -82,6 +82,7 @@ exports.renderView = function(options, cb) {
             try {
                 log.d('Started rendering images');
                 var page = await browser.newPage();
+                await page.setBypassCSP(true);
 
                 page.on('console', (msg) => {
                     log.d("Headless chrome page log", msg.text());
diff --git a/frontend/express/public/core/events/javascripts/countly.details.models.js b/frontend/express/public/core/events/javascripts/countly.details.models.js
@@ -486,6 +486,9 @@
                     }
                 });
             }
+            allEvents.sort(function(a, b) {
+                return a.label.localeCompare(b.label);
+            });
             return allEvents;
         },
         getGroupData: function(groupData, selectedEventName) {
diff --git a/plugins/reports/api/api.js b/plugins/reports/api/api.js
@@ -4,7 +4,9 @@ var common = require('../../../api/utils/common.js'),
     moment = require('moment-timezone'),
     log = require('../../../api/utils/log')('reports:api'),
     ejs = require("ejs"),
+    fs = require("fs"),
     plugins = require('../../pluginManager.js'),
+    pdf = require('../../../api/utils/pdf'),
     { validateCreate, validateRead, validateUpdate, validateDelete, getUserApps, } = require('../../../api/utils/rights.js');
 
 const FEATURE_NAME = 'reports';
@@ -414,15 +416,81 @@ const FEATURE_NAME = 'reports';
                         if (err2) {
                             common.returnMessage(params, 200, err2);
                         }
+                        else if (res) {
+                            var html = res.message;
+                            if (result.report_type !== "core") {
+                                html = ejs.render(res.message.template, res.message.data);
+                            }
+
+                            common.returnRaw(params, 200, html, {'Content-Type': 'text/html; charset=utf-8', 'Access-Control-Allow-Origin': '*'});
+                        }
                         else {
-                            if (params && params.res) {
-                                var html = res.message;
-                                if (result.report_type !== "core") {
-                                    html = ejs.render(res.message.template, res.message.data);
-                                }
+                            common.returnMessage(params, 200, 'No data to report');
+                        }
+                    });
+                });
+            });
+            break;
+        case 'pdf':
+            validateRead(paramsInstance, FEATURE_NAME, function() {
+                var params = paramsInstance;
+                var argProps = {
+                        '_id': { 'required': true, 'type': 'String'}
+                    },
+                    id = '';
+
+                if (!(id = common.validateArgs(params.qstring.args, argProps)._id)) {
+                    common.returnMessage(params, 200, 'Not enough args');
+                    return false;
+                }
+                common.db.collection('reports').findOne(recordUpdateOrDeleteQuery(params, id), function(err, result) {
+                    if (err || !result) {
+                        common.returnMessage(params, 200, 'Report not found');
+                        return false;
+                    }
 
-                                common.returnRaw(params, 200, html, {'Content-Type': 'text/html; charset=utf-8', 'Access-Control-Allow-Origin': '*'});
+                    // TODO: Handle report type check
+
+                    reports.getReport(common.db, result, function(err2, res) {
+                        if (err2) {
+                            common.returnMessage(params, 200, err2);
+                        }
+                        else if (res) {
+                            var html = res.message;
+                            if (result.report_type !== "core") {
+                                html = ejs.render(res.message.template, res.message.data);
                             }
+                            const filePath = '/tmp/email_report_' + new Date().getTime() + '.pdf';
+                            const options = { "path": filePath, "width": "1028px", height: "1000px" };
+
+                            pdf.renderPDF(html, function() {
+                                //output created file to browser
+                                fs.readFile(filePath, function(err3, data) {
+                                    if (err3) {
+                                        console.log(err3);
+                                        common.returnMessage(params, 500, 'Cannot read pdf file');
+                                    }
+                                    else {
+                                        common.returnRaw(params, 200, data, {
+                                            'Content-Type': 'application/pdf',
+                                            'Content-Disposition': 'inline; filename="report.pdf"',
+                                            'Content-Length': data.length,
+                                            'Access-Control-Allow-Origin': '*'
+                                        });
+                                    }
+                                    fs.unlink(filePath, function(unlinkErr) {
+                                        if (unlinkErr) {
+                                            console.log("Cannot remove temp pdf file");
+                                            console.log(unlinkErr);
+                                        }
+                                    });
+                                });
+                            }, options, {
+                                args: ['--no-sandbox', '--disable-setuid-sandbox', '--disable-web-security'],
+                            }, true);
+                        }
+                        else {
+                            common.returnMessage(params, 200, 'No data to report');
                         }
                     });
                 });
diff --git a/plugins/reports/api/reports.js b/plugins/reports/api/reports.js
@@ -708,7 +708,7 @@ var metricProps = {
                             mail.sendMail(msg, deletePDFCallback);
                         }
                     }, options, {
-                        args: ['--no-sandbox', '--disable-setuid-sandbox'],
+                        args: ['--no-sandbox', '--disable-setuid-sandbox', '--disable-web-security'],
                     }, true).catch(err => {
                         log.d(err);
                     });
diff --git a/plugins/reports/frontend/public/templates/email.html b/plugins/reports/frontend/public/templates/email.html
@@ -90,6 +90,12 @@
         #report-title { font-size: 25px !important; line-height: 30px !important; }
         #report-title span { font-size: 20px; }
     }
+    @media print {
+        .mobile-no-margin {
+            margin:0px 0px !important;
+            max-width: 100% !important;
+        }
+    }
 </style>
 </head>
 <body style="margin: 0; padding: 0; background-color:#f2f2f2;">
@@ -398,7 +404,8 @@
 
                 <% } %>
                 <% } %>
-		<tr class="                    <td>
+		        <tr class="desktop-table" >
+                      <td>
                         <!-- ONE COLUMN SECTION -->
                         <table border="0" cellpadding="0" cellspacing="0" width="100%">
                             <tr>

Original file line number	Diff line number	Diff line change
`@@ -486,6 +486,9 @@`
`486`	`486`	`}`
`487`	`487`	`});`
`488`	`488`	`}`
	`489`	`+ allEvents.sort(function(a, b) {`
	`490`	`+ return a.label.localeCompare(b.label);`
	`491`	`+ });`
`489`	`492`	`return allEvents;`
`490`	`493`	`},`
`491`	`494`	`getGroupData: function(groupData, selectedEventName) {`
Original file line number	Diff line number	Diff line change
`@@ -708,7 +708,7 @@ var metricProps = {`
`708`	`708`	`mail.sendMail(msg, deletePDFCallback);`
`709`	`709`	`}`
`710`	`710`	`}, options, {`
`711`		`- args: ['--no-sandbox', '--disable-setuid-sandbox'],`
	`711`	`+ args: ['--no-sandbox', '--disable-setuid-sandbox', '--disable-web-security'],`
`712`	`712`	`}, true).catch(err => {`
`713`	`713`	`log.d(err);`
`714`	`714`	`});`