Merge branch 'feature/date_improvements'

Author: RafaelGB

package-lock.json

@@ -28,46 +28,46 @@
 		"@rollup/plugin-terser": "0.4.0",
 		"@testing-library/jest-dom": "5.16.5",
 		"@testing-library/react": "14.0.0",
-		"@types/jest": "29.4.0",
+		"@types/jest": "29.5.0",
 		"@types/luxon": "3.2.0",
-		"@types/node": "18.14.1",
+		"@types/node": "18.15.3",
 		"@types/react": "18.0.28",
-		"@types/react-datepicker": "4.8.0",
+		"@types/react-datepicker": "4.10.0",
 		"@types/react-dom": "18.0.11",
 		"@types/react-window": "1.8.5",
 		"@types/papaparse": "5.3.7",
-		"@typescript-eslint/eslint-plugin": "5.53.0",
-		"@typescript-eslint/parser": "5.53.0",
-		"eslint": "8.34.0",
-		"jest": "29.4.3",
-		"jest-mock-extended": "3.0.2",
-		"jest-environment-jsdom": "29.4.3",
+		"@typescript-eslint/eslint-plugin": "5.56.0",
+		"@typescript-eslint/parser": "5.56.0",
+		"eslint": "8.36.0",
+		"jest": "29.5.0",
+		"jest-mock-extended": "3.0.3",
+		"jest-environment-jsdom": "29.5.0",
 		"obsidian": "1.1.1",
-		"rollup": "3.17.3",
+		"rollup": "3.20.0",
 		"rollup-plugin-typescript2": "0.34.1",
 		"ts-jest": "29.0.5",
 		"tslib": "2.5.0",
 		"typescript": "4.9.5"
 	},
 	"dependencies": {
 		"@emotion/styled": "11.10.6",
-		"@mui/icons-material": "5.11.9",
-		"@mui/material": "5.11.10",
+		"@mui/icons-material": "5.11.11",
+		"@mui/material": "5.11.13",
 		"@popperjs/core": "2.11.6",
 		"@tanstack/match-sorter-utils": "8.7.6",
 		"@tanstack/react-table": "8.7.9",
 		"eventemitter3": "5.0.0",
 		"fuse.js": "6.6.2",
-		"luxon": "3.2.1",
+		"luxon": "3.3.0",
 		"monkey-around": "2.3.0",
 		"obsidian-dataview": "0.5.55",
 		"obsidian-projects-types": "0.7.1",
 		"react": "18.2.0",
-		"papaparse": "5.3.2",
+		"papaparse": "5.4.0",
 		"react-datepicker": "4.10.0",
 		"react-dom": "18.2.0",
-		"react-select": "5.7.0",
+		"react-select": "5.7.1",
 		"react-window": "1.8.8",
-		"zustand": "4.3.3"
+		"zustand": "4.3.6"
 	}
 }

package.json

@@ -1,6 +1,7 @@
 import { DatabaseYaml } from 'cdm/DatabaseModel';
 import { YamlHandlerResponse } from 'cdm/MashallModel';
 import { AtomicFilter, FilterGroup, FilterGroupCondition } from 'cdm/SettingsModel';
+import { InputType } from 'helpers/Constants';
 import { AbstractYamlHandler } from 'IO/md/handlers/marshall/AbstractYamlPropertyHandler';
 import { DataviewService } from 'services/DataviewService';
 
@@ -59,6 +60,10 @@ export class MarshallFiltersHandler extends AbstractYamlHandler {
                 this.addError(`There was not operator key in filter: ${JSON.stringify(filter)}`);
                 return false;
             }
+            // Type of filter: Optional (if not present, it will be set to TEXT)
+            if (!DataviewService.isTruthy((filter as AtomicFilter).type)) {
+                (filter as AtomicFilter).type = InputType.TEXT;
+            }
         }
         return true;
     }

src/IO/md/handlers/marshall/MarshallFiltersHandler.ts

@@ -53,6 +53,7 @@ export class UnmarshallFiltersHandler extends AbstractDiskHandler {
             this.localDisk.push(`${YAML_INDENT.repeat(indentLevel)}- field: ${(filter as AtomicFilter).field}`);
             this.localDisk.push(`${YAML_INDENT.repeat(indentLevel)}  operator: ${(filter as AtomicFilter).operator}`);
             this.localDisk.push(`${YAML_INDENT.repeat(indentLevel)}  value: "${(filter as AtomicFilter).value ?? ''}"`);
+            this.localDisk.push(`${YAML_INDENT.repeat(indentLevel)}  type: ${(filter as AtomicFilter).type}`);
         }
     }
 }

src/IO/md/handlers/unmarshall/UnmarshallFiltersHandler.ts

@@ -1,7 +1,7 @@
 import { CellContext, Table } from "@tanstack/react-table";
 import { RowDataType } from "cdm/FolderModel";
 import { Link, Literal } from "obsidian-dataview/lib/data-model/value";
-import { AtomicFilter } from "cdm/SettingsModel";
+import { AtomicFilter, FilterGroup } from "cdm/SettingsModel";
 
 export type ColumnOption = {
     value: string;
@@ -37,5 +37,19 @@ export type AtomicFilterComponentProps = {
     recursiveIndex: number[];
     level: number;
     atomicFilter: AtomicFilter;
-    possibleColumns: string[];
-} & DataviewFiltersProps;
+    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[];
+};

src/cdm/ComponentsModel.ts

@@ -17,6 +17,7 @@ export type FilterGroupCondition = {
 export type AtomicFilter = {
     field: string;
     operator: string;
+    type: string;
     value?: string;
 }
 /**

src/cdm/SettingsModel.ts

@@ -14,14 +14,15 @@ const TaskCell = (taskProps: CellComponentProps) => {
   const { defaultCell } = taskProps;
   const { cell, column, table, row } = defaultCell;
   const { view } = table.options.meta;
+  const tableColumn = column.columnDef as TableColumn;
   useEffect(() => {
     let taskValue = cell.getValue();
     // Check if there are tasks in the cell
     if (taskValue) {
       taskRef.current.innerHTML = "";
       if (
-        (column.columnDef as TableColumn).config.task_hide_completed &&
-        DataviewService.getDataviewAPI().isDataArray(taskValue)
+        tableColumn.config.task_hide_completed &&
+        DataviewService.isDataArray(taskValue)
       ) {
         taskValue = taskValue
           .where((t: STask) => !t.completed)

src/components/cellTypes/TaskCell.tsx

@@ -5,6 +5,7 @@ import {
 } from "cdm/ModalsModel";
 import {
   ConditionFiltersOptions,
+  InputType,
   OperatorFilter,
   StyleVariables,
 } from "helpers/Constants";
@@ -50,6 +51,7 @@ const NewFiltersForm = (props: FiltersModalProps) => {
       field: possibleColumns[0],
       operator: OperatorFilter.CONTAINS[0],
       value: "",
+      type: InputType.TEXT,
     });
     configActions.alterFilters(alteredFilterState);
   };
@@ -67,6 +69,7 @@ const NewFiltersForm = (props: FiltersModalProps) => {
       field: possibleColumns[0],
       operator: OperatorFilter.CONTAINS[0],
       value: "",
+      type: InputType.TEXT,
     };
 
     alteredFilterState.conditions.push({

src/components/modals/filters/handlers/AddNewFilterHandler.tsx

@@ -15,7 +15,7 @@ import IconButton from "@mui/material/IconButton";
 const AtomicFilterComponent = (props: AtomicFilterComponentProps) => {
   const { table, recursiveIndex, level, atomicFilter, possibleColumns } = props;
   const { tableState } = table.options.meta;
-  const { field, operator, value } = atomicFilter;
+  const { field, operator, value, type } = atomicFilter;
   const configActions = tableState.configState((state) => state.actions);
   const configInfo = tableState.configState((state) => state.info);
   const columnsInfo = tableState.columns((state) => state.info);
@@ -118,6 +118,7 @@ const AtomicFilterComponent = (props: AtomicFilterComponentProps) => {
         >
           <ValueFilterComponent
             value={value}
+            type={type}
             handler={onChangeFilterValueHandler(recursiveIndex, level)}
           />
         </Grid>

src/components/modals/filters/handlers/AtomicFilterComponent.tsx

@@ -1,9 +1,10 @@
-import { DataviewFiltersProps } from "cdm/ComponentsModel";
+import { ColumnFilterOption, DataviewFiltersProps } from "cdm/ComponentsModel";
 import { obtainColumnsFromRows } from "components/Columns";
 import React, { useEffect, useState } from "react";
 import { FilterGroupCondition } from "cdm/SettingsModel";
 import GroupFilterComponent from "components/modals/filters/handlers/GroupFilterComponent";
 import DnDComponent from "components/behavior/DnDComponent";
+import { InputType } from "helpers/Constants";
 
 const DataviewFiltersComponent = (props: DataviewFiltersProps) => {
   const { table } = props;
@@ -13,8 +14,10 @@ const DataviewFiltersComponent = (props: DataviewFiltersProps) => {
   const filters = tableState.configState((state) => state.filters);
   const columnsInfo = tableState.columns((state) => state.info);
 
-  const [possibleColumns, setPossibleColumns] = useState([] as string[]);
-
+  const [possibleColumns, setPossibleColumns] = useState(
+    [] as ColumnFilterOption[]
+  );
+  const DbColumns = columnsInfo.getAllColumns();
   useEffect(() => {
     new Promise<string[]>((resolve) => {
       // Empty conditions to refresh the dataview
@@ -25,11 +28,25 @@ const DataviewFiltersComponent = (props: DataviewFiltersProps) => {
           view.file.parent.path,
           configInfo.getLocalSettings(),
           emptyFilterConditions,
-          columnsInfo.getAllColumns()
+          DbColumns
         )
       );
     }).then((columns) => {
-      setPossibleColumns(columns.sort((a, b) => a.localeCompare(b)));
+      const columnOptions: ColumnFilterOption[] = [];
+      columns.forEach((column) => {
+        const possibleColumn = DbColumns.find(
+          (dbColumn) => dbColumn.key === column
+        );
+        const isColumnExistent = possibleColumn !== undefined;
+        columnOptions.push({
+          enabled: isColumnExistent,
+          key: column,
+          type: isColumnExistent ? possibleColumn.input : InputType.TEXT,
+        });
+      });
+      setPossibleColumns(
+        columnOptions.sort((a, b) => a.key.localeCompare(b.key))
+      );
     });
   }, []);