Merge branch '260-search-function-does-not-work-with-tags'

Author: RafaelGB

src/cdm/FolderModel.ts

@@ -82,8 +82,8 @@ export type TableDataType = {
 }
 
 export interface DatabaseHeaderProps {
-    column: Column<RowDataType, any>,
-    header: Header<RowDataType, TableColumn>,
+    column: Column<RowDataType, Literal>,
+    header: Header<RowDataType, Literal>,
     table: Table<RowDataType>
 }
 

src/components/Table.tsx

@@ -41,6 +41,7 @@ import { DndProvider } from "react-dnd";
 import { HTML5Backend } from "react-dnd-html5-backend";
 import TableCell from "components/TableCell";
 import getInitialColumnSizing from "components/behavior/InitialColumnSizeRecord";
+import { globalDatabaseFilterFn } from "components/reducers/TableFilterFlavours";
 
 const defaultColumn: Partial<ColumnDef<RowDataType>> = {
   minSize: DatabaseLimits.MIN_COLUMN_HEIGHT,
@@ -221,7 +222,9 @@ export function Table(tableData: TableDataType) {
       setColumnSizing(list);
     },
     onColumnOrderChange: setColumnOrder,
-    globalFilterFn: "includesStringSensitive",
+    // Hack to force react-table to use all columns when filtering
+    getColumnCanGlobalFilter: (column) => true,
+    globalFilterFn: globalDatabaseFilterFn(ddbbConfig),
     meta: {
       tableState: tableStore,
       view: view,

src/components/headerActions/handlers/buttons/SortHandlerAction.tsx

@@ -15,7 +15,6 @@ export default class SortHandlerAction extends AbstractHeaderAction {
     const column = this.globalHeaderActionResponse.headerMenuProps.headerProps
       .column.columnDef as TableColumn;
     switch (column.input) {
-      case InputType.TAGS:
       case InputType.TASK:
         // DO NOTHING
         break;

src/components/portals/TagsPortal.tsx

@@ -7,7 +7,6 @@ import React, { useState } from "react";
 import { ActionMeta, OnChangeValue } from "react-select";
 import { c } from "helpers/StylesHelper";
 import { Literal } from "obsidian-dataview/lib/data-model/value";
-import NoteInfo from "services/NoteInfo";
 import { TableColumn } from "cdm/FolderModel";
 
 const TagsPortal = (tagsProps: TagsProps) => {
@@ -35,9 +34,6 @@ const TagsPortal = (tagsProps: TagsProps) => {
       : []
   );
 
-  /** Note info of current Cell */
-  const note: NoteInfo = (defaultCell.row.original as any).__note__;
-
   function getColor(tag: string) {
     const match = tableColumn.options.find(
       (option: { label: string }) => option.label === tag

src/components/reducers/TableFilterFlavours.ts

@@ -0,0 +1,19 @@
+import { FilterFn, Row } from "@tanstack/react-table"
+import { RowDataType } from "cdm/FolderModel"
+import { LocalSettings } from "cdm/SettingsModel";
+import { InputType } from "helpers/Constants";
+import { Literal } from "obsidian-dataview";
+import { DataviewService } from "services/DataviewService";
+
+export const globalDatabaseFilterFn: (ddbbConfig: LocalSettings) => FilterFn<RowDataType> = (ddbbConfig: LocalSettings) => (
+    row: Row<RowDataType>,
+    columnId: string,
+    filterValue: string
+) => {
+    const value = row.getValue<Literal>(columnId);
+    if (value === undefined) {
+        return false;
+    }
+    const sanitized = DataviewService.parseLiteral(value, InputType.MARKDOWN, ddbbConfig, true);
+    return sanitized.toString().includes(filterValue)
+}