Merge branch 'add_options_sanitize'

Author: RafaelGB

src/components/cellTypes/SelectCell.tsx

@@ -10,6 +10,7 @@ import { TableColumn } from "cdm/FolderModel";
 import CreatableSelect from "react-select/creatable";
 import CustomTagsStyles from "components/styles/TagsStyles";
 import { c, getAlignmentClassname } from "helpers/StylesHelper";
+import { satinizedColumnOption } from "helpers/FileManagement";
 import { ActionMeta, OnChangeValue } from "react-select";
 import { ParseService } from "services/ParseService";
 import { InputType } from "helpers/Constants";
@@ -65,11 +66,14 @@ const SelectCell = (popperProps: CellComponentProps) => {
     newValue: OnChangeValue<SelectValue, false>,
     actionMeta: ActionMeta<RowSelectOption>
   ) => {
-    const selectValue = newValue ? newValue.value.toString() : "";
+    const sanitized = satinizedColumnOption(
+      newValue ? newValue.value.toString() : ""
+    );
+
     const newCell = ParseService.parseRowToLiteral(
       selectRow,
       tableColumn,
-      selectValue
+      sanitized
     );
 
     // Update on disk & memory
@@ -86,7 +90,7 @@ const SelectCell = (popperProps: CellComponentProps) => {
     if (actionMeta.action === "create-option") {
       await columnActions.addOptionToColumn(
         tableColumn,
-        selectValue,
+        sanitized,
         randomColor()
       );
     }

src/components/cellTypes/TagsCell.tsx

@@ -13,6 +13,7 @@ import { c, getAlignmentClassname } from "helpers/StylesHelper";
 import { TableColumn } from "cdm/FolderModel";
 import { ParseService } from "services/ParseService";
 import { InputType } from "helpers/Constants";
+import { satinizedColumnOption } from "helpers/FileManagement";
 
 const TagsCell = (tagsProps: CellComponentProps) => {
   const { defaultCell } = tagsProps;
@@ -67,7 +68,9 @@ const TagsCell = (tagsProps: CellComponentProps) => {
     newValue: OnChangeValue<SelectValue, true>,
     actionMeta: ActionMeta<RowSelectOption>
   ) => {
-    const arrayTags = newValue.map((tag) => `${tag.value}`);
+    const arrayTags = newValue.map(
+      (tag) => `${satinizedColumnOption(tag.value)}`
+    );
     const newCell = ParseService.parseRowToLiteral(
       tagsRow,
       tableColumn,
@@ -84,14 +87,20 @@ const TagsCell = (tagsProps: CellComponentProps) => {
     );
 
     // Add new option to column options
-    newValue
-      .filter(
-        (tag) =>
-          !tableColumn.options.find((option) => option.label === tag.value)
-      )
-      .forEach((tag) => {
-        columnActions.addOptionToColumn(tableColumn, tag.value, randomColor());
-      });
+    if (actionMeta.action === "create-option") {
+      newValue
+        .filter(
+          (tag) =>
+            !tableColumn.options.find((option) => option.label === tag.value)
+        )
+        .forEach((tag) => {
+          columnActions.addOptionToColumn(
+            tableColumn,
+            tag.value,
+            randomColor()
+          );
+        });
+    }
   };
 
   function TagsForm() {

src/components/modals/columnSettings/handlers/SelectedColumnOptionsHandler.tsx

@@ -1,6 +1,7 @@
 import { RowSelectOption } from "cdm/ComponentsModel";
 import { ColumnSettingsHandlerResponse } from "cdm/ModalsModel";
 import { randomColor, castStringtoHsl, castHslToString } from "helpers/Colors";
+import { satinizedColumnOption } from "helpers/FileManagement";
 import { ButtonComponent, Notice, Setting } from "obsidian";
 import { AbstractHandlerClass } from "patterns/chain/AbstractHandler";
 import { LOGGER } from "services/Logger";
@@ -53,7 +54,8 @@ export class SelectedColumnOptionsHandler extends AbstractHandlerClass<ColumnSet
           .setPlaceholder("label of option")
           .setValue(newLabel)
           .onChange(async (value: string): Promise<void> => {
-            newLabel = value;
+            newLabel = satinizedColumnOption(value);
+            text.setValue(newLabel);
           });
         text.inputEl.onkeydown = (e: KeyboardEvent) => {
           switch (e.key) {

src/components/modals/newColumn/handlers/QuickOptionsColumnsHandler.ts

@@ -5,7 +5,6 @@ import { DynamicInputType } from "helpers/Constants";
 import { t } from "lang/helpers";
 import { Setting } from "obsidian";
 import { AbstractHandlerClass } from "patterns/chain/AbstractHandler";
-import { StringSuggest } from "settings/suggesters/StringSuggester";
 
 export class QuickOptionsColumnsHandler extends AbstractHandlerClass<AddColumnModalHandlerResponse> {
   settingTitle: string = "Column quick options";
@@ -68,14 +67,10 @@ export class QuickOptionsColumnsHandler extends AbstractHandlerClass<AddColumnMo
         if (!column.isMetadata) {
           // Select type
           columnSetting
-            .addSearch(cb => {
-              new StringSuggest(
-                cb.inputEl,
-                typesRecord
-              );
-              cb.setPlaceholder("Select type...")
-                .setValue(column.input)
-                .onChange(selectTypeHandler);
+            .addDropdown((dropdown) => {
+              dropdown.addOptions(typesRecord);
+              dropdown.setValue(DynamicInputType.TEXT);
+              dropdown.onChange(selectTypeHandler);
             });
           // Delete column
           columnSetting

src/helpers/FileManagement.ts

@@ -179,4 +179,19 @@ export async function create_row_file(
     ddbbConfig
   );
   return filepath;
+}
+
+/**
+   * Remove all not readable characters of yaml and trim the string
+   * 
+   * Example:
+   * input: "\- some text"
+   * output: "some text"
+   * @param option 
+   * @returns 
+   */
+export function satinizedColumnOption(option: string): string {
+  return option
+    .replace("\\", "")
+    .trim();
 }

src/services/ParseService.ts

@@ -7,6 +7,7 @@ import { LocalSettings } from "cdm/SettingsModel";
 import { RowDataType, TableColumn } from "cdm/FolderModel";
 import { deepMerge, generateLiteral, obtainAnidatedLiteral } from "helpers/DataObjectHelper";
 import { parseLuxonDatetimeToString, parseLuxonDateToString, parseStringToLuxonDate, parseStringToLuxonDatetime } from "helpers/LuxonHelper";
+import { satinizedColumnOption } from "helpers/FileManagement";
 
 class Parse {
 
@@ -58,6 +59,9 @@ class Parse {
             case InputType.RELATION:
                 parsedLiteral = this.parseToLink(wrapped);
                 break;
+            case InputType.SELECT:
+                parsedLiteral = this.parseToSelect(wrapped, localSettings);
+                break;
             case InputType.TASK:
             case InputType.FORMULA:
             case InputType.ROLLUP:
@@ -205,6 +209,12 @@ class Parse {
         }
     }
 
+    private parseToSelect(wrapped: WrappedLiteral, localSettings: LocalSettings): string {
+        return satinizedColumnOption(
+            this.parseToText(wrapped, localSettings).toString(),
+        );
+    }
+
     private parseToText(wrapped: WrappedLiteral, localSettings: LocalSettings): string | DataObject {
         switch (wrapped.type) {
             case 'object':
@@ -337,9 +347,9 @@ class Parse {
 
     private parseToOptionsArray(wrapped: WrappedLiteral): Literal {
         if (wrapped.type !== 'array') {
-            return wrapped.value.toString().split(",").map(s => s.toString().trim());
+            return wrapped.value.toString().split(",").map(s => satinizedColumnOption(s.toString().trim()));
         }
-        return wrapped.value.map(v => DataviewService.getDataviewAPI().value.toString(v));
+        return wrapped.value.map(v => satinizedColumnOption(DataviewService.getDataviewAPI().value.toString(v)));
     }
 
     private handleYamlBreaker(value: string, localSettings: LocalSettings, isInline?: boolean): string {