Merge branch '801-bug-using-dataview-query-with-use-all-fields-causes-an-error'

RafaelGB · RafaelGB · commit 66fbf298a7ae · 2023-02-14T00:49:59.000+01:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -30,20 +30,20 @@
 		"@testing-library/react": "13.4.0",
 		"@types/jest": "29.4.0",
 		"@types/luxon": "3.2.0",
-		"@types/node": "18.11.18",
-		"@types/react": "18.0.27",
+		"@types/node": "18.13.0",
+		"@types/react": "18.0.28",
 		"@types/react-datepicker": "4.8.0",
 		"@types/react-dom": "18.0.10",
 		"@types/react-window": "1.8.5",
 		"@types/papaparse": "5.3.7",
-		"@typescript-eslint/eslint-plugin": "5.50.0",
-		"@typescript-eslint/parser": "5.50.0",
-		"eslint": "8.33.0",
-		"jest": "29.4.1",
+		"@typescript-eslint/eslint-plugin": "5.52.0",
+		"@typescript-eslint/parser": "5.52.0",
+		"eslint": "8.34.0",
+		"jest": "29.4.2",
 		"jest-mock-extended": "3.0.1",
-		"jest-environment-jsdom": "29.4.1",
+		"jest-environment-jsdom": "29.4.2",
 		"obsidian": "1.1.1",
-		"rollup": "3.13.0",
+		"rollup": "3.15.0",
 		"rollup-plugin-typescript2": "0.34.1",
 		"ts-jest": "29.0.5",
 		"tslib": "2.5.0",
@@ -52,7 +52,7 @@
 	"dependencies": {
 		"@emotion/styled": "11.10.5",
 		"@mui/icons-material": "5.11.0",
-		"@mui/material": "5.11.7",
+		"@mui/material": "5.11.8",
 		"@popperjs/core": "2.11.6",
 		"@tanstack/match-sorter-utils": "8.7.6",
 		"@tanstack/react-table": "8.7.9",
@@ -68,6 +68,6 @@
 		"react-dom": "18.2.0",
 		"react-select": "5.7.0",
 		"react-window": "1.8.8",
-		"zustand": "4.3.2"
+		"zustand": "4.3.3"
 	}
 }
diff --git a/src/components/modals/columnSettings/handlers/selects/FormulaColumnOptionsHandler.ts b/src/components/modals/columnSettings/handlers/selects/FormulaColumnOptionsHandler.ts
@@ -7,7 +7,7 @@ import { AbstractHandlerClass } from "patterns/chain/AbstractHandler";
 import { FormulaService } from "services/FormulaService";
 
 export class FormulaColumnOptionsHandler extends AbstractHandlerClass<ColumnSettingsHandlerResponse> {
-    settingTitle = t("column_settings_modal_option_source_dropdown_title");
+    settingTitle = t("column_settings_modal_formula_option_source_title");
     handle(
         columnHandlerResponse: ColumnSettingsHandlerResponse
     ): ColumnSettingsHandlerResponse {
@@ -24,23 +24,25 @@ export class FormulaColumnOptionsHandler extends AbstractHandlerClass<ColumnSett
             };
             new Setting(containerEl)
                 .setName("Formula for column options")
-                .setDesc("Write a formula to generate the options for this column.")
+                .setDesc(t("column_settings_modal_formula_option_source_desc"))
                 .setClass(c("setting-item"))
                 .addTextArea((textArea) => {
                     textArea.setValue(currentFormula);
                     textArea.setPlaceholder("I.E.: [{value: 'a', label: 'A' color: 'red'}, {value: 'b', label: 'B' color: 'blue'}]");
                     textArea.inputEl.addClass(c("textarea-setting"));
                     textArea.onChange(formula_promise);
                 }).addExtraButton((cb) => {
-                    cb.setIcon("pencil")
-                        .setTooltip("Update your column options with the formula above.")
+                    cb.setIcon("reset")
+                        .setTooltip("column_settings_modal_formula_option_source_placeholder")
                         .onClick(async (): Promise<void> => {
-                            if (currentFormula === config.formula_option_source) {
-                                new Notice("No changes made", 1500);
+                            try {
+                                columnHandlerResponse.column.options = FormulaService.evalOptionsWith(column, automationState.info.getFormulas());
+                            } catch (e) {
+                                new Notice("Error in formula: " + e);
                                 return;
                             }
-                            columnHandlerResponse.column.options = FormulaService.evalOptionsWith(column, automationState.info.getFormulas());
                             columnHandlerResponse.column.config.formula_option_source = currentFormula;
+
                             // Persist changes
                             await view.diskConfig.updateColumnConfig(column.id, {
                                 formula_option_source: columnHandlerResponse.column.config.formula_option_source
@@ -61,14 +63,29 @@ export class FormulaColumnOptionsHandler extends AbstractHandlerClass<ColumnSett
                     href: "https://rafaelgb.github.io/obsidian-db-folder/features/Formulas/",
                 })
             );
-            // TODO Show column options read-only
+            // Label-Value pairs table
+            const tableEl = containerEl.createEl("table");
+            const thead = tableEl.createEl("thead");
+            const tr = thead.createEl("tr");
+            tr.createEl("th", {
+                text: "Label",
+            });
+            tr.createEl("th", {
+                text: "Value",
+            });
+            const tbody = tableEl.createEl("tbody");
+            // Show column options read-only
             columnHandlerResponse.column.options.forEach((option) => {
-                const optionEl = containerEl.createDiv();
-                optionEl.style.backgroundColor = option.color;
-                optionEl.addClass(c("readable-options"));
-                optionEl.createDiv({ text: option.label });
-                optionEl.createDiv({ text: option.value });
-
+                const tr = tbody.createEl("tr");
+                tr.addClass(c("center-cell"));
+                tr.style.backgroundColor = option.color;
+                // td centering text
+                tr.createEl("td", {
+                    text: option.label,
+                });
+                tr.createEl("td", {
+                    text: option.value,
+                });
             });
         }
         return this.goNext(columnHandlerResponse);
diff --git a/src/components/modals/columnSettings/handlers/selects/OptionSourceDropdownHandler.ts b/src/components/modals/columnSettings/handlers/selects/OptionSourceDropdownHandler.ts
@@ -23,7 +23,6 @@ export class OptionSourceDropdownHandler extends AbstractHandlerClass<ColumnSett
     });
 
     const optionSourcePromise = async (optionSource: string): Promise<void> => {
-      console.log("optionSourcePromise", optionSource);
       if (optionSource === column.config.option_source) {
         new Notice("No changes made", 1500);
         return;
@@ -34,6 +33,11 @@ export class OptionSourceDropdownHandler extends AbstractHandlerClass<ColumnSett
         option_source: optionSource,
       });
 
+      // Reset options
+      await view.diskConfig.updateColumnProperties(column.id, {
+        options: [],
+      });
+
       columnHandlerResponse.column.config.option_source = optionSource;
       // Reset column settings
       columnSettingsManager.reset(columnHandlerResponse);
diff --git a/src/lang/locale/en.ts b/src/lang/locale/en.ts
@@ -194,6 +194,9 @@ export default {
 
   "column_settings_modal_option_source_dropdown_title": "Select option source",
   "column_settings_modal_option_source_dropdown_desc": "Select the source of the options",
+  "column_settings_modal_formula_option_source_title": "Formula option source",
+  "column_settings_modal_formula_option_source_desc": "Write your formula to generate the options",
+  "column_settings_modal_formula_option_source_placeholder": "Write your formula here...",
 
   "column_settings_modal_hide_completed_tasks_toggle_title": "Hide completed tasks",
   "column_settings_modal_hide_completed_tasks_toggle_desc": "Enable/disable to hide completed tasks",
diff --git a/src/main.ts b/src/main.ts
@@ -407,13 +407,6 @@ export default class DBFolderPlugin extends Plugin {
 		 */
 		this.registerEvent(
 			app.metadataCache.on("dataview:index-ready", async () => {
-				for (const [, { viewMap }] of Array.from(this.windowRegistry.entries())) {
-					// Refresh all database views
-					for (const view of viewMap.values()) {
-						await view.reloadDatabase();
-					}
-				}
-				await sleep(2000);
 				/**
 				 * Once the index is ready, we can start listening for metadata changes.
 				 */
@@ -497,7 +490,7 @@ export default class DBFolderPlugin extends Plugin {
 
 		// Active View Open Settings
 		this.addCommand({
-			id: 'activ-database-folder-open-settings',
+			id: 'active-database-folder-open-settings',
 			name: t('active_open_settings'),
 			checkCallback: (checking) => {
 				const activeView = app.workspace.getActiveViewOfType(DatabaseView);
diff --git a/src/settings/HelpersSection.ts b/src/settings/HelpersSection.ts
@@ -3,7 +3,7 @@ import { SettingHandlerResponse } from 'settings/handlers/AbstractSettingHandler
 import { AbstractChain } from 'patterns/chain/AbstractFactoryChain';
 import { AbstractHandler } from 'patterns/chain/AbstractHandler';
 import { ShowSearchBarByDefaultToggleHandler } from 'settings/handlers/helpersCommands/ShowSearchBarByDefaultToggleHandler';
-import { EnableAutoUpdateToggleHandler } from 'settings/handlers/helpersCommands/EnableAutoUpdateTOggleHandler';
+import { EnableAutoUpdateToggleHandler } from 'settings/handlers/helpersCommands/EnableAutoUpdateToggleHandler';
 import { t } from 'lang/helpers';
 
 class HelpersSection extends AbstractChain<SettingHandlerResponse> {
diff --git a/src/stateManagement/columns/handlers/AlterOptionToColumnAction.ts b/src/stateManagement/columns/handlers/AlterOptionToColumnAction.ts
@@ -11,11 +11,10 @@ export default class AlterOptionToColumnHandlerAction extends AbstractTableActio
             column: TableColumn,
             option: ColumnOption
         ) => {
-            if (OptionSource.FORMULA === column.config.formula_option_source) {
+            if (OptionSource.FORMULA === column.config.option_source) {
                 // End the execution if the option is from a formula
                 return;
             }
-
             const { value } = option;
             // Wrap in a promise of a queue to avoid concurrency issues
             const columnIndex = get().columns.findIndex(
diff --git a/src/views/AbstractView.ts b/src/views/AbstractView.ts
@@ -52,6 +52,16 @@ export abstract class CustomView extends TextFileView implements HoverParent {
      */
     abstract getFormulas(): Promise<Record<string, unknown>>;
 
+    /**
+     * Pre actions to be executed before the database is loaded
+     */
+    abstract preActions(): Promise<void>;
+
+    /**
+     * Post actions to be executed after the database is loaded
+     */
+    abstract postActions(): Promise<void>;
+
     /**
      * Abstract 
      * @param leaf 
@@ -93,6 +103,7 @@ export abstract class CustomView extends TextFileView implements HoverParent {
     private async initDatabase(): Promise<void> {
         try {
             LOGGER.info(`=>initDatabase ${this.file.path}`);
+            await this.preActions();
             // Load the database file
             this.diskConfig = await new DatabaseInfo(this.file, this.plugin.settings.local_settings).build();
             this.setDataApi(this.diskConfig.yaml.config.implementation);
@@ -103,6 +114,8 @@ export abstract class CustomView extends TextFileView implements HoverParent {
 
             // Define table properties
             this.shadowColumns = this.columns.filter((col) => col.skipPersist);
+
+            await this.postActions();
             const tableProps: TableDataType = {
                 skipReset: false,
                 view: this,
@@ -111,7 +124,7 @@ export abstract class CustomView extends TextFileView implements HoverParent {
             // Render database
             const table = createDatabase(tableProps);
             this.rootContainer.render(table);
-            this.diskConfig.saveOnDisk();
+            await this.diskConfig.saveOnDisk();
             LOGGER.info(`<=initDatabase ${this.file.path}`);
         } catch (e: unknown) {
             LOGGER.error(`initDatabase ${this.file.path}`, e);
diff --git a/src/views/DatabaseView.tsx b/src/views/DatabaseView.tsx
@@ -3,9 +3,12 @@ import {
   obtainColumnsFromFolder,
   obtainMetadataColumns,
 } from "components/Columns";
+import { OptionSource } from "helpers/Constants";
 import obtainInitialType from "helpers/InitialType";
 import { adapterTFilesToRows } from "helpers/VaultManagement";
 import { Db } from "services/CoreService";
+import { FormulaService } from "services/FormulaService";
+import { LOGGER } from "services/Logger";
 import { CustomView } from "./AbstractView";
 
 export class DatabaseView extends CustomView {
@@ -35,4 +38,26 @@ export class DatabaseView extends CustomView {
   async getFormulas() {
     return await Db.buildFns(this.diskConfig.yaml.config);
   }
+
+  async preActions() {
+    // Nothing to do
+  }
+
+  async postActions() {
+    // Automatically update formula options
+    this.columns.forEach(async (column) => {
+      const { config } = column;
+      if (config.option_source === OptionSource.FORMULA) {
+        LOGGER.info(`Updating options for column ${column.id}`);
+        const updatedOptions = FormulaService.evalOptionsWith(
+          column,
+          this.formulas
+        );
+
+        await this.diskConfig.updateColumnProperties(column.id, {
+          options: updatedOptions,
+        });
+      }
+    });
+  }
 }
diff --git a/src/views/impl/DefaultDataImpl.ts b/src/views/impl/DefaultDataImpl.ts
@@ -1,8 +1,7 @@
 import { DataApi, UpdateApiInfo } from "api/data-api";
 import { RowDataType, TableColumn } from "cdm/FolderModel";
 import { LocalSettings } from "cdm/SettingsModel";
-import { UpdateRowInfo } from "cdm/TableStateInterface";
-import { MetadataColumns, UpdateRowOptions } from "helpers/Constants";
+import { MetadataColumns } from "helpers/Constants";
 import { destination_folder, resolveNewFilePath, resolve_tfile } from "helpers/FileManagement";
 import { DateTime } from "luxon";
 import { Link } from "obsidian-dataview";
diff --git a/styles.css b/styles.css
@@ -773,11 +773,8 @@ div.database-plugin__td.data-input span:focus {
   margin-bottom: 10px;
 }
 
-.database-plugin__readable-options {
-  display: flex;
-  flex-direction: row;
-  gap: 0.5rem;
-  justify-content: center;
+.database-plugin__center-cell td {
+  text-align: center;
 }
 
 /**
