move metainfo to add columns

RafaelGB · RafaelGB · commit b47bd11a3324 · 2023-02-19T00:33:11.000+01:00
diff --git a/src/components/modals/newColumn/SelectNewColumnSection.ts b/src/components/modals/newColumn/SelectNewColumnSection.ts
@@ -4,12 +4,14 @@ import { AbstractHandler } from "patterns/chain/AbstractHandler";
 import { AddEmptyColumnHandler } from "components/modals/newColumn/handlers/AddEmptyColumnHandler";
 import { AddExistingColumnHandler } from "components/modals/newColumn/handlers/AddExistingColumnHandler";
 import { QuickOptionsColumnsHandler } from "components/modals/newColumn/handlers/QuickOptionsColumnsHandler";
+import { MetadataToggleGroupHandler } from "./handlers/MetadataToggleGroupHandler";
 
 class SelectNewColumnSection extends AbstractChain<AddColumnModalHandlerResponse> {
     protected getHandlers(): AbstractHandler<AddColumnModalHandlerResponse>[] {
         return [
             new AddEmptyColumnHandler(),
             new AddExistingColumnHandler(),
+            new MetadataToggleGroupHandler(),
             new QuickOptionsColumnsHandler()
         ];
     }
diff --git a/src/components/modals/newColumn/handlers/AddEmptyColumnHandler.ts b/src/components/modals/newColumn/handlers/AddEmptyColumnHandler.ts
@@ -31,6 +31,7 @@ export class AddEmptyColumnHandler extends AbstractHandlerClass<AddColumnModalHa
           t("add_row_modal_add_empty_notice_informed", newColumnName),
         1500);
       (activeDocument.getElementById(this.textElId) as HTMLInputElement).value = "";
+      addColumnModalManager.addColumnModal.enableReset = true;
     }
 
     const selectTypeHandler = (value: string): void => {
diff --git a/src/components/modals/newColumn/handlers/MetadataToggleGroupHandler.ts b/src/components/modals/newColumn/handlers/MetadataToggleGroupHandler.ts
@@ -0,0 +1,121 @@
+import { AddColumnModalHandlerResponse } from "cdm/ModalsModel";
+import { ColumnSettingsModal } from "components/modals/columnSettings/ColumnSettingsModal";
+import { MetadataColumns } from "helpers/Constants";
+import { t } from "lang/helpers";
+import { Setting } from "obsidian";
+import { AbstractHandlerClass } from "patterns/chain/AbstractHandler";
+import { add_setting_header } from "settings/SettingsComponents";
+
+export class MetadataToggleGroupHandler extends AbstractHandlerClass<AddColumnModalHandlerResponse> {
+    settingTitle: string = t("settings_metatata_title");
+    handle(response: AddColumnModalHandlerResponse): AddColumnModalHandlerResponse {
+        const { containerEl, addColumnModalManager } = response;
+        const { view } = addColumnModalManager.props;
+
+        const metadata_section = containerEl.createDiv("configuration-section-container-columns-metadata");
+        // title of the section
+        add_setting_header(metadata_section, this.settingTitle, 'h4');
+        /*************************
+         * METADATA CREATED COLUMN
+         *************************/
+        const metadata_file_toggle_promise = async (value: boolean): Promise<void> => {
+            // Persist value
+            await view.diskConfig.updateColumnProperties(MetadataColumns.FILE, { isHidden: value });
+            addColumnModalManager.addColumnModal.enableReset = true;
+        }
+        new Setting(metadata_section)
+            .setName(t("settings_metatata_file_toggle_title"))
+            .setDesc(t("settings_metatata_file_toggle_desc"))
+            .addToggle(toggle =>
+                toggle.setValue(view.diskConfig.yaml.columns.__file__.isHidden)
+                    .onChange(metadata_file_toggle_promise)
+            );
+
+        /*************************
+         * METADATA CREATED COLUMN
+         *************************/
+        const metadata_created_toggle_promise = async (value: boolean): Promise<void> => {
+            // Persist value
+            view.diskConfig.updateConfig({ show_metadata_created: value });
+            addColumnModalManager.addColumnModal.enableReset = true;
+        }
+        new Setting(metadata_section)
+            .setName(t("settings_metatata_create_toggle_title"))
+            .setDesc(t("settings_metatata_create_toggle_desc"))
+            .addToggle(toggle =>
+                toggle.setValue(view.diskConfig.yaml.config.show_metadata_created)
+                    .onChange(metadata_created_toggle_promise)
+            );
+
+        /*************************
+        * METADATA MODIFIED COLUMN
+        *************************/
+        const metadata_modified_toggle_promise = async (value: boolean): Promise<void> => {
+            // Persist value
+            view.diskConfig.updateConfig({ show_metadata_modified: value });
+            addColumnModalManager.addColumnModal.enableReset = true;
+        }
+
+        new Setting(metadata_section)
+            .setName(t("settings_metatata_modified_toggle_title"))
+            .setDesc(t("settings_metatata_modified_toggle_desc"))
+            .addToggle(toggle =>
+                toggle
+                    .setValue(view.diskConfig.yaml.config.show_metadata_modified)
+                    .onChange(metadata_modified_toggle_promise)
+            );
+
+        /*************************
+        * METADATA TASK COLUMN
+        *************************/
+        const metadata_tasks_toggle_promise = async (value: boolean): Promise<void> => {
+            // Persist value
+            view.diskConfig.updateConfig({ show_metadata_tasks: value });
+            addColumnModalManager.addColumnModal.enableReset = true;
+        }
+
+        new Setting(metadata_section)
+            .setName(t("settings_metatata_task_toggle_title"))
+            .setDesc(t("settings_metatata_task_toggle_desc"))
+            .addToggle(toggle =>
+                toggle.setValue(view.diskConfig.yaml.config.show_metadata_tasks)
+                    .onChange(metadata_tasks_toggle_promise)
+            );
+
+        /*************************
+        * INLINKS COLUMN
+        *************************/
+        const metadata_inlinks_toggle_promise = async (value: boolean): Promise<void> => {
+            // Persist value
+            view.diskConfig.updateConfig({ show_metadata_inlinks: value });
+            addColumnModalManager.addColumnModal.enableReset = true;
+        }
+
+        new Setting(metadata_section)
+            .setName(t("settings_metatata_inlinks_toggle_title"))
+            .setDesc(t("settings_metatata_inlinks_toggle_desc"))
+            .addToggle(toggle =>
+                toggle.setValue(view.diskConfig.yaml.config.show_metadata_inlinks)
+                    .onChange(metadata_inlinks_toggle_promise)
+            );
+
+        /*************************
+        * OUTLINKS COLUMN
+        *************************/
+        const metadata_outlinks_toggle_promise = async (value: boolean): Promise<void> => {
+            // Persist value
+            view.diskConfig.updateConfig({ show_metadata_outlinks: value });
+            addColumnModalManager.addColumnModal.enableReset = true;
+        }
+
+        new Setting(metadata_section)
+            .setName(t("settings_metatata_outlinks_toggle_title"))
+            .setDesc(t("settings_metatata_outlinks_toggle_desc"))
+            .addToggle(toggle =>
+                toggle.setValue(view.diskConfig.yaml.config.show_metadata_outlinks)
+                    .onChange(metadata_outlinks_toggle_promise)
+            );
+
+        return this.goNext(response);
+    }
+}
diff --git a/src/components/modals/newColumn/handlers/QuickOptionsColumnsHandler.ts b/src/components/modals/newColumn/handlers/QuickOptionsColumnsHandler.ts
@@ -22,9 +22,10 @@ export class QuickOptionsColumnsHandler extends AbstractHandlerClass<AddColumnMo
     Object.values(DynamicInputType).forEach((value) => {
       typesRecord[value] = t(value);
     });
+
     // List of columns to show/hide
     columnState.info.getAllColumns()
-      .filter(c => !c.skipPersist)
+      .filter(c => !c.skipPersist && !c.isMetadata)
       .sort((a, b) => a.position - b.position)
       .forEach((column) => {
         const toggleHandler = (shown: boolean): void => {
@@ -64,37 +65,31 @@ export class QuickOptionsColumnsHandler extends AbstractHandlerClass<AddColumnMo
               .setIcon("gear")
               .setTooltip(t("add_row_modal_quick_options_desc_button_add_tooltip", column.label))
               .onClick(openSettingsHandler)
+          }).addDropdown((dropdown) => {
+            dropdown.addOptions(typesRecord);
+            dropdown.setValue(column.input);
+            dropdown.onChange(selectTypeHandler);
+          });
+        // Delete column
+        columnSetting
+          .addButton(button => {
+            button
+              .setIcon("trash")
+              .setTooltip(t("add_row_modal_quick_options_desc_button_delete_tooltip", column.label))
+              .onClick(async () => {
+                const confirmation = await new ConfirmModal()
+                  .setMessage(t(
+                    "add_row_modal_quick_options_desc_button_delete_notice_confirm",
+                    column.label
+                  ))
+                  .isConfirmed();
+                if (confirmation) {
+                  columnState.actions.remove(column);
+                  // Refresh the modal to remove the selected column from the dropdown
+                  addColumnModalManager.reset(response);
+                }
+              })
           });
-        // Add extra options for non-metadata columns
-        if (!column.isMetadata) {
-          // Select type
-          columnSetting
-            .addDropdown((dropdown) => {
-              dropdown.addOptions(typesRecord);
-              dropdown.setValue(column.input);
-              dropdown.onChange(selectTypeHandler);
-            });
-          // Delete column
-          columnSetting
-            .addButton(button => {
-              button
-                .setIcon("trash")
-                .setTooltip(t("add_row_modal_quick_options_desc_button_delete_tooltip", column.label))
-                .onClick(async () => {
-                  const confirmation = await new ConfirmModal()
-                    .setMessage(t(
-                      "add_row_modal_quick_options_desc_button_delete_notice_confirm",
-                      column.label
-                    ))
-                    .isConfirmed();
-                  if (confirmation) {
-                    columnState.actions.remove(column);
-                    // Refresh the modal to remove the selected column from the dropdown
-                    addColumnModalManager.reset(response);
-                  }
-                })
-            });
-        }
       });
     return this.goNext(response);
   }
diff --git a/src/lang/locale/en.ts b/src/lang/locale/en.ts
@@ -265,6 +265,8 @@ export default {
   "settings_inline_options_position_title": "Select position of new inline fields",
   "settings_inline_options_position_desc": "New inline fields will be created in the selected position on your notes",
   "settings_metatata_title": "Metadata toggle group",
+  "settings_metatata_file_toggle_title": "File name",
+  "settings_metatata_file_toggle_desc": "Enable/disable File Name Column",
   "settings_metatata_create_toggle_title": "Created date",
   "settings_metatata_create_toggle_desc": "Enable/disable Created Metadata Column",
   "settings_metatata_modified_toggle_title": "Modified date",
diff --git a/src/lang/locale/es.ts b/src/lang/locale/es.ts
@@ -254,6 +254,8 @@ export default {
     "settings_inline_options_position_title": "Posición de los campos inline",
     "settings_inline_options_position_desc": "Selecciona la posición de los nuevos campos inline dentro de la nota",
     "settings_metatata_title": "Meta información",
+    "settings_metatata_file_toggle_title": "Nombre del archivo",
+    "settings_metatata_file_toggle_desc": "Habilitar/deshabilitar la columna de nombre del archivo",
     "settings_metatata_create_toggle_title": "Fecha de creación",
     "settings_metatata_create_toggle_desc": "Habilitar/deshabilitar la columna de fecha de creación",
     "settings_metatata_modified_toggle_title": "Fecha de modificación",
diff --git a/src/lang/locale/fr.ts b/src/lang/locale/fr.ts
@@ -249,6 +249,8 @@ export default {
   "settings_inline_options_position_title": "Sélectionner la position des nouveaux champs en ligne",
   "settings_inline_options_position_desc": "De nouveaux champs en ligne seront créés à l'emplacement sélectionné sur vos notes.",
   "settings_metatata_title": "Contrôle des métadonnées",
+  "settings_metatata_file_toggle_title": "Nom du fichier",
+  "settings_metatata_file_toggle_desc": "Activer/désactiver la colonne des métadonnées de nom de fichier.",
   "settings_metatata_create_toggle_title": "Date de création",
   "settings_metatata_create_toggle_desc": "Activer/désactiver la colonne des métadonnées de date de création.",
   "settings_metatata_modified_toggle_title": "Date de modification",
diff --git a/src/settings/ColumnsSection.ts b/src/settings/ColumnsSection.ts
@@ -2,7 +2,7 @@ import { add_setting_header } from 'settings/SettingsComponents';
 import { SettingHandlerResponse } from 'settings/handlers/AbstractSettingHandler';
 import { GroupFolderColumnTextInputHandler } from 'settings/handlers/columns/GroupFolderColumnTextInputHandler';
 import { RemoveFieldsWhenDeleteToggleHandler } from 'settings/handlers/columns/RemoveFieldsWhenDeleteToggleHandler';
-import { MetadataToggleGroupHandler } from 'settings/handlers/columns/MetadataToggleGroupHandler';
+import { DefaultMetadataToggleGroupHandler } from 'settings/handlers/columns/DefaultMetadataToggleGroupHandler';
 import { TemplateColumnsHandler } from 'settings/handlers/columns/TemplateColumnsHandler';
 import { InlineFieldsOptionsHandler } from 'settings/handlers/columns/InlineFieldsOptionsHandler';
 import { AbstractChain } from 'patterns/chain/AbstractFactoryChain';
@@ -22,7 +22,7 @@ class ColumnSetttingsSection extends AbstractChain<SettingHandlerResponse> {
             new GroupFolderColumnTextInputHandler(),
             new RemoveFieldsWhenDeleteToggleHandler(),
             new TemplateColumnsHandler(),
-            new MetadataToggleGroupHandler(),
+            new DefaultMetadataToggleGroupHandler(),
             new InlineFieldsOptionsHandler()
         ];
     }
diff --git a/src/settings/handlers/columns/DefaultMetadataToggleGroupHandler.ts b/src/settings/handlers/columns/DefaultMetadataToggleGroupHandler.ts
@@ -0,0 +1,122 @@
+import { t } from "lang/helpers";
+import { Setting } from "obsidian";
+import { AbstractSettingsHandler, SettingHandlerResponse } from "settings/handlers/AbstractSettingHandler";
+import { add_setting_header } from "settings/SettingsComponents";
+
+export class DefaultMetadataToggleGroupHandler extends AbstractSettingsHandler {
+    settingTitle: string = t("settings_metatata_title");
+    handle(settingHandlerResponse: SettingHandlerResponse): SettingHandlerResponse {
+        const { settingsManager, containerEl, local } = settingHandlerResponse;
+        if (!local) {
+            const metadata_section = containerEl.createDiv("configuration-section-container-columns-metadata");
+            // title of the section
+            add_setting_header(metadata_section, this.settingTitle, 'h4');
+            /*************************
+             * METADATA CREATED COLUMN
+             *************************/
+            const metadata_created_toggle_promise = async (value: boolean): Promise<void> => {
+                // switch show created on/off
+                const update_local_settings = settingsManager.plugin.settings.local_settings;
+                update_local_settings.show_metadata_created = value;
+                // update settings
+                await settingsManager.plugin.updateSettings({
+                    local_settings: update_local_settings
+                });
+
+            }
+
+            new Setting(metadata_section)
+                .setName(t("settings_metatata_create_toggle_title"))
+                .setDesc(t("settings_metatata_create_toggle_desc"))
+                .addToggle(toggle =>
+                    toggle.setValue(settingsManager.plugin.settings.local_settings.show_metadata_created)
+                        .onChange(metadata_created_toggle_promise)
+                )
+
+            /*************************
+            * METADATA MODIFIED COLUMN
+            *************************/
+            const metadata_modified_toggle_promise = async (value: boolean): Promise<void> => {
+                // switch show modified on/off
+                const update_local_settings = settingsManager.plugin.settings.local_settings;
+                update_local_settings.show_metadata_modified = value;
+                // update settings
+                await settingsManager.plugin.updateSettings({
+                    local_settings: update_local_settings
+                });
+            }
+
+            new Setting(metadata_section)
+                .setName(t("settings_metatata_modified_toggle_title"))
+                .setDesc(t("settings_metatata_modified_toggle_desc"))
+                .addToggle(toggle =>
+                    toggle.setValue(settingsManager.plugin.settings.local_settings.show_metadata_modified)
+                        .onChange(metadata_modified_toggle_promise)
+                );
+
+            /*************************
+            * METADATA TASK COLUMN
+            *************************/
+            const metadata_tasks_toggle_promise = async (value: boolean): Promise<void> => {
+                // switch show task on/off
+                const update_local_settings = settingsManager.plugin.settings.local_settings;
+                update_local_settings.show_metadata_tasks = value;
+                // update settings
+                await settingsManager.plugin.updateSettings({
+                    local_settings: update_local_settings
+                });
+            }
+
+            new Setting(metadata_section)
+                .setName(t("settings_metatata_task_toggle_title"))
+                .setDesc(t("settings_metatata_task_toggle_desc"))
+                .addToggle(toggle =>
+                    toggle.setValue(settingsManager.plugin.settings.local_settings.show_metadata_tasks)
+                        .onChange(metadata_tasks_toggle_promise)
+                );
+
+            /*************************
+            * INLINKS COLUMN
+            *************************/
+            const metadata_inlinks_toggle_promise = async (value: boolean): Promise<void> => {
+                // switch show task on/off
+                const update_local_settings = settingsManager.plugin.settings.local_settings;
+                update_local_settings.show_metadata_inlinks = value;
+                // update settings
+                await settingsManager.plugin.updateSettings({
+                    local_settings: update_local_settings
+                });
+            }
+
+            new Setting(metadata_section)
+                .setName(t("settings_metatata_inlinks_toggle_title"))
+                .setDesc(t("settings_metatata_inlinks_toggle_desc"))
+                .addToggle(toggle =>
+                    toggle.setValue(settingsManager.plugin.settings.local_settings.show_metadata_inlinks)
+                        .onChange(metadata_inlinks_toggle_promise)
+                );
+
+            /*************************
+            * OUTLINKS COLUMN
+            *************************/
+            const metadata_outlinks_toggle_promise = async (value: boolean): Promise<void> => {
+                // switch show task on/off
+                const update_local_settings = settingsManager.plugin.settings.local_settings;
+                update_local_settings.show_metadata_outlinks = value;
+                // update settings
+                await settingsManager.plugin.updateSettings({
+                    local_settings: update_local_settings
+                });
+            }
+
+            new Setting(metadata_section)
+                .setName(t("settings_metatata_outlinks_toggle_title"))
+                .setDesc(t("settings_metatata_outlinks_toggle_desc"))
+                .addToggle(toggle =>
+                    toggle.setValue(settingsManager.plugin.settings.local_settings.show_metadata_outlinks)
+                        .onChange(metadata_outlinks_toggle_promise)
+                );
+        }
+        return this.goNext(settingHandlerResponse);
+    }
+}
diff --git a/src/settings/handlers/columns/MetadataToggleGroupHandler.ts b/src/settings/handlers/columns/MetadataToggleGroupHandler.ts
diff --git a/src/settings/handlers/folder/DetailsFormHandler.ts b/src/settings/handlers/folder/DetailsFormHandler.ts

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ export class AddEmptyColumnHandler extends AbstractHandlerClass<AddColumnModalHa`
`31`	`31`	`t("add_row_modal_add_empty_notice_informed", newColumnName),`
`32`	`32`	`1500);`
`33`	`33`	`(activeDocument.getElementById(this.textElId) as HTMLInputElement).value = "";`
	`34`	`+ addColumnModalManager.addColumnModal.enableReset = true;`
`34`	`35`	`}`
`35`	`36`
`36`	`37`	`const selectTypeHandler = (value: string): void => {`