Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2024-10-27 20:44:07 +00:00
Code Issues Projects Releases Wiki Activity

(core) Filter out gristHelper columns from the code listing in CodeEditor

Browse Source 
Test Plan: Added a test case for this, which fails without the change.

Reviewers: paulfitz

Reviewed By: paulfitz

Differential Revision: https://phab.getgrist.com/D2569
This commit is contained in:
Dmitry S 2020-07-30 22:10:18 -04:00
parent 156b75133c
commit 7da05e0bbf
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sandbox/grist/gencode.py
View File

@ -20,6 +20,7 @@ import imp
from collections import OrderedDict from collections import OrderedDict
import codebuilder import codebuilder
from column import is_visible_column
import summary import summary
import table import table
import textbuilder import textbuilder
@ -113,13 +114,18 @@ class GenCode(object):
return self._make_data_field(col_info, table_id) return self._make_data_field(col_info, table_id)
def _make_table_model(self, table_info, summary_tables): def _make_table_model(self, table_info, summary_tables, filter_for_user=False):
"""Returns the code for a table model.""" """
Returns the code for a table model.
If filter_for_user is True, includes only user-visible columns.
"""
table_id = table_info.tableId table_id = table_info.tableId
source_table_id = summary.decode_summary_table_name(table_id) source_table_id = summary.decode_summary_table_name(table_id)
# Sort columns by "isFormula" to output all data columns before all formula columns. # Sort columns by "isFormula" to output all data columns before all formula columns.
columns = sorted(table_info.columns.itervalues(), key=lambda c: c.isFormula) columns = sorted(table_info.columns.itervalues(), key=lambda c: c.isFormula)
if filter_for_user:
columns = [c for c in columns if is_visible_column(c.colId)]
parts = ["@grist.UserTable\nclass %s:\n" % table_id] parts = ["@grist.UserTable\nclass %s:\n" % table_id]
if source_table_id: if source_table_id:
parts.append(indent(textbuilder.Text("_summarySourceTable = %r\n" % source_table_id))) parts.append(indent(textbuilder.Text("_summarySourceTable = %r\n" % source_table_id)))
@ -151,12 +157,12 @@ class GenCode(object):
"import datetime, math, re # modules commonly needed in formulas\n"] "import datetime, math, re # modules commonly needed in formulas\n"]
userparts = fullparts[:] userparts = fullparts[:]
for table_info in schema.itervalues(): for table_info in schema.itervalues():
table_model = self._make_table_model(table_info, summary_tables.get(table_info.tableId))
fullparts.append("\n\n") fullparts.append("\n\n")
fullparts.append(table_model) fullparts.append(self._make_table_model(table_info, summary_tables.get(table_info.tableId)))
if not _is_special_table(table_info.tableId): if not _is_special_table(table_info.tableId):
userparts.append("\n\n") userparts.append("\n\n")
userparts.append(table_model) userparts.append(self._make_table_model(table_info, summary_tables.get(table_info.tableId),
filter_for_user=True))
# Once all formulas are generated, replace the formula cache with the newly-populated version. # Once all formulas are generated, replace the formula cache with the newly-populated version.
self._formula_cache = self._new_formula_cache self._formula_cache = self._new_formula_cache