Merge branch 'minor_bugs_3.1.0'

RafaelGB · RafaelGB · commit 4386ceade9fc · 2022-12-26T13:31:09.000+01:00
diff --git a/src/cdm/SettingsModel.ts b/src/cdm/SettingsModel.ts
@@ -40,7 +40,6 @@ export interface LocalSettings {
     remove_empty_folders: boolean;
     hoist_files_with_empty_attributes: boolean;
     automatically_group_files: boolean;
-    frontmatter_quote_wrap: boolean;
     pagination_size: number;
     font_size: number;
     remove_field_when_delete_column: boolean;
diff --git a/src/components/TableRow.tsx b/src/components/TableRow.tsx
@@ -3,7 +3,7 @@ import { RowDataType } from "cdm/FolderModel";
 import { StyleVariables } from "helpers/Constants";
 import { c } from "helpers/StylesHelper";
 import { Literal } from "obsidian-dataview";
-import React from "react";
+import React, { CSSProperties } from "react";
 import { MdFileComponent } from "components/obsidianArq/embedMdInteractive";
 import { TableRowProps } from "cdm/RowTypeModel";
 
@@ -38,9 +38,11 @@ export default function TableRow(tableRowProps: TableRowProps) {
                 className={`${c(
                   "td" + (cellIndex === 0 ? " row-context-menu" : "")
                 )} data-input`}
-                style={{
-                  fontSize: `${fontSize}px`,
-                }}
+                style={
+                  {
+                    "--dbfolder-font-size": `${fontSize}px`,
+                  } as CSSProperties
+                }
               >
                 {flexRender(cell.column.columnDef.cell, cell.getContext())}
               </div>
diff --git a/src/components/modals/columnSettings/handlers/automations/FormulaInputHandler.ts b/src/components/modals/columnSettings/handlers/automations/FormulaInputHandler.ts
@@ -3,6 +3,7 @@ import { AbstractHandlerClass } from "patterns/chain/AbstractHandler";
 import { Setting } from "obsidian";
 import { add_toggle } from "settings/SettingsComponents";
 import { t } from "lang/helpers";
+import { c } from "helpers/StylesHelper";
 export class FormulaInputHandler extends AbstractHandlerClass<ColumnSettingsHandlerResponse>  {
     settingTitle: string = 'Formula properties';
     handle(columnHandlerResponse: ColumnSettingsHandlerResponse): ColumnSettingsHandlerResponse {
@@ -41,11 +42,7 @@ export class FormulaInputHandler extends AbstractHandlerClass<ColumnSettingsHand
                 textArea.setValue(config.formula_query);
                 textArea.setPlaceholder(t("column_settings_modal_formula_input_textarea_placeholder"));
                 textArea.onChange(formula_promise);
-                // style textarea size in function of formula length
-                const formula_length = config.formula_query ? config.formula_query.length : 0;
-                textArea.inputEl.rows = Math.max(4, formula_length / 30);
-                textArea.inputEl.cols = Math.min(Math.max(10, formula_length * 2), 45);
-                textArea.inputEl.style.width = 'auto';
+                textArea.inputEl.addClass(c("textarea-setting"));
 
             });
         const mainDesc = containerEl.createEl('p');
diff --git a/src/helpers/Constants.ts b/src/helpers/Constants.ts
@@ -396,7 +396,6 @@ export const DEFAULT_SETTINGS: DatabaseSettings = {
     source_data: SourceDataTypes.CURRENT_FOLDER,
     source_form_result: 'root',
     source_destination_path: '/',
-    frontmatter_quote_wrap: false,
     row_templates_folder: '/',
     current_row_template: '',
     pagination_size: 10,
diff --git a/src/lang/locale/en.ts b/src/lang/locale/en.ts
@@ -332,5 +332,4 @@ export default {
   "settings_source_form_destination_title": "Select destination folder",
   "settings_source_form_destination_desc": "Select the destination of new entries for this source",
   "settings_source_form_destination_placeholder": "Example: folder1/folder2",
-
 };
diff --git a/src/lang/locale/es.ts b/src/lang/locale/es.ts
@@ -26,4 +26,15 @@ export default {
     "outgoing_link": "Enlace saliente",
     "incoming_link": "Enlace entrante",
     "query": "Consulta de Dataview",
+    /** COMMAND OPTIONS */
+    "active_go_next_page": "Ir a la página siguiente",
+    "active_go_previous_page": "Ir a la página anterior",
+    "active_add_new_row": "Añadir nueva fila",
+    "active_open_settings": "Abrir configuración",
+    "active_toggle_filters": "Mostrar/Ocultar filtros",
+    "active_open_filters": "Abrir filtros",
+    /** FOOTER MENU OPTIONS */
+    "footer_menu_none": "Nada",
+    "footer_menu_count_unique": "Contar valores únicos",
+    "footer_menu_count_empty": "Contar valores vacíos",
 };
diff --git a/src/parsers/RowDatabaseFieldsToFile.ts b/src/parsers/RowDatabaseFieldsToFile.ts
@@ -27,8 +27,8 @@ export const parseInlineFieldsToString = (inlineFields: RowDatabaseFields): stri
     return array.join('\n');
 }
 
-export function parseValuetoSanitizeYamlValue(value: string, localSettings: LocalSettings): string {
-    return ParseService.parseLiteral(value, InputType.MARKDOWN, localSettings).toString();
+export function parseValuetoSanitizeYamlValue(value: string, localSettings: LocalSettings, wrapQuote = false): string {
+    return ParseService.parseLiteral(value, InputType.MARKDOWN, localSettings, undefined, wrapQuote).toString();
 }
 
 function stringifyDbYaml(literal: Literal, level: number, localSettings: LocalSettings, key?: string): string[] {
@@ -58,7 +58,7 @@ function stringifyDbYaml(literal: Literal, level: number, localSettings: LocalSe
     else if (key) {
         literalBlock.push(`${" ".repeat(level)}${key}: ${ParseService.parseLiteral(literal, InputType.MARKDOWN, localSettings)}`);
     } else {
-        literalBlock.push(`${" ".repeat(level)}- ${ParseService.parseLiteral(literal, InputType.MARKDOWN, { ...localSettings, frontmatter_quote_wrap: true })}`);
+        literalBlock.push(`${" ".repeat(level)}- ${ParseService.parseLiteral(literal, InputType.MARKDOWN, localSettings, undefined, true)}`);
     }
     return literalBlock;
 }
diff --git a/src/parsers/handlers/unmarshall/UnmarshallColumnsHandler.ts b/src/parsers/handlers/unmarshall/UnmarshallColumnsHandler.ts
@@ -31,11 +31,13 @@ export class UnmarshallColumnsHandler extends AbstractDiskHandler {
 
             // Lvl4: column config
             Object.keys(column.config).forEach(key => {
-                let quoteConfig = config;
-                if (column.config[key] && typeof column.config[key] === 'string') {
-                    quoteConfig = { ...config, frontmatter_quote_wrap: true };
-                }
-                const confValue = parseValuetoSanitizeYamlValue(column.config[key]?.toString(), quoteConfig);
+                // Wrap quotes if it is a string
+                const requiredWrap = column.config[key] && typeof column.config[key] === 'string';
+                const confValue = parseValuetoSanitizeYamlValue(
+                    column.config[key]?.toString(),
+                    config,
+                    requiredWrap
+                );
                 this.localDisk.push(`${YAML_INDENT.repeat(3)}${key}: ${confValue}`);
             });
         };
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)}`);
+                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/EditEngineService.ts b/src/services/EditEngineService.ts
@@ -158,7 +158,12 @@ class EditEngine {
 
         async function persistFrontmatter(deletedColumn?: string): Promise<void> {
             await app.fileManager.processFrontMatter(file, (frontmatter) => {
-                Object.assign(frontmatter, rowFields.frontmatter);
+                frontmatter[columnId] = ParseService.parseLiteral(
+                    rowFields.frontmatter[columnId],
+                    InputType.MARKDOWN,
+                    ddbbConfig
+                );
+
                 if (deletedColumn) {
                     delete frontmatter[deletedColumn];
                 }
diff --git a/src/services/MarkdownRenderService.ts b/src/services/MarkdownRenderService.ts
@@ -37,7 +37,6 @@ class MarkdownRenderService {
             }
             // Array modifiers
             if (SUGGESTER_REGEX.TEXT_ARRAY.test(markdownString)) {
-                console.log("Array detected");
                 let alternativeString = "";
                 markdownString
                     .replaceAll(SUGGESTER_REGEX.TEXT_ARRAY, "$2")
diff --git a/src/services/ParseService.ts b/src/services/ParseService.ts
@@ -21,7 +21,7 @@ class Parse {
      * @param isInline 
      * @returns 
      */
-    public parseLiteral(literal: Literal, dataTypeDst: string, localSettings: LocalSettings, isInline?: boolean): Literal {
+    public parseLiteral(literal: Literal, dataTypeDst: string, localSettings: LocalSettings, isInline?: boolean, wrapQuotes = false): Literal {
         let parsedLiteral: Literal = literal;
         if (!DataviewService.isTruthy(literal?.toString())) {
             return "";
@@ -31,7 +31,7 @@ class Parse {
         // Check empty or undefined literals
         switch (dataTypeDst) {
             case InputType.MARKDOWN:
-                parsedLiteral = this.parseToMarkdown(wrapped, localSettings, isInline);
+                parsedLiteral = this.parseToMarkdown(wrapped, localSettings, isInline, wrapQuotes);
                 break;
             case InputType.SORTING:
                 parsedLiteral = this.parseToEnableSorting(wrapped, localSettings, isInline);
@@ -284,7 +284,7 @@ class Parse {
         return auxMarkdown;
     }
 
-    private parseToMarkdown(wrapped: WrappedLiteral, localSettings: LocalSettings, isInline: boolean): string {
+    private parseToMarkdown(wrapped: WrappedLiteral, localSettings: LocalSettings, isInline: boolean, wrapQuotes = false): string {
         let auxMarkdown = '';
         switch (wrapped.type) {
             case 'boolean':
@@ -325,8 +325,7 @@ class Parse {
             default:
                 auxMarkdown = wrapped.value?.toString().trim();
         }
-        // Check possible markdown breakers
-        return this.handleYamlBreaker(auxMarkdown, localSettings, isInline);
+        return wrapQuotes ? this.handleYamlBreaker(auxMarkdown) : auxMarkdown;
     }
 
     private parseArrayToText(array: Literal[], localSettings: LocalSettings): string {
@@ -349,23 +348,13 @@ class Parse {
         return wrapped.value.map(v => satinizedColumnOption(DataviewService.getDataviewAPI().value.toString(v)));
     }
 
-    private handleYamlBreaker(value: string, localSettings: LocalSettings, isInline?: boolean): string {
+    private handleYamlBreaker(value: string): string {
         // Remove a possible already existing quote wrapper
         if (value.startsWith('"') && value.endsWith('"')) {
             value = value.substring(1, value.length - 1);
             return this.wrapWithQuotes(value);
         }
 
-        // Wrap in quotes if is configured to do so
-        if (localSettings.frontmatter_quote_wrap) {
-            return this.wrapWithQuotes(value);
-        }
-
-        // Do nothing if is inline
-        if (isInline) {
-            return value;
-        }
-
         // Check possible markdown breakers of the yaml
         if (MarkdownBreakerRules.INIT_CHARS.some(c => value.startsWith(c)) ||
             MarkdownBreakerRules.BETWEEN_CHARS.some(rule => value.includes(rule)) ||
diff --git a/src/settings/EditingEngineSection.ts b/src/settings/EditingEngineSection.ts
@@ -1,7 +1,6 @@
 import { AbstractChain } from "patterns/chain/AbstractFactoryChain";
 import { SettingHandlerResponse } from "settings/handlers/AbstractSettingHandler";
 import { add_setting_header } from "settings/SettingsComponents";
-import { FrontmatterQuotesToggleHandler } from "settings/handlers/editingEngine/FrontmatterQuotesToggleHandler";
 import { AbstractHandler } from "patterns/chain/AbstractHandler";
 import { DateFormatHandler } from "settings/handlers/editingEngine/DateFormatHandler";
 import { t } from "lang/helpers";
@@ -16,7 +15,6 @@ class EditingEngineSetttingsSection extends AbstractChain<SettingHandlerResponse
     }
     protected getHandlers(): AbstractHandler<SettingHandlerResponse>[] {
         return [
-            new FrontmatterQuotesToggleHandler(),
             new DateFormatHandler()
         ]
     }
diff --git a/src/settings/handlers/editingEngine/FrontmatterQuotesToggleHandler.ts b/src/settings/handlers/editingEngine/FrontmatterQuotesToggleHandler.ts
diff --git a/src/settings/handlers/source/SourceFormHandler.ts b/src/settings/handlers/source/SourceFormHandler.ts
@@ -2,6 +2,7 @@ import { TableColumn } from "cdm/FolderModel";
 import { DatabaseView } from "DatabaseView";
 import { SourceDataTypes } from "helpers/Constants";
 import { generateDataviewTableQuery } from "helpers/QueryHelper";
+import { c } from "helpers/StylesHelper";
 import { t } from "lang/helpers";
 import { Notice, Setting } from "obsidian";
 import { DataviewService } from "services/DataviewService";
@@ -12,6 +13,7 @@ import { StringSuggest } from "settings/suggesters/StringSuggester";
 
 export class SourceFormHandler extends AbstractSettingsHandler {
     settingTitle = t("settings_source_form_title");
+    private sourceFormResultTimeout: NodeJS.Timeout;
     handle(settingHandlerResponse: SettingHandlerResponse): SettingHandlerResponse {
         const { containerEl, view, columns } = settingHandlerResponse;
         switch (view.diskConfig.yaml.config.source_data) {
@@ -83,14 +85,21 @@ export class SourceFormHandler extends AbstractSettingsHandler {
 
     private queryHandler(view: DatabaseView, containerEl: HTMLElement, columns: TableColumn[]) {
         const query_promise = async (value: string): Promise<void> => {
-            // update settings
-            view.diskConfig.yaml.config.source_form_result = value;
-            view.diskConfig.updateConfig({ source_form_result: value });
+            if (this.sourceFormResultTimeout) {
+                clearTimeout(this.sourceFormResultTimeout);
+            }
+            this.sourceFormResultTimeout = setTimeout(() => {
+                // update settings
+                view.diskConfig.yaml.config.source_form_result = value;
+                view.diskConfig.updateConfig({ source_form_result: value });
+            }, 1500);
+
         };
         new Setting(containerEl)
             .setName(t("settings_source_form_query_title"))
             .setDesc(t("settings_source_form_query_desc"))
             .addTextArea((textArea) => {
+                textArea.inputEl.addClass(c("textarea-setting"));
                 textArea.setValue(view.diskConfig.yaml.config.source_form_result);
                 textArea.setPlaceholder(t("settings_source_form_query_placeholder"));
                 textArea.onChange(query_promise);
diff --git a/styles.css b/styles.css
@@ -3,6 +3,7 @@
 ******************/
 .database-plugin__container {
   --dbfolder-line-height: 1rem;
+  --dbfolder-font-size: 16px;
 }
 /*****************
 *      Base
@@ -126,11 +127,14 @@ div.database-plugin__td.data-input:hover {
   text-align: -webkit-center;
   vertical-align: middle;
   line-height: var(--dbfolder-line-height);
+  font-size: var(--dbfolder-font-size);
 }
 
 .database-plugin__td.data-input p {
   margin: 0;
+  font-size: var(--dbfolder-font-size);
 }
+
 /** children of data-input fills parent div*/
 .data-input > * {
   border: none;
@@ -858,6 +862,12 @@ div.database-plugin__td.data-input:hover {
 .database-plugin__container div.dataview-error-box {
   display: none;
 }
+
+.database-plugin__textarea-setting {
+  min-width: 350px;
+  min-height: 80px;
+  margin: 10px;
+}
 /************************************************************
  *                    EXTERNAL APIs STYLES
  ************************************************************/

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,8 @@ export const parseInlineFieldsToString = (inlineFields: RowDatabaseFields): stri`
`27`	`27`	`return array.join('\n');`
`28`	`28`	`}`
`29`	`29`
`30`		`-export function parseValuetoSanitizeYamlValue(value: string, localSettings: LocalSettings): string {`
`31`		`- return ParseService.parseLiteral(value, InputType.MARKDOWN, localSettings).toString();`
	`30`	`+export function parseValuetoSanitizeYamlValue(value: string, localSettings: LocalSettings, wrapQuote = false): string {`
	`31`	`+ return ParseService.parseLiteral(value, InputType.MARKDOWN, localSettings, undefined, wrapQuote).toString();`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`function stringifyDbYaml(literal: Literal, level: number, localSettings: LocalSettings, key?: string): string[] {`
`@@ -58,7 +58,7 @@ function stringifyDbYaml(literal: Literal, level: number, localSettings: LocalSe`
`58`	`58`	`else if (key) {`
`59`	`59`	literalBlock.push(`${" ".repeat(level)}${key}: ${ParseService.parseLiteral(literal, InputType.MARKDOWN, localSettings)}`);
`60`	`60`	`} else {`
`61`		- literalBlock.push(`${" ".repeat(level)}- ${ParseService.parseLiteral(literal, InputType.MARKDOWN, { ...localSettings, frontmatter_quote_wrap: true })}`);
	`61`	+ literalBlock.push(`${" ".repeat(level)}- ${ParseService.parseLiteral(literal, InputType.MARKDOWN, localSettings, undefined, true)}`);
`62`	`62`	`}`
`63`	`63`	`return literalBlock;`
`64`	`64`	`}`