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

Author: RafaelGB

src/Settings.ts

@@ -1,7 +1,6 @@
 import { App, Modal, PluginSettingTab } from "obsidian";
 import { add_setting_header } from 'settings/SettingsComponents';
 import DBFolderPlugin from 'main';
-import { DatabaseView } from "views/DatabaseView";
 import { LOGGER } from "services/Logger";
 import columns_settings_section from "settings/ColumnsSection";
 import { folder_settings_section } from "settings/FolderSection";

src/cdm/DatabaseModel.ts

@@ -4,6 +4,7 @@ import { Literal } from "obsidian-dataview/lib/data-model/value";
 import { TableOptions } from "@tanstack/react-table";
 import { BaseColumn, RowDataType } from "cdm/FolderModel";
 import { SMarkdownPage } from "obsidian-dataview";
+import en from "lang/locale/en";
 
 /** database column */
 export interface DatabaseColumn extends BaseColumn {
@@ -44,4 +45,6 @@ export type TableOptionsResponse = {
 
 export type NoteInfoPage = Omit<SMarkdownPage, "file"> & {
     file: Pick<SMarkdownPage["file"], "link" | "path" | "ctime" | "mtime" | "tasks" | "outlinks" | "inlinks" | "folder">
-};
+};
+
+export type LocaleDict = keyof typeof en;

src/cdm/FolderModel.ts

@@ -47,6 +47,9 @@ export interface ConfigColumn {
     // Text
     link_alias_enabled?: boolean;
     custom_link_alias?: string;
+    // Selects & Tags
+    option_source?: string;
+    formula_option_source?: string;
     // Tasks
     task_hide_completed?: boolean;
     // Formulas

src/cdm/ModalsModel.ts

@@ -1,5 +1,5 @@
 import { RowDataType, TableColumn } from "cdm/FolderModel";
-import { ColumnsState, ConfigState, DataState, RowTemplateState } from "cdm/TableStateInterface";
+import { AutomationState, ColumnsState, ConfigState, DataState, RowTemplateState } from "cdm/TableStateInterface";
 import { ColumnSettingsManager } from "components/modals/columnSettings/ColumnSettingsModal";
 import { AddColumnModalManager } from "components/modals/newColumn/addColumnModal";
 import { FiltersModalManager } from "components/modals/filters/FiltersModal";
@@ -18,8 +18,8 @@ export type BaseColumnModalProps = {
     dataState: Pick<DataState, "actions">,
     columnState: Pick<ColumnsState, "info" | "actions">,
     configState: Pick<ConfigState, "info">,
-    view: CustomView,
-    //headerMenuProps: HeaderMenuProps
+    automationState: Pick<AutomationState, "info">,
+    view: CustomView
 }
 /***************************************
  *      COLUMN SETTINGS MODAL

src/cdm/TableStateInterface.ts

@@ -158,6 +158,7 @@ export type AutomationStateActions = {
 
 export type AutomationStateInfo = {
     getFormula: (name: string) => unknown;
+    getFormulas: () => { [key: string]: unknown };
     runFormula: (input: string, row: RowDataType, dbInfo: DbInfo) => Literal;
     dispatchFooter: (column: TableColumn, colValues: Literal[]) => Literal;
     dispatchRollup: (configColumn: ConfigColumn, relation: Literal) => Literal;

src/components/DefaultHeader.tsx

@@ -42,7 +42,7 @@ export default function DefaultHeader(headerProps: DatabaseHeaderProps) {
   const columnsInfo = tableState.columns((state) => state.info);
   const columnActions = tableState.columns((state) => state.actions);
   const dataActions = tableState.data((state) => state.actions);
-
+  const automationInfo = tableState.automations((state) => state.info);
   const areColumnsFilterable = tableState.configState(
     (state) => state.ephimeral.enable_columns_filter
   );
@@ -124,6 +124,7 @@ export default function DefaultHeader(headerProps: DatabaseHeaderProps) {
         actions: columnActions,
       },
       configState: { info: configInfo },
+      automationState: { info: automationInfo },
       view: table.options.meta.view,
     };
     new AddColumnModal(table.options.meta.view, addColumnProps).open();

src/components/HeaderMenu.tsx

@@ -1,5 +1,5 @@
 import { StyleVariables } from "helpers/Constants";
-import { dbTrim, c, getLabelHeader } from "helpers/StylesHelper";
+import { dbTrim, c } from "helpers/StylesHelper";
 import AdjustmentsIcon from "components/img/AdjustmentsIcon";
 import React, { FocusEventHandler, useState } from "react";
 import Popper from "@mui/material/Popper";
@@ -18,15 +18,18 @@ import { dynamic_t, t } from "lang/helpers";
 const HeaderMenu = (headerMenuProps: HeaderMenuProps) => {
   const { table, column } = headerMenuProps.headerProps;
 
-  const [columnsInfo, columnActions] = table.options.meta.tableState.columns(
-    (state) => [state.info, state.actions]
-  );
-  const dataActions = table.options.meta.tableState.data(
-    (state) => state.actions
-  );
-  const configInfo = table.options.meta.tableState.configState(
-    (state) => state.info
-  );
+  const { tableState } = table.options.meta;
+
+  const [columnsInfo, columnActions] = tableState.columns((state) => [
+    state.info,
+    state.actions,
+  ]);
+
+  const dataActions = tableState.data((state) => state.actions);
+
+  const configInfo = tableState.configState((state) => state.info);
+
+  const automationInfo = tableState.automations((state) => state.info);
 
   /** Header props */
   const { propertyIcon, menuEl, setMenuEl, labelState, setLabelState } =
@@ -238,6 +241,7 @@ const HeaderMenu = (headerMenuProps: HeaderMenuProps) => {
                         actions: columnActions,
                       },
                       configState: { info: configInfo },
+                      automationState: { info: automationInfo },
                       view: table.options.meta.view,
                       tableColumn: column.columnDef as TableColumn,
                     }).open();

src/components/cellTypes/FormulaCell.tsx

@@ -33,9 +33,6 @@ const FormulaCell = (mdProps: CellComponentProps) => {
         })
         .toString();
 
-      // If the formula cell is the same as the rendered formula, do nothing
-      if (cell.getValue() === formulaResponse) return;
-
       await MarkdownService.renderMarkdown(
         defaultCell,
         formulaResponse,

src/components/cellTypes/RelationCell.tsx

@@ -112,8 +112,11 @@ const RelationCell = (mdProps: CellComponentProps) => {
         ? relationCell.map((link: Link, index) => (
             <Relationship
               key={`relation-${index}-${tableColumn.key}-${link.path}`}
-              value={link.markdown()}
-              backgroundColor={tableColumn.config.relation_color || grey(300)}
+              option={{
+                value: link.markdown(),
+                label: link.markdown(),
+                color: tableColumn.config.relation_color || grey(300),
+              }}
               view={view}
             />
           ))

src/components/modals/columnSettings/ColumnSections.ts

@@ -3,8 +3,9 @@ import { add_setting_header } from "settings/SettingsComponents";
 import { MediaDimensionsHandler } from "./handlers/media/MediaDimensionsHandler";
 import { MediaToggleHandler } from "./handlers/media/MediaToggleHandler";
 import { InlineToggleHandler } from "./handlers/InlineToggleHandler";
+import { OptionSourceDropdownHandler } from "./handlers/selects/OptionSourceDropdownHandler";
 import { AddOptionHandler } from "./handlers/selects/AddOptionHandler";
-import { SelectedColumnOptionsHandler } from "./handlers/selects/SelectedColumnOptionsHandler";
+import { ManualColumnOptionsHandler } from "./handlers/selects/ManualColumnOptionsHandler";
 import { HideCompletedTaskToggleHandler } from "./handlers/tasks/HideCompletedTaskToggleHandler";
 import { LinkAliasToggleHandler } from "./handlers/media/LinkAliasToggleHandler";
 import { FormulaInputHandler } from "./handlers/automations/FormulaInputHandler";
@@ -20,6 +21,7 @@ import { RollupPersistToggleHandler } from "./handlers/rollups/RollupPersistTogg
 import { RollupFormulaHandler } from "./handlers/rollups/RollupFormulaHandler";
 import { BidirectionalRelationToggleHandler } from "./handlers/relations/BidirectionalRelationToggleHandler";
 import { RelationColorSelectorHandler } from "./handlers/relations/RelationColorSelectorHandler";
+import { FormulaColumnOptionsHandler } from "./handlers/selects/FormulaColumnOptionsHandler";
 import { InputType } from "helpers/Constants";
 import { AbstractChain } from "patterns/chain/AbstractFactoryChain";
 import { AbstractHandler } from "patterns/chain/AbstractHandler";
@@ -135,8 +137,10 @@ class ParticularSetttingsSection extends AbstractChain<ColumnSettingsHandlerResp
                 break;
             case InputType.SELECT:
             case InputType.TAGS:
+                particularHandlers.push(new OptionSourceDropdownHandler());
                 particularHandlers.push(new AddOptionHandler());
-                particularHandlers.push(new SelectedColumnOptionsHandler());
+                particularHandlers.push(new ManualColumnOptionsHandler());
+                particularHandlers.push(new FormulaColumnOptionsHandler());
                 break;
             case InputType.TASK:
                 particularHandlers.push(new HideCompletedTaskToggleHandler());