Skip to content

Fixes for views #7093

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.

Sign up for GitHub

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

Merged
Cookiezaurs merged 3 commits into from
Dec 18, 2025
Merged

Fixes for views #7093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
405f174
localization
Dec 17, 2025
146ccfb
Fixes for views
Dec 18, 2025
6323234
Merge branch 'newarchitecture' into feature/ingestion
Cookiezaurs Dec 18, 2025
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
1 change: 1 addition & 0 deletions frontend/express/public/localization/dashboard/dashboard.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ common.7days = 7 days
common.30days = 30 days
common.60days = 60 days
common.90days = 90 days
common.is = is
common.from = from
common.to = to
common.download = Download
Expand Down
19 changes: 13 additions & 6 deletions plugins/views/api/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ const FEATURE_NAME = 'views';
for (var z in selectMap) {
var matchStage0 = {"$match": {"_id": {"$regex": prefix + z + "_.*"}}};
if (settings && settings.onlyIDs) {
matchStage0.vw = {"$in": settings.onlyIDs};
matchStage0.$match.vw = {"$in": settings.onlyIDs};
}
projector = {_id: "$vw", name: "$n"};
for (let i = 0; i < settings.levels.daily.length; i++) {
Expand Down Expand Up @@ -634,7 +634,11 @@ const FEATURE_NAME = 'views';
}
else {
var qq = settings.count_query || {};
qq._id = {"$regex": "^" + params.qstring.app_id + "_.*"};
common.db.collection("app_viewsmeta").count(qq, function(err, total) {
if (err) {
log.e(err);
}
common.db.collection(collectionName).aggregate(pipeline, {allowDiskUse: true}, function(err1, res) {
if (err1) {
log.e(err1);
Expand Down Expand Up @@ -810,7 +814,7 @@ const FEATURE_NAME = 'views';
var pipeline = createAggregatePipeline(params, selOptions);
pipeline.push({
$lookup: {
from: "app_viewsmeta" + params.qstring.app_id,
from: "app_viewsmeta",
localField: "_id",
foreignField: "_id",
as: "view_meta"
Expand Down Expand Up @@ -908,7 +912,8 @@ const FEATURE_NAME = 'views';

if (params.qstring.sSearch && params.qstring.sSearch !== "") {
selOptions.count_query = {};
query = [{$addFields: {"sortcol": { $cond: [ "$display", "$display", "$view"] }}}];

query = [{"$match": {"_id": {"$regex": "^" + params.qstring.app_id}}}, {$addFields: {"sortcol": { $cond: [ "$display", "$display", "$view"] }}}];
if (params.qstring.sSearch && params.qstring.sSearch !== "") {
//Dealing with special symbols
params.qstring.sSearch = params.qstring.sSearch.replace(/\\/g, "\\\\");
Expand Down Expand Up @@ -975,6 +980,8 @@ const FEATURE_NAME = 'views';
ret.sEcho = params.qstring.sEcho;
ret.iTotalRecords = total || ret.data.length;
ret.iTotalDisplayRecords = total || ret.data.length;
ret.aaData = ret.data;
delete ret.data;
common.returnOutput(params, ret);
});
});
Expand Down Expand Up @@ -1170,7 +1177,7 @@ const FEATURE_NAME = 'views';
else if (params.qstring.action === "listNames") {
common.db.collection("app_viewsmeta").count({"_id": {"$regex": "^" + params.qstring.app_id + "_.*"}}, function(errCount, totalCn) {
if (!errCount && totalCn && totalCn < 10000) {
common.db.collection("app_viewsmeta").find({}, {view: 1, display: 1}).toArray(function(err, res) {
common.db.collection("app_viewsmeta").find({"_id": {"$regex": "^" + params.qstring.app_id + "_.*"}}, {view: 1, display: 1}).toArray(function(err, res) {
common.returnOutput(params, res || []);
});
}
Expand Down Expand Up @@ -1583,7 +1590,7 @@ const FEATURE_NAME = 'views';


plugins.register("/i/apps/create", function() {
common.db.collection('app_viewsmeta').ensureIndex({"view": 1}, {'unique': 1}, function() {});
common.db.collection('app_viewsmeta').ensureIndex({"a": 1, "view": 1}, {'unique': 1}, function() {});
});

plugins.register("/i/apps/delete", function(ob) {
Expand All @@ -1594,7 +1601,7 @@ const FEATURE_NAME = 'views';
/* old end */

common.db.collection("views").findOne({'_id': common.db.ObjectID(appId)}, {}, function(err, viewInfo) {
//deleing user last view data(old_collections)
//deleting user last view data(old_collections)
common.db.collection('app_userviews' + appId).drop(function() {});
common.db.collection('app_viewsmeta' + appId).drop(function() {});

Expand Down