Merge branch 'pattern_improvements'

RafaelGB · RafaelGB · commit 1765bb11cabe · 2022-12-29T18:16:32.000+01:00
diff --git a/src/components/Columns.tsx b/src/components/Columns.tsx
@@ -153,8 +153,8 @@ export async function obtainColumnsFromRows(
   ddbbConfig: LocalSettings,
   filters: FilterSettings,
   tableColumns: TableColumn[]
-): Promise<Record<string, DatabaseColumn>> {
-  const columns: Record<string, DatabaseColumn> = {};
+): Promise<string[]> {
+  const columns: string[] = [];
   const rows = await obtainAllPossibleRows(
     view.file.parent.path,
     ddbbConfig,
@@ -190,15 +190,7 @@ export async function obtainColumnsFromRows(
     // Check metadata columns to not be added
     .filter((key) => validateColumnKey(key))
     .forEach((key, index) => {
-      columns[key] = {
-        input: InputType.TEXT,
-        accessorKey: key,
-        label: key,
-        key: key,
-        id: key,
-        position: index,
-        config: DEFAULT_COLUMN_CONFIG,
-      };
+      columns.push(key);
     });
 
   return columns;
diff --git a/src/components/NavBar.tsx b/src/components/NavBar.tsx
@@ -23,18 +23,19 @@ export function NavBar(navBarProps: NavBarProps) {
   );
 
   const updateBar = () => {
+    if (!view.plugin.statusBarItem) {
+      view.plugin.statusBarItem = view.plugin.addStatusBarItem();
+    }
     view.plugin.statusBarItem.replaceChildren();
     view.plugin.statusBarItem.createEl("span", {
       text: `${table.getFilteredRowModel().rows.length}/${view.rows.length} '${
         view.diskConfig.yaml.name
       }'`,
     });
   };
-  // Control
+
+  // Bar status control
   useEffect(() => {
-    if (!view.plugin.statusBarItem) {
-      view.plugin.statusBarItem = view.plugin.addStatusBarItem();
-    }
     updateBar();
   }, [table.getFilteredRowModel().rows.length]);
 
diff --git a/src/components/cellTypes/TagsCell.tsx b/src/components/cellTypes/TagsCell.tsx
@@ -116,7 +116,6 @@ const TagsCell = (tagsProps: CellComponentProps) => {
           isSearchable
           isMulti
           autoFocus
-          openMenuOnFocus
           menuPosition="fixed"
           styles={CustomTagsStyles}
           options={columnOptions}
diff --git a/src/components/modals/filters/handlers/DataviewFiltersComponent.tsx b/src/components/modals/filters/handlers/DataviewFiltersComponent.tsx
@@ -1,5 +1,4 @@
 import { DataviewFiltersProps } from "cdm/ComponentsModel";
-import { DatabaseColumn } from "cdm/DatabaseModel";
 import { obtainColumnsFromRows } from "components/Columns";
 import React, { useEffect, useState } from "react";
 import { FilterGroupCondition } from "cdm/SettingsModel";
@@ -15,7 +14,7 @@ const DataviewFiltersComponent = (props: DataviewFiltersProps) => {
   const [possibleColumns, setPossibleColumns] = useState([] as string[]);
 
   useEffect(() => {
-    new Promise<Record<string, DatabaseColumn>>((resolve, reject) => {
+    new Promise<string[]>((resolve) => {
       // Empty conditions to refresh the dataview
       const emptyFilterConditions = { ...filters };
       emptyFilterConditions.conditions = [];
@@ -28,9 +27,7 @@ const DataviewFiltersComponent = (props: DataviewFiltersProps) => {
         )
       );
     }).then((columns) => {
-      setPossibleColumns(
-        Object.keys(columns).sort((a, b) => a.localeCompare(b))
-      );
+      setPossibleColumns(columns.sort((a, b) => a.localeCompare(b)));
     });
   }, []);
 
diff --git a/src/components/modals/newColumn/handlers/AddExistingColumnHandler.ts b/src/components/modals/newColumn/handlers/AddExistingColumnHandler.ts
@@ -1,4 +1,3 @@
-import { DatabaseColumn } from "cdm/DatabaseModel";
 import { AddColumnModalHandlerResponse } from "cdm/ModalsModel";
 import { obtainColumnsFromRows } from "components/Columns";
 import { DynamicInputType, MetadataColumns } from "helpers/Constants";
@@ -20,7 +19,7 @@ export class AddExistingColumnHandler extends AbstractHandlerClass<AddColumnModa
             typesRecord[value] = t(value);
         });
 
-        const promiseOfObtainColumnsFromRows = new Promise<Record<string, DatabaseColumn>>((resolve) => {
+        const promiseOfObtainColumnsFromRows = new Promise<string[]>((resolve) => {
             resolve(obtainColumnsFromRows(
                 addColumnModalManager.addColumnModal.view,
                 configState.info.getLocalSettings(),
@@ -32,11 +31,11 @@ export class AddExistingColumnHandler extends AbstractHandlerClass<AddColumnModa
             typeOfNewColumn = value;
         }
 
-        promiseOfObtainColumnsFromRows.then((columnsRaw: Record<string, DatabaseColumn>) => {
+        promiseOfObtainColumnsFromRows.then((columnsRaw: string[]) => {
             // Filter out the columns that are already in the table
-            const currentColumns = (columnState.info.getValueOfAllColumnsAsociatedWith('id') as string[]).map(id => id);
+            const currentColumns = (columnState.info.getValueOfAllColumnsAsociatedWith('id') as string[]).map(id => id.toLowerCase());
             const filteredColumns: Record<string, string> = {};
-            Object.keys(columnsRaw)
+            columnsRaw
                 .sort((a, b) => a.localeCompare(b))
                 .filter((columnName: string) => {
                     return !currentColumns.includes(columnName.toLowerCase())
diff --git a/src/components/reducers/DataviewFilters.tsx b/src/components/reducers/DataviewFilters.tsx
@@ -1,5 +1,4 @@
 import { DataviewFiltersProps } from "cdm/ComponentsModel";
-import { DatabaseColumn } from "cdm/DatabaseModel";
 import { obtainColumnsFromRows } from "components/Columns";
 import MenuDownIcon from "components/img/MenuDownIcon";
 import { FiltersModal } from "components/modals/filters/FiltersModal";
@@ -18,7 +17,7 @@ export default function EditFiltersButton(props: DataviewFiltersProps) {
   const columns = tableState.columns((state) => state.columns);
 
   const openFiltersGroupHandler = async () => {
-    new Promise<Record<string, DatabaseColumn>>((resolve, reject) => {
+    new Promise<string[]>((resolve, reject) => {
       // Empty conditions to refresh the dataview
       const emptyFilterConditions = { ...filters };
       emptyFilterConditions.conditions = [];
@@ -33,9 +32,7 @@ export default function EditFiltersButton(props: DataviewFiltersProps) {
     }).then((columns) => {
       new FiltersModal({
         table,
-        possibleColumns: Object.keys(columns).sort((a, b) =>
-          a.localeCompare(b)
-        ),
+        possibleColumns: columns.sort((a, b) => a.localeCompare(b)),
       }).open();
     });
   };
diff --git a/src/main.ts b/src/main.ts
@@ -429,14 +429,12 @@ export default class DBFolderPlugin extends Plugin {
 		 */
 		this.registerEvent(app.workspace.on("active-leaf-change", () => {
 			const activeView = app.workspace.getActiveViewOfType(DatabaseView);
-			if (!activeView) {
+			if (!activeView && this.statusBarItem) {
 				this.statusBarItem.detach();
 				this.statusBarItem = null;
 			}
-			else if (this.statusBarItem) {
+			else if (activeView && this.statusBarItem) {
 				activeView.handleUpdateStatusBar();
-			} else {
-				this.statusBarItem = this.addStatusBarItem();
 			}
 		}));
 	}
@@ -529,7 +527,6 @@ export default class DBFolderPlugin extends Plugin {
 
 		// Ribbon Icon
 		this.showRibbonIcon();
-
 	}
 
 	showRibbonIcon() {
diff --git a/src/parsers/RowDatabaseFieldsToFile.ts b/src/parsers/RowDatabaseFieldsToFile.ts
@@ -28,7 +28,7 @@ export const parseInlineFieldsToString = (inlineFields: RowDatabaseFields): stri
 }
 
 export function parseValuetoSanitizeYamlValue(value: string, localSettings: LocalSettings, wrapQuote = false): string {
-    return ParseService.parseLiteral(value, InputType.MARKDOWN, localSettings, undefined, wrapQuote).toString();
+    return ParseService.parseLiteral(value, InputType.MARKDOWN, localSettings, false, wrapQuote).toString();
 }
 
 function stringifyDbYaml(literal: Literal, level: number, localSettings: LocalSettings, key?: string): string[] {
diff --git a/src/parsers/handlers/unmarshall/UnmarshallConfigHandler.ts b/src/parsers/handlers/unmarshall/UnmarshallConfigHandler.ts
@@ -19,7 +19,7 @@ export class UnmarshallConfigHandler extends AbstractDiskHandler {
                     this.localDisk.push(`${YAML_INDENT.repeat(2)}${key}: ${parseValuetoSanitizeYamlValue(valueInternal as string, config)}`);
                 });
             } else if (typeof valueConfig === "string") {
-                this.localDisk.push(`${YAML_INDENT.repeat(1)}${key}: ${parseValuetoSanitizeYamlValue(escapeSpecialCharacters(valueConfig), config, true)}`);
+                this.localDisk.push(`${YAML_INDENT.repeat(1)}${key}: "${parseValuetoSanitizeYamlValue(escapeSpecialCharacters(valueConfig), config, true)}"`);
             } else {
                 // Lvl2: config properties
                 this.localDisk.push(`${YAML_INDENT.repeat(1)}${key}: ${parseValuetoSanitizeYamlValue(valueConfig, config)}`);
diff --git a/src/services/NoteInfo.ts b/src/services/NoteInfo.ts
@@ -3,6 +3,7 @@ import { MetadataColumns } from "helpers/Constants";
 import { TFile } from "obsidian";
 import { resolve_tfile } from "helpers/FileManagement";
 import { NoteInfoPage } from "cdm/DatabaseModel";
+import { DataviewService } from "./DataviewService";
 /**
  * Keep info about a note and offer methods to manipulate it
  */
@@ -52,11 +53,12 @@ export default class NoteInfo {
             __note__: this
         }
         /** Optional fields */
+        const record = DataviewService.getDataviewAPI().page(this.filepath);
         /** Parse data with the type of column */
-        Object.keys(this.page)
+        Object.keys(record)
             .filter(key => !["file"].includes(key))
             .forEach(property => {
-                aFile[property] = this.page[property];
+                aFile[property] = record[property];
             });
         return aFile;
     }
diff --git a/src/services/parseServiceHelpers/MarkdownParser.ts b/src/services/parseServiceHelpers/MarkdownParser.ts
@@ -3,7 +3,7 @@ import { parseLuxonDatetimeToString, parseLuxonDateToString } from "helpers/Luxo
 import { Literal, WrappedLiteral } from "obsidian-dataview";
 import { DataviewService } from "services/DataviewService";
 import { DateTime } from "luxon";
-import { InputType, MarkdownBreakerRules } from "helpers/Constants";
+import { DEFAULT_SETTINGS, MarkdownBreakerRules } from "helpers/Constants";
 import stringifyReplacer from "./StringifyReplacer";
 
 class MarkdownParser extends TypeParser<Literal> {
@@ -41,10 +41,16 @@ class MarkdownParser extends TypeParser<Literal> {
                 if (wrapped.value.hour === 0 && wrapped.value.minute === 0 && wrapped.value.second === 0) {
                     // Parse date
 
-                    auxMarkdown = parseLuxonDatetimeToString(wrapped.value, this.config.date_format);
+                    auxMarkdown = parseLuxonDatetimeToString(
+                        wrapped.value,
+                        this.config.date_format ?? DEFAULT_SETTINGS.local_settings.date_format
+                    );
                 } else {
                     // Parse datetime
-                    auxMarkdown = parseLuxonDateToString(wrapped.value, this.config.datetime_format);
+                    auxMarkdown = parseLuxonDateToString(
+                        wrapped.value,
+                        this.config.datetime_format ?? DEFAULT_SETTINGS.local_settings.datetime_format
+                    );
                 }
                 break;
             case 'object':
diff --git a/src/services/parseServiceHelpers/ParseBuilder.ts b/src/services/parseServiceHelpers/ParseBuilder.ts
@@ -1,5 +1,5 @@
 import { LocalSettings } from "cdm/SettingsModel"
-import { InputType } from "helpers/Constants"
+import { DEFAULT_SETTINGS, InputType } from "helpers/Constants"
 import ArrayParser from "./ArrayParser"
 import BooleanParser from "./BooleanParser"
 import CalendarParser from "./CalendarParser"
@@ -16,15 +16,17 @@ class ParseBuilder {
     static setType = (type: string, config: LocalSettings, isInline: boolean, wrapQuotes: boolean) => {
         switch (type) {
             case InputType.MARKDOWN:
-                return new MarkdownParser().beforeParse(wrapQuotes, isInline);
+                return new MarkdownParser()
+                    .setConfig(config)
+                    .beforeParse(wrapQuotes, isInline);
             case InputType.SORTING:
                 return new SortingParser();
             case InputType.TAGS:
                 return new ArrayParser();
             case InputType.CALENDAR:
-                return new CalendarParser().beforeParse(config.date_format);
+                return new CalendarParser().beforeParse(config.date_format ?? DEFAULT_SETTINGS.local_settings.date_format);
             case InputType.CALENDAR_TIME:
-                return new CalendarParser().beforeParse(config.datetime_format);
+                return new CalendarParser().beforeParse(config.datetime_format ?? DEFAULT_SETTINGS.local_settings.datetime_format);
             case InputType.METATADA_TIME:
                 return new DatetimeISOParser()
             case InputType.NUMBER:
diff --git a/src/settings/handlers/columns/TemplateColumnsHandler.ts b/src/settings/handlers/columns/TemplateColumnsHandler.ts
@@ -1,5 +1,7 @@
+import { DatabaseColumn } from "cdm/DatabaseModel";
 import { RowDataType } from "cdm/FolderModel";
 import { obtainColumnsFromFile, obtainColumnsFromRows } from "components/Columns";
+import { DEFAULT_COLUMN_CONFIG, InputType } from "helpers/Constants";
 import { resolve_tfile } from "helpers/FileManagement";
 import { t } from "lang/helpers";
 import { Notice, Setting } from "obsidian";
@@ -69,12 +71,25 @@ export class TemplateColumnsHandler extends AbstractSettingsHandler {
                     button.setIcon("save")
                         .setTooltip(t("settings_template_all_button_tooltip"))
                         .onClick(async (): Promise<void> => {
+                            const recordColumns: Record<string, DatabaseColumn> = {};
                             const allColumns = await obtainColumnsFromRows(
                                 view,
                                 view.diskConfig.yaml.config,
                                 view.diskConfig.yaml.filters,
                                 columns);
-                            view.diskConfig.yaml.columns = allColumns;
+
+                            allColumns.forEach((key, index) => {
+                                recordColumns[key] = {
+                                    input: InputType.TEXT,
+                                    accessorKey: key,
+                                    label: key,
+                                    key: key,
+                                    id: key,
+                                    position: index,
+                                    config: DEFAULT_COLUMN_CONFIG,
+                                }
+                            })
+                            view.diskConfig.yaml.columns = recordColumns;
                             view.diskConfig.saveOnDisk();
                             new Notice(t("settings_template_all_notice_success_on_save", Object.keys(columns).length.toString()), 1500);
                         });

Original file line number	Diff line number	Diff line change
`@@ -429,14 +429,12 @@ export default class DBFolderPlugin extends Plugin {`
`429`	`429`	`*/`
`430`	`430`	`this.registerEvent(app.workspace.on("active-leaf-change", () => {`
`431`	`431`	`const activeView = app.workspace.getActiveViewOfType(DatabaseView);`
`432`		`- if (!activeView) {`
	`432`	`+ if (!activeView && this.statusBarItem) {`
`433`	`433`	`this.statusBarItem.detach();`
`434`	`434`	`this.statusBarItem = null;`
`435`	`435`	`}`
`436`		`- else if (this.statusBarItem) {`
	`436`	`+ else if (activeView && this.statusBarItem) {`
`437`	`437`	`activeView.handleUpdateStatusBar();`
`438`		`- } else {`
`439`		`- this.statusBarItem = this.addStatusBarItem();`
`440`	`438`	`}`
`441`	`439`	`}));`
`442`	`440`	`}`
`@@ -529,7 +527,6 @@ export default class DBFolderPlugin extends Plugin {`
`529`	`527`
`530`	`528`	`// Ribbon Icon`
`531`	`529`	`this.showRibbonIcon();`
`532`		`-`
`533`	`530`	`}`
`534`	`531`
`535`	`532`	`showRibbonIcon() {`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ export const parseInlineFieldsToString = (inlineFields: RowDatabaseFields): stri`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`export function parseValuetoSanitizeYamlValue(value: string, localSettings: LocalSettings, wrapQuote = false): string {`
`31`		`- return ParseService.parseLiteral(value, InputType.MARKDOWN, localSettings, undefined, wrapQuote).toString();`
	`31`	`+ return ParseService.parseLiteral(value, InputType.MARKDOWN, localSettings, false, wrapQuote).toString();`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`function stringifyDbYaml(literal: Literal, level: number, localSettings: LocalSettings, key?: string): string[] {`