reworking de settings

Author: RafaelGB

dist/main.js

@@ -5,15 +5,27 @@ import { DatabaseView } from "DatabaseView";
 import { LOGGER } from "services/Logger";
 import { developer_settings_section } from "settings/DeveloperSection";
 
+interface GlobalSettings {
+  enable_debug_mode: boolean;
+  logger_level_info: string;
+}
 
+interface LocalSettings {
+  enable_show_state: boolean;
+}
 export interface DatabaseSettings {
-    enable_debug_mode: boolean;
-    logger_level_info: string;
+  global_settings: GlobalSettings;
+  local_settings: LocalSettings;
 }
 
 export const DEFAULT_SETTINGS: DatabaseSettings = {
+  global_settings:{
     enable_debug_mode: false,
-    logger_level_info: "error"
+    logger_level_info: 'error'
+  },
+  local_settings:{
+    enable_show_state: false
+  }
 };
 
 export type SettingRetriever = <K extends keyof DatabaseSettings>(
@@ -117,6 +129,6 @@ export class DBFolderSettingTab extends PluginSettingTab {
 
 export function loadServicesThatRequireSettings(settings: DatabaseSettings) {
   /** Init logger */
-    LOGGER.setDebugMode(settings.enable_debug_mode);
-    LOGGER.setLevelInfo(settings.logger_level_info);
+    LOGGER.setDebugMode(settings.global_settings.enable_debug_mode);
+    LOGGER.setLevelInfo(settings.global_settings.logger_level_info);
 }

src/Settings.ts

@@ -5,7 +5,7 @@ const DraggableStyle = (styleProps:any) => ({
     userSelect: "none",
 
     // change background colour if dragging
-    background: styleProps.dragableProps.isDragging ? "lightgreen" : "grey",
+    // background: styleProps.dragableProps.isDragging ? "lightgreen" : "grey",
 
     ...(!styleProps.dragableProps.isDragging && { transform: "translate(0,0)" }),
     ...(styleProps.dragableProps.isDropAnimating && { transitionDuration: "0.001s" })

src/components/styles/DragableStyle.ts

@@ -1,8 +1,8 @@
 import { add_setting_header } from 'settings/SettingsComponents';
 import { SettingHandler } from 'settings/handlers/AbstractSettingHandler';
-import { DebugToggleHandler } from 'settings/handlers/DebugToggleSettingHandler';
+import { LoggerToggleHandler } from 'settings/handlers/developer/LoggerToggleHandler';
 import { SettingsManager } from 'Settings';
-import { DropDownLevelInfoHandler } from 'settings/handlers/DropDownLevelInfoHandler';
+import { LoggerLevelInfoDropDownHandler } from 'settings/handlers/developer/LoggerLevelInfoDropDownHandler';
 
 /**
      * developer settings section
@@ -27,7 +27,7 @@ export function developer_settings_section(settingsManager: SettingsManager, con
  */
  function getHandlers(): SettingHandler[] {
     return [
-        new DebugToggleHandler(),
-        new DropDownLevelInfoHandler()
+        new LoggerToggleHandler(),
+        new LoggerLevelInfoDropDownHandler()
     ];
 }

src/settings/DeveloperSection.ts

@@ -3,10 +3,10 @@ import { LOGGER } from "services/Logger";
 import { SettingsManager } from "Settings";
 import { AbstractSettingsHandler } from "settings/handlers/AbstractSettingHandler";
 
-export class DropDownLevelInfoHandler extends AbstractSettingsHandler {
+export class LoggerLevelInfoDropDownHandler extends AbstractSettingsHandler {
     settingTitle: string = 'Enable debug mode';
     handle(settingsManager: SettingsManager, containerEl: HTMLElement, local: boolean): [string, string][] {
-        if(!local && settingsManager.plugin.settings.enable_debug_mode){
+        if(!local && settingsManager.plugin.settings.global_settings.enable_debug_mode){
             new Setting(containerEl)
             .setName('Select level info of logs')
             .setDesc(
@@ -18,10 +18,14 @@ export class DropDownLevelInfoHandler extends AbstractSettingsHandler {
                 dropdown.addOption('warn', 'warn');
                 dropdown.addOption('error', 'error');
                 dropdown.setValue(
-                    settingsManager.plugin.settings.logger_level_info
+                    settingsManager.plugin.settings.global_settings.logger_level_info
                 );
                 dropdown.onChange((value) => {
-                    settingsManager.plugin.updateSettings({ logger_level_info: value });
+                    // set dropdown value
+                    const update_global_settings = settingsManager.plugin.settings.global_settings;
+                    update_global_settings.logger_level_info = value;
+                    // update settings
+                    settingsManager.plugin.updateSettings({ global_settings: update_global_settings });
                     LOGGER.setLevelInfo(value);
                 });
             });

…ngs/handlers/DropDownLevelInfoHandler.ts …eloper/LoggerLevelInfoDropDownHandler.tssrc/settings/handlers/DropDownLevelInfoHandler.ts renamed to src/settings/handlers/developer/LoggerLevelInfoDropDownHandler.ts src/settings/handlers/DropDownLevelInfoHandler.ts renamed to src/settings/handlers/developer/LoggerLevelInfoDropDownHandler.ts

@@ -1,15 +1,20 @@
-import { Setting } from "obsidian";
 import { LOGGER } from "services/Logger";
 import { SettingsManager } from "Settings";
 import { add_toggle } from "settings/SettingsComponents";
 import { AbstractSettingsHandler } from "settings/handlers/AbstractSettingHandler";
-export class DebugToggleHandler extends AbstractSettingsHandler {
+export class LoggerToggleHandler extends AbstractSettingsHandler {
     settingTitle: string = 'Enable debug mode';
     handle(settingsManager: SettingsManager, containerEl: HTMLElement, local: boolean): [string, string][] {
         // pass if modal opened from local settings
         if(!local){
             let debug_togle_promise = async (value: boolean): Promise<void> => {
-                await settingsManager.plugin.updateSettings({ enable_debug_mode: value });
+                // set debug mode
+                const update_global_settings = settingsManager.plugin.settings.global_settings;
+                update_global_settings.enable_debug_mode = value;
+                // update settings
+                await settingsManager.plugin.updateSettings({ 
+                    global_settings:update_global_settings 
+                });
                 LOGGER.setDebugMode(value);
                 // Force refresh of settings
                 settingsManager.constructSettingBody(containerEl, local);
@@ -18,7 +23,7 @@ export class DebugToggleHandler extends AbstractSettingsHandler {
                 containerEl,
                 this.settingTitle, 
                 "This will log all the errors and warnings in the console",
-                settingsManager.plugin.settings.enable_debug_mode, 
+                settingsManager.plugin.settings.global_settings.enable_debug_mode, 
                 debug_togle_promise);
         }
         // Check next handler