improving behaviour

Author: RafaelGB

src/helpers/FileManagement.ts

@@ -70,14 +70,14 @@ export function destination_folder(view: DatabaseView, ddbbConfig: LocalSettings
     return destination_folder;
 }
 
-export function inline_regex_target_in_function_of(position: string, columnId: string, newValue: string) {
+export function inline_regex_target_in_function_of(position: string, columnId: string, newValue: string, contentHasFrontmatter: boolean) {
     let regex_target = "";
     switch (position) {
         case INLINE_POSITION.BOTTOM:
-            regex_target = `$1$2${columnId}:: ${newValue}`;
+            regex_target = contentHasFrontmatter ? `$1$2\n${columnId}:: ${newValue}` : `$1\n${columnId}:: ${newValue}`;
             break;
         default:
-            regex_target = `$1${columnId}:: ${newValue}\n$2`;
+            regex_target = contentHasFrontmatter ? `$1\n${columnId}:: ${newValue}$2` : `${columnId}:: ${newValue}\n$1`;
     }
     return regex_target;
 }

src/helpers/VaultManagement.ts

@@ -232,7 +232,7 @@ export async function updateRowFile(file: TFile, columnId: string, newValue: Lit
 
   async function persistFrontmatter(deletedColumn?: string): Promise<void> {
     // If the frontmatter is empty, do not persist it
-    if (Object.keys(rowFields.frontmatter).length > 0) {
+    if (Object.keys(rowFields.frontmatter).length > 0 || deletedColumn !== undefined) {
       const frontmatterGroupRegex = contentHasFrontmatter ? /^---[\s\S]+?---/g : /(^[\s\S]*$)/g;
       const frontmatterFieldsText = parseFrontmatterFieldsToString(rowFields, ddbbConfig, deletedColumn);
       const noteObject = {
@@ -265,7 +265,7 @@ export async function updateRowFile(file: TFile, columnId: string, newValue: Lit
       newValue: `$3$6$7$8 ${DataviewService.parseLiteral(newValue, InputType.MARKDOWN, ddbbConfig, true)}$10$11`
     };
     await VaultManagerDB.editNoteContent(noteObject);
-    await persistFrontmatter();
+    await persistFrontmatter(columnId);
   }
 
   async function inlineColumnKey(): Promise<void> {
@@ -288,18 +288,19 @@ export async function updateRowFile(file: TFile, columnId: string, newValue: Lit
   }
 
   async function inlineAddColumn(): Promise<void> {
-    const inlineAddRegex = new RegExp(`(^---[\\s\\S]+?---\\n)+([\\s\\S]+?$)`, 'g');
+    const inlineAddRegex = contentHasFrontmatter ? new RegExp(`(^---[\\s\\S]+?---)+([\\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()
+        DataviewService.parseLiteral(newValue, InputType.MARKDOWN, ddbbConfig).toString(),
+        contentHasFrontmatter
       )
     };
-    await persistFrontmatter();
+    await persistFrontmatter(columnId);
     await VaultManagerDB.editNoteContent(noteObject);
   }