Merge branch 'master' into 574-support-of-obsidian-projects

Author: RafaelGB

src/components/cellTypes/Editor/RelationEditor.tsx

@@ -8,7 +8,7 @@ import { recordRowsFromRelation } from "helpers/RelationHelper";
 import { TableColumn } from "cdm/FolderModel";
 import { Link } from "obsidian-dataview";
 import { OnChangeValue } from "react-select";
-import { StyleVariables } from "helpers/Constants";
+import { DEFAULT_SETTINGS, StyleVariables } from "helpers/Constants";
 
 const RelationEditor = (props: RelationEditorComponentProps) => {
   const { defaultCell, persistChange, relationCell } = props;
@@ -49,7 +49,7 @@ const RelationEditor = (props: RelationEditorComponentProps) => {
   const relationRowsCallBack = useCallback(async () => {
     const relationRows = await recordRowsFromRelation(
       tableColumn.config.related_note_path,
-      configInfo.getLocalSettings(),
+      DEFAULT_SETTINGS.local_settings,
       columnsInfo.getAllColumns()
     );
     const multiOptions = Object.entries(relationRows).map(([key, value]) => ({

src/helpers/RelationHelper.ts

@@ -30,8 +30,9 @@ export async function recordRowsFromRelation(ddbbPath: string, ddbbConfig: Local
     const relationRows: Record<string, string> = {};
     const ddbbFile = resolve_tfile(ddbbPath);
     const ddbbInfo = new DatabaseInfo(ddbbFile);
-    ddbbInfo.initDatabaseconfigYaml(ddbbConfig);
-    const ddbbRows = await sourceDataviewPages(ddbbConfig, ddbbFile.parent.path, columns);
+    await ddbbInfo.initDatabaseconfigYaml(ddbbConfig);
+
+    const ddbbRows = await sourceDataviewPages(ddbbInfo.yaml.config, ddbbFile.parent.path, columns);
     ddbbRows
         .filter((page) => page[DatabaseCore.FRONTMATTER_KEY] === undefined)
         .forEach((page) => {

src/parsers/handlers/unmarshall/UnmarshallFiltersHandler.ts

@@ -47,7 +47,7 @@ export class UnmarshallFiltersHandler extends AbstractDiskHandler {
             // Is a simple filter
             this.localDisk.push(`${YAML_INDENT.repeat(indentLevel)}- field: ${(filter as AtomicFilter).field}`);
             this.localDisk.push(`${YAML_INDENT.repeat(indentLevel)}  operator: ${(filter as AtomicFilter).operator}`);
-            this.localDisk.push(`${YAML_INDENT.repeat(indentLevel)}  value: ${(filter as AtomicFilter).value ?? ""}`);
+            this.localDisk.push(`${YAML_INDENT.repeat(indentLevel)}  value: "${(filter as AtomicFilter).value ?? ''}"`);
         }
     }
 }

src/services/EditEngineService.ts

@@ -202,7 +202,7 @@ class EditEngine {
                 newValue: inline_regex_target_in_function_of(
                     ddbbConfig.inline_new_position,
                     columnId,
-                    ParseService.parseLiteral(newValue, InputType.MARKDOWN, ddbbConfig).toString(),
+                    ParseService.parseLiteral(newValue, InputType.MARKDOWN, ddbbConfig, true).toString(),
                     contentHasFrontmatter
                 )
             };

src/services/ParseService.ts

@@ -249,7 +249,13 @@ class Parse {
                 break;
             case 'array':
                 auxMarkdown = wrapped.value
-                    .map(v => this.parseToMarkdown(DataviewService.getDataviewAPI().value.wrapValue(v), localSettings, isInline))
+                    .map(
+                        v => this.parseToMarkdown(
+                            DataviewService.wrapLiteral(v),
+                            localSettings,
+                            isInline
+                        )
+                    )
                     .join(', ');
                 break;
             case 'link':

src/stateManagement/data/handlers/RenameFileHandlerAction.ts

@@ -3,6 +3,8 @@ import { PromptModal } from "components/modals/PromptModal";
 import { MetadataColumns } from "helpers/Constants";
 import { resolve_tfile } from "helpers/FileManagement";
 import { Notice } from "obsidian";
+import { Link } from "obsidian-dataview";
+import { DataviewService } from "services/DataviewService";
 import { AbstractTableAction } from "stateManagement/AbstractTableAction";
 
 export default class RenameFileHandlerAction extends AbstractTableAction<DataState> {
@@ -11,17 +13,16 @@ export default class RenameFileHandlerAction extends AbstractTableAction<DataSta
         implementation.actions.renameFile = async (rowIndex: number) => {
             try {
                 const rowToRename = get().rows[rowIndex];
-
-                const oldFile = rowToRename[MetadataColumns.FILE].toString().split("|");
-                const prompt_filename = new PromptModal(oldFile[0], "");
+                const fileLink = rowToRename[MetadataColumns.FILE] as Link;
+                const oldFile = fileLink.fileName();
+                const prompt_filename = new PromptModal(oldFile, "");
 
                 const renameFilePromise = (newFilename: string) => {
-                    const oldTfile = resolve_tfile(oldFile[1]);
+                    const oldTfile = resolve_tfile(fileLink.path);
                     const newPath = `${oldTfile.parent.path}/${newFilename}.md`;
                     app.vault.rename(oldTfile, newPath);
-                    const newFile = `${newFilename}|${newPath}`;
                     rowToRename.__note__.filepath = newPath;
-                    rowToRename[MetadataColumns.FILE] = newFile;
+                    rowToRename[MetadataColumns.FILE] = DataviewService.getDataviewAPI().fileLink(newPath);
                     set((state) => {
                         return {
                             rows: [...state.rows.slice(0, rowIndex), rowToRename, ...state.rows.slice(rowIndex + 1)]