Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[vue container] data can also be object #2873

Merged
merged 1 commit into from
Mar 5, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 21 additions & 5 deletions frontend/express/public/javascripts/countly/vue/container.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}, {});
}
Expand Down