Merge branch 'testing-new-editing'

Author: RafaelGB

src/components/NavBar.tsx

@@ -93,7 +93,6 @@ export function NavBar(navBarProps: NavBarProps) {
             PaperProps={{
               style: {
                 maxHeight: NavBarConfig.ITEM_HEIGHT * 4.5,
-                width: "20ch",
               },
             }}
             MenuListProps={{

src/components/headerActions/handlers/buttons/RemoveColumnHandlerAction.tsx

@@ -4,8 +4,8 @@ import TrashIcon from "components/img/Trash";
 import React from "react";
 import { UpdateRowOptions } from "helpers/Constants";
 import { RowDataType, TableColumn } from "cdm/FolderModel";
-import { updateRowFileProxy } from "helpers/VaultManagement";
 import headerButtonComponent from "components/headerActions/HeaderButtonComponent";
+import { EditEngineService } from "services/EditEngineService";
 
 export default class RemoveColumnHandlerAction extends AbstractHeaderAction {
   globalHeaderActionResponse: HeaderActionResponse;
@@ -49,7 +49,7 @@ function removeButton(headerActionResponse: HeaderActionResponse) {
     if (ddbbConfig.remove_field_when_delete_column) {
       Promise.all(
         rows.map(async (row: RowDataType) => {
-          updateRowFileProxy(
+          EditEngineService.updateRowFileProxy(
             row.__note__.getFile(),
             hooks.keyState,
             undefined, // delete does not need this field

src/errors/ErrorTypes.ts

@@ -1,6 +1,26 @@
+import { Notice } from "obsidian";
+import { LOGGER } from "services/Logger";
+
 /**
  * REPOSITORY OF POSSIBLE ERRORS IN FUNCTION OF THE AMBIT
  */
-export enum EditionError {
-    YamlRead = `[Error reading yaml file](https://rafaelgb.github.io/obsidian-db-folder/faq/#possible-edition-issues-while-you-are-saving-a-cell-change)`,
-}
+type DBError = {
+    error: string;
+    solution: string;
+}
+
+type DBErrorTypeEnum = {
+    [key: string]: DBError;
+}
+export function showDBError(err: DBError, exception: Error) {
+    LOGGER.error(`${err.error}. See ${err.solution}`, exception);
+    new Notice(`${err.error}. See ${err.solution}`, 6000);
+}
+
+
+export const EditionError: DBErrorTypeEnum = Object.freeze({
+    YamlRead: {
+        error: `Error reading yaml file`,
+        solution: `https://rafaelgb.github.io/obsidian-db-folder/faq/#possible-edition-issues-while-you-are-saving-a-cell-change`,
+    }
+});

src/errors/HelperException.ts

@@ -7,4 +7,4 @@ export default class HelperException extends DbFolderException {
     constructor(message: string) {
         super(message, {});
     }
-}
+}

src/helpers/FileManagement.ts

@@ -74,10 +74,10 @@ export function inline_regex_target_in_function_of(position: string, columnId: s
     let regex_target = "";
     switch (position) {
         case INLINE_POSITION.BOTTOM:
-            regex_target = contentHasFrontmatter ? `$1$2${columnId}:: ${newValue}` : `$1${columnId}:: ${newValue}`;
+            regex_target = contentHasFrontmatter ? `$1$2\n${columnId}:: ${newValue}` : `$1\n${columnId}:: ${newValue}`;
             break;
         default:
-            regex_target = contentHasFrontmatter ? `$1${columnId}:: ${newValue}\n$2` : `${columnId}:: ${newValue}\n$1`;
+            regex_target = contentHasFrontmatter ? `$1\n${columnId}:: ${newValue}$2` : `${columnId}:: ${newValue}\n$1`;
     }
     return regex_target;
 }

src/helpers/VaultManagement.ts

@@ -1,19 +1,15 @@
 import { RowDataType, NormalizedPath, TableColumn } from 'cdm/FolderModel';
 import { Notice, TFile } from 'obsidian';
-import { VaultManagerDB } from 'services/FileManagerService';
 import { LOGGER } from "services/Logger";
 import NoteInfo from 'services/NoteInfo';
-import { DatabaseCore, InputType, SourceDataTypes, UpdateRowOptions } from "helpers/Constants";
-import { generateDataviewTableQuery, inlineRegexInFunctionOf } from 'helpers/QueryHelper';
-import obtainRowDatabaseFields from 'parsers/FileToRowDatabaseFields';
-import { parseFrontmatterFieldsToString } from 'parsers/RowDatabaseFieldsToFile';
+import { DatabaseCore, SourceDataTypes, UpdateRowOptions } from "helpers/Constants";
+import { generateDataviewTableQuery } from 'helpers/QueryHelper';
 import { DataviewService } from 'services/DataviewService';
 import { Literal } from 'obsidian-dataview/lib/data-model/value';
 import { DataArray } from 'obsidian-dataview/lib/api/data-array';
-import { EditionError } from 'errors/ErrorTypes';
 import { FilterSettings, LocalSettings } from 'cdm/SettingsModel';
 import { NoteInfoPage } from 'cdm/DatabaseModel';
-import { inline_regex_target_in_function_of } from './FileManagement';
+import { EditEngineService } from 'services/EditEngineService';
 
 const noBreakSpace = /\u00A0/g;
 
@@ -164,178 +160,6 @@ async function obtainQueryResult(query: string, folderPath: string): Promise<Dat
   }
 }
 
-export async function updateRowFileProxy(file: TFile, columnId: string, newValue: Literal, columns: TableColumn[], ddbbConfig: LocalSettings, option: string): Promise<void> {
-  await updateRowFile(file, columnId, newValue, columns, ddbbConfig, option).catch((err) => {
-    throw err;
-  });
-}
-
-/**
- * Modify the file asociated to the row in function of input options
- * @param asociatedCFilePathToCell 
- * @param columnId 
- * @param newColumnValue 
- * @param option 
- */
-export async function updateRowFile(file: TFile, columnId: string, newValue: Literal, columns: TableColumn[], ddbbConfig: LocalSettings, option: string): Promise<void> {
-  LOGGER.info(`=>updateRowFile. file: ${file.path} | columnId: ${columnId} | newValue: ${newValue} | option: ${option}`);
-  const content = await VaultManagerDB.obtainContentFromTfile(file);
-  const contentHasFrontmatter = hasFrontmatter(content);
-  const frontmatterKeys = VaultManagerDB.obtainFrontmatterKeys(content);
-  const rowFields = obtainRowDatabaseFields(file, columns, frontmatterKeys);
-  const column = columns.find(
-    c => c.key === (UpdateRowOptions.COLUMN_KEY === option ? newValue : columnId)
-  );
-  /*******************************************************************************************
-   *                              FRONTMATTER GROUP FUNCTIONS
-   *******************************************************************************************/
-  // Modify value of a column
-  async function columnValue(): Promise<void> {
-    if (column.config.isInline) {
-      await inlineColumnEdit();
-      return;
-    }
-    rowFields.frontmatter[columnId] = DataviewService.parseLiteral(newValue, InputType.MARKDOWN, ddbbConfig);
-    await persistFrontmatter();
-    await inlineRemoveColumn();
-  }
-
-  // Modify key of a column
-  async function columnKey(): Promise<void> {
-    if (column.config.isInline) {
-      // Go to inline mode
-      await inlineColumnKey();
-      return;
-    }
-    // If field does not exist yet, ignore it
-    if (!Object.prototype.hasOwnProperty.call(rowFields.frontmatter, columnId)
-      && !Object.prototype.hasOwnProperty.call(rowFields.inline, columnId)) {
-      return;
-    }
-
-    // Check if the column is already in the frontmatter
-    // assign an empty value to the new key
-    rowFields.frontmatter[DataviewService.parseLiteral(newValue, InputType.TEXT, ddbbConfig) as string] = rowFields.frontmatter[columnId] ?? "";
-    delete rowFields.frontmatter[columnId];
-    await persistFrontmatter(columnId);
-  }
-
-  // Remove a column
-  async function removeColumn(): Promise<void> {
-    if (column.config.isInline) {
-      await inlineRemoveColumn();
-      return;
-    }
-    delete rowFields.frontmatter[columnId];
-    await persistFrontmatter(columnId);
-  }
-
-  async function persistFrontmatter(deletedColumn?: string): Promise<void> {
-    const frontmatterGroupRegex = contentHasFrontmatter ? /^---[\s\S]+?---\n/g : /(^[\s\S]*$)/g;
-    const frontmatterFieldsText = parseFrontmatterFieldsToString(rowFields, ddbbConfig, deletedColumn);
-    const noteObject = {
-      action: 'replace',
-      file: file,
-      regexp: frontmatterGroupRegex,
-      newValue: contentHasFrontmatter ? `${frontmatterFieldsText}` : `${frontmatterFieldsText}$1`,
-    };
-    await VaultManagerDB.editNoteContent(noteObject);
-  }
-
-  /*******************************************************************************************
-   *                              INLINE GROUP FUNCTIONS
-   *******************************************************************************************/
-  async function inlineColumnEdit(): Promise<void> {
-    const inlineFieldRegex = inlineRegexInFunctionOf(columnId);
-    if (!inlineFieldRegex.test(content)) {
-      await inlineAddColumn();
-      return;
-    }
-    /* Regex explanation
-    * group 1 is inline field checking that starts in new line
-    * group 2 is the current value of inline field
-    */
-    const noteObject = {
-      action: 'replace',
-      file: file,
-      regexp: inlineFieldRegex,
-      newValue: `$3$6$7$8 ${DataviewService.parseLiteral(newValue, InputType.MARKDOWN, ddbbConfig, true)}$10$11`
-    };
-    await VaultManagerDB.editNoteContent(noteObject);
-    await persistFrontmatter(columnId);
-  }
-
-  async function inlineColumnKey(): Promise<void> {
-    if (!Object.keys(rowFields.inline).contains(columnId)) {
-      return;
-    }
-    /* Regex explanation
-    * group 1 is inline field checking that starts in new line
-    * group 2 is the current value of inline field
-    */
-    const inlineFieldRegex = inlineRegexInFunctionOf(columnId);
-    const noteObject = {
-      action: 'replace',
-      file: file,
-      regexp: inlineFieldRegex,
-      newValue: `$6$7${newValue}:: $4$9$10$11`
-    };
-    await VaultManagerDB.editNoteContent(noteObject);
-    await persistFrontmatter();
-  }
-
-  async function inlineAddColumn(): Promise<void> {
-    const inlineAddRegex = contentHasFrontmatter ? new RegExp(`(^---[\\s\\S]+?---\n)+([\\s\\S]*$)`, 'g') : new RegExp(`(^[\\s\\S]*$)`, 'g');
-    const noteObject = {
-      action: 'replace',
-      file: file,
-      regexp: inlineAddRegex,
-      newValue: inline_regex_target_in_function_of(
-        ddbbConfig.inline_new_position,
-        columnId,
-        DataviewService.parseLiteral(newValue, InputType.MARKDOWN, ddbbConfig).toString(),
-        contentHasFrontmatter
-      )
-    };
-    await persistFrontmatter(columnId);
-    await VaultManagerDB.editNoteContent(noteObject);
-  }
-
-  async function inlineRemoveColumn(): Promise<void> {
-    /* Regex explanation
-    * group 1 is inline field checking that starts in new line
-    * group 2 is the current value of inline field
-    */
-    const inlineFieldRegex = inlineRegexInFunctionOf(columnId);
-    const noteObject = {
-      action: 'replace',
-      file: file,
-      regexp: inlineFieldRegex,
-      newValue: `$6$11`
-    };
-    await VaultManagerDB.editNoteContent(noteObject);
-  }
-  try {
-    // Record of options
-    const updateOptions: Record<string, any> = {};
-    updateOptions[UpdateRowOptions.COLUMN_VALUE] = columnValue;
-    updateOptions[UpdateRowOptions.COLUMN_KEY] = columnKey;
-    updateOptions[UpdateRowOptions.REMOVE_COLUMN] = removeColumn;
-    updateOptions[UpdateRowOptions.INLINE_VALUE] = inlineColumnEdit;
-    // Execute action
-    if (updateOptions[option]) {
-      // Then execute the action
-      await updateOptions[option]();
-    } else {
-      throw `Error: option ${option} not supported yet`;
-    }
-  } catch (e) {
-    LOGGER.error(`${EditionError.YamlRead}`, e);
-    new Notice(`${EditionError.YamlRead} : ${e.message}`, 6000);
-  }
-  LOGGER.info(`<= updateRowFile.asociatedFilePathToCell: ${file.path} | columnId: ${columnId} | newValue: ${newValue} | option: ${option} `);
-}
-
 /**
  * After update a row value, move the file to the new folder path
  * @param folderPath 
@@ -348,7 +172,7 @@ export async function moveFile(folderPath: string, info: {
   columns: TableColumn[],
   ddbbConfig: LocalSettings
 }): Promise<void> {
-  await updateRowFile(
+  await EditEngineService.updateRowFileProxy(
     info.file,
     info.id,
     info.value,

src/parsers/RowDatabaseFieldsToFile.ts

@@ -12,7 +12,7 @@ export const parseFrontmatterFieldsToString = (databaseFields: RowDatabaseFields
         }
     });
     if (array.length > 0) {
-        array = [`---`, ...array, `---\n`];
+        array = [`---`, ...array, `---`];
     }
     return array.join('\n');
 }