Refactor to achive Literal support of dtaview

RafaelGB · RafaelGB · commit 0cb5b2dd842c · 2022-05-12T16:48:27.000+02:00
diff --git a/src/DatabaseView.tsx b/src/DatabaseView.tsx
@@ -130,6 +130,7 @@ export class DatabaseView extends TextFileView implements HoverParent {
       const columns = await obtainColumnsFromFolder(yamlColumns);
       const rows = await adapterTFilesToRows(
         this.file.parent.path,
+        columns,
         this.diskConfig.yaml.filters
       );
       // Define table properties
diff --git a/src/components/Cell.tsx b/src/components/Cell.tsx
@@ -10,6 +10,7 @@ import { CellContext } from "components/contexts/CellContext";
 import { c } from "helpers/StylesHelper";
 import CalendarPortal from "./portals/CalendarPortal";
 import { TableColumn } from "cdm/FolderModel";
+import { DataviewService } from "services/DataviewService";
 
 /**
  * Obtain the path of the file inside cellValue
@@ -129,6 +130,7 @@ export default function DefaultCell(cellProperties: Cell) {
         return <span ref={containerRef} className={`${c("md_cell")}`}></span>;
       /** Selector option */
       case DataTypes.SELECT:
+        console.log("selector");
         return (
           <CellContext.Provider value={{ contextValue, setContextValue }}>
             <PopperSelectPortal
diff --git a/src/components/contexts/CellContext.tsx b/src/components/contexts/CellContext.tsx
@@ -1,8 +1,9 @@
 import { Literal } from "obsidian-dataview/lib/data-model/value";
 import React from "react";
+import NoteInfo from "services/NoteInfo";
 
 export type CellDataType = {
-  value: Literal;
+  value: Literal | NoteInfo;
   update: boolean;
 };
 
diff --git a/src/components/portals/CalendarPortal.tsx b/src/components/portals/CalendarPortal.tsx
@@ -1,13 +1,14 @@
 import { TableColumn, TableDataType } from "cdm/FolderModel";
 import { CellContext } from "components/contexts/CellContext";
-import { ActionTypes, StyleVariables } from "helpers/Constants";
+import { ActionTypes, DataTypes, StyleVariables } from "helpers/Constants";
 import React, { useContext, useState } from "react";
 import Calendar from "react-calendar";
 import ReactDOM from "react-dom";
 import { DateTime } from "luxon";
 import { usePopper } from "react-popper";
 import { Cell } from "react-table";
 import NoteInfo from "services/NoteInfo";
+import { DataviewService } from "services/DataviewService";
 
 type CalendarProps = {
   intialState: TableDataType;
@@ -30,9 +31,12 @@ const CalendarPortal = (calendarProps: CalendarProps) => {
   const note: NoteInfo = (cellProperties.row.original as any).note;
 
   const [calendarState, setCalendarState] = useState(
-    DateTime.isDateTime(contextValue.value)
-      ? contextValue.value.toJSDate()
-      : new Date()
+    (
+      DataviewService.parseLiteral(
+        contextValue.value,
+        DataTypes.CALENDAR
+      ) as DateTime
+    ).toJSDate()
   );
 
   function handleCalendarChange(date: Date) {
@@ -89,9 +93,7 @@ const CalendarPortal = (calendarProps: CalendarProps) => {
         onBlur={() => setShowCalendar(false)}
       >
         <span>
-          {DateTime.isDateTime(contextValue.value)
-            ? contextValue.value.toFormat("yyyy-MM-dd")
-            : ""}
+          {DataviewService.parseLiteral(contextValue.value, DataTypes.TEXT)}
         </span>
       </div>
       {showCalendar &&
diff --git a/src/components/reducers/DatabaseDispatch.tsx b/src/components/reducers/DatabaseDispatch.tsx
@@ -15,6 +15,7 @@ import { moveFile, updateRowFile } from "helpers/VaultManagement";
 import { randomColor } from "helpers/Colors";
 import { DatabaseColumn, RowDatabaseFields } from "cdm/DatabaseModel";
 import NoteInfo from "services/NoteInfo";
+import { DataviewService } from "services/DataviewService";
 
 export function databaseReducer(state: TableDataType, action: ActionType) {
   LOGGER.debug(
@@ -151,55 +152,41 @@ export function databaseReducer(state: TableDataType, action: ActionType) {
       const typeIndex = state.columns.findIndex(
         (column) => column.id === action.columnId
       );
+      /** Check if type is changed */
+      if (state.columns[typeIndex].dataType === action.dataType) {
+        return state;
+      }
+      /** If changed, then parsed information */
       // Update configuration on disk
       state.view.diskConfig.updateColumnProperties(action.columnId, {
         input: action.dataType,
       });
+      // Parse data
+      const parsedData = state.data.map((row: any) => ({
+        ...row,
+        [action.columnId]: DataviewService.parseLiteral(
+          row[action.columnId],
+          action.dataType // Destination type to parse
+        ),
+      }));
       // Update state
       switch (action.dataType) {
-        case DataTypes.NUMBER:
-          if (state.columns[typeIndex].dataType === DataTypes.NUMBER) {
-            return state;
-          } else {
-            return {
-              ...state,
-              columns: [
-                ...state.columns.slice(0, typeIndex),
-                { ...state.columns[typeIndex], dataType: action.dataType },
-                ...state.columns.slice(typeIndex + 1, state.columns.length),
-              ],
-              data: state.data.map((row: any) => ({
-                ...row,
-                [action.columnId]: isNaN(row[action.columnId])
-                  ? ""
-                  : Number.parseInt(row[action.columnId]),
-              })),
-            };
-          }
         case DataTypes.SELECT:
-          if (state.columns[typeIndex].dataType === DataTypes.SELECT) {
-            return {
-              ...state,
-              columns: [
-                ...state.columns.slice(0, typeIndex),
-                { ...state.columns[typeIndex], dataType: action.dataType },
-                ...state.columns.slice(typeIndex + 1, state.columns.length),
-              ],
-              skipReset: true,
-            };
-          } else {
-            const options: any = [];
-            state.data.forEach((row) => {
-              if (row[action.columnId]) {
-                options.push({
-                  label: row[action.columnId],
-                  backgroundColor: randomColor(),
-                });
-              }
-            });
-            return {
-              ...state,
-              columns: [
+          const options: any = [];
+          // Generate selected options
+          parsedData.forEach((row) => {
+            if (row[action.columnId]) {
+              options.push({
+                label: row[action.columnId],
+                backgroundColor: randomColor(),
+              });
+            }
+          });
+          // Update column to SELECT type
+          return update(state, {
+            skipReset: { $set: true },
+            columns: {
+              $set: [
                 ...state.columns.slice(0, typeIndex),
                 {
                   ...state.columns[typeIndex],
@@ -208,39 +195,34 @@ export function databaseReducer(state: TableDataType, action: ActionType) {
                 },
                 ...state.columns.slice(typeIndex + 1, state.columns.length),
               ],
-              skipReset: true,
-            };
-          }
-        case DataTypes.TEXT:
-          if (state.columns[typeIndex].dataType === DataTypes.TEXT) {
-            return state;
-          } else if (state.columns[typeIndex].dataType === DataTypes.SELECT) {
-            return {
-              ...state,
-              skipReset: true,
-              columns: [
-                ...state.columns.slice(0, typeIndex),
-                { ...state.columns[typeIndex], dataType: action.dataType },
-                ...state.columns.slice(typeIndex + 1, state.columns.length),
-              ],
-            };
-          } else {
-            return {
-              ...state,
-              skipReset: true,
-              columns: [
+            },
+            data: {
+              $set: parsedData,
+            },
+          });
+        default:
+          /**
+           * GENERIC update change
+           * Update column dataType & parsed data
+           * Aplied to:
+           * - TEXT
+           * - NUMBER
+           * - CALENDAR
+           */
+          console.log("GENERIC update change");
+          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: state.data.map((row) => ({
-                ...row,
-                [action.columnId]: row[action.columnId] + "",
-              })),
-            };
-          }
-        default:
-          return state;
+            },
+            data: {
+              $set: parsedData,
+            },
+          });
       }
     /**
      * Add new column to the table to the left of the column with the given id
diff --git a/src/helpers/VaultManagement.ts b/src/helpers/VaultManagement.ts
@@ -1,4 +1,4 @@
-import { RowDataType, NormalizedPath, TableDataType } from 'cdm/FolderModel';
+import { RowDataType, NormalizedPath, TableDataType, TableColumn } from 'cdm/FolderModel';
 import { TFile } from 'obsidian';
 import { ActionType } from 'react-table';
 import { VaultManagerDB } from 'services/FileManagerService';
@@ -62,20 +62,23 @@ export function getNormalizedPath(path: string): NormalizedPath {
  * @param folderPath 
  * @returns 
  */
-export async function adapterTFilesToRows(folderPath: string, filters?: FilterCondition[]): Promise<Array<RowDataType>> {
+export async function adapterTFilesToRows(folderPath: string, columns: TableColumn[], filters: FilterCondition[]): Promise<Array<RowDataType>> {
   LOGGER.debug(`=> adapterTFilesToRows.  folderPath:${folderPath}`);
   const rows: Array<RowDataType> = [];
   let id = 0;
 
   let folderFiles = DataviewService.getDataviewAPI().pages(`"${folderPath}"`)
     .where(p => !p[DatabaseCore.FRONTMATTER_KEY]);
+  // Config filters asociated with the database
   if (filters) {
     folderFiles = folderFiles.where(p => DataviewService.filter(filters, p));
   }
-  await Promise.all(folderFiles.map(async (page) => {
+
+  folderFiles.map(async (page) => {
     const noteInfo = new NoteInfo(page, ++id);
-    rows.push(noteInfo.getRowDataType());
-  }));
+    rows.push(noteInfo.getRowDataType(columns));
+  });
+
   LOGGER.debug(`<= adapterTFilesToRows.  number of rows:${rows.length}`);
   return rows;
 }
diff --git a/src/services/DataviewService.ts b/src/services/DataviewService.ts
@@ -1,9 +1,11 @@
 import { FilterCondition } from "cdm/DatabaseModel";
-import { getOperatorFilterValue, OperatorFilter } from "helpers/Constants";
+import { DataTypes, getOperatorFilterValue, OperatorFilter } from "helpers/Constants";
 import { Notice } from "obsidian";
 import { getAPI, isPluginEnabled } from "obsidian-dataview";
 import { Literal } from "obsidian-dataview/lib/data-model/value";
 import { DvAPIInterface } from "obsidian-dataview/lib/typings/api";
+import { DateTime } from "luxon";
+import NoteInfo from "./NoteInfo";
 class DataviewProxy {
 
     private static instance: DataviewProxy;
@@ -59,8 +61,24 @@ class DataviewProxy {
         }
     }
 
-    parseLiteral(literal: Literal): Literal {
-        return literal;
+    parseLiteral(literal: Literal | NoteInfo, dataTypeDst: string): Literal | NoteInfo {
+        let parsedLiteral: Literal | NoteInfo;
+        // Check empty or undefined literals
+        switch (dataTypeDst) {
+            case DataTypes.CALENDAR:
+                // Check if original literal is a date. If not convert to current date
+                parsedLiteral = DateTime.isDateTime(literal) ? literal : DateTime.now();
+                break;
+            case DataTypes.NUMBER:
+                parsedLiteral = isNaN(literal as any) ? ""
+                    : Number.parseInt(literal as string);
+                break;
+            default:
+                parsedLiteral = DateTime.isDateTime(literal) ? literal.toFormat("yyyy-MM-dd")
+                    : literal;
+
+        }
+        return parsedLiteral;
     }
     /**
      * Singleton instance
diff --git a/src/services/NoteInfo.ts b/src/services/NoteInfo.ts
@@ -1,8 +1,9 @@
-import { RowDataType } from "cdm/FolderModel";
+import { RowDataType, TableColumn } from "cdm/FolderModel";
 import { MetadataColumns } from "helpers/Constants";
 import { TFile } from "obsidian";
 import { VaultManagerDB } from "services/FileManagerService";
 import { DateTime } from "luxon";
+import { DataviewService } from "./DataviewService";
 /**
  * Keep info about a note and offer methods to manipulate it
  */
@@ -16,7 +17,7 @@ export default class NoteInfo {
         this.id = id;
     }
 
-    getRowDataType(): RowDataType {
+    getRowDataType(columns: TableColumn[]): RowDataType {
         /** Mandatory fields */
         const aFile: RowDataType = {
             id: this.id,
@@ -26,11 +27,18 @@ 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;
+
         /** Optional fields */
         Object.keys(this.page).forEach(property => {
             const value = this.page[property];
             aFile[property] = value;
         });
+        /** parse the data with the type of column */
+        columns.forEach(column => {
+            if (aFile[column.key] !== undefined) {
+                aFile[column.key] = DataviewService.parseLiteral(aFile[column.key], column.dataType);
+            }
+        });
         return aFile;
     }
 
diff --git a/src/settings/handlers/columns/RemoveFieldsWhenDeleteToggleHandler.ts b/src/settings/handlers/columns/RemoveFieldsWhenDeleteToggleHandler.ts
@@ -22,7 +22,7 @@ export class RemoveFieldsWhenDeleteToggleHandler extends AbstractSettingsHandler
         add_toggle(
             containerEl,
             this.settingTitle,
-            "Enable/disable remove fields when delete a column",
+            "Enable/disable remove fields when a column is deleted",
             local ? view.diskConfig.yaml.config.remove_field_when_delete_column : settingsManager.plugin.settings.local_settings.remove_field_when_delete_column,
             remove_fields_toggle_promise
         );
