Skip to content

chore(cubejs-server-core): make sure DAP doesn't generate empty filters #9317

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
merged 1 commit into from
Mar 19, 2025
Merged

chore(cubejs-server-core): make sure DAP doesn't generate empty filters #9317

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 18 additions & 4 deletions packages/cubejs-server-core/src/core/CompilerApi.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,11 +339,25 @@ export class CompilerApi {
viewFiltersPerCubePerRole,
hasAllowAllForCube
);
query.filters = query.filters || [];
query.filters.push(rlsFilter);
if (rlsFilter) {
query.filters = query.filters || [];
query.filters.push(rlsFilter);
}
return { query, denied: false };
}

removeEmptyFilters(filter) {
if (filter?.and) {
const and = filter.and.map(f => this.removeEmptyFilters(f)).filter(f => f);
return and.length > 1 ? { and } : and.at(0) || null;
}
if (filter?.or) {
const or = filter.or.map(f => this.removeEmptyFilters(f)).filter(f => f);
return or.length > 1 ? { or } : or.at(0) || null;
}
return filter;
}

buildFinalRlsFilter(cubeFiltersPerCubePerRole, viewFiltersPerCubePerRole, hasAllowAllForCube) {
// - delete all filters for cubes where the user has allowAll
// - combine the rest into per role maps
Expand All @@ -369,7 +383,7 @@ export class CompilerApi {
{}
);

return {
return this.removeEmptyFilters({
and: [{
or: Object.keys(cubeFiltersPerRole).map(role => ({
and: cubeFiltersPerRole[role]
Expand All @@ -379,7 +393,7 @@ export class CompilerApi {
and: viewFiltersPerRole[role]
}))
}]
};
});
}

async compilerCacheFn(requestId, key, path) {
Expand Down
Loading