Merge branch 'next' into release.24.10

Countly · Oct 14, 2024 · fcd4729 · fcd4729
2 parents e70beee + 35acbb4
commit fcd4729
Show file tree

Hide file tree

Showing 8 changed files with 387 additions and 16 deletions.
diff --git a/bin/upgrade/24.10/scripts/merge_events_collections.js b/bin/upgrade/24.10/scripts/merge_events_collections.js
@@ -46,7 +46,7 @@ async function merge_data_from_collection(countlyDB, collection, mapped, resolve
         var app_id = mapped[collection].a;
         var prefix = app_id + "_" + collection.replace("events", "");
         var tscheck = Date.now().valueOf();
-        countlyDB.collection(collection).aggregate([{"$match": {"merged": {"$ne": true}}}, {"$addFields": {"_id": {"$concat": [prefix, "_", "$_id"]}, "tscheck": tscheck, "a": app_id, "e": mapped[collection].e}}, {"$merge": {"into": "events_data", "on": "_id", "whenMatched": "fail"}}], async function(err) {
+        countlyDB.collection(collection).aggregate([{"$match": {"merged": {"$ne": true}}}, {"$addFields": {"_id": {"$concat": [prefix, "_", "$_id"]}, "tscheck": tscheck, "a": app_id, "e": mapped[collection].e}}, {"$merge": {"into": "events_data", "on": "_id", "whenMatched": "fail"}}], {ignore_errors: [11000]}, async function(err) {
             if (err) {
                 console.log("Failed to merge with database  $merge operation. Doing each document one by one");
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/plugins/data_migration/frontend/public/javascripts/countly.views.js b/plugins/data_migration/frontend/public/javascripts/countly.views.js
@@ -196,7 +196,7 @@
                     createImageThumbnails: false,
                     autoProcessQueue: false,
                     addRemoveLinks: true,
-                    acceptedFiles: 'application/x-gzip',
+                    acceptedFiles: 'application/gzip,application/x-gzip',
                     dictDefaultMessage: this.i18n('feedback.drop-message'),
                     dictRemoveFile: this.i18n('feedback.remove-file'),
                     url: "/i/datamigration/import",
@@ -220,7 +220,7 @@
                                 message: CV.i18n('data-migration.generated-token')
                             });
                             self.importDrawerCancelButtonLabel = CV.i18n('data-migration.close');
-                            self.importDrawerSaveButtonLabel = false;
+                            self.importDrawerSaveButtonLabel = "";
                         }
                         else {
                             CountlyHelpers.notify({