Merge pull request #2873 from Countly/feature/new-ui-additions-to-set…

…tings [vue container] data can also be object
Countly · Mar 5, 2022 · cb14b36 · cb14b36
2 parents ce4baaf + 0d5e95b
commit cb14b36
Showing 1 changed file with 21 additions and 5 deletions.
diff --git a/frontend/express/public/javascripts/countly/vue/container.js b/frontend/express/public/javascripts/countly/vue/container.js
@@ -99,12 +99,28 @@
         var mixin = {
             data: function() {
                 return Object.keys(mapping).reduce(function(acc, val) {
-                    acc[val] = (self.dict[mapping[val]] ? self.dict[mapping[val]].data : []).filter(function(data) {
-                        if (data.permission) {
-                            return countlyAuth.validateRead(data.permission);
+                    var dataOb = self.dict[mapping[val]] ? self.dict[mapping[val]].data : [];
+                    if (Array.isArray(dataOb)) {
+                        dataOb = dataOb.filter(function(data) {
+                            if (data.permission) {
+                                return countlyAuth.validateRead(data.permission);
+                            }
+                            return true;
+                        });
+                    }
+                    else {
+                        for (var key in dataOb) {
+                            if (dataOb[key].permission) {
+                                if (countlyAuth.validateRead(dataOb[key].permission)) {
+                                    acc[val] = dataOb;
+                                }
+                            }
+                            else {
+                                acc[val] = dataOb;
+                            }
+                            break;
                         }
-                        return true;
-                    });
+                    }
                     return acc;
                 }, {});
             }