metadata column checkbox added

RafaelGB · RafaelGB · commit 0ec1ca3a1d2b · 2022-05-25T22:48:13.000+02:00
diff --git a/docs/docs/changelog.md b/docs/docs/changelog.md
@@ -1,3 +1,12 @@
+## 1.4.0
+### Shiny new things
+- New metadata column: File tasks! You can see the tasks that are associated with each file and interact with them. Powered with tasklist render of dataview. [ISSUE#54](https://github.com/RafaelGB/obsidian-db-folder/issues/54)
+
+### Improved
+- Extra margin added to the botton and top of every cell is removed. Markdown obsidian renderer add html tagging that affected the margin. [ISSUE#71](https://github.com/RafaelGB/obsidian-db-folder/issues/71)
+
+### No longer broken
+- Column settings of a type that has a type without behavior section does not produce a console error now and section tittle is not shown.
 ## 1.3.2
 *Published on 2022/05/24*
 ### Improved
diff --git a/src/Settings.ts b/src/Settings.ts
@@ -29,6 +29,7 @@ export interface LocalSettings {
   remove_field_when_delete_column: boolean;
   show_metadata_created: boolean;
   show_metadata_modified: boolean;
+  show_metadata_tasks: boolean;
 }
 
 export interface DatabaseSettings {
@@ -52,6 +53,7 @@ export const DEFAULT_SETTINGS: DatabaseSettings = {
     group_folder_column: '',
     show_metadata_created: false,
     show_metadata_modified: false,
+    show_metadata_tasks: false
   }
 };
 
diff --git a/src/components/Cell.tsx b/src/components/Cell.tsx
@@ -10,6 +10,7 @@ import CalendarPortal from "./portals/CalendarPortal";
 import { TableColumn } from "cdm/FolderModel";
 import CalendarTimePortal from "components/portals/CalendarTimePortal";
 import { renderMarkdown } from "components/markdown/MarkdownRenderer";
+import { DataviewService } from "services/DataviewService";
 
 export default function DefaultCell(cellProperties: Cell) {
   const dataDispatch = (cellProperties as any).dataDispatch;
@@ -24,6 +25,7 @@ export default function DefaultCell(cellProperties: Cell) {
   /** Ref to cell container */
   const containerCellRef = useRef<HTMLDivElement>();
   const editableMdRef = useRef<HTMLInputElement>();
+  const taskRef = useRef<HTMLDivElement>();
   /** state of cell value */
   const [contextValue, setContextValue] = useState({
     value: initialValue,
@@ -38,11 +40,25 @@ export default function DefaultCell(cellProperties: Cell) {
   );
   // set contextValue when cell is loaded
   useEffect(() => {
-    if (!dirtyCell && initialValue !== contextValue.value) {
-      setContextValue({
-        value: initialValue,
-        update: false,
-      });
+    switch (dataType) {
+      case DataTypes.TASK:
+        //TODO - this is a hack. find why is layout effect called twice
+        taskRef.current.innerHTML = "";
+        DataviewService.getDataviewAPI().taskList(
+          contextValue.value,
+          false,
+          taskRef.current,
+          (cellProperties as any).initialState.view,
+          (cellProperties as any).initialState.view.file.path
+        );
+        break;
+      default:
+        if (!dirtyCell && initialValue !== contextValue.value) {
+          setContextValue({
+            value: initialValue,
+            update: false,
+          });
+        }
     }
   }, []);
 
@@ -54,7 +70,6 @@ export default function DefaultCell(cellProperties: Cell) {
 
   useEffect(() => {
     if (!dirtyCell && containerCellRef.current) {
-      renderMarkdown;
       //TODO - this is a hack. find why is layout effect called twice
       containerCellRef.current.innerHTML = "";
       renderMarkdown(
@@ -191,9 +206,8 @@ export default function DefaultCell(cellProperties: Cell) {
         );
 
       case DataTypes.TASK:
-        return (
-          <span ref={containerCellRef} className={`${c("md_cell")}`}></span>
-        );
+        return <div ref={taskRef} className="data-input"></div>;
+
       /** Default option */
       default:
         LOGGER.warn(`Unknown data type: ${dataType}`);
diff --git a/src/components/Columns.tsx b/src/components/Columns.tsx
@@ -45,6 +45,16 @@ export async function obtainMetadataColumns(
     delete yamlColumns[MetadataColumns.MODIFIED];
   }
 
+  if (localSetting.show_metadata_tasks) {
+    // If Modified is not already in the table, add it
+    yamlColumns[MetadataColumns.TASKS] = {
+      ...MetadataDatabaseColumns.TASKS,
+      ...(yamlColumns[MetadataColumns.TASKS] ?? {}),
+    };
+  } else {
+    delete yamlColumns[MetadataColumns.TASKS];
+  }
+
   yamlColumns[MetadataColumns.ADD_COLUMN] = MetadataDatabaseColumns.ADD_COLUMN;
   return yamlColumns;
 }
diff --git a/src/components/Header.tsx b/src/components/Header.tsx
@@ -94,7 +94,6 @@ export default function Header(headerProps: DatabaseHeaderProps) {
       propertyIcon = <MarkdownObsidian />;
       break;
     case DataTypes.TASK:
-      // TODO : add a markdown icon
       propertyIcon = <TaskIcon />;
       break;
     default:
diff --git a/src/components/HeaderMenu.tsx b/src/components/HeaderMenu.tsx
@@ -81,23 +81,28 @@ const HeaderMenu = (headerMenuProps: HeaderMenuProps) => {
   /**
    * Array of action buttons asociated to the header
    */
-  const buttons = [
-    {
-      onClick: (e: any) => {
-        setSortBy([{ id: column.id, desc: false }]);
-        setExpanded(false);
+  const buttons = [];
+  if (column.dataType !== DataTypes.TASK) {
+    buttons.push(
+      {
+        onClick: (e: any) => {
+          setSortBy([{ id: column.id, desc: false }]);
+          setExpanded(false);
+        },
+        icon: <ArrowUpIcon />,
+        label: "Sort ascending",
       },
-      icon: <ArrowUpIcon />,
-      label: "Sort ascending",
-    },
-    {
-      onClick: (e: any) => {
-        setSortBy([{ id: column.id, desc: true }]);
-        setExpanded(false);
-      },
-      icon: <ArrowDownIcon />,
-      label: "Sort descending",
-    },
+      {
+        onClick: (e: any) => {
+          setSortBy([{ id: column.id, desc: true }]);
+          setExpanded(false);
+        },
+        icon: <ArrowDownIcon />,
+        label: "Sort descending",
+      }
+    );
+  }
+  buttons.push(
     {
       onClick: (e: any) => {
         dispatch({
@@ -123,8 +128,8 @@ const HeaderMenu = (headerMenuProps: HeaderMenuProps) => {
       },
       icon: <ArrowRightIcon />,
       label: "Insert right",
-    },
-  ];
+    }
+  );
   /**
    * Add extra buttons if column is not a metadata
    */
@@ -213,19 +218,6 @@ const HeaderMenu = (headerMenuProps: HeaderMenuProps) => {
       icon: <CalendarTimeIcon />,
       label: MetadataLabels.CALENDAR_TIME,
     },
-    {
-      onClick: (e: any) => {
-        dispatch({
-          type: ActionTypes.UPDATE_COLUMN_TYPE,
-          columnId: column.id,
-          dataType: DataTypes.TASK,
-        });
-        setShowType(false);
-        setExpanded(false);
-      },
-      icon: <TaskIcon />,
-      label: MetadataLabels.TASK,
-    },
   ];
 
   const typePopper = usePopper(typeReferenceElement, typePopperElement, {
diff --git a/src/components/markdown/MarkdownRenderer.tsx b/src/components/markdown/MarkdownRenderer.tsx
@@ -65,12 +65,6 @@ function handleEmbeds(dom: HTMLDivElement, view: DatabaseView, depth: number) {
       if (MediaExtensions.VIDEO.contains(target.extension)) {
         return handleVideo(el, target, view);
       }
-
-      //   if (target.extension === "md") {
-      //     return await handleMarkdown(el, target, normalizedPath, view, depth);
-      //   }
-
-      //return handleUnknownFile(el, target);
     })
   );
 }
diff --git a/src/components/modals/ColumnSections.ts b/src/components/modals/ColumnSections.ts
@@ -26,25 +26,32 @@ export function behavior_settings_section(settingHandlerResponse: ColumnHandlerR
     return handlers[0].handle(settingHandlerResponse);
 }
 
+/**
+ * Every column type has a different behavior section
+ * @param settingHandlerResponse 
+ * @returns 
+ */
 export function particular_settings_section(settingHandlerResponse: ColumnHandlerResponse): ColumnHandlerResponse {
-    const particular_section = settingHandlerResponse.containerEl.createDiv("column-section-container-particular");
-    // title of the section
-    add_setting_header(particular_section, `Particular properties of "${settingHandlerResponse.column.dataType
-        }" column type`, 'h3');
-    /**
-     * Obtain all classes than extends from AbstractHandler
-     */
     const handlers = [
         ...addParticularInputSettings(settingHandlerResponse.column.dataType)
     ]
-    let i = 1;
-    while (i < handlers.length) {
-        handlers[i - 1].setNext(handlers[i]);
-        i++;
-    }
+    if (handlers.length > 0) {
+        const particular_section = settingHandlerResponse.containerEl.createDiv("column-section-container-particular");
+        // title of the section
+        add_setting_header(particular_section, `Particular properties of "${settingHandlerResponse.column.dataType
+            }" column type`, 'h3');
 
-    settingHandlerResponse.containerEl = particular_section;
-    return handlers[0].handle(settingHandlerResponse);
+        let i = 1;
+        while (i < handlers.length) {
+            handlers[i - 1].setNext(handlers[i]);
+            i++;
+        }
+
+        settingHandlerResponse.containerEl = particular_section;
+        return handlers[0].handle(settingHandlerResponse);
+    } else {
+        return settingHandlerResponse;
+    }
 }
 
 function addParticularInputSettings(dataType: string): ColumnHandler[] {
diff --git a/src/components/reducers/DatabaseDispatch.tsx b/src/components/reducers/DatabaseDispatch.tsx
@@ -210,20 +210,6 @@ export function databaseReducer(state: TableDataType, action: ActionType) {
               $set: parsedData,
             },
           });
-        case DataTypes.TASK:
-          return update(state, {
-            skipReset: { $set: true },
-            columns: {
-              $set: [
-                ...state.columns.slice(0, typeIndex),
-                { ...state.columns[typeIndex], dataType: action.dataType },
-                ...state.columns.slice(typeIndex + 1, state.columns.length),
-              ],
-            },
-            data: {
-              $set: parsedData,
-            },
-          });
         default:
           /**
            * GENERIC update change
diff --git a/src/helpers/Constants.ts b/src/helpers/Constants.ts
@@ -35,6 +35,7 @@ export const MetadataColumns = Object.freeze({
   CREATED: `__created__`,
   MODIFIED: `__modified__`,
   ADD_COLUMN: `__add_column__`,
+  TASKS: `__tasks__`
 });
 
 export const MetadataLabels = Object.freeze({
@@ -53,6 +54,7 @@ export const DEFAULT_COLUMN_CONFIG = Object.freeze({
   media_height: 100,
   isInline: false
 });
+
 export const MetadataDatabaseColumns = Object.freeze({
   FILE:
   {
@@ -94,7 +96,17 @@ export const MetadataDatabaseColumns = Object.freeze({
     skipPersist: false,
     csvCandidate: true,
     config: DEFAULT_COLUMN_CONFIG
-  }
+  },
+  TASKS: {
+    key: MetadataColumns.TASKS,
+    input: DataTypes.TASK,
+    label: MetadataLabels.TASK,
+    accessor: MetadataColumns.TASKS,
+    isMetadata: true,
+    skipPersist: false,
+    csvCandidate: true,
+    config: DEFAULT_COLUMN_CONFIG
+  },
 });
 
 export const TableColumnsTemplate: Partial<TableColumn> =
diff --git a/src/helpers/VaultManagement.ts b/src/helpers/VaultManagement.ts
@@ -82,6 +82,7 @@ export async function adapterTFilesToRows(folderPath: string, columns: TableColu
   LOGGER.debug(`<= adapterTFilesToRows.  number of rows:${rows.length}`);
   return rows;
 }
+
 export async function updateRowFileProxy(file: TFile, columnId: string, newValue: string, state: TableDataType, option: string): Promise<void> {
   await updateRowFile(file, columnId, newValue, state, option).catch(e => {
     LOGGER.error(`updateRowFileProxy.  Error:${e}`);
diff --git a/src/services/DataviewService.ts b/src/services/DataviewService.ts
@@ -70,7 +70,8 @@ class DataviewProxy {
         literal = this.parseDataArray(literal);
 
         const wrapped = this.getDataviewAPI().value.wrapValue(literal)
-
+        LOGGER.debug(`=>parseLiteral: type ${wrapped
+            .type} to ${dataTypeDst}`);
         // Check empty or undefined literals
         switch (dataTypeDst) {
             case DataTypes.CALENDAR:
@@ -80,15 +81,19 @@ class DataviewProxy {
             case DataTypes.NUMBER:
                 parsedLiteral = wrapped.type === 'number' ? literal : Number(literal);
                 break;
+            case DataTypes.TASK:
+                // Do nothing
+                break;
             default:
-
                 if (DateTime.isDateTime(wrapped.value)) {
+                    LOGGER.debug("adapting DateTime to string...");
                     // Values of dataview parse to md friendly strings
                     parsedLiteral = wrapped.value.toFormat("yyyy-MM-dd");
                 } else {
                     parsedLiteral = this.getDataviewAPI().value.toString(literal);
                 }
         }
+        LOGGER.debug(`<=parseLiteral`);
         return parsedLiteral;
     }
     /**
diff --git a/src/services/NoteInfo.ts b/src/services/NoteInfo.ts
@@ -28,6 +28,7 @@ export default class NoteInfo {
         aFile[MetadataColumns.FILE] = `${this.page.file.link.markdown()}`;
         aFile[MetadataColumns.CREATED] = this.page.file.ctime;
         aFile[MetadataColumns.MODIFIED] = this.page.file.mtime;
+        aFile[MetadataColumns.TASKS] = this.page.file.tasks;
 
         /** Optional fields */
         Object.keys(this.page).forEach(property => {
diff --git a/src/settings/handlers/columns/MetadataToggleGroupHandler.ts b/src/settings/handlers/columns/MetadataToggleGroupHandler.ts
diff --git a/styles.css b/styles.css

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ export interface LocalSettings {`
`29`	`29`	`remove_field_when_delete_column: boolean;`
`30`	`30`	`show_metadata_created: boolean;`
`31`	`31`	`show_metadata_modified: boolean;`
	`32`	`+ show_metadata_tasks: boolean;`
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`export interface DatabaseSettings {`
`@@ -52,6 +53,7 @@ export const DEFAULT_SETTINGS: DatabaseSettings = {`
`52`	`53`	`group_folder_column: '',`
`53`	`54`	`show_metadata_created: false,`
`54`	`55`	`show_metadata_modified: false,`
	`56`	`+ show_metadata_tasks: false`
`55`	`57`	`}`
`56`	`58`	`};`
`57`	`59`
Original file line number	Diff line number	Diff line change
`@@ -65,12 +65,6 @@ function handleEmbeds(dom: HTMLDivElement, view: DatabaseView, depth: number) {`
`65`	`65`	`if (MediaExtensions.VIDEO.contains(target.extension)) {`
`66`	`66`	`return handleVideo(el, target, view);`
`67`	`67`	`}`
`68`		`-`
`69`		`- // if (target.extension === "md") {`
`70`		`- // return await handleMarkdown(el, target, normalizedPath, view, depth);`
`71`		`- // }`
`72`		`-`
`73`		`- //return handleUnknownFile(el, target);`
`74`	`68`	`})`
`75`	`69`	`);`
`76`	`70`	`}`