Merge branch 'bug-persisting-data'

RafaelGB · RafaelGB · commit de69f6138e61 · 2022-06-01T21:58:52.000+02:00
diff --git a/src/Settings.ts b/src/Settings.ts
@@ -10,57 +10,7 @@ import { DEFAULT_COLUMN_CONFIG, SourceDataTypes, StyleClasses } from "helpers/Co
 import { SettingHandlerResponse } from "settings/handlers/AbstractSettingHandler";
 import { media_settings_section } from "settings/MediaSection";
 import { source_settings_section } from "settings/SourceSection";
-
-export interface MediaSettings {
-  enable_media_view: boolean;
-  width: number;
-  height: number;
-}
-/**
- * Options that affects the behavior of the plugin and defines default values with some fields
- */
-interface GlobalSettings {
-  enable_debug_mode: boolean;
-  logger_level_info: string;
-  media_settings: MediaSettings;
-}
-export interface LocalSettings {
-  enable_show_state: boolean;
-  group_folder_column: string;
-  remove_field_when_delete_column: boolean;
-  show_metadata_created: boolean;
-  show_metadata_modified: boolean;
-  show_metadata_tasks: boolean;
-  source_data: string;
-  source_form_result: string;
-}
-
-export interface DatabaseSettings {
-  global_settings: GlobalSettings;
-  local_settings: LocalSettings;
-}
-
-export const DEFAULT_SETTINGS: DatabaseSettings = {
-  global_settings: {
-    enable_debug_mode: false,
-    logger_level_info: 'error',
-    media_settings: {
-      enable_media_view: DEFAULT_COLUMN_CONFIG.enable_media_view,
-      width: DEFAULT_COLUMN_CONFIG.media_height,
-      height: DEFAULT_COLUMN_CONFIG.media_height
-    }
-  },
-  local_settings: {
-    enable_show_state: false,
-    remove_field_when_delete_column: false,
-    group_folder_column: '',
-    show_metadata_created: false,
-    show_metadata_modified: false,
-    show_metadata_tasks: false,
-    source_data: SourceDataTypes.CURRENT_FOLDER,
-    source_form_result: 'root'
-  }
-};
+import { DatabaseSettings } from "cdm/SettingsModel";
 
 export type SettingRetriever = <K extends keyof DatabaseSettings>(
   key: K,
diff --git a/src/StateManager.ts b/src/StateManager.ts
@@ -1,7 +1,6 @@
+import { DatabaseSettings } from "cdm/SettingsModel";
 import { DatabaseView } from "DatabaseView";
 import { App, TFile } from 'obsidian';
-import { LOGGER } from "services/Logger";
-import { DatabaseSettings } from 'Settings';
 export default class StateManager {
   private onEmpty: () => void;
   private getGlobalSettings: () => DatabaseSettings;
diff --git a/src/api/plugin-api.ts b/src/api/plugin-api.ts
@@ -1,6 +1,6 @@
 import { FolderModel, } from 'cdm/FolderModel';
+import { DatabaseSettings } from 'cdm/SettingsModel';
 import { App } from 'obsidian';
-import { DatabaseSettings } from 'Settings';
 import { Schema } from 'services/BaseService';
 import { DbfAPIInterface } from 'typings/api';
 
@@ -9,15 +9,15 @@ export class DBFolderAPI implements DbfAPIInterface {
     settings: DatabaseSettings;
 
     public constructor(
-        app: App, 
+        app: App,
         settings: DatabaseSettings
     ) {
         this.app = app;
         this.settings = settings;
     }
-    
+
     obtainFolderModel(key: string): FolderModel {
-        const model:FolderModel = Schema.getInstance().getModel(key);
+        const model: FolderModel = Schema.getInstance().getModel(key);
         return model;
     }
 }
diff --git a/src/cdm/DatabaseModel.ts b/src/cdm/DatabaseModel.ts
@@ -1,7 +1,7 @@
 import { RowType } from "cdm/RowTypeModel"
+import { LocalSettings } from "cdm/SettingsModel";
 import { Literal } from "obsidian-dataview/lib/data-model/value";
 import { Cell } from "react-table";
-import { LocalSettings } from "Settings"
 import { BaseColumn, TableColumn, TableDataType } from "cdm/FolderModel";
 import { RowSelectOption } from "cdm/RowSelectModel";
 
diff --git a/src/cdm/SettingsModel.ts b/src/cdm/SettingsModel.ts
@@ -0,0 +1,28 @@
+export interface MediaSettings {
+    enable_media_view: boolean;
+    width: number;
+    height: number;
+}
+/**
+ * Options that affects the behavior of the plugin and defines default values with some fields
+ */
+interface GlobalSettings {
+    enable_debug_mode: boolean;
+    logger_level_info: string;
+    media_settings: MediaSettings;
+}
+export interface LocalSettings {
+    enable_show_state: boolean;
+    group_folder_column: string;
+    remove_field_when_delete_column: boolean;
+    show_metadata_created: boolean;
+    show_metadata_modified: boolean;
+    show_metadata_tasks: boolean;
+    source_data: string;
+    source_form_result: string;
+}
+
+export interface DatabaseSettings {
+    global_settings: GlobalSettings;
+    local_settings: LocalSettings;
+}
diff --git a/src/components/Columns.tsx b/src/components/Columns.tsx
@@ -7,8 +7,8 @@ import { TableColumn } from "cdm/FolderModel";
 import { LOGGER } from "services/Logger";
 import { DatabaseColumn } from "cdm/DatabaseModel";
 import { RowSelectOption } from "cdm/RowSelectModel";
+import { LocalSettings } from "cdm/SettingsModel";
 import { dbTrim } from "helpers/StylesHelper";
-import { LocalSettings } from "Settings";
 
 /**
  * Add mandatory columns to the table
diff --git a/src/components/RelationShip.tsx b/src/components/RelationShip.tsx
@@ -1,19 +1,16 @@
 import React from "react";
 import { grey } from "helpers/Colors";
 import { RelationshipProps } from "cdm/FolderModel";
+import { c } from "helpers/StylesHelper";
 
 export default function Relationship(relationShipProps: RelationshipProps) {
   const { value, backgroundColor } = relationShipProps;
   return (
     <span
+      className={c("relationship")}
       style={{
-        boxSizing: "border-box",
         backgroundColor: backgroundColor,
         color: grey(800),
-        fontWeight: 400,
-        padding: "2px 6px",
-        borderRadius: 4,
-        display: "inline-block",
       }}
     >
       {value}
diff --git a/src/components/reducers/DatabaseDispatch.tsx b/src/components/reducers/DatabaseDispatch.tsx
@@ -3,6 +3,7 @@ import update from "immutability-helper";
 import {
   ActionTypes,
   DataTypes,
+  DEFAULT_COLUMN_CONFIG,
   MetadataColumns,
   TableColumnsTemplate,
   UpdateRowOptions,
@@ -27,9 +28,7 @@ import { Literal } from "obsidian-dataview/lib/data-model/value";
 import { DateTime } from "luxon";
 
 export function databaseReducer(state: TableDataType, action: ActionType) {
-  LOGGER.debug(
-    `<=>databaseReducer action: ${action.type} value: ${action.value}`
-  );
+  LOGGER.debug(`<=>databaseReducer action: ${action.type}`, action);
   /** database configuration */
   const dbconfig = state.view.diskConfig.yaml.config;
   // Check if action exists
@@ -114,23 +113,25 @@ export function databaseReducer(state: TableDataType, action: ActionType) {
         (column: any) => column.id === action.columnId
       );
       // Update configuration & row files on disk
-      state.view.diskConfig
-        .updateColumnKey(action.columnId, action.newKey, action.label)
-        .then(async () => {
-          // Once the column is updated, update the rows in case the key is changed
-
-          await Promise.all(
-            state.data.map(async (row: RowDataType) => {
-              await updateRowFileProxy(
-                row.note.getFile(),
-                action.columnId,
-                action.newKey,
-                state,
-                UpdateRowOptions.COLUMN_KEY
-              );
-            })
-          );
-        });
+      state.view.diskConfig.updateColumnKey(
+        action.columnId,
+        action.newKey,
+        action.label
+      );
+      async () => {
+        // Update the rows in case the key is changed
+        await Promise.all(
+          state.data.map(async (row: RowDataType) => {
+            await updateRowFileProxy(
+              row.note.getFile(),
+              action.columnId,
+              action.newKey,
+              state,
+              UpdateRowOptions.COLUMN_KEY
+            );
+          })
+        );
+      };
       return update(state, {
         skipReset: { $set: true },
         // Modify column visually with the new label
@@ -158,6 +159,14 @@ export function databaseReducer(state: TableDataType, action: ActionType) {
             return row;
           }),
         },
+        // Update view yaml state
+        view: {
+          diskConfig: {
+            yaml: {
+              $set: state.view.diskConfig.yaml,
+            },
+          },
+        },
       });
 
     /**
@@ -256,12 +265,7 @@ export function databaseReducer(state: TableDataType, action: ActionType) {
         key: action.columnInfo.name,
         label: action.columnInfo.label,
         position: action.columnInfo.position,
-        config: {
-          isInline: false,
-          media_height: 100,
-          media_width: 100,
-          enable_media_view: false,
-        },
+        config: DEFAULT_COLUMN_CONFIG,
       };
       // Update configuration on disk
       state.view.diskConfig.addColumn(action.columnInfo.name, newLeftColumn);
@@ -285,6 +289,14 @@ export function databaseReducer(state: TableDataType, action: ActionType) {
             ...state.columns.slice(leftIndex, state.columns.length),
           ],
         },
+        // Update view yaml
+        view: {
+          diskConfig: {
+            yaml: {
+              $set: state.view.diskConfig.yaml,
+            },
+          },
+        },
       });
     /**
      * Add new column to the table to the right of the column with the given id
@@ -301,12 +313,7 @@ export function databaseReducer(state: TableDataType, action: ActionType) {
         key: action.columnInfo.name,
         label: action.columnInfo.label,
         position: action.columnInfo.position,
-        config: {
-          isInline: false,
-          media_height: 100,
-          media_width: 100,
-          enable_media_view: false,
-        },
+        config: DEFAULT_COLUMN_CONFIG,
       };
       // Update configuration on disk
       state.view.diskConfig.addColumn(action.columnInfo.name, newRIghtColumn);
@@ -331,6 +338,14 @@ export function databaseReducer(state: TableDataType, action: ActionType) {
             ...state.columns.slice(rightIndex + 1, state.columns.length),
           ],
         },
+        // Update view yaml
+        view: {
+          diskConfig: {
+            yaml: {
+              $set: state.view.diskConfig.yaml,
+            },
+          },
+        },
       });
     case ActionTypes.DELETE_COLUMN:
       const deleteIndex = state.columns.findIndex(
diff --git a/src/helpers/Constants.ts b/src/helpers/Constants.ts
@@ -1,4 +1,5 @@
 import { TableColumn } from "cdm/FolderModel";
+import { DatabaseSettings } from "cdm/SettingsModel";
 
 /** Table Actions */
 export const ActionTypes = Object.freeze({
@@ -54,7 +55,8 @@ export const DEFAULT_COLUMN_CONFIG = Object.freeze({
   enable_media_view: true,
   media_width: 100,
   media_height: 100,
-  isInline: false
+  isInline: false,
+  source_data: 'current_folder',
 });
 
 export const MetadataDatabaseColumns = Object.freeze({
@@ -146,6 +148,7 @@ export const DatabaseFrontmatterOptions = Object.freeze({
     '   media_width: 100',
     '   media_height: 100',
     '   isInline: false',
+    '   source_data: current_folder',
     'filters:',
   ].join('\n')
 });
@@ -165,6 +168,7 @@ export const StyleClasses = Object.freeze({
   COLUMN_MODAL_BODY: 'database-column-body',
 });
 
+
 export const StyleVariables = Object.freeze({
   BACKGROUND_MODIFIER_ERROR: 'var(--background-modifier-error)',
   BACKGROUND_PRIMARY: 'var(--background-primary)',
@@ -212,4 +216,29 @@ export const MediaExtensions = Object.freeze({
   AUDIO: ['mp3', 'wav', 'm4a', '3gp', 'flac', 'ogg', 'oga']
 });
 
-export const YAML_INDENT = Object.freeze("  ");
+export const YAML_INDENT = Object.freeze("  ");
+
+/******************************************************************************
+ *                          SETTINGS CONSTANTS
+ ******************************************************************************/
+export const DEFAULT_SETTINGS: DatabaseSettings = {
+  global_settings: {
+    enable_debug_mode: false,
+    logger_level_info: 'error',
+    media_settings: {
+      enable_media_view: DEFAULT_COLUMN_CONFIG.enable_media_view,
+      width: DEFAULT_COLUMN_CONFIG.media_height,
+      height: DEFAULT_COLUMN_CONFIG.media_height
+    }
+  },
+  local_settings: {
+    enable_show_state: false,
+    remove_field_when_delete_column: false,
+    group_folder_column: '',
+    show_metadata_created: false,
+    show_metadata_modified: false,
+    show_metadata_tasks: false,
+    source_data: SourceDataTypes.CURRENT_FOLDER,
+    source_form_result: 'root'
+  }
+};
diff --git a/src/main.ts b/src/main.ts
@@ -15,8 +15,6 @@ import {
 } from 'DatabaseView';
 
 import {
-	DEFAULT_SETTINGS,
-	DatabaseSettings,
 	DBFolderSettingTab,
 	loadServicesThatRequireSettings
 } from 'Settings';
@@ -28,11 +26,12 @@ import {
 import {
 	DBFolderAPI
 } from 'api/plugin-api';
+import { DatabaseSettings } from 'cdm/SettingsModel';
 
 import StateManager from 'StateManager';
 import { around } from 'monkey-around';
 import { LOGGER } from 'services/Logger';
-import { DatabaseCore, DatabaseFrontmatterOptions } from 'helpers/Constants';
+import { DatabaseCore, DatabaseFrontmatterOptions, DEFAULT_SETTINGS } from 'helpers/Constants';
 import { PreviewDatabaseModeService } from 'services/MarkdownPostProcessorService';
 
 export default class DBFolderPlugin extends Plugin {
diff --git a/src/services/DatabaseInfo.ts b/src/services/DatabaseInfo.ts
diff --git a/styles.css b/styles.css
