Skip to content
This repository was archived by the owner on Jul 28, 2025. It is now read-only.

Commit a1be003

Browse files
committed
merging
2 parents 491f606 + 2898126 commit a1be003

File tree

109 files changed

+1571
-817
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+1571
-817
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
This plugin is a Notion like database based on folders.
66

77
- **[Documentation](https://rafaelgb.github.io/obsidian-db-folder/)**
8-
- **[Roadmap](https://github.com/RafaelGB/obsidian-db-folder/projects/1)**
8+
- **[Roadmap](https://github.com/users/RafaelGB/projects/7/views/4)**
99
- **[changelog](https://rafaelgb.github.io/obsidian-db-folder/changelog/)**
1010

1111
### How to use?

devops/generateTranslations.py

Whitespace-only changes.

docs/docs/changelog.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,38 @@
1+
## 2.6.4
2+
### Improved
3+
- Filters refactor into a modal improving the UX and mobile experience [ISSUE#400](https://github.com/RafaelGB/obsidian-db-folder/issues/400)
4+
- Select and tag displayed on alfabetical order [ISSUE#323](https://github.com/RafaelGB/obsidian-db-folder/issues/323)
5+
- Existed column displayed on alfabetical order [ISSUE#306](https://github.com/RafaelGB/obsidian-db-folder/issues/306)
6+
- new rows does not insert an empty yaml in favor of templates [ISSUE#403](https://github.com/RafaelGB/obsidian-db-folder/issues/403)
7+
- Edit engine minor improvements. Now empty frontmatter is ignored
8+
### No longer broken
9+
- Number type problem with decimals and zero values solved [ISSUE#402](https://github.com/RafaelGB/obsidian-db-folder/issues/402)
10+
- Navbar on mobiles improved (not perfect not) [392](https://github.com/RafaelGB/obsidian-db-folder/issues/392)
11+
## 2.6.3
12+
### Improved
13+
- Translation architecture added. Now you can contribute to the translation of the plugin [ISSUE#386](https://github.com/RafaelGB/obsidian-db-folder/issues/386)
14+
- Edit engine improved. Now the plugin not inserts frontmatter yaml if is empty [ISSUE#343](https://github.com/RafaelGB/obsidian-db-folder/issues/343)
15+
### No longer broken
16+
- error habndler of js formulas on load [ISSUE#396](https://github.com/RafaelGB/obsidian-db-folder/issues/396)
17+
- now you can parse a db form another db [ISSUE#398](https://github.com/RafaelGB/obsidian-db-folder/issues/398)
18+
- Problem of portal components with Obsidian .16 resolved [ISSUE#395](https://github.com/RafaelGB/obsidian-db-folder/issues/395)
19+
- Problem with save columns if quotes wrapped is enabled was resolved [ISSUE#399](https://github.com/RafaelGB/obsidian-db-folder/issues/399)
20+
## 2.6.2
21+
### Shiny new things
22+
- aligment options for every column (text,number and formula) [ISSUE#292](https://github.com/RafaelGB/obsidian-db-folder/issues/292)
23+
- Option for make inline fields as default [ISSUE#304](https://github.com/RafaelGB/obsidian-db-folder/issues/304)
24+
- Option to choose where to save new inline fields (top or bottom)[ISSUE#304](https://github.com/RafaelGB/obsidian-db-folder/issues/304)
25+
- Option to persist formulas (make them sortable and searchable) [ISSUE#387](https://github.com/RafaelGB/obsidian-db-folder/issues/387)
26+
- Configurable Date format [ISSUE#297](https://github.com/RafaelGB/obsidian-db-folder/issues/297)
27+
## 2.6.1
28+
- hotfix of global settings and a partial regresion of [ISSUE#375](https://github.com/RafaelGB/obsidian-db-folder/issues/375) cause some columns could not be shown
29+
## 2.6.0
30+
### Shiny new things
31+
- New column type: `Formulas`! You can configure you own formula inside the column settings. Check our documentation for more details [here](https://rafaelgb.github.io/obsidian-db-folder/features/Formulas/) [ISSUE#49](https://github.com/RafaelGB/obsidian-db-folder/issues/49)
32+
### No longer broken
33+
- Group folders with dv query source now respect ther target folder for new entries [ISSUE#372](https://github.com/RafaelGB/obsidian-db-folder/issues/372https://github.com/RafaelGB/obsidian-db-folder/issues/372)
34+
- Improved sorting to respect all the types of the table [ISSUE#371](https://github.com/RafaelGB/obsidian-db-folder/issues/371)
35+
- Columns with special characters are allowed now with dv query source [ISSUE#375](https://github.com/RafaelGB/obsidian-db-folder/issues/375)
136
## 2.5.3
237
### No longer broken
338
- Sorting for created and modified dates working with new table version [ISSUE#368](https://github.com/RafaelGB/obsidian-db-folder/issues/368)

docs/docs/features/Properties.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
- **Time**: this property accepts time. The default format is `yyyy-MM-dd HH:mm:ss`, but it can be changed in the plugin or database settings under `editing engine section > Datetime format` ;
88
- **Select**: this property accepts from a list of options you define. Colors are attributed automatically, though you can change them in the column setting. Furthermore, when removing the select option in the setting, it is also removed from the note's metadata ;
99
- **Tags**: similar to the previous property, but instead of only selecting one option, you can select multiples options per cell ;
10-
- **Formulas**: property that accepts js code to return dynamic values in function of your code. See the [Formulas](/docs/features/Formulas) section for more details.
10+
- **Formulas**: property that accepts js code to return dynamic values in function of your code. See the [Formulas](/obsidian-db-folder/features/Formulas/) section for more details.
1111
- **Image**: you can embed images in the `text` property in this format `![[image]]`. Make sure to enable `media links` in the column setting and adjust the dimensions too ;
1212
- **Created time**: this column can be added only once from the database settings and will display the created time of the row ;
1313
- **Modified time**: this column can be added only once from the database settings and will display the last modified time of the row ;

manifest-beta.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"id": "dbfolder",
33
"name": "DB Folder",
4-
"version": "2.5.3",
4+
"version": "2.6.4",
55
"minAppVersion": "0.15.9",
66
"description": "Folder with the capability to store and retrieve data from a folder like database",
77
"author": "RafaelGB",

manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"id": "dbfolder",
33
"name": "DB Folder",
4-
"version": "2.5.3",
4+
"version": "2.6.4",
55
"minAppVersion": "0.15.9",
66
"description": "Folder with the capability to store and retrieve data from a folder like database",
77
"author": "RafaelGB",

package.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "obsidian-dbfolder",
3-
"version": "2.5.3",
3+
"version": "2.6.4",
44
"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
55
"main": "main.js",
66
"scripts": {
@@ -26,32 +26,32 @@
2626
"@rollup/plugin-typescript": "8.5.0",
2727
"@testing-library/jest-dom": "5.16.5",
2828
"@testing-library/react": "13.4.0",
29-
"@types/jest": "28.1.8",
29+
"@types/jest": "29.0.3",
3030
"@types/luxon": "3.0.1",
31-
"@types/node": "18.7.16",
32-
"@types/react": "18.0.19",
31+
"@types/node": "18.7.18",
32+
"@types/react": "18.0.20",
3333
"@types/react-color": "3.0.6",
3434
"@types/react-csv": "1.1.3",
3535
"@types/react-datepicker": "4.4.2",
3636
"@types/react-dom": "18.0.6",
3737
"@types/react-window": "1.8.5",
38-
"@typescript-eslint/eslint-plugin": "5.36.2",
39-
"@typescript-eslint/parser": "5.36.2",
40-
"eslint": "8.23.0",
41-
"jest": "28.1.3",
42-
"jest-mock-extended": "2.0.7",
38+
"@typescript-eslint/eslint-plugin": "5.37.0",
39+
"@typescript-eslint/parser": "5.37.0",
40+
"eslint": "8.23.1",
41+
"jest": "29.0.3",
42+
"jest-mock-extended": "3.0.1",
4343
"obsidian": "0.15.9",
4444
"rollup": "2.79.0",
4545
"rollup-plugin-terser": "7.0.2",
46-
"rollup-plugin-typescript2": "0.33.0",
47-
"ts-jest": "28.0.8",
46+
"rollup-plugin-typescript2": "0.34.0",
47+
"ts-jest": "29.0.1",
4848
"tslib": "2.4.0",
4949
"typescript": "4.8.3"
5050
},
5151
"dependencies": {
5252
"@emotion/styled": "11.10.4",
5353
"@mui/icons-material": "5.10.3",
54-
"@mui/material": "5.10.4",
54+
"@mui/material": "5.10.5",
5555
"@popperjs/core": "2.11.6",
5656
"@tanstack/match-sorter-utils": "8.1.1",
5757
"@tanstack/react-table": "8.5.13",

src/DatabaseView.tsx

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,17 @@ import {
1313
} from "components/Columns";
1414
import { createDatabase } from "components/index/Database";
1515
import { DbFolderException } from "errors/AbstractException";
16-
import { DatabaseCore, InputType, StyleClasses } from "helpers/Constants";
16+
import {
17+
DatabaseCore,
18+
DB_ICONS,
19+
InputType,
20+
StyleClasses,
21+
} from "helpers/Constants";
1722
import { createEmitter, Emitter } from "helpers/Emitter";
1823
import obtainInitialType from "helpers/InitialType";
1924
import { adapterTFilesToRows, isDatabaseNote } from "helpers/VaultManagement";
2025
import { getParentWindow } from "helpers/WindowElement";
26+
import { t } from "lang/helpers";
2127
import DBFolderPlugin from "main";
2228

2329
import {
@@ -109,7 +115,7 @@ export class DatabaseView extends TextFileView implements HoverParent {
109115
menu
110116
.addItem((item) => {
111117
item
112-
.setTitle("Open as markdown")
118+
.setTitle(t("menu_pane_open_as_md_action"))
113119
.setIcon("document")
114120
.onClick(() => {
115121
this.plugin.databaseFileModes[
@@ -120,8 +126,8 @@ export class DatabaseView extends TextFileView implements HoverParent {
120126
})
121127
.addItem((item) => {
122128
item
123-
.setTitle("Open database settings")
124-
.setIcon("gear")
129+
.setTitle(t("menu_pane_open_db_settings_action"))
130+
.setIcon(DB_ICONS.NAME)
125131
.onClick(() => {
126132
new SettingsModal(
127133
this,
@@ -161,7 +167,7 @@ export class DatabaseView extends TextFileView implements HoverParent {
161167
// Obtain base information about columns
162168
this.columns = await obtainColumnsFromFolder(yamlColumns);
163169
this.rows = await adapterTFilesToRows(
164-
this.file.parent.path,
170+
this.file,
165171
this.columns,
166172
this.diskConfig.yaml.config,
167173
this.diskConfig.yaml.filters
@@ -182,6 +188,7 @@ export class DatabaseView extends TextFileView implements HoverParent {
182188
// Render database
183189
const table = createDatabase(tableProps);
184190
this.rootContainer.render(table);
191+
this.diskConfig.saveOnDisk();
185192
LOGGER.info(`<=initDatabase ${this.file.path}`);
186193
} catch (e: unknown) {
187194
LOGGER.error(`initDatabase ${this.file.path}`, e);

src/automations/AutomationsHelper.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { LocalSettings } from "cdm/SettingsModel";
22
import { FormulaGenerator } from "automations/FormulaGenerator";
3+
import { AutomationError, showDBError } from "errors/ErrorTypes";
34

45
export async function obtainFormulasFromFolder(config: LocalSettings) {
56
const generator = new FormulaGenerator(config);

src/automations/formula_functions/FormulaFunctions.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { IGenerateObject } from "automations/IGenerateObject";
2-
import { UserScriptFunctions } from "automations/formula_functions/ScriptFunctions";
2+
import { ScriptFunctions } from "automations/formula_functions/ScriptFunctions";
33
import { LocalSettings } from "cdm/SettingsModel";
44

55
export class FormulaFunctions implements IGenerateObject {
6-
private js_script_functions: UserScriptFunctions;
6+
private js_script_functions: ScriptFunctions;
77

88
constructor(private config: LocalSettings) {
9-
this.js_script_functions = new UserScriptFunctions(config);
9+
this.js_script_functions = new ScriptFunctions(config);
1010
}
1111

1212
async generate_object(

0 commit comments

Comments
 (0)