Merge branch 'improved_rollup_and_footer'

RafaelGB · RafaelGB · commit 4c7cb7610e54 · 2023-01-03T02:51:45.000+01:00
diff --git a/src/DatabaseView.tsx b/src/DatabaseView.tsx
@@ -37,7 +37,7 @@ import {
   Menu,
 } from "obsidian";
 import { createRoot, Root } from "react-dom/client";
-import { DbAutomationService } from "services/AutomationService";
+import { Db } from "services/CoreService";
 import DatabaseInfo from "services/DatabaseInfo";
 import { LOGGER } from "services/Logger";
 import { SettingsModal } from "Settings";
@@ -172,9 +172,7 @@ export class DatabaseView extends TextFileView implements HoverParent {
       );
       this.initial = obtainInitialType(this.columns);
 
-      this.formulas = await DbAutomationService.buildFns(
-        this.diskConfig.yaml.config
-      );
+      this.formulas = await Db.buildFns(this.diskConfig.yaml.config);
       // Define table properties
       this.shadowColumns = this.columns.filter((col) => col.skipPersist);
       const tableProps: TableDataType = {
diff --git a/src/automations/Footer.ts b/src/automations/Footer.ts
@@ -1,8 +1,7 @@
 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";
+import { Db } from "services/CoreService";
 
 export default class Footer {
     constructor(public readonly colValues: Literal[]) { }
@@ -120,7 +119,7 @@ export default class Footer {
      * @returns 
      */
     public sum(): string {
-        const total = DbAutomationService.coreFns.numbers.sum(this.colValues);
+        const total = Db.coreFns.numbers.sum(this.colValues);
         return `Total: ${total}`;
     }
 
@@ -129,7 +128,7 @@ export default class Footer {
      * @returns 
      */
     public min(): string {
-        const min = DbAutomationService.coreFns.numbers.min(this.colValues);
+        const min = Db.coreFns.numbers.min(this.colValues);
         return `Min: ${min}`;
     }
 
@@ -138,7 +137,7 @@ export default class Footer {
      * @returns 
      */
     public max(): string {
-        const max = DbAutomationService.coreFns.numbers.max(this.colValues);
+        const max = Db.coreFns.numbers.max(this.colValues);
         return `Max: ${max}`;
     }
 
@@ -150,7 +149,7 @@ export default class Footer {
      * @returns 
      */
     public earliestDate(): string {
-        const earliest = DbAutomationService.coreFns.luxon.earliest(this.colValues);
+        const earliest = Db.coreFns.luxon.earliest(this.colValues);
         return earliest.isValid ?
             `Earliest: ${earliest.toFormat(DEFAULT_SETTINGS.local_settings.datetime_format)}` :
             null;
@@ -161,7 +160,7 @@ export default class Footer {
      * @returns 
      */
     public latestDate(): string {
-        const latest = DbAutomationService.coreFns.luxon.latest(this.colValues);
+        const latest = Db.coreFns.luxon.latest(this.colValues);
         return latest.isValid ?
             `Latest: ${latest.toFormat(DEFAULT_SETTINGS.local_settings.datetime_format)}` :
             null;
@@ -172,7 +171,7 @@ export default class Footer {
      * @returns 
      */
     public rangeDate(): string {
-        const range = DbAutomationService.coreFns.luxon.range(this.colValues);
+        const range = Db.coreFns.luxon.range(this.colValues);
         return `Range: ${range} days`
     }
 
diff --git a/src/automations/Rollup.ts b/src/automations/Rollup.ts
@@ -1,7 +1,7 @@
 import { LocalSettings } from "cdm/SettingsModel";
 import { DEFAULT_SETTINGS, InputType, ROLLUP_ACTIONS } from "helpers/Constants";
 import { Link, Literal, SMarkdownPage } from "obsidian-dataview";
-import { DbAutomationService } from "services/AutomationService";
+import { Db } from "services/CoreService";
 import { DataviewService } from "services/DataviewService";
 import { LOGGER } from "services/Logger";
 import { ParseService } from "services/ParseService";
@@ -97,7 +97,7 @@ class Rollup {
             return NaN;
         }
         const rawValues = this.rawValues(key);
-        return DbAutomationService.coreFns.numbers.sum(rawValues)
+        return Db.coreFns.numbers.sum(rawValues)
     }
 
     /**
diff --git a/src/automations/core/modules/NumbersFn.ts b/src/automations/core/modules/NumbersFn.ts
@@ -14,11 +14,15 @@ export class NumbersFn extends DbModule {
     async create_dynamic_functions(): Promise<void> { }
 
     private parseRaw(rawValues: Literal[]): number[] {
-        return rawValues.map((value) => {
-            return parseFloat(value.toString());
-        }).filter((value) => {
-            return !isNaN(value);
-        });
+        return rawValues
+            .filter((value) => value &&
+                typeof value === "string" ||
+                typeof value === "number")
+            .map((value) => {
+                return parseFloat(value.toString());
+            }).filter((value) => {
+                return !isNaN(value);
+            });
     }
 
     /**
diff --git a/src/cdm/TableStateInterface.ts b/src/cdm/TableStateInterface.ts
@@ -47,7 +47,7 @@ export interface DataState {
     rows: RowDataType[];
     actions: {
         addRow: (filename: string, columns: TableColumn[], ddbbConfig: LocalSettings) => Promise<void>;
-        updateCell: (rowIndex: number, column: TableColumn, value: Literal, columns: TableColumn[], ddbbConfig: LocalSettings, isMovingFile?: boolean) => Promise<void>;
+        updateCell: (rowIndex: number, column: TableColumn, value: Literal, columns: TableColumn[], ddbbConfig: LocalSettings, isMovingFile?: boolean, saveOnDisk?: boolean) => Promise<void>;
         parseDataOfColumn: (column: TableColumn, input: string, ddbbConfig: LocalSettings) => void;
         updateDataAfterLabelChange: (column: TableColumn, label: string, columns: TableColumn[], ddbbConfig: LocalSettings) => Promise<void>;
         removeRow: (row: RowDataType) => Promise<void>;
diff --git a/src/components/Columns.tsx b/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
diff --git a/src/components/cellTypes/FormulaCell.tsx b/src/components/cellTypes/FormulaCell.tsx
@@ -1,5 +1,6 @@
 import { CellComponentProps } from "cdm/ComponentsModel";
 import { TableColumn } from "cdm/FolderModel";
+import { MetadataColumns } from "helpers/Constants";
 import { c, getAlignmentClassname } from "helpers/StylesHelper";
 import React, { useEffect, useRef } from "react";
 import { MarkdownService } from "services/MarkdownRenderService";
@@ -18,10 +19,9 @@ const FormulaCell = (mdProps: CellComponentProps) => {
   const formulaInfo = tableState.automations((state) => state.info);
 
   useEffect(() => {
-    setTimeout(async () => {
+    Promise.resolve().then(async () => {
       // If formula cell is empty, do nothing
       if (formulaRef.current === null) return;
-
       const formulaResponse = formulaInfo
         .runFormula(
           tableColumn.config.formula_query,
@@ -39,14 +39,8 @@ const FormulaCell = (mdProps: CellComponentProps) => {
         formulaRef.current,
         5
       );
-
       // If formula cell is not configured to persist, exit
-      if (
-        !tableColumn.config.persist_formula ||
-        cell.getValue() === formulaResponse
-      )
-        return;
-
+      if (cell.getValue() === formulaResponse) return;
       // Save formula response on disk
       const newCell = ParseService.parseRowToLiteral(
         formulaRow,
@@ -59,10 +53,17 @@ const FormulaCell = (mdProps: CellComponentProps) => {
         tableColumn,
         newCell,
         columnsInfo.getAllColumns(),
-        configInfo.getLocalSettings()
+        configInfo.getLocalSettings(),
+        false,
+        tableColumn.config.persist_formula
       );
-    }, 0);
-  }, [row]);
+    });
+  }, [
+    Object.entries(formulaRow)
+      .filter(([key]) => key !== MetadataColumns.MODIFIED && key !== column.id)
+      .map(([, value]) => (value ? value.toString() : ""))
+      .join(""),
+  ]);
 
   return (
     <span
diff --git a/src/components/cellTypes/RollupCell.tsx b/src/components/cellTypes/RollupCell.tsx
@@ -27,11 +27,11 @@ const RollupCell = (mdProps: CellComponentProps) => {
         configInfo.getLocalSettings()
       ) as string
   );
+  const relation = formulaRow[tableColumn.config.asociated_relation_id];
 
   useEffect(() => {
     if (formulaRef.current !== null) {
       formulaRef.current.innerHTML = "";
-      const relation = formulaRow[tableColumn.config.asociated_relation_id];
       if (!relation) {
         return;
       }
@@ -67,7 +67,7 @@ const RollupCell = (mdProps: CellComponentProps) => {
         );
       }
     }
-  }, [cell, row, column]);
+  }, [relation]);
   return (
     <span
       ref={formulaRef}
diff --git a/src/components/modals/columnSettings/handlers/automations/FormulaInputHandler.ts b/src/components/modals/columnSettings/handlers/automations/FormulaInputHandler.ts
@@ -43,6 +43,13 @@ export class FormulaInputHandler extends AbstractHandlerClass<ColumnSettingsHand
                 textArea.setPlaceholder(t("column_settings_modal_formula_input_textarea_placeholder"));
                 textArea.onChange(formula_promise);
                 textArea.inputEl.addClass(c("textarea-setting"));
+                textArea.inputEl.onkeydown = (e: KeyboardEvent) => {
+                    switch (e.key) {
+                        case "Enter":
+                            e.preventDefault();
+                            break;
+                    }
+                };
 
             });
         const mainDesc = containerEl.createEl('p');
diff --git a/src/components/modals/columnSettings/handlers/rollups/RollupKeyHandler.ts b/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(),
diff --git a/src/components/modals/filters/handlers/DataviewFiltersComponent.tsx b/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()
diff --git a/src/components/modals/newColumn/handlers/AddExistingColumnHandler.ts b/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
diff --git a/src/components/reducers/DataviewFilters.tsx b/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
diff --git a/src/helpers/RelationHelper.ts b/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;
 }
diff --git a/src/main.ts b/src/main.ts
@@ -36,6 +36,7 @@ import { DatabaseHelperCreationModal } from 'commands/addDatabaseHelper/database
 import { generateDbConfiguration, generateNewDatabase } from 'helpers/CommandsHelper';
 import { registerDateFnLocale, t } from 'lang/helpers';
 import ProjectAPI from 'api/obsidian-projects-api';
+import { Db } from "services/CoreService";
 
 interface WindowRegistry {
 	viewMap: Map<string, DatabaseView>;
@@ -58,8 +59,6 @@ export default class DBFolderPlugin extends Plugin {
 
 	databaseFileModes: Record<string, string> = {};
 
-	viewMap: Map<string, DatabaseView> = new Map();
-
 	_loaded = false;
 
 	stateManagers: Map<TFile, StateManager> = new Map();
@@ -72,6 +71,7 @@ export default class DBFolderPlugin extends Plugin {
 
 	async onload(): Promise<void> {
 		await this.load_settings();
+		await this.loadServices();
 		addIcon(DB_ICONS.NAME, DB_ICONS.ICON);
 		this.registerEvent(
 			app.workspace.on('window-open', (_: any, win: Window) => {
@@ -156,6 +156,10 @@ export default class DBFolderPlugin extends Plugin {
 		loadServicesThatRequireSettings(this.settings);
 	}
 
+	async loadServices() {
+		await Db.init();
+	}
+
 	public registerPriorityCodeblockPostProcessor(
 		language: string,
 		priority: number,
@@ -183,8 +187,8 @@ export default class DBFolderPlugin extends Plugin {
 			return;
 		}
 
-		if (!this.viewMap.has(view.id)) {
-			this.viewMap.set(view.id, view);
+		if (!reg.viewMap.has(view.id)) {
+			reg.viewMap.set(view.id, view);
 		}
 
 		const file = view.file;
@@ -402,27 +406,30 @@ export default class DBFolderPlugin extends Plugin {
 		 */
 		this.registerEvent(
 			app.metadataCache.on("dataview:index-ready", async () => {
-				// Refresh all database views
-				this.viewMap.forEach(async (view) => {
-					await view.reloadDatabase();
-				});
+				for (const [win, { viewMap }] of Array.from(this.windowRegistry.entries())) {
+					// Refresh all database views
+					for (const view of viewMap.values()) {
+						await view.reloadDatabase();
+					}
+				}
 				/**
 				 * Once the index is ready, we can start listening for metadata changes.
 				 */
 				if (this.settings.global_settings.enable_auto_update) {
 					this.registerEvent(app.metadataCache.on("dataview:metadata-change",
 						(type, file, oldPath?) => {
 							const activeView = app.workspace.getActiveViewOfType(DatabaseView);
-							// Iterate through all the views and reload the database if the file is the same
-							this.viewMap.forEach(async (view) => {
-								const isActive = activeView && (view.file.path === activeView.file.path);
-								view.handleExternalMetadataChange(type, file, isActive, oldPath);
+							Array.from(this.windowRegistry.entries()).forEach(async ([, { viewMap }]) => {
+								// Iterate through all the views and reload the database if the file is the same
+								viewMap.forEach(async (view) => {
+									const isActive = activeView && (view.file.path === activeView?.file.path);
+									view.handleExternalMetadataChange(type, file, isActive, oldPath);
+								});
 							});
 						})
 					);
 				}
-			})
-		);
+			}));
 
 		/**
 		 * Check when the active view focus changes and update bar status
diff --git a/src/services/CoreService.ts b/src/services/CoreService.ts
diff --git a/src/services/Logger.ts b/src/services/Logger.ts
diff --git a/src/settings/handlers/columns/TemplateColumnsHandler.ts b/src/settings/handlers/columns/TemplateColumnsHandler.ts
diff --git a/src/stateManagement/automations/handlers/LoadFormulasHandlerAction.ts b/src/stateManagement/automations/handlers/LoadFormulasHandlerAction.ts
diff --git a/src/stateManagement/data/handlers/UpdateCellHandlerAction.ts b/src/stateManagement/data/handlers/UpdateCellHandlerAction.ts
