Merge pull request #4965 from Cookiezaurs/master-user-merging

[core] Fixes for views ommiting
Countly · Mar 7, 2024 · 13bddf5 · 13bddf5
2 parents 8b127d8 + 82fbce0
commit 13bddf5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/plugins/views/api/jobs/cleanupMeta.js b/plugins/views/api/jobs/cleanupMeta.js
@@ -54,10 +54,12 @@ class CleanupMetaJob extends job.Job {
                         }
                         else {
                             let listToOmit = [];
+
                             if (view && view.segments) {
+                                var omittedList = view.omit || [];
                                 for (var key in view.segments) {
                                     //console.log(key+" "+Object.keys(listed[z].segments[key]).length);
-                                    if (Object.keys(view.segments[key]).length > 100) {
+                                    if (omittedList.indexOf(key) !== -1) {
                                         listToOmit.push(key);
                                     }
                                 }

diff --git a/plugins/views/api/parts/viewsUtils.js b/plugins/views/api/parts/viewsUtils.js
@@ -16,7 +16,7 @@ module.exports = {
         }
         var updateOp = {};
         if (options.extend) {
-            updateOp = {$addToSet: {omit: omit}, "$unset": unset};
+            updateOp = {$addToSet: {omit: {"$each": omit}}, "$unset": unset};
 
         }
         else {