Merge branch 'alyssa-starter' of https://github.com/brown-dash/Dash-Web into alyssa-starter

2 files changed, 6 insertions, 4 deletions

diff --git a/src/client/documents/DocUtils.ts b/src/client/documents/DocUtils.ts
index 74a0f5220..1696de7ad 100644
--- a/src/client/documents/DocUtils.ts
+++ b/src/client/documents/DocUtils.ts
@@ -241,7 +241,10 @@ export namespace DocUtils {
             Object.keys(scripts).forEach(key => {
                 const script = scripts[key] as string;
                 if (ScriptCast(doc[key])?.script.originalScript !== scripts[key] && script) {
+                    const additionalItems: { [key: string]: unknown } = {};
+                    script.match(/_[a-zA-Z]*_/)?.forEach(match => (additionalItems[match] = 'any'));
                     (key.startsWith('_') ? doc : Doc.GetProto(doc))[key] = ScriptField.MakeScript(script, {
+                        ...additionalItems,
                         this: Doc.name,
                         dragData: Doc.DocDragDataName,
                         value: 'any',
diff --git a/src/client/documents/Documents.ts b/src/client/documents/Documents.ts
index da3419de2..3cbf3cc60 100644
--- a/src/client/documents/Documents.ts
+++ b/src/client/documents/Documents.ts
@@ -320,11 +320,11 @@ export class DocumentOptions {
     contextMenuLabels?: List<string>;
     contextMenuIcons?: List<string>;
     childContentPointerEvents?: string; // pointer events allowed for content of a document view.  eg. set to "none" in menuSidebar for sharedDocs so that you can select a document, but not interact with its contents
-    childFilters_boolean?: string;
+    childFilters_boolean?: STRt = new StrInfo('boolean operator to apply to filters on different metadata fields. Value should be AND or OR. Default is AND');
     childFilters?: List<string>;
     childLimitHeight?: NUMt = new NumInfo('whether to limit the height of collection children.  0 - means  height can be no bigger than width', false);
     childLayoutTemplate?: Doc; // template for collection to use to render its children (see PresBox layout in tree view)
-    childLayoutString?: string; // template string for collection to use to render its children
+    childLayoutString?: STRt = new StrInfo('JSX layout string for rendering children of a (collection) Doc'); // template string for collection to use to render its children
     childDocumentsActive?: BOOLt = new BoolInfo('whether child documents are active when parent is document active');
     childLayoutFitWidth?: BOOLt = new BoolInfo("whether a child doc's fitWith should be overriden by collection");
     childDontRegisterViews?: BOOLt = new BoolInfo('whether child document views should be registered so that they can be found when following links, etc');
@@ -489,8 +489,7 @@ export class DocumentOptions {
     userColor?: STRt = new StrInfo('color associated with a Dash user (seen in header fields of shared documents)');
 
     cardSort?: STRt = new StrInfo('way cards are sorted in deck view');
-    cardSort_customField?: STRt = new StrInfo('field key used for sorting cards');
-    cardSort_visibleSortGroups?: List<number>; // which sorting values are being filtered (shown)
+    cardSort_isDesc?: BOOLt = new BoolInfo('whether the cards are sorted ascending or descending');
 }
 
 export const DocOptions = new DocumentOptions();