Merge branch 'master' into imed-docu-branch

Author: RafaelGB

docs/docs/changelog.md

@@ -1,3 +1,18 @@
+# 2.4.0
+*Published on 2022/09/08*
+### Shiny new things
+- Totally renewed row context menu! Now wraps the obsidian context menu, so you can use all the plugins that add items to it(rename and delete file included as custom options too) [ISSUE#152](https://github.com/RafaelGB/obsidian-db-folder/issues/152)
+- Created and modified columns now is rendered as daily link note using the complete date as alias [ISSUE#144](https://github.com/RafaelGB/obsidian-db-folder/issues/144)
+### Improved
+- Global search now ignore cases [ISSUE#340](https://github.com/RafaelGB/obsidian-db-folder/issues/340)
+- File column is ordered alphabetically using filename instead of path with sort options [ISSUE#335](https://github.com/RafaelGB/obsidian-db-folder/issues/335)
+- Checkbox edition save boolean values instead of 1 or 0 [ISSUE#158](https://github.com/RafaelGB/obsidian-db-folder/issues/158)
+### Visual
+- Tasks aligned to the left properly
+- Open tags cell on the bottom of the table is displayed properly [ISSUE#139](https://github.com/RafaelGB/obsidian-db-folder/issues/139)
+### No longer broken
+- new yaml breaker conditions added (>)
+- Edit a cell in a page out of the first one does not reset the pagination anymore [ISSUE#338](https://github.com/RafaelGB/obsidian-db-folder/issues/338)
 # 2.3.6
 *Published on 2022/09/07*
 ### Improved

manifest-beta.json

@@ -1,7 +1,7 @@
 {
 	"id": "dbfolder",
 	"name": "DB Folder",
-	"version": "2.3.6",
+	"version": "2.4.0",
 	"minAppVersion": "0.15.9",
 	"description": "Folder with the capability to store and retrieve data from a folder like database",
 	"author": "RafaelGB",

manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "dbfolder",
 	"name": "DB Folder",
-	"version": "2.3.6",
+	"version": "2.4.0",
 	"minAppVersion": "0.15.9",
 	"description": "Folder with the capability to store and retrieve data from a folder like database",
 	"author": "RafaelGB",

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "obsidian-dbfolder",
-	"version": "2.3.6",
+	"version": "2.4.0",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
@@ -50,7 +50,7 @@
 	"dependencies": {
 		"@emotion/styled": "11.10.4",
 		"@mui/icons-material": "5.10.3",
-		"@mui/material": "5.10.3",
+		"@mui/material": "5.10.4",
 		"@popperjs/core": "2.11.6",
 		"@tanstack/match-sorter-utils": "8.1.1",
 		"@tanstack/react-table": "8.5.13",

src/cdm/TableStateInterface.ts

@@ -45,6 +45,7 @@ export interface DataState {
         removeOptionForAllRows: (column: TableColumn, option: string, columns: TableColumn[],
             ddbbConfig: LocalSettings) => Promise<void>;
         dataviewRefresh: (column: TableColumn[], ddbbConfig: LocalSettings, filterConfig: FilterSettings) => void;
+        renameFile: (rowIndex: number) => Promise<void>;
     }
 }
 

src/components/DefaultCell.tsx

@@ -13,6 +13,7 @@ import NumberCell from "components/cellTypes/NumberCell";
 import TextCell from "components/cellTypes/TextCell";
 import { CellContext } from "@tanstack/react-table";
 import { Literal } from "obsidian-dataview";
+import MetadataTimeCell from "./cellTypes/MetadataTimeCell";
 
 export default function DefaultCell(
   defaultCell: CellContext<RowDataType, Literal>
@@ -46,6 +47,10 @@ export default function DefaultCell(
       case InputType.CALENDAR_TIME:
         return <CalendarTimePortal defaultCell={defaultCell} />;
 
+      /** Metadata options related with date/datetime */
+      case InputType.METATADA_TIME:
+        return <MetadataTimeCell defaultCell={defaultCell} />;
+
       /** Selector option */
       case InputType.SELECT:
         return <PopperSelectPortal defaultCell={defaultCell} />;

src/components/DefaultHeader.tsx

@@ -95,6 +95,7 @@ export default function DefaultHeader(headerProps: DatabaseHeaderProps) {
       propertyIcon = <CalendarIcon />;
       break;
     case InputType.CALENDAR_TIME:
+    case InputType.METATADA_TIME:
       propertyIcon = <CalendarTimeIcon />;
       break;
     case InputType.MARKDOWN:

src/components/RowContextMenu.tsx

@@ -1,16 +1,13 @@
 import IconButton from "@mui/material/IconButton";
-import ListItemIcon from "@mui/material/ListItemIcon";
 import { TableColumn } from "cdm/FolderModel";
 import DragIndicatorIcon from "@mui/icons-material/DragIndicator";
-import DeleteIcon from "@mui/icons-material/Delete";
 import {
   DEFAULT_COLUMN_CONFIG,
   InputType,
   MetadataDatabaseColumns,
 } from "helpers/Constants";
 import React from "react";
-import Menu from "@mui/material/Menu";
-import MenuItem from "@mui/material/MenuItem";
+import { showFileMenu } from "components/obsidianArq/commands";
 
 const rowContextMenuColumn: TableColumn = {
   ...MetadataDatabaseColumns.ROW_CONTEXT_MENU,
@@ -21,32 +18,21 @@ const rowContextMenuColumn: TableColumn = {
   cell: ({ row, table }) => {
     const { tableState } = table.options.meta;
     const rowActions = tableState.data((state) => state.actions);
-    const [anchorEl, setAnchorEl] = React.useState<null | HTMLElement>(null);
-    const open = Boolean(anchorEl);
-
-    const handleClick = (event: React.MouseEvent<HTMLElement>) => {
-      row.getToggleSelectedHandler()({
-        event: {
-          target: {
-            checked: !row.getIsSelected(),
-          },
-        },
-      });
-      setAnchorEl(event.currentTarget);
+    const handleDeleteRow = () => {
+      rowActions.removeRow(row.original);
     };
-    const handleMenuClose = () => {
-      setAnchorEl(null);
-      row.getToggleSelectedHandler()({
-        event: {
-          target: {
-            checked: !row.getIsSelected(),
-          },
-        },
-      });
+
+    const handleRenameRow = () => {
+      rowActions.renameFile(row.index);
     };
 
-    const handleDeleteRow = () => {
-      rowActions.removeRow(row.original);
+    const handleClick = (event: React.MouseEvent<HTMLElement>) => {
+      showFileMenu(
+        row.original.__note__.getFile(),
+        event.nativeEvent,
+        handleDeleteRow,
+        handleRenameRow
+      );
     };
 
     return (
@@ -66,31 +52,6 @@ const rowContextMenuColumn: TableColumn = {
         >
           <DragIndicatorIcon />
         </IconButton>
-        <Menu
-          anchorEl={anchorEl}
-          id={`row-context-menu-${row.id}`}
-          open={open}
-          onClose={handleMenuClose}
-          onClick={handleMenuClose}
-          transformOrigin={{ horizontal: "left", vertical: "top" }}
-          anchorOrigin={{ horizontal: "left", vertical: "bottom" }}
-          key={`row-context-Menu-${row.id}`}
-        >
-          <MenuItem
-            onClick={handleDeleteRow}
-            key={`row-context-Menu-MenuItem-Delete-${row.id}`}
-          >
-            <ListItemIcon
-              key={`row-context-Menu-MenuItem-ListItemIcon-${row.id}`}
-            >
-              <DeleteIcon
-                fontSize="small"
-                key={`row-context-Menu-MenuItem-DeleteIcon-${row.id}`}
-              />
-            </ListItemIcon>
-            Delete
-          </MenuItem>
-        </Menu>
       </>
     );
   },

src/components/Table.tsx

@@ -50,6 +50,7 @@ const defaultColumn: Partial<ColumnDef<RowDataType>> = {
   cell: DefaultCell,
   header: DefaultHeader,
   enableResizing: true,
+  sortingFn: "alphanumeric",
 };
 
 /**
@@ -252,6 +253,7 @@ export function Table(tableData: TableDataType) {
     debugTable: globalConfig.enable_debug_mode,
     debugHeaders: globalConfig.enable_debug_mode,
     debugColumns: globalConfig.enable_debug_mode,
+    autoResetPageIndex: false,
   });
 
   // Manage input of new row

src/components/cellTypes/CheckboxCell.tsx

@@ -18,11 +18,12 @@ function CheckboxCell(props: CellComponentProps) {
 
   const handleChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     const newValue = event.target.checked;
+    console.log("newValue", newValue);
     // save on disk
     dataActions.updateCell(
       row.index,
       column.columnDef as TableColumn,
-      newValue,
+      newValue ? "true" : "false",
       columnsInfo.getAllColumns(),
       configInfo.getLocalSettings()
     );
@@ -31,7 +32,7 @@ function CheckboxCell(props: CellComponentProps) {
     <div key={`checkbox-div-${row.index}`} className={`${c("checkbox")}`}>
       <input
         type="checkbox"
-        checked={checkboxRow[column.id] as boolean}
+        checked={checkboxRow[column.id] === "true"}
         key={`checkbox-input-${row.index}`}
         onChange={handleChange}
       />