Merge branch '172-support-for-popout-windows'

Author: RafaelGB

manifest-beta.json

@@ -1,8 +1,8 @@
 {
 	"id": "dbfolder",
 	"name": "DB Folder",
-	"version": "1.7.0",
-	"minAppVersion": "0.14.8",
+	"version": "1.8.0",
+	"minAppVersion": "0.15.3",
 	"description": "Folder with the capability to store and retrieve data from a folder like database",
 	"author": "RafaelGB",
 	"authorUrl": "https://github.com/RafaelGB/obsidian-bd-folder",

manifest.json

@@ -2,7 +2,7 @@
 	"id": "dbfolder",
 	"name": "DB Folder",
 	"version": "1.8.0",
-	"minAppVersion": "0.14.8",
+	"minAppVersion": "0.15.3",
 	"description": "Folder with the capability to store and retrieve data from a folder like database",
 	"author": "RafaelGB",
 	"authorUrl": "https://github.com/RafaelGB/obsidian-bd-folder",

package.json

@@ -40,7 +40,7 @@
 		"eslint": "8.15.0",
 		"jest": "27.5.1",
 		"jest-mock-extended": "2.0.6",
-		"obsidian": "0.15.1",
+		"obsidian": "0.15.3",
 		"rollup": "2.75.5",
 		"rollup-plugin-typescript2": "0.32.0",
 		"rollup-plugin-terser": "7.0.2",

src/components/reducers/GlobalFilter.tsx

@@ -1,7 +1,6 @@
 import React from "react";
 import "regenerator-runtime/runtime";
 import { useAsyncDebounce } from "react-table";
-import { StyleVariables } from "helpers/Constants";
 import { GlobalFilterProps } from "cdm/MenuBarModel";
 
 /**

src/main.ts

@@ -26,12 +26,12 @@ import {
 import {
 	DBFolderAPI
 } from 'api/plugin-api';
-import { DatabaseSettings } from 'cdm/SettingsModel';
+import { DatabaseSettings, LocalSettings } from 'cdm/SettingsModel';
 
 import StateManager from 'StateManager';
 import { around } from 'monkey-around';
 import { LOGGER } from 'services/Logger';
-import { DatabaseCore, DatabaseFrontmatterOptions, DEFAULT_SETTINGS } from 'helpers/Constants';
+import { DatabaseCore, DatabaseFrontmatterOptions, DEFAULT_SETTINGS, YAML_INDENT } from 'helpers/Constants';
 import { PreviewDatabaseModeService } from 'services/MarkdownPostProcessorService';
 
 export default class DBFolderPlugin extends Plugin {
@@ -195,13 +195,13 @@ export default class DBFolderPlugin extends Plugin {
 				this.app.fileManager as any
 			).createNewMarkdownFile(targetFolder, 'Untitled database');
 
-			await this.app.vault.modify(
+			await app.vault.modify(
 				database,
 				DatabaseFrontmatterOptions.BASIC
 					.concat('\n')
 					.concat(this.defaultConfiguration())
 			);
-			await this.app.workspace.activeLeaf.setViewState({
+			await app.workspace.getMostRecentLeaf().setViewState({
 				type: DatabaseCore.FRONTMATTER_KEY,
 				state: { file: database.path },
 			});
@@ -215,20 +215,16 @@ export default class DBFolderPlugin extends Plugin {
 	 */
 	defaultConfiguration(): string {
 		const local_settings = this.settings.local_settings;
-		return [
-			`config:`,
-			` enable_show_state: ${local_settings.enable_show_state}`,
-			` group_folder_column: `,
-			` remove_field_when_delete_column: ${local_settings.remove_field_when_delete_column}`,
-			` cell_size: ${local_settings.cell_size}`,
-			` sticky_first_column: ${local_settings.sticky_first_column}`,
-			` show_metadata_created: ${local_settings.show_metadata_created}`,
-			` show_metadata_modified: ${local_settings.show_metadata_modified}`,
-			` source_data: ${local_settings.source_data}`,
-			` source_form_result: ${local_settings.source_form_result}`,
-			`%%>`
-		].join('\n');
+		const defaultConfig = [];
+		defaultConfig.push("config:");
+		Object.entries(DEFAULT_SETTINGS.local_settings).forEach(([key, value]) => {
+			const defaultValue = local_settings[key as keyof LocalSettings] !== undefined ? local_settings[key as keyof LocalSettings] : value;
+			defaultConfig.push(`${YAML_INDENT}${key}: ${defaultValue}`);
+		});
+		defaultConfig.push("%%>");
+		return defaultConfig.join('\n');
 	}
+
 	registerEvents() {
 		this.registerEvent(
 			this.app.workspace.on('file-menu', (menu, file: TFile) => {
@@ -253,7 +249,7 @@ export default class DBFolderPlugin extends Plugin {
 		this.registerMarkdownPostProcessor(previewMode.markdownPostProcessor);
 
 		// internal-link quick preview
-		this.registerEvent(this.app.workspace.on("quick-preview", previewMode.hoverEvent));
+		this.registerEvent(app.workspace.on("quick-preview", previewMode.hoverEvent));
 
 		//monitoring for div.popover.hover-popover.file-embed.is-loaded to be added to the DOM tree
 		// this.observer = observer;
@@ -268,10 +264,10 @@ export default class DBFolderPlugin extends Plugin {
 
 		this.app.workspace.onLayoutReady(() => {
 			this.register(
-				around((this.app as any).commands, {
+				around((app as any).commands, {
 					executeCommandById(next) {
 						return function (command: string) {
-							const view = self.app.workspace.getActiveViewOfType(DatabaseView);
+							const view = app.workspace.getActiveViewOfType(DatabaseView);
 
 							if (view) {
 								//view.emitter.emit('hotkey', command);
@@ -337,7 +333,7 @@ export default class DBFolderPlugin extends Plugin {
 		// Add a menu item to go back to database view
 		this.register(
 			around(MarkdownView.prototype, {
-				onMoreOptionsMenu(next) {
+				onPaneMenu(next) {
 					return function (menu: Menu) {
 						const file = this.file;
 						const cache = file

src/parsers/handlers/marshall/MarshallConfigHandler.ts

@@ -15,14 +15,14 @@ export class MarshallConfigHandler extends AbstractYamlHandler {
         } else {
             Object.entries(DEFAULT_SETTINGS.local_settings).forEach(([key, value]) => {
                 if (this.checkNullable(yaml.config[key as keyof LocalSettings])) {
-                    yaml.config = this.loadDefaultConfig(key, value, yaml.config);
+                    yaml.config = this.loadDefaultConfig(key as keyof LocalSettings, value, yaml.config);
                     if (value !== "") {
                         this.addError(`There was not "${key}" key in yaml. Default value "${value}" will be loaded`);
                     }
                 }
                 // Check type of default value
                 if (typeof value === "boolean") {
-                    yaml.config = this.parseBoolean(key, yaml.config);
+                    yaml.config = this.parseBoolean(key as keyof LocalSettings, yaml.config);
                 }
             });
         }

src/services/DatabaseInfo.ts

@@ -38,7 +38,7 @@ export default class DatabaseInfo {
         const response = DatabaseStringToYamlParser(frontmatterRaw);
         if (Object.keys(response.errors).length > 0) {
             const errors = Object.keys(response.errors).map(e => e + ': ' + response.errors[e].join('\n')).join('\n')
-            new Notice(errors);
+            new Notice(errors, 10000);
             if (!response.yaml.config) response.yaml.config = default_local_settings;
         }