fixing rollup source fields on dv query

Author: RafaelGB

src/automations/Footer.ts

@@ -1,7 +1,6 @@
 import { DEFAULT_SETTINGS, FooterType } from "helpers/Constants";
 import { Literal } from "obsidian-dataview";
 import { DataviewService } from "services/DataviewService";
-import { DateTime } from "luxon";
 import { DbAutomationService } from "services/AutomationService";
 
 export default class Footer {

src/components/Columns.tsx

@@ -149,14 +149,14 @@ export async function obtainColumnsFromFile(
 }
 
 export async function obtainColumnsFromRows(
-  view: DatabaseView,
+  folderPath: string,
   ddbbConfig: LocalSettings,
   filters: FilterSettings,
   tableColumns: TableColumn[]
 ): Promise<string[]> {
   const columns: string[] = [];
   const rows = await obtainAllPossibleRows(
-    view.file.parent.path,
+    folderPath,
     ddbbConfig,
     filters,
     tableColumns

src/components/modals/columnSettings/handlers/rollups/RollupKeyHandler.ts

@@ -26,6 +26,7 @@ export class RollupKeyHandler extends AbstractHandlerClass<ColumnSettingsHandler
                 });
                 columnSettingsManager.modal.enableReset = true;
             };
+
             recordFieldsFromRelation(
                 relationColumn.config.related_note_path,
                 configState.info.getLocalSettings(),

src/components/modals/filters/handlers/DataviewFiltersComponent.tsx

@@ -20,7 +20,7 @@ const DataviewFiltersComponent = (props: DataviewFiltersProps) => {
       emptyFilterConditions.conditions = [];
       resolve(
         obtainColumnsFromRows(
-          view,
+          view.file.parent.path,
           configInfo.getLocalSettings(),
           emptyFilterConditions,
           columnsInfo.getAllColumns()

src/components/modals/newColumn/handlers/AddExistingColumnHandler.ts

@@ -21,7 +21,7 @@ export class AddExistingColumnHandler extends AbstractHandlerClass<AddColumnModa
 
         const promiseOfObtainColumnsFromRows = new Promise<string[]>((resolve) => {
             resolve(obtainColumnsFromRows(
-                addColumnModalManager.addColumnModal.view,
+                addColumnModalManager.addColumnModal.view.file.parent.path,
                 configState.info.getLocalSettings(),
                 configState.info.getFilters(),
                 columns

src/components/reducers/DataviewFilters.tsx

@@ -23,7 +23,7 @@ export default function EditFiltersButton(props: DataviewFiltersProps) {
       emptyFilterConditions.conditions = [];
       resolve(
         obtainColumnsFromRows(
-          view,
+          view.file.parent.path,
           configInfo.getLocalSettings(),
           emptyFilterConditions,
           columns

src/helpers/RelationHelper.ts

@@ -6,6 +6,7 @@ import DatabaseInfo from "services/DatabaseInfo";
 import { sourceDataviewPages } from "helpers/VaultManagement";
 import { LocalSettings } from "cdm/SettingsModel";
 import { TableColumn } from "cdm/FolderModel";
+import { obtainColumnsFromRows } from "components/Columns";
 
 /**
  * Search for all databases in the vault returning a Record of all databases
@@ -43,17 +44,16 @@ export async function recordFieldsFromRelation(ddbbPath: string, ddbbConfig: Loc
     const relationFields: 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 fields = await obtainColumnsFromRows(
+        ddbbFile.parent.path,
+        ddbbInfo.yaml.config,
+        ddbbInfo.yaml.filters,
+        columns);
     // get unique fields from all rows
-    ddbbRows.forEach((page) => {
+    fields.forEach((field) => {
         // iterate over all fields in the row
-        Object.keys(page).forEach((key) => {
-            if (relationFields[key] === undefined) {
-                relationFields[key] = key;
-            }
-        });
-    }
-    );
+        relationFields[field] = field;
+    });
     return relationFields;
 }

src/settings/handlers/columns/TemplateColumnsHandler.ts

@@ -73,7 +73,7 @@ export class TemplateColumnsHandler extends AbstractSettingsHandler {
                         .onClick(async (): Promise<void> => {
                             const recordColumns: Record<string, DatabaseColumn> = {};
                             const allColumns = await obtainColumnsFromRows(
-                                view,
+                                view.file.parent.path,
                                 view.diskConfig.yaml.config,
                                 view.diskConfig.yaml.filters,
                                 columns);