Merge branch 'next' into release.24.12

Author: ArtursKadikis

CHANGELOG.md

@@ -132,6 +132,27 @@ Enterprise Features:
 - [users] UI improvements
 - [views] Added a quick transition to drill
 
+## Version 24.05.20
+Fixes:
+- [push] Fixed bug where IOS credentials get mixed up while sending messages from different apps at the same time
+- [push] Fixed bug where it crashes in connection pool growth because of a type mismatch in an if condition
+
+Security:
+- [cohorts] Prevent query injection on cohort creation
+
+Dependencies:
+- Bump countly-sdk-nodejs from 22.6.0 to 24.10.0
+- Bump countly-sdk-web from 24.4.1 to 24.11.0
+- Bump express from 4.21.1 to 4.21.2
+- Bump form-data from 4.0.0 to 4.0.1
+- Bump jimp from 0.22.12 to 1.6.0
+- Bump jsdoc from 4.0.3 to 4.0.4
+- Bump mocha from 10.2.0 to 10.8.2
+- Bump mongodb from 4.9.1 to 4.17.2
+- Bump nodemailer from 6.9.15 to 6.9.16
+- Bump puppeteer from 23.8.0 to 23.9.0
+- Bump tslib from 2.7.0 to 2.8.1
+
 ## Version 24.05.19
 Fixes:
 - [dashboards] Fixing issue where dashboard widgets go into single column

frontend/express/public/javascripts/countly/vue/components/content.js

@@ -428,6 +428,10 @@
                         return !!this.value;
                     }
 
+                    if (this.type === COUNTLY_CONTENT_SIDEBAR_INPUT_COMPONENT_BY_TYPE_INPUT) {
+                        return countlyCommon.unescapeHtml(this.value) || '';
+                    }
+
                     return this.value || null;
                 },
                 set(newValue) {

plugins/compliance-hub/frontend/public/templates/exportHistory.html

@@ -29,12 +29,14 @@
                         <div :data-test-id="'datatable-export-purge-history-user-' + scope.$index">
                             {{scope.row.u}}
                         </div>
+                    </template>
                 </el-table-column>
                 <el-table-column sortable="custom" prop="ip" label="IP ADDRESS">
                     <template slot-scope="scope">
                         <div :data-test-id="'datatable-export-purge-history-ip-address-' + scope.$index">
                             {{scope.row.ip}}
                         </div>
+                    </template>
                 </el-table-column>
                 <el-table-column width="400" sortable="custom" label="ACTION">
                     <template v-slot="rowScope">

plugins/star-rating/api/api.js

@@ -722,9 +722,15 @@ function uploadFile(myfile, id, callback) {
                             if (!changes.targeting) {
                                 changes.targeting = {};
                             }
+                            if (!changes.targeting.user_segmentation) {
+                                changes.targeting.user_segmentation = '{"query":{},"queryText":""}';
+                            }
+                            if (!changes.targeting.steps) {
+                                changes.targeting.steps = '[]';
+                            }
                             changes.targeting.app_id = params.app_id + "";//has to be string
                             // eslint-disable-next-line
-                            createCohort(params, type, widgetId, changes.targeting, function(cohortId) { //create cohort using this 
+                            createCohort(params, type, widgetId, changes.targeting, function(cohortId) { //create cohort using this
                                 if (cohortId) {
                                     //update widget record to have this cohortId
                                     common.db.collection("feedback_widgets").findAndModify({ "_id": widgetId }, {}, { $set: { "cohortID": cohortId } }, function(/*err, widget*/) {