extracted field dropdown menu to a components and then cleaned up collectionTimeView, Documentview titles, and FilterPanel to share it

1 files changed, 15 insertions, 3 deletions

diff --git a/src/client/documents/Documents.ts b/src/client/documents/Documents.ts
index 9b17901ca..031560886 100644
--- a/src/client/documents/Documents.ts
+++ b/src/client/documents/Documents.ts
@@ -77,6 +77,7 @@ export enum FInfoFieldType {
     enumeration,
     date,
     list,
+    rtf,
 }
 export class FInfo {
     description: string = '';
@@ -84,7 +85,7 @@ export class FInfo {
     fieldType?: FInfoFieldType;
     values?: Field[];
 
-    filterable?: boolean = true;
+    filterable?: boolean = true; // can be used as a Filter in FilterPanel
     // format?: string; // format to display values (e.g, decimal places, $, etc)
     // parse?: ScriptField; // parse a value from a string
     constructor(d: string, readOnly?: boolean) {
@@ -165,9 +166,19 @@ class DTypeInfo extends FInfo {
     override searchable = () => false;
 }
 class DateInfo extends FInfo {
+    constructor(d: string, filterable?: boolean) {
+        super(d, true);
+        this.filterable = filterable;
+    }
     fieldType? = FInfoFieldType.date;
     values?: DateField[] = [];
-    filterable = true;
+}
+class RtfInfo extends FInfo {
+    constructor(d: string, filterable?: boolean) {
+        super(d, true);
+        this.filterable = filterable;
+    }
+    fieldType? = FInfoFieldType.rtf;
 }
 class ListInfo extends FInfo {
     fieldType? = FInfoFieldType.list;
@@ -178,6 +189,7 @@ type NUMt = NumInfo | number;
 type STRt = StrInfo | string;
 type LISTt = ListInfo | List<any>;
 type DOCt = DocInfo | Doc;
+type RTFt = RtfInfo | RichTextField;
 type DIMt = DimInfo | typeof DimUnit.Pixel | typeof DimUnit.Ratio;
 type PEVt = PEInfo | 'none' | 'all';
 type COLLt = CTypeInfo | CollectionViewType;
@@ -191,6 +203,7 @@ export class DocumentOptions {
     z?: NUMt = new NumInfo('whether document is in overlay (1) or not (0)', false, false, [1, 0]);
     overlayX?: NUMt = new NumInfo('x coordinate of document in a overlay view', false);
     overlayY?: NUMt = new NumInfo('y coordinate of document in a overlay view', false);
+    text?: RTFt = new RtfInfo('rich text of a text doc', true);
     _dimMagnitude?: NUMt = new NumInfo("magnitude of collectionMulti{row,col} element's width or height", false);
     _dimUnit?: DIMt = new DimInfo("units of collectionMulti{row,col} element's width or height - 'px' or '*' for pixels or relative units");
     latitude?: NUMt = new NumInfo('latitude coordinate for map views', false);
@@ -470,7 +483,6 @@ export class DocumentOptions {
     sidebar_type_collection?: string; // collection type of text sidebar
 
     data_dashboards?: List<any>; // list of dashboards used in shareddocs;
-    text?: string;
     textTransform?: string;
     letterSpacing?: string;
     iconTemplate?: string; // name of icon template style