Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2026-03-02 04:09:24 +00:00
Code Issues Projects Releases Wiki Activity

(core) Hiding censored pages and all their leaves

Browse Source 
Summary:
Page is now hidden when any of its ancestor (or the page itself)
is censored.

Test Plan: Updated

Reviewers: georgegevoian

Reviewed By: georgegevoian

Differential Revision: https://phab.getgrist.com/D4319
This commit is contained in:
Jarosław Sadziński
2024-08-14 14:43:16 +02:00
parent fbc0418118
commit 9509b2edcb
2 changed files with 25 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/client/models/DocModel.ts
View File

@@ -223,16 +223,21 @@ export class DocModel {
this.allPages = ko.computed(() => allPages.all());
this.menuPages = ko.computed(() => {
const pagesToShow = this.allPages().filter(p => !p.isSpecial()).sort((a, b) => a.pagePos() - b.pagePos());
// Helper to find all children of a page.
const children = memoize((page: PageRec) => {
const following = pagesToShow.slice(pagesToShow.indexOf(page) + 1);
const firstOutside = following.findIndex(p => p.indentation() <= page.indentation());
return firstOutside >= 0 ? following.slice(0, firstOutside) : following;
const parent = memoize((page: PageRec) => {
const myIdentation = page.indentation();
if (myIdentation === 0) { return null; }
const idx = pagesToShow.indexOf(page);
// Find first page starting from before that has lower indentation then mine.
const beforeMe = pagesToShow.slice(0, idx).reverse();
return beforeMe.find(p => p.indentation() < myIdentation) ?? null;
});
// Helper to test if the page is hidden and all its children are hidden.
// In that case, we won't show it at all.
const hide = memoize((page: PageRec): boolean => page.isCensored() && children(page).every(p => hide(p)));
return pagesToShow.filter(p => !hide(p));
const ancestors = memoize((page: PageRec): PageRec[] => {
const anc = parent(page);
return anc ? [anc, ...ancestors(anc)] : [];
});
// Helper to test if the page is hidden or is in a hidden branch.
const hidden = memoize((page: PageRec): boolean => page.isHidden() || ancestors(page).some(p => p.isHidden()));
return pagesToShow.filter(p => !hidden(p));
});
this.visibleDocPages = ko.computed(() => this.allPages().filter(p => !p.isHidden()));