Merge branch '398-bug-i-cannot-parse-my-database-from-other-database'

Author: RafaelGB

src/DatabaseView.tsx

@@ -167,7 +167,7 @@ export class DatabaseView extends TextFileView implements HoverParent {
       // Obtain base information about columns
       this.columns = await obtainColumnsFromFolder(yamlColumns);
       this.rows = await adapterTFilesToRows(
-        this.file.parent.path,
+        this.file,
         this.columns,
         this.diskConfig.yaml.config,
         this.diskConfig.yaml.filters

src/automations/AutomationsHelper.ts

@@ -3,12 +3,7 @@ import { FormulaGenerator } from "automations/FormulaGenerator";
 import { AutomationError, showDBError } from "errors/ErrorTypes";
 
 export async function obtainFormulasFromFolder(config: LocalSettings) {
-    try {
-        const generator = new FormulaGenerator(config);
-        return await generator.generate_object();
-    } catch (e) {
-        showDBError(AutomationError.LoadFormulas, e);
-        return {};
-    }
+    const generator = new FormulaGenerator(config);
+    return await generator.generate_object();
 }
 

src/automations/formula_functions/ScriptFunctions.ts

@@ -3,6 +3,7 @@ import { IGenerateObject } from "automations/IGenerateObject";
 import { get_tfiles_from_folder } from "helpers/FileManagement";
 import { LocalSettings } from "cdm/SettingsModel";
 import { LOGGER } from "services/Logger";
+import { AutomationError, showDBError } from "errors/ErrorTypes";
 
 export class ScriptFunctions implements IGenerateObject {
     constructor(private config: LocalSettings) { }
@@ -21,10 +22,17 @@ export class ScriptFunctions implements IGenerateObject {
 
         for (const file of files) {
             if (file.extension.toLowerCase() === "js") {
-                await this.load_script_function(
-                    file,
-                    script_functions
-                );
+                try {
+                    await this.load_script_function(
+                        file,
+                        script_functions
+                    );
+                } catch (e) {
+                    showDBError({
+                        error: AutomationError.LoadFormulas.error,
+                        solution: `check your ${file.path} js file code`
+                    }, e);
+                }
             }
         }
         return script_functions;

src/helpers/VaultManagement.ts

@@ -73,12 +73,13 @@ export function getNormalizedPath(path: string): NormalizedPath {
  * @param folderPath 
  * @returns 
  */
-export async function adapterTFilesToRows(folderPath: string, columns: TableColumn[], ddbbConfig: LocalSettings, filters: FilterSettings): Promise<Array<RowDataType>> {
+export async function adapterTFilesToRows(dbFile: TFile, columns: TableColumn[], ddbbConfig: LocalSettings, filters: FilterSettings): Promise<Array<RowDataType>> {
+  const folderPath = dbFile.parent.path;
   LOGGER.debug(`=> adapterTFilesToRows.  folderPath:${folderPath}`);
   const rows: Array<RowDataType> = [];
 
   let folderFiles = await sourceDataviewPages(folderPath, ddbbConfig, columns);
-  folderFiles = folderFiles.where(p => !p[DatabaseCore.FRONTMATTER_KEY]);
+  folderFiles = folderFiles.where(p => (p.file as any).path !== dbFile.path);
   // Config filters asociated with the database
   if (filters.enabled && filters.conditions.length > 0) {
     folderFiles = folderFiles.where(p => DataviewService.filter(filters.conditions, p, ddbbConfig));

src/services/DatabaseInfo.ts

@@ -49,7 +49,6 @@ export default class DatabaseInfo {
         }
 
         this.yaml = response.yaml;
-        //await this.saveOnDisk();
         LOGGER.info(`<=initDatabaseconfigYaml`);
     }
 

src/services/MarkdownPostProcessorService.ts

@@ -135,7 +135,7 @@ export class PreviewDatabaseModeService {
         // Obtain base information about columns
         const columns = await obtainColumnsFromFolder(yamlColumns);
         const rows = await adapterTFilesToRows(
-            dbFile.parent.path,
+            dbFile,
             columns,
             databaseDisk.yaml.config,
             databaseDisk.yaml.filters

src/stateManagement/data/handlers/DataviewRefreshHandlerAction.ts

@@ -9,7 +9,7 @@ export default class DataviewRefreshHandlerAction extends AbstractTableAction<Da
         const { set, view, implementation } = tableActionResponse;
         implementation.actions.dataviewRefresh = async (column: TableColumn[], ddbbConfig: LocalSettings, filterConfig: FilterSettings) => {
             const refreshedRows = await adapterTFilesToRows(
-                view.file.parent.path,
+                view.file,
                 column,
                 ddbbConfig,
                 filterConfig