Merge branch 'feature/improved_filters'

Author: RafaelGB

src/__tests__/services/colorsFn.test.ts …ests__/lib/core/modules/colorsFn.test.tssrc/__tests__/services/colorsFn.test.ts renamed to src/__tests__/lib/core/modules/colorsFn.test.ts src/__tests__/services/colorsFn.test.ts renamed to src/__tests__/lib/core/modules/colorsFn.test.ts

@@ -28,28 +28,4 @@ export type EditorCellComponentProps = {
 export type RelationEditorComponentProps = {
     persistChange: (newPath: string[]) => void;
     relationCell: Link[];
-} & CellComponentProps;
-
-export type DataviewFiltersProps = {
-    table: Table<RowDataType>;
-};
-export type AtomicFilterComponentProps = {
-    recursiveIndex: number[];
-    level: number;
-    atomicFilter: AtomicFilter;
-    possibleColumns: ColumnFilterOption[];
-} & DataviewFiltersProps;
-
-export type ColumnFilterOption = {
-    key: string;
-    enabled: boolean;
-    type: string;
-}
-
-export type GroupFilterComponentProps = {
-    group: FilterGroup;
-    recursiveIndex: number[];
-    level: number;
-    table: Table<RowDataType>;
-    possibleColumns: ColumnFilterOption[];
-};
+} & CellComponentProps;

src/__tests__/services/luxonFn.test.ts …tests__/lib/core/modules/luxonFn.test.tssrc/__tests__/services/luxonFn.test.ts renamed to src/__tests__/lib/core/modules/luxonFn.test.ts src/__tests__/services/luxonFn.test.ts renamed to src/__tests__/lib/core/modules/luxonFn.test.ts

@@ -115,6 +115,8 @@ export interface DatabaseHeaderProps {
     table: Table<RowDataType>
 }
 
+export type ColumnFilterProps = Pick<DatabaseHeaderProps, 'column'>;
+
 export type RelationshipProps = {
     option: ColumnOption
     view: CustomView,

src/__tests__/services/numbersFn.test.ts …sts__/lib/core/modules/numbersFn.test.tssrc/__tests__/services/numbersFn.test.ts renamed to src/__tests__/lib/core/modules/numbersFn.test.ts src/__tests__/services/numbersFn.test.ts renamed to src/__tests__/lib/core/modules/numbersFn.test.ts

@@ -2,15 +2,14 @@ import { RowDataType, TableColumn } from "cdm/FolderModel";
 import { AutomationState, ColumnsState, ConfigState, DataState, RowTemplateState } from "cdm/TableStateInterface";
 import { ColumnSettingsManager } from "components/modals/columnSettings/ColumnSettingsModal";
 import { AddColumnModalManager } from "components/modals/newColumn/addColumnModal";
-import { FiltersModalManager } from "components/modals/filters/FiltersModal";
 import { Table } from "@tanstack/react-table";
 import { AddRowModalManager } from "components/modals/addRow/AddRowModal";
 import { CustomView } from "views/AbstractView";
 
 /**
  * Base class for all modal responses.
  */
-type BaseModalHandlerResponse = {
+export type BaseModalHandlerResponse = {
     containerEl: HTMLElement;
 };
 
@@ -71,17 +70,4 @@ export type AddRowModalProps = {
     configState: Pick<ConfigState, "info" | "actions">
     view: CustomView,
     table: Table<RowDataType>
-}
-
-/***************************************
- *         FILTERS  MODAL
- ***************************************/
-
-/** Filters Modal */
-export type FiltersModalProps = {
-    table: Table<RowDataType>,
-    possibleColumns: string[]
-}
-export type FiltersModalHandlerResponse = {
-    filtersModalManager: FiltersModalManager
-} & BaseModalHandlerResponse;
+};

src/cdm/ComponentsModel.ts

@@ -17,7 +17,7 @@ import { Literal } from "obsidian-dataview/lib/data-model/value";
 import { obtainAllPossibleRows } from "helpers/VaultManagement";
 import rowContextMenuColumn from "components/contextMenu/RowContextMenu";
 import { containsUpper } from "helpers/WindowElement";
-import { getFilterKeyInFunctionOfInputType } from "helpers/TableFiltersHelper";
+import ReactTableMapper from "lib/features/filters/mappers/ReactTableMapper";
 
 /**
  * Add mandatory and configured metadata columns of the table
@@ -234,7 +234,9 @@ function columnOptions(
       config: column.config,
     };
     // Custom react-table attributes
-    columnOption["filterFn"] = getFilterKeyInFunctionOfInputType(column.input);
+    columnOption["filterFn"] = ReactTableMapper.inputTypeToFilterKey(
+      column.input
+    );
     return columnOption;
   } else {
     throw `Error: option ${column.input} not supported yet`;

src/cdm/FolderModel.ts

@@ -1,4 +1,4 @@
-import { DatabaseHeaderProps } from "cdm/FolderModel";
+import { ColumnFilterProps, DatabaseHeaderProps } from "cdm/FolderModel";
 import { DynamicDebouncedInput } from "components/behavior/DebouncedInputFn";
 import DatePicker from "react-datepicker";
 import React, { useState } from "react";
@@ -10,7 +10,7 @@ import { StyleVariables } from "helpers/Constants";
  * @param headerProps
  * @returns
  */
-export function BaseFilter(headerProps: DatabaseHeaderProps) {
+export function BaseFilter(headerProps: ColumnFilterProps) {
   const { column } = headerProps;
 
   return (
@@ -35,7 +35,7 @@ export function BaseFilter(headerProps: DatabaseHeaderProps) {
  * @param headerProps
  * @returns
  */
-export function TextFilter(headerProps: DatabaseHeaderProps) {
+export function TextFilter(headerProps: ColumnFilterProps) {
   const { column } = headerProps;
 
   const sortedUniqueValues = React.useMemo(
@@ -69,7 +69,7 @@ export function TextFilter(headerProps: DatabaseHeaderProps) {
   );
 }
 
-export function NumberFilter(headerProps: DatabaseHeaderProps) {
+export function NumberFilter(headerProps: ColumnFilterProps) {
   const { column } = headerProps;
   const minRaw = Number(column.getFacetedMinMaxValues()?.[0] ?? undefined);
   const maxRaw = Number(column.getFacetedMinMaxValues()?.[1] ?? undefined);
@@ -131,7 +131,7 @@ export function NumberFilter(headerProps: DatabaseHeaderProps) {
   );
 }
 
-export function DateRangeFilter(headerProps: DatabaseHeaderProps) {
+export function DateRangeFilter(headerProps: ColumnFilterProps) {
   const { column } = headerProps;
   const [startDate, setStartDate] = useState(null);
   const [endDate, setEndDate] = useState(null);
@@ -191,7 +191,7 @@ export function DateRangeFilter(headerProps: DatabaseHeaderProps) {
   );
 }
 
-export function BooleanFilter(headerProps: DatabaseHeaderProps) {
+export function BooleanFilter(headerProps: ColumnFilterProps) {
   const { column } = headerProps;
   const [value, setValue] = useState<number | string>("All");
 

src/cdm/ModalsModel.ts

@@ -1,40 +1,56 @@
-import { DataviewFiltersProps } from "cdm/ComponentsModel";
+import { FiltersModal } from "@features/filters";
+import {
+  ColumnFilterOption,
+  TableFiltersProps,
+} from "@features/filters/model/FiltersModel";
 import { obtainColumnsFromRows } from "components/Columns";
 import MenuDownIcon from "components/img/MenuDownIcon";
-import { FiltersModal } from "components/modals/filters/FiltersModal";
-import { EMITTERS_GROUPS, EMITTERS_SHORTCUT } from "helpers/Constants";
+import {
+  EMITTERS_GROUPS,
+  EMITTERS_SHORTCUT,
+  InputType,
+} from "helpers/Constants";
 import { c } from "helpers/StylesHelper";
 import React, { useEffect } from "react";
 
-export default function EditFiltersButton(props: DataviewFiltersProps) {
+export default function EditFiltersButton(props: TableFiltersProps) {
   const { table } = props;
   const { tableState, view } = table.options.meta;
   const [configInfo, filters] = tableState.configState((state) => [
     state.info,
     state.filters,
-    state.actions,
   ]);
   const columns = tableState.columns((state) => state.columns);
 
-  const openFiltersGroupHandler = async () => {
-    new Promise<string[]>((resolve, reject) => {
-      // Empty conditions to refresh the dataview
-      const emptyFilterConditions = { ...filters };
-      emptyFilterConditions.conditions = [];
-      resolve(
-        obtainColumnsFromRows(
-          view.file.parent.path,
-          configInfo.getLocalSettings(),
-          emptyFilterConditions,
-          columns
-        )
+  const obtainPossibleColumns = async (): Promise<ColumnFilterOption[]> => {
+    const emptyFilterConditions = { ...filters };
+    const allColumns = await obtainColumnsFromRows(
+      view.file.parent.path,
+      configInfo.getLocalSettings(),
+      emptyFilterConditions,
+      columns
+    );
+
+    const columnOptions: ColumnFilterOption[] = [];
+    allColumns.forEach((column) => {
+      const possibleColumn = columns.find(
+        (dbColumn) => dbColumn.key === column
       );
-    }).then((columns) => {
-      new FiltersModal({
-        table,
-        possibleColumns: columns.sort((a, b) => a.localeCompare(b)),
-      }).open();
+
+      columnOptions.push({
+        enabled: possibleColumn !== undefined,
+        key: column,
+        type: possibleColumn ? possibleColumn.input : InputType.TEXT,
+      });
     });
+    return columnOptions.sort((a, b) => a.key.localeCompare(b.key));
+  };
+
+  const openFiltersGroupHandler = async () => {
+    new FiltersModal({
+      table,
+      possibleColumns: await obtainPossibleColumns(),
+    }).open();
   };
 
   /**