better control of select write. Number filter improved

Author: RafaelGB

src/components/Table.tsx

@@ -180,7 +180,6 @@ export function Table(tableData: TableDataType) {
     defaultColumn: {
       ...defaultColumn,
       sortingFn: dbfolderColumnSortingFn(configInfo.getLocalSettings()),
-      filterFn: globalDatabaseFilterFn(configInfo.getLocalSettings()),
     },
     getExpandedRowModel: getExpandedRowModel(),
     getCoreRowModel: getCoreRowModel(),

src/components/cellTypes/SelectCell.tsx

@@ -86,14 +86,16 @@ const SelectCell = (popperProps: CellComponentProps) => {
       selectRow,
       tableColumn,
       selectValue
-    );
+    )
+      .toString()
+      .replaceAll('"', "");
     // Update on disk & memory
     dataActions.updateCell(
       row.index,
       tableColumn,
-      newCell,
+      `"${newCell}"`,
       columnsInfo.getAllColumns(),
-      { ...configInfo.getLocalSettings(), frontmatter_quote_wrap: true },
+      configInfo.getLocalSettings(),
       true
     );
     // Add new option to column options
@@ -151,10 +153,7 @@ const SelectCell = (popperProps: CellComponentProps) => {
           style={{ width: column.getSize() }}
         >
           {selectCell && (
-            <Relationship
-              value={selectCell.toString()}
-              backgroundColor={getColor()}
-            />
+            <Relationship value={selectCell} backgroundColor={getColor()} />
           )}
         </div>
       )}

src/components/reducers/ColumnFilters.tsx

@@ -47,7 +47,10 @@ export function TextFilter(headerProps: DatabaseHeaderProps) {
     <div key={`${column.id}-text-filter`}>
       <datalist id={`${column.id}-list`} key={`${column.id}-datalist`}>
         {sortedUniqueValues.slice(0, 5000).map((value, index) => (
-          <option value={value} key={`${column.id}-option-${index}`} />
+          <option
+            value={value?.toString()}
+            key={`${column.id}-option-${index}`}
+          />
         ))}
       </datalist>
       <DynamicDebouncedInput
@@ -68,10 +71,12 @@ export function TextFilter(headerProps: DatabaseHeaderProps) {
 
 export function NumberFilter(headerProps: DatabaseHeaderProps) {
   const { column } = headerProps;
-  const min = Number(column.getFacetedMinMaxValues()?.[0] ?? "");
-  const max = Number(column.getFacetedMinMaxValues()?.[1] ?? "");
-  const minValue = (column.getFilterValue() as [number, number])?.[0] ?? "";
-  const maxValue = (column.getFilterValue() as [number, number])?.[1] ?? "";
+  const min = Number(column.getFacetedMinMaxValues()?.[0] ?? undefined);
+  const max = Number(column.getFacetedMinMaxValues()?.[1] ?? undefined);
+  const minValue =
+    (column.getFilterValue() as [number, number])?.[0] ?? undefined;
+  const maxValue =
+    (column.getFilterValue() as [number, number])?.[1] ?? undefined;
   return (
     <>
       <div className="flex space-x-2" key={`${column.id}-number-filter`}>
@@ -80,9 +85,12 @@ export function NumberFilter(headerProps: DatabaseHeaderProps) {
           min={min}
           max={max}
           value={minValue}
-          onChange={(value) =>
-            column.setFilterValue((old: [number, number]) => [value, old?.[1]])
-          }
+          onChange={(value) => {
+            if (value === "" || value === null) {
+              value = undefined;
+            }
+            column.setFilterValue((old: [number, number]) => [value, old?.[1]]);
+          }}
           placeholder={`Min ${
             column.getFacetedMinMaxValues()?.[0]
               ? `(${column.getFacetedMinMaxValues()?.[0]})`
@@ -98,9 +106,12 @@ export function NumberFilter(headerProps: DatabaseHeaderProps) {
           min={Number.isNaN(min) ? undefined : min}
           max={Number.isNaN(max) ? undefined : max}
           value={maxValue}
-          onChange={(value) =>
-            column.setFilterValue((old: [number, number]) => [old?.[0], value])
-          }
+          onChange={(value) => {
+            if (value === "" || value === null) {
+              value = undefined;
+            }
+            column.setFilterValue((old: [number, number]) => [old?.[0], value]);
+          }}
           placeholder={`Max ${
             column.getFacetedMinMaxValues()?.[1]
               ? `(${column.getFacetedMinMaxValues()?.[1]})`

src/components/reducers/TableFilterFlavours.ts

@@ -61,6 +61,7 @@ const LinksGroupFilterFn: FilterFn<RowDataType> = (row: Row<RowDataType>, column
         if (value === undefined || wrapLiteral.type !== "array") {
             return false;
         }
+
         return wrapLiteral.value
             .filter((l) => DataviewService.wrapLiteral(l).type === "link")
             .some((l: Link) => {
@@ -150,13 +151,52 @@ const TaskGroupFilterFn: FilterFn<RowDataType> = (row: Row<RowDataType>, columnI
     });
 }
 
+const PlainTextGroupFilterFn: FilterFn<RowDataType> = (row: Row<RowDataType>, columnId: string, selectedOption: string) => {
+    const value = row.getValue<Literal>(columnId);
+    if (selectedOption === undefined || selectedOption === null) {
+        return true;
+    }
+    if (value === undefined || value === null) {
+        return false;
+    }
+
+    const sanitizedSelectedOption = selectedOption.toLowerCase();
+    const sanitized = value.toString().toLowerCase();
+    return sanitized.includes(sanitizedSelectedOption) || searchRegex(sanitized, sanitizedSelectedOption);
+}
+
+const NumberGroupFilterFn: FilterFn<RowDataType> = (row: Row<RowDataType>, columnId: string, numberRange: [number, number]) => {
+    const value = row.getValue<Literal>(columnId);
+    const minRange = numberRange[0];
+    const maxRange = numberRange[1];
+    if (minRange === undefined && maxRange === undefined) {
+        return true;
+    }
+
+    const sanitizedValue = Number(value);
+    if (value === undefined || value === null || Number.isNaN(sanitizedValue)) {
+        return false;
+    }
+
+    if (minRange === undefined) {
+        return sanitizedValue <= maxRange;
+    }
+
+    if (maxRange === undefined) {
+        return sanitizedValue >= minRange;
+    }
+
+    return sanitizedValue >= minRange && sanitizedValue <= maxRange;
+}
 const customSortingfns: FilterFns = {
     markdown: MarkdownFilterFn,
     linksGroup: LinksGroupFilterFn,
     calendar: CalendarGroupFilterFn,
     boolean: BooleanGroupFilterFn,
     task: TaskGroupFilterFn,
     tags: TagsGroupFilterFn,
+    plainText: PlainTextGroupFilterFn,
+    number: NumberGroupFilterFn
 };
 
 export default customSortingfns;

src/helpers/TableFiltersHelper.ts

@@ -117,6 +117,15 @@ export function getFilterKeyInFunctionOfInputType(inputType: string): string {
         case InputType.TASK:
             filterKey = 'task';
             break;
+        case InputType.SELECT:
+        case InputType.TEXT:
+        case InputType.ROLLUP:
+        case InputType.FORMULA:
+            filterKey = 'plainText';
+            break;
+        case InputType.NUMBER:
+            filterKey = 'number';
+            break;
         default:
             filterKey = 'auto';
     }

src/services/ParseService.ts

@@ -319,6 +319,7 @@ class Parse {
         // Remove a possible already existing quote wrapper
         if (value.startsWith('"') && value.endsWith('"')) {
             value = value.substring(1, value.length - 1);
+            return this.wrapWithQuotes(value);
         }
 
         // Wrap in quotes if is configured to do so

src/stateManagement/data/handlers/UpdateCellHandlerAction.ts

@@ -23,7 +23,7 @@ export default class UpdateCellHandlerAction extends AbstractTableAction<DataSta
             let rowTFile = modifiedRow.__note__.getFile();
 
             // Update the row on memory
-            modifiedRow[column.key] = value;
+            modifiedRow[column.key] = value.toString().replaceAll('"', "");
 
             // Row Rules
             if (ddbbConfig.show_metadata_modified) {