Merge branch 'hotfix2.6.0'

Author: RafaelGB

src/helpers/QueryHelper.ts

@@ -3,10 +3,13 @@ import { DatabaseCore } from "helpers/Constants";
 import { LOGGER } from "services/Logger";
 
 export function generateDataviewTableQuery(columns: TableColumn[], fromQuery: string): string {
-    return `TABLE ${columns
+    LOGGER.info('generateDataviewTableQuery');
+    const query = `TABLE ${columns
         .filter((col) => !col.isMetadata)
-        .map((col) => `"${col.key}"`)
-        .join(",")},${DatabaseCore.DATAVIEW_FILE},${DatabaseCore.FRONTMATTER_KEY} ${fromQuery}`
+        .map((col) => `${col.key}`)
+        .join(",")},${DatabaseCore.DATAVIEW_FILE},${DatabaseCore.FRONTMATTER_KEY} ${fromQuery}`;
+    LOGGER.info(`DV query of the source: ${query}`);
+    return query;
 }
 
 

src/settings/AutomationSection.ts

@@ -6,10 +6,10 @@ import { FormulaJSFolderHandler } from 'settings/handlers/automation/FormulaJSFo
 
 class AutomationSetttingsSection extends AbstractChain<SettingHandlerResponse> {
     protected customHandle(settingHandlerResponse: SettingHandlerResponse): SettingHandlerResponse {
-        const columns_section = settingHandlerResponse.containerEl.createDiv("configuration-section-container-automations");
+        const automation_section = settingHandlerResponse.containerEl.createDiv("configuration-section-container-automations");
         // title of the section
-        add_setting_header(columns_section, "Automations related the table", 'h3');
-        settingHandlerResponse.containerEl = columns_section;
+        add_setting_header(automation_section, "Automations related the table", 'h3');
+        settingHandlerResponse.containerEl = automation_section;
         return settingHandlerResponse;
     }
     protected getHandlers(): AbstractHandler<SettingHandlerResponse>[] {

src/settings/handlers/automation/FormulaJSFolderHandler.ts

@@ -3,13 +3,25 @@ import { AbstractSettingsHandler, SettingHandlerResponse } from "settings/handle
 import { FolderSuggest } from "settings/suggesters/FolderSuggester";
 
 export class FormulaJSFolderHandler extends AbstractSettingsHandler {
-    settingTitle: string = 'Select the source of database data';
+    settingTitle: string = 'Select the source of your formula JS files';
     handle(settingHandlerResponse: SettingHandlerResponse): SettingHandlerResponse {
-        const { containerEl, view } = settingHandlerResponse;
+        const { settingsManager, containerEl, view, local } = settingHandlerResponse;
         const formula_folder_promise = async (value: string): Promise<void> => {
-            // update settings
-            view.diskConfig.updateConfig({ formula_folder_path: value });
+            if (local) {
+                // update settings
+                view.diskConfig.updateConfig({ formula_folder_path: value });
+            } else {
+                // switch show created on/off
+                const update_local_settings = settingsManager.plugin.settings.local_settings;
+                update_local_settings.formula_folder_path = value;
+                // update settings
+                await settingsManager.plugin.updateSettings({
+                    local_settings: update_local_settings
+                });
+            }
+
         };
+        console.log('FormulaJSFolderHandler bejore');
         // render dropdown inside container
         new Setting(containerEl)
             .setName('Select the formula JS folder')
@@ -19,9 +31,11 @@ export class FormulaJSFolderHandler extends AbstractSettingsHandler {
                     cb.inputEl
                 );
                 cb.setPlaceholder("Example: path/to/folder")
-                    .setValue(view.diskConfig.yaml.config.formula_folder_path)
+                    .setValue(local ? view.diskConfig.yaml.config.formula_folder_path : settingsManager.plugin.settings.local_settings.formula_folder_path)
                     .onChange(formula_folder_promise);
             });
+
+        console.log('FormulaJSFolderHandler after');
         return this.goNext(settingHandlerResponse);
     }
 }