improve order of metadata created and modified adding time

Author: RafaelGB

src/components/Cell.tsx

@@ -112,6 +112,7 @@ export default function DefaultCell(cellProperties: Cell) {
             //innerRef={containerCellRef}
           />
         );
+
       /** Number option */
       case DataTypes.NUMBER:
         return (
@@ -131,6 +132,15 @@ export default function DefaultCell(cellProperties: Cell) {
         return (
           <span ref={containerCellRef} className={`${c("md_cell")}`}></span>
         );
+
+      /** Calendar with time option */
+      case DataTypes.CALENDAR_TIME:
+        return (
+          <span className="data-input calendar-time">
+            {contextValue.value.toString()}
+          </span>
+        );
+
       /** Selector option */
       case DataTypes.SELECT:
         return (
@@ -145,6 +155,7 @@ export default function DefaultCell(cellProperties: Cell) {
             />
           </CellContext.Provider>
         );
+
       /** Calendar option */
       case DataTypes.CALENDAR:
         return (
@@ -156,6 +167,7 @@ export default function DefaultCell(cellProperties: Cell) {
             />
           </CellContext.Provider>
         );
+
       /** Default option */
       default:
         LOGGER.warn(`Unknown data type: ${dataType}`);

src/components/Columns.tsx

@@ -68,115 +68,27 @@ export async function obtainColumnsFromFolder(
   return sortColumnsByPosition(columns);
 }
 
-function parseDatabaseToTableColumn(
-  databaseColumn: DatabaseColumn,
-  columnKey: string,
-  index: number
-): TableColumn {
-  const tableColumn: TableColumn = {
-    ...(databaseColumn as Partial<TableColumn>),
-    id: columnKey,
-    dataType: databaseColumn.input,
-    position: databaseColumn.position ?? index,
-    key: databaseColumn.key ?? columnKey,
-    label: databaseColumn.label,
-    accessor: databaseColumn.accessor ?? dbTrim(databaseColumn.label),
-    csvCandidate: databaseColumn.csvCandidate ?? true,
-  };
-  return tableColumn;
-}
-
-async function columnOptions(
+function columnOptions(
   columnKey: string,
   index: number,
   column: DatabaseColumn
-): Promise<TableColumn> {
+): TableColumn {
   LOGGER.debug(`=> columnOptions. column: ${JSON.stringify(column)}`);
   const options: RowSelectOption[] = [];
-  const tableRow: TableColumn = parseDatabaseToTableColumn(
-    column,
-    columnKey,
-    index
-  );
-  /**
-   * return plain text
-   * @returns {TableColumn}
-   */
-  function isText(): TableColumn {
-    LOGGER.debug(`<= columnOptions`, `return text column`);
-    return {
-      ...tableRow,
-      dataType: DataTypes.TEXT,
-      options: options,
-    };
-  }
-
-  /**
-   * return number
-   * @returns {TableColumn}
-   */
-  function isNumber(): TableColumn {
-    LOGGER.debug(`<= columnOptions`, `return number column`);
-    return {
-      ...tableRow,
-      dataType: DataTypes.NUMBER,
-      options: options,
-    };
-  }
-  /**
-   * return selector
-   * @returns {TableColumn}
-   */
-  function isSelect(): TableColumn {
-    LOGGER.debug(`<= columnOptions`, `return select column`);
-    return {
-      ...tableRow,
-      dataType: DataTypes.SELECT,
-      options: options,
-    };
-  }
-
-  /**
-   * return markdown rendered text
-   * @returns {TableColumn}
-   */
-  function isMarkdown(): TableColumn {
-    LOGGER.debug(`<= columnOptions`, `return markdown column`);
-    return {
-      ...tableRow,
-      dataType: DataTypes.MARKDOWN,
-      options: options,
-    };
-  }
-
-  function isNewColumn(): TableColumn {
-    LOGGER.debug(`<= columnOptions`, `return new column`);
-    return {
-      ...tableRow,
-      dataType: DataTypes.NEW_COLUMN,
-      options: options,
-    };
-  }
 
-  function isCalendar(): TableColumn {
-    LOGGER.debug(`<= columnOptions`, `return calendar column`);
+  if (Object.values(DataTypes).includes(column.input)) {
+    LOGGER.debug(`<= columnOptions`, `return ${column.input} column`);
     return {
-      ...tableRow,
-      dataType: DataTypes.CALENDAR,
+      ...(column as Partial<TableColumn>),
+      position: column.position ?? index,
+      key: column.key ?? columnKey,
+      accessor: column.accessor ?? dbTrim(column.label),
+      csvCandidate: column.csvCandidate ?? true,
+      id: columnKey,
+      label: column.label,
+      dataType: column.input,
       options: options,
     };
-  }
-
-  // Record of options
-  let inputs: Record<string, any> = {};
-  inputs[DataTypes.TEXT] = isText;
-  inputs[DataTypes.NUMBER] = isNumber;
-  inputs[DataTypes.SELECT] = isSelect;
-  inputs[DataTypes.MARKDOWN] = isMarkdown;
-  inputs[DataTypes.NEW_COLUMN] = isNewColumn;
-  inputs[DataTypes.CALENDAR] = isCalendar;
-  if (inputs.hasOwnProperty(column.input)) {
-    return await inputs[column.input]();
   } else {
     throw `Error: option ${column.input} not supported yet`;
   }

src/components/Header.tsx

@@ -7,6 +7,7 @@ import PlusIcon from "components/img/Plus";
 import HeaderMenu from "components/HeaderMenu";
 import CalendarIcon from "components/img/CalendarIcon";
 import MarkdownObsidian from "components/img/Markdown";
+import CalendarTimeIcon from "components/img/CalendarTime";
 import {
   ActionTypes,
   DataTypes,
@@ -78,6 +79,9 @@ export default function Header(headerProps: DatabaseHeaderProps) {
     case DataTypes.CALENDAR:
       propertyIcon = <CalendarIcon />;
       break;
+    case DataTypes.CALENDAR_TIME:
+      propertyIcon = <CalendarTimeIcon />;
+      break;
     case DataTypes.MARKDOWN:
       // TODO : add a markdown icon
       propertyIcon = <MarkdownObsidian />;

src/components/img/CalendarTime.tsx

@@ -0,0 +1,24 @@
+import React from "react";
+
+export default function CalendarTimeIcon() {
+  return (
+    <svg
+      width="24"
+      height="24"
+      viewBox="0 0 24 24"
+      strokeWidth="2"
+      stroke="currentColor"
+      fill="none"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+    >
+      <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+      <path d="M11.795 21h-6.795a2 2 0 0 1 -2 -2v-12a2 2 0 0 1 2 -2h12a2 2 0 0 1 2 2v4" />
+      <circle cx="18" cy="18" r="4" />
+      <path d="M15 3v4" />
+      <path d="M7 3v4" />
+      <path d="M3 11h16" />
+      <path d="M18 16.496v1.504l1 1" />
+    </svg>
+  );
+}

src/components/portals/CalendarPortal.tsx

@@ -52,12 +52,6 @@ const CalendarPortal = (calendarProps: CalendarProps) => {
     });
   }
 
-  if (contextValue.value instanceof DateTime) {
-    console.log("calendar datatime value");
-  } else {
-    console.log("calendar differ value");
-  }
-
   function handlerOnClick(e: any) {
     if (!column.isMetadata) {
       const portalActive = document.getElementById("unique-calendar-portal");

src/helpers/Constants.ts

@@ -23,6 +23,7 @@ export const DataTypes = Object.freeze({
   SELECT: 'select',
   MARKDOWN: 'markdown',
   CALENDAR: 'calendar',
+  CALENDAR_TIME: 'calendar_time',
   NEW_COLUMN: 'new_column'
 });
 
@@ -66,7 +67,7 @@ export const MetadataDatabaseColumns = Object.freeze({
   },
   CREATED: {
     key: MetadataColumns.CREATED,
-    input: DataTypes.CALENDAR,
+    input: DataTypes.CALENDAR_TIME,
     label: MetadataLabels.CREATED,
     accessor: MetadataColumns.CREATED,
     isMetadata: true,
@@ -76,7 +77,7 @@ export const MetadataDatabaseColumns = Object.freeze({
   },
   MODIFIED: {
     key: MetadataColumns.MODIFIED,
-    input: DataTypes.CALENDAR,
+    input: DataTypes.CALENDAR_TIME,
     label: MetadataLabels.MODIFIED,
     accessor: MetadataColumns.MODIFIED,
     isMetadata: true,

src/services/DataviewService.ts

@@ -68,6 +68,9 @@ class DataviewProxy {
             case DataTypes.CALENDAR:
                 parsedLiteral = this.parseToCalendar(wrapped);
                 break;
+            case DataTypes.CALENDAR_TIME:
+                parsedLiteral = this.parseToCalendarTime(wrapped);
+                break;
             case DataTypes.NUMBER:
                 parsedLiteral = wrapped.type === 'number' ? literal : Number(literal);
                 break;
@@ -100,6 +103,14 @@ class DataviewProxy {
             return literal.value;
         }
     }
+
+    private parseToCalendarTime(literal: WrappedLiteral): Literal {
+        if (literal.type === 'string') {
+            return DateTime.fromISO(literal.value);
+        } else {
+            return literal.value;
+        }
+    }
 }
 
 export const DataviewService = DataviewProxy.getInstance();

src/services/NoteInfo.ts

@@ -4,6 +4,7 @@ import { TFile } from "obsidian";
 import { VaultManagerDB } from "services/FileManagerService";
 import { DateTime } from "luxon";
 import { DataviewService } from "./DataviewService";
+import { Literal } from "obsidian-dataview/lib/data-model/value";
 /**
  * Keep info about a note and offer methods to manipulate it
  */
@@ -36,7 +37,7 @@ export default class NoteInfo {
         /** Parse data with the type of column */
         columns.forEach(column => {
             if (aFile[column.key] !== undefined) {
-                aFile[column.key] = DataviewService.parseLiteral(aFile[column.key], column.dataType);
+                aFile[column.key] = DataviewService.parseLiteral((aFile[column.key]) as Literal, column.dataType);
             }
         });
         return aFile;