Merge branch 'csv_api'

Author: RafaelGB

src/cdm/TableStateInterface.ts

@@ -3,7 +3,7 @@ import { ConfigColumn, RowDataType, TableColumn } from "cdm/FolderModel";
 import { FilterSettings, GlobalSettings, LocalSettings } from "cdm/SettingsModel";
 import { ColumnOption } from "cdm/ComponentsModel";
 import { DatabaseView } from "views/DatabaseView";
-import { Literal } from "obsidian-dataview";
+import { Link, Literal } from "obsidian-dataview";
 import { StoreApi, UseBoundStore } from "zustand";
 import { UpdaterData, ContextHeaderData } from "cdm/EmitterModel";
 
@@ -72,6 +72,7 @@ export type DataStateActions = {
     insertRows: () => Promise<void>;
     addRow: (args: CreateRowInfo) => Promise<void>;
     updateCell: (args: UpdateRowInfo) => Promise<void>;
+    updateBidirectionalRelation: (source: RowDataType, column: TableColumn, oldPaths: string[], newPaths: string[]) => Promise<void>;
     parseDataOfColumn: (column: TableColumn, input: string, ddbbConfig: LocalSettings) => void;
     updateDataAfterLabelChange: (column: TableColumn, label: string, columns: TableColumn[], ddbbConfig: LocalSettings) => Promise<void>;
     removeRow: (row: RowDataType) => Promise<void>;
@@ -103,7 +104,7 @@ export interface DataState {
 export type ColumnsStateActions = {
     addToLeft: (column: TableColumn, customName?: string, customType?: string) => void;
     addToRight: (column: TableColumn, customName?: string, customType?: string) => void;
-    remove: (column: TableColumn) => void;
+    remove: (column: TableColumn) => Promise<void>;
     alterSorting: (column: TableColumn) => void;
     addOptionToColumn: (column: TableColumn, option: string, backgroundColor: string) => void;
     alterColumnType: (column: TableColumn, input: string, parsedRows?: RowDataType[]) => Promise<void>;

src/components/cellTypes/Editor/RelationEditor.tsx

@@ -4,11 +4,11 @@ import { useState } from "react";
 import Select from "react-select";
 import CustomTagsStyles from "components/styles/TagsStyles";
 import { c } from "helpers/StylesHelper";
-import { recordRowsFromRelation } from "helpers/RelationHelper";
+import { obtainInfoFromRelation } from "helpers/RelationHelper";
 import { TableColumn } from "cdm/FolderModel";
 import { Link } from "obsidian-dataview";
 import { OnChangeValue } from "react-select";
-import { DEFAULT_SETTINGS, StyleVariables } from "helpers/Constants";
+import { StyleVariables } from "helpers/Constants";
 
 const RelationEditor = (props: RelationEditorComponentProps) => {
   const { defaultCell, persistChange, relationCell } = props;
@@ -47,13 +47,11 @@ const RelationEditor = (props: RelationEditorComponentProps) => {
 
   useEffect(() => {
     setTimeout(async () => {
-      const relationRows = await recordRowsFromRelation(
-        tableColumn.config.related_note_path,
-        DEFAULT_SETTINGS.local_settings,
-        columnsInfo.getAllColumns()
+      const { recordRows } = await obtainInfoFromRelation(
+        tableColumn.config.related_note_path
       );
 
-      const multiOptions = Object.entries(relationRows).map(([key, value]) => ({
+      const multiOptions = Object.entries(recordRows).map(([key, value]) => ({
         label: value,
         value: key,
         color: StyleVariables.TEXT_NORMAL,

src/components/cellTypes/RelationCell.tsx

@@ -83,6 +83,15 @@ const RelationCell = (mdProps: CellComponentProps) => {
         columns: columnsInfo.getAllColumns(),
         ddbbConfig: configInfo.getLocalSettings(),
       });
+
+      if (tableColumn.config.bidirectional_relation) {
+        dataActions.updateBidirectionalRelation(
+          relationRow,
+          tableColumn,
+          oldPaths,
+          newPaths
+        );
+      }
     }
     setDirtyCell(false);
   };

src/components/modals/columnSettings/handlers/automations/BidirectionalRelationToggleHandler.ts

@@ -40,13 +40,15 @@ export class BidirectionalRelationToggleHandler extends AbstractHandlerClass<Col
         const { column, columnSettingsManager } = columnHandlerResponse;
         const { view } = columnSettingsManager.modal;
         const file = resolve_tfile(column.config.related_note_path);
-        const relationConfig = await new DatabaseInfo(file, view.plugin.settings.local_settings).build();
+        const relatedDB = await new DatabaseInfo(file, view.plugin.settings.local_settings).build();
+        // Check if the relation is already bidirectional
         if (toggleValue) {
-            relationConfig.yaml.columns[column.id] = view.diskConfig.yaml.columns[column.id];
+            const relatedColumn = { ...view.diskConfig.yaml.columns[column.id] };
+            relatedColumn.config.related_note_path = view.file.path;
+            relatedDB.yaml.columns[column.id] = relatedColumn;
         } else {
-            delete relationConfig.yaml.columns[column.id];
+            delete relatedDB.yaml.columns[column.id];
         }
-        await relationConfig.saveOnDisk();
-        // Check if the relation is already bidirectional
+        await relatedDB.saveOnDisk();
     }
 }

src/helpers/Constants.ts

@@ -250,7 +250,6 @@ export const DatabaseCore = Object.freeze({
 export const UpdateRowOptions = Object.freeze({
   COLUMN_VALUE: 'column_value',
   COLUMN_KEY: 'column_key',
-  INLINE_VALUE: 'inline_value',
   REMOVE_COLUMN: 'remove_column'
 });
 

src/helpers/RelationHelper.ts

@@ -1,12 +1,13 @@
-import { SMarkdownPage } from "obsidian-dataview";
+import { DataArray, Literal, SMarkdownPage } from "obsidian-dataview";
 import { DataviewService } from "services/DataviewService";
-import { DatabaseCore } from "helpers/Constants";
+import { DatabaseCore, DEFAULT_SETTINGS } from "helpers/Constants";
 import { resolve_tfile } from "helpers/FileManagement";
 import DatabaseInfo from "services/DatabaseInfo";
-import { sourceDataviewPages } from "helpers/VaultManagement";
+import { adapterTFilesToRows, sourceDataviewPages } from "helpers/VaultManagement";
 import { LocalSettings } from "cdm/SettingsModel";
-import { TableColumn } from "cdm/FolderModel";
-import { obtainColumnsFromRows } from "components/Columns";
+import { RowDataType, TableColumn } from "cdm/FolderModel";
+import { obtainColumnsFromFolder, obtainColumnsFromRows } from "components/Columns";
+import { TFile } from "obsidian";
 
 /**
  * Search for all databases in the vault returning a Record of all databases
@@ -23,20 +24,25 @@ export function recordAllDatabases(): Record<string, string> {
     });
     return avaliableDDBB;
 }
+type RelationInfo = {
+    recordRows: Record<string, string>;
+    ddbbFile: TFile,
+    ddbbInfo: DatabaseInfo,
+    relatedColumns: TableColumn[],
+    relatedRows: RowDataType[]
+}
 
-export async function recordRowsFromRelation(ddbbPath: string, ddbbConfig: LocalSettings, columns?: TableColumn[]): Promise<Record<string, string>> {
-    const relationRows: Record<string, string> = {};
+export async function obtainInfoFromRelation(ddbbPath: string): Promise<RelationInfo> {
+    const recordRows: Record<string, string> = {};
     const ddbbFile = resolve_tfile(ddbbPath);
-    const ddbbInfo = await new DatabaseInfo(ddbbFile, ddbbConfig).build();
-
-    const ddbbRows = await sourceDataviewPages(ddbbInfo.yaml.config, ddbbFile.parent.path, columns);
-    ddbbRows
-        .filter((page) => !page[DatabaseCore.FRONTMATTER_KEY])
-        .forEach((page) => {
-            const file = (page as SMarkdownPage).file;
-            relationRows[file.path] = file.name;
-        });
-    return relationRows;
+    const ddbbInfo = await new DatabaseInfo(ddbbFile, DEFAULT_SETTINGS.local_settings).build();
+    const relatedColumns = await obtainColumnsFromFolder(ddbbInfo.yaml.columns);
+    const relatedRows = await adapterTFilesToRows(ddbbFile, relatedColumns, ddbbInfo.yaml.config, ddbbInfo.yaml.filters);
+    relatedRows.forEach((row) => {
+        const file = row.__note__.getFile()
+        recordRows[file.path] = file.name;
+    });
+    return { recordRows, ddbbFile, ddbbInfo, relatedColumns, relatedRows }
 }
 
 export async function recordFieldsFromRelation(ddbbPath: string, ddbbConfig: LocalSettings, columns?: TableColumn[]): Promise<Record<string, string>> {

src/services/DatabaseInfo.ts

@@ -10,7 +10,7 @@ import { ConfigColumn, TableColumn } from 'cdm/FolderModel';
 import { FilterSettings, LocalSettings } from 'cdm/SettingsModel';
 import { isDatabaseNote } from 'helpers/VaultManagement';
 import databaseStringToYamlParser from 'IO/md/DatabaseStringToYamlParser';
-import { DATABASE_CONFIG } from 'helpers/Constants';
+import { DATABASE_CONFIG, DEFAULT_COLUMN_CONFIG } from 'helpers/Constants';
 import NoteContentActionBuilder from 'patterns/builders/NoteContentActionBuilder';
 
 export default class DatabaseInfo {
@@ -159,6 +159,13 @@ export default class DatabaseInfo {
         await this.saveOnDisk();
     }
 
+    async resetColumnConfig(columnId: string): Promise<void> {
+        const colToUpdate = this.yaml.columns[columnId];
+        colToUpdate.config = DEFAULT_COLUMN_CONFIG;
+        this.yaml.columns[columnId] = colToUpdate;
+        await this.saveOnDisk();
+    }
+
     async updateYaml<K extends keyof DatabaseYaml>(key: K, value: DatabaseYaml[K]): Promise<void> {
         this.yaml[key] = value;
         await this.saveOnDisk();