marshall unmarshall options

Author: RafaelGB

src/cdm/DatabaseModel.ts

@@ -3,10 +3,12 @@ import { Literal } from "obsidian-dataview/lib/data-model/value";
 import { Cell } from "react-table";
 import { LocalSettings } from "Settings"
 import { BaseColumn, TableColumn, TableDataType } from "cdm/FolderModel";
+import { RowSelectOption } from "cdm/RowSelectModel";
 
 /** database column */
 export interface DatabaseColumn extends BaseColumn {
     input: string;
+    options?: RowSelectOption[];
     [key: string]: RowType;
 }
 

src/components/portals/PopperSelectPortal.tsx

@@ -15,7 +15,6 @@ const PopperSelectPortal = (popperProps: PopperProps) => {
   // Selector reference state
   const [selectRef, setSelectRef] = useState(null);
   const [showSelect, setShowSelect] = useState(false);
-  const [addSelectRef, setAddSelectRef] = useState(null);
   // Selector popper state
   const [selectPop, setSelectPop] = useState(null);
   const { styles, attributes } = usePopper(selectRef, selectPop);
@@ -136,7 +135,6 @@ const PopperSelectPortal = (popperProps: PopperProps) => {
                     type="text"
                     className="option-input"
                     onBlur={handleOptionBlur}
-                    ref={setAddSelectRef}
                     onKeyDown={handleOptionKeyDown}
                   />
                 </div>

src/parsers/handlers/marshall/MarshallColumnsHandler.ts

@@ -1,4 +1,6 @@
+import { DatabaseColumn } from 'cdm/DatabaseModel';
 import { YamlHandlerResponse } from 'cdm/MashallModel';
+import { RowSelectOption } from 'cdm/RowSelectModel';
 import { DataTypes, DEFAULT_COLUMN_CONFIG } from 'helpers/Constants';
 import { AbstractYamlHandler } from 'parsers/handlers/marshall/AbstractYamlPropertyHandler';
 
@@ -30,9 +32,13 @@ export class MarshallColumnsHandler extends AbstractYamlHandler {
         Object.keys(yaml.columns)
             .forEach((key) => {
                 const column = yaml.columns[key];
+                /** BASE COLUMN INFO */
                 if (!column.input) {
                     this.addError(`There was not input in column ${key}`);
                     yaml.columns[key].input = DataTypes.TEXT;
+                } else {
+                    yaml.columns[key] = marshallParticularInputInfo(column);
+                    // PARTICULAR INPUT INFO
                 }
                 if (!column.accessor) {
                     this.addError(`There was not accessor in column ${key}`);
@@ -46,6 +52,7 @@ export class MarshallColumnsHandler extends AbstractYamlHandler {
                     this.addError(`There was not label in column ${key}`);
                     yaml.columns[key].label = key;
                 }
+                /** CONFIG COLUMN INFO */
                 if (!column.config && !(column.config instanceof Object)) {
                     column.config = DEFAULT_COLUMN_CONFIG;
                     yaml.columns[key] = column;
@@ -72,4 +79,22 @@ export class MarshallColumnsHandler extends AbstractYamlHandler {
         handlerResponse.yaml = yaml;
         return this.goNext(handlerResponse);
     }
+}
+
+function marshallParticularInputInfo(column: DatabaseColumn): DatabaseColumn {
+    switch (column.input) {
+        case DataTypes.SELECT:
+            if (!column.options || !Array.isArray(column.options)) {
+                column.options = [];
+            } else {
+                column.options = column.options.filter((option: RowSelectOption) => {
+                    return option.backgroundColor
+                        && option.label
+                        && option.label !== ''
+                        && option.backgroundColor !== '';
+                });
+            }
+            break;
+    }
+    return column;
 }

src/parsers/handlers/unmarshall/UnmarshallColumnsHandler.ts

@@ -1,5 +1,7 @@
+import { DatabaseColumn } from "cdm/DatabaseModel";
 import { DiskHandlerResponse } from "cdm/MashallModel";
-import { YAML_INDENT } from "helpers/Constants";
+import { DataTypes, YAML_INDENT } from "helpers/Constants";
+import { Literal } from "obsidian-dataview/lib/data-model/value";
 import { AbstractDiskHandler } from "parsers/handlers/unmarshall/AbstractDiskPropertyHandler";
 
 export class UnmarshallColumnsHandler extends AbstractDiskHandler {
@@ -17,13 +19,14 @@ export class UnmarshallColumnsHandler extends AbstractDiskHandler {
             this.localDisk.push(`${YAML_INDENT.repeat(1)}${columnKey
                 }:`);
             Object.keys(column)
-                .filter(key => key !== 'config')
+                .filter(key => typeof column[key] !== 'object')
                 .forEach(key => {
-                    // Lvl3: column properties
+                    // Lvl3: literal column properties
                     this.localDisk.push(`${YAML_INDENT.repeat(2)}${key}: ${column[key]}`);
                 });
-            this.localDisk.push(`${YAML_INDENT.repeat(2)}config:`);
 
+            this.localDisk.push(...unmarshallParticularInputInfo(column));
+            this.localDisk.push(`${YAML_INDENT.repeat(2)}config:`);
             // Skip those columns that are metadata. They dont have config
             if (column.isMetadata) continue;
             // Lvl4: column config
@@ -34,3 +37,19 @@ export class UnmarshallColumnsHandler extends AbstractDiskHandler {
         return this.goNext(handlerResponse);
     }
 }
+
+function unmarshallParticularInputInfo(column: DatabaseColumn): string[] {
+    const particularInputString: string[] = [];
+    switch (column.input) {
+        case DataTypes.SELECT:
+            // Lvl3: select column properties
+            if (column.options && Array.isArray(column.options)) {
+                particularInputString.push(`${YAML_INDENT.repeat(2)}options:`);
+                column.options.forEach(option => {
+                    particularInputString.push(`${YAML_INDENT.repeat(3)}- {label: ${option.label}, backgroundColor: ${option
+                        .backgroundColor}`);
+                });
+            }
+    }
+    return particularInputString;
+}