Merge branch 'issue126'

Author: RafaelGB

src/cdm/SettingsModel.ts

@@ -31,6 +31,7 @@ export interface LocalSettings {
     show_metadata_modified: boolean;
     show_metadata_tasks: boolean;
     source_form_result: string;
+    source_destination_path: string;
     source_data: string;
     sticky_first_column: boolean;
     row_templates_folder: string;

src/helpers/Constants.ts

@@ -312,6 +312,7 @@ export const DEFAULT_SETTINGS: DatabaseSettings = {
     show_metadata_tasks: false,
     source_data: SourceDataTypes.CURRENT_FOLDER,
     source_form_result: 'root',
+    source_destination_path: '/',
     frontmatter_quote_wrap: false,
     row_templates_folder: '/',
     current_row_template: '',

src/settings/handlers/source/SourceFormHandler.ts

@@ -6,7 +6,8 @@ import { Notice, Setting } from "obsidian";
 import { DataviewService } from "services/DataviewService";
 import { AbstractSettingsHandler, SettingHandlerResponse } from "settings/handlers/AbstractSettingHandler";
 import { add_dropdown } from "settings/SettingsComponents";
-import { FileSuggest } from "settings/suggesters/FileSuggester";
+import { filePathsRecordSuggester, FileSuggest } from "settings/suggesters/FileSuggester";
+import { FolderSuggest } from "settings/suggesters/FolderSuggester";
 
 export class SourceFormHandler extends AbstractSettingsHandler {
     settingTitle: string = 'Form in function of source data';
@@ -18,24 +19,7 @@ export class SourceFormHandler extends AbstractSettingsHandler {
                 break;
             case SourceDataTypes.OUTGOING_LINK:
             case SourceDataTypes.INCOMING_LINK:
-                const filePaths: Record<string, string> = {}
-                app.vault.getMarkdownFiles().forEach(file => { filePaths[file.path] = file.basename });
-                const source_form_promise = async (value: string): Promise<void> => {
-                    // update settings
-                    view.diskConfig.updateConfig({ source_form_result: value });
-                };
-                new Setting(containerEl)
-                    .setName('Select a file')
-                    .setDesc('Select file from vault to be used as source of data.')
-                    .addSearch((cb) => {
-                        new FileSuggest(
-                            cb.inputEl,
-                            view.file.parent.path
-                        );
-                        cb.setPlaceholder("Example: folder1/template_file")
-                            .setValue(view.diskConfig.yaml.config.source_form_result)
-                            .onChange(source_form_promise);
-                    });
+                outgoingAndIncomingHandler(view, containerEl);
                 break;
             case SourceDataTypes.QUERY:
                 queryHandler(view, containerEl, columns);
@@ -70,9 +54,30 @@ function tagHandler(view: DatabaseView, containerEl: HTMLElement) {
             tagRecords,
             source_form_promise
         );
+        destinationFolderHandler(view, containerEl);
     }
 }
 
+function outgoingAndIncomingHandler(view: DatabaseView, containerEl: HTMLElement) {
+    const source_form_promise = async (value: string): Promise<void> => {
+        // update settings
+        view.diskConfig.updateConfig({ source_form_result: value });
+    };
+    new Setting(containerEl)
+        .setName('Select a file')
+        .setDesc('Select file from vault to be used as source of data.')
+        .addSearch((cb) => {
+            new FileSuggest(
+                cb.inputEl,
+                view.file.parent.path
+            );
+            cb.setPlaceholder("Example: folder1/template_file")
+                .setValue(view.diskConfig.yaml.config.source_form_result)
+                .onChange(source_form_promise);
+        });
+    destinationFolderHandler(view, containerEl);
+}
+
 function queryHandler(view: DatabaseView, containerEl: HTMLElement, columns: TableColumn[]) {
     const query_promise = async (value: string): Promise<void> => {
         // update settings
@@ -104,4 +109,23 @@ function queryHandler(view: DatabaseView, containerEl: HTMLElement, columns: Tab
                     }
                 });
         });
+    destinationFolderHandler(view, containerEl);
+}
+
+function destinationFolderHandler(view: DatabaseView, containerEl: HTMLElement) {
+    const source_form_promise = async (value: string): Promise<void> => {
+        // update settings
+        view.diskConfig.updateConfig({ source_destination_path: value });
+    };
+    new Setting(containerEl)
+        .setName('Select destination folder')
+        .setDesc('Select the destination of new entries for this source')
+        .addSearch((cb) => {
+            new FolderSuggest(
+                cb.inputEl
+            );
+            cb.setPlaceholder("Example: path/to/folder")
+                .setValue(view.diskConfig.yaml.config.source_destination_path)
+                .onChange(source_form_promise);
+        });
 }

src/settings/suggesters/FileSuggester.ts

@@ -52,4 +52,10 @@ export class FileSuggest extends TextInputSuggest<TFile> {
         this.inputEl.trigger("input");
         this.close();
     }
+}
+
+export function filePathsRecordSuggester(): Record<string, string> {
+    const filePaths: Record<string, string> = {}
+    app.vault.getMarkdownFiles().forEach(file => { filePaths[file.path] = file.basename });
+    return filePaths;
 }

src/stateManagement/data/handlers/AddRowHandlerAction.ts

@@ -2,7 +2,9 @@ import { RowDatabaseFields } from "cdm/DatabaseModel";
 import { RowDataType, TableColumn } from "cdm/FolderModel";
 import { LocalSettings } from "cdm/SettingsModel";
 import { DataState, TableActionResponse } from "cdm/TableStateInterface";
-import { MetadataColumns } from "helpers/Constants";
+import { DatabaseView } from "DatabaseView";
+import { MetadataColumns, SourceDataTypes } from "helpers/Constants";
+import { resolve_tfolder } from "helpers/FileManagement";
 import { DateTime } from "luxon";
 import { Literal } from "obsidian-dataview";
 import { VaultManagerDB } from "services/FileManagerService";
@@ -13,13 +15,14 @@ export default class AddRowlHandlerAction extends AbstractTableAction<DataState>
     handle(tableActionResponse: TableActionResponse<DataState>): TableActionResponse<DataState> {
         const { view, set, implementation } = tableActionResponse;
         implementation.actions.addRow = (filename: string, columns: TableColumn[], ddbbConfig: LocalSettings) => set((state) => {
+            const destination_folder = this.destination_folder(view, ddbbConfig);
             let trimedFilename = filename.replace(/\.[^/.]+$/, "").trim();
-            let filepath = `${view.file.parent.path}/${trimedFilename}.md`;
+            let filepath = `${destination_folder}/${trimedFilename}.md`;
             // Validate possible duplicates
             let sufixOfDuplicate = 0;
             while (state.rows.find((row) => row.__note__.filepath === filepath)) {
                 sufixOfDuplicate++;
-                filepath = `${view.file.parent.path}/${trimedFilename}-${sufixOfDuplicate}.md`;
+                filepath = `${destination_folder}/${trimedFilename}-${sufixOfDuplicate}.md`;
             }
             if (sufixOfDuplicate > 0) {
                 trimedFilename = `${trimedFilename}-${sufixOfDuplicate}`;
@@ -37,7 +40,7 @@ export default class AddRowlHandlerAction extends AbstractTableAction<DataState>
                 });
             // Add note to persist row
             VaultManagerDB.create_markdown_file(
-                view.file.parent,
+                resolve_tfolder(destination_folder),
                 trimedFilename,
                 rowRecord,
                 ddbbConfig
@@ -62,4 +65,17 @@ export default class AddRowlHandlerAction extends AbstractTableAction<DataState>
         tableActionResponse.implementation = implementation;
         return this.goNext(tableActionResponse);
     }
+    destination_folder(view: DatabaseView, ddbbConfig: LocalSettings): string {
+        let destination_folder = view.file.parent.path;
+        switch (ddbbConfig.source_data) {
+            case SourceDataTypes.TAG:
+            case SourceDataTypes.OUTGOING_LINK:
+            case SourceDataTypes.INCOMING_LINK:
+                destination_folder = ddbbConfig.source_destination_path;
+                break;
+            default:
+            //Current folder
+        }
+        return destination_folder;
+    }
 }