mirror of
https://github.com/gristlabs/grist-core.git
synced 2024-09-29 03:40:47 +00:00
460f22b701
Summary: As reported in https://grist.slack.com/archives/C069RUP71/p1655316194602829, when a table is hidden by ACL, it was still showing as a blank 'ghost' option to select data when adding a widget: {F55498} The fix is simply to return `true` from `isHiddenTable` for empty table IDs, which indicate a table hidden by ACL. `TableRec.isHidden` is supposed to match this so I updated it too, and I cleaned up a tiny bit of other related code. Test Plan: Extended `nbrowser/AccessRules1.ts` to test the data options when adding widgets. Reviewers: jarek Reviewed By: jarek Differential Revision: https://phab.getgrist.com/D3530
29 lines
1.2 KiB
TypeScript
29 lines
1.2 KiB
TypeScript
import {DocModel, IRowModel, refRecord, ViewRec} from 'app/client/models/DocModel';
|
|
import * as ko from 'knockout';
|
|
|
|
// Represents a page entry in the tree of pages.
|
|
export interface PageRec extends IRowModel<"_grist_Pages"> {
|
|
view: ko.Computed<ViewRec>;
|
|
isHidden: ko.Computed<boolean>;
|
|
}
|
|
|
|
export function createPageRec(this: PageRec, docModel: DocModel): void {
|
|
this.view = refRecord(docModel.views, this.viewRef);
|
|
this.isHidden = ko.pureComputed(() => {
|
|
const name = this.view().name();
|
|
const isTableHidden = () => {
|
|
const viewId = this.view().id();
|
|
const tables = docModel.rawDataTables.all();
|
|
const primaryTable = tables.find(t => t.primaryViewId() === viewId);
|
|
return !!primaryTable && primaryTable.tableId()?.startsWith("GristHidden_");
|
|
};
|
|
// Page is hidden when any of this is true:
|
|
// - It has an empty name (or no name at all)
|
|
// - It is GristDocTour (unless user wants to see it)
|
|
// - It is a page generated for a hidden table TODO: Follow up - don't create
|
|
// pages for hidden tables.
|
|
// This is used currently only the left panel, to hide pages from the user.
|
|
return !name || (name === 'GristDocTour' && !docModel.showDocTourTable) || isTableHidden();
|
|
});
|
|
}
|