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

Commit aac8591

Browse files
committed
merging
2 parents 5afcbf4 + 6489efd commit aac8591

File tree

94 files changed

+1488
-879
lines changed

Some content is hidden

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

94 files changed

+1488
-879
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ The database has its own type of view. It will search all notes depending on man
1313

1414
The information you add or edit will be saved into the target obsidian note.
1515

16-
17-
https://user-images.githubusercontent.com/11924043/172692604-f6a2df6a-85da-4883-b25e-d80fef750142.mov
16+
Most recent tutorials:
17+
- [Notion databases in Obsidian](https://www.youtube.com/watch?v=ibarYqG4W5I)
1818

1919
## Sources
2020
### Search engine:

docs/docs/changelog.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,30 @@
1+
2+
## 2.7.4
3+
### Shiny new things
4+
- names of tags are now editable (updating all the related rows) [ISSUE#443](https://github.com/RafaelGB/obsidian-db-folder/issues/443)
5+
### Improved
6+
- ddbb yaml now supports linter plugins [ISSUE#509](https://github.com/RafaelGB/obsidian-db-folder/issues/509)
7+
- Enter event added to add tags on column settings [ISSUE#520](https://github.com/RafaelGB/obsidian-db-folder/issues/520)
8+
- Improved nested matadata behaviour [ISSUE#500](https://github.com/RafaelGB/obsidian-db-folder/issues/500)
9+
### Visual
10+
- UX of navbar and addRow forms improved with some redesigns [ISSUE#534](https://github.com/RafaelGB/obsidian-db-folder/issues/534) [cesarpereira904](https://github.com/cesarpereira904)
11+
### No longer broken
12+
- problem with dataview query without any column informed fixed [ISSUE#531](https://github.com/RafaelGB/obsidian-db-folder/issues/531)
13+
- Sorting dates and numbers is now more precise [ISSUE#507](https://github.com/RafaelGB/obsidian-db-folder/issues/507) [ISSUE#516](https://github.com/RafaelGB/obsidian-db-folder/issues/516) [ISSUE#533](https://github.com/RafaelGB/obsidian-db-folder/issues/533)
14+
- CSV export button fixed. the bug was introduced in 2.7.3 [ISSUE#535](https://github.com/RafaelGB/obsidian-db-folder/issues/535)
15+
## 2.7.3
16+
### Improved
17+
- Use of Obsidian 1.0 color picker [ISSUE#497](https://github.com/RafaelGB/obsidian-db-folder/issues/497)
18+
### No longer broken
19+
- Hotfix with rename ids breaking the rendering of the plugin [ISSUE#505](https://github.com/RafaelGB/obsidian-db-folder/issues/505)
20+
## 2.7.2
21+
### Shiny new things
22+
- Edit nested metadata arrives! You can now edit nested metadata in the cell editor [ISSUE#442](https://github.com/RafaelGB/obsidian-db-folder/issues/442)
23+
### Performance
24+
- Editions use a new method to update the notes under a queue. It should prevent the plugin from locking the UI when editing a lot of notes or errors editing the same note multiple times
25+
### No longer broken
26+
- support for stack tabs. If a ddbb note is included Obsidian does not crash anymore [ISSUE#435](https://github.com/RafaelGB/obsidian-db-folder/issues/435)
27+
- empty line was added if yaml did not exist editing inline fields [ISSUE#504](https://github.com/RafaelGB/obsidian-db-folder/issues/504)
128
## 2.7.1
229
- Hotfix for 2.7.0 of global settings developer options
330
- Experimental support for Objects on text fields

docs/docs/features/Formulas.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,35 @@ The root object `db` has the following functions:
2424

2525
- `js` : execute a javascript function that you previously defined in the `js` folder of your table in the database or plugin global settings. (I.E.: `db.js.myFunction( arg1, arg2)`)
2626

27+
## Examples
28+
29+
If you have a column ID (not always the name of the column) named "Date" you can add time:
30+
31+
- `${row.Date.plus({years: 1}).toFormat("DD")}` adds 1 year
32+
- `${row.Date.plus({months: 1}).toFormat("DD")}` adds 1 month
33+
- `${row.Date.plus({weeks: 1}).toFormat("DD")}` adds 1 week
34+
- `${row.Date.plus({days: 1}).toFormat("DD")}` adds 1 day
35+
36+
Change the date format using 1st January 2000 1pm British Standard time as an example.
37+
38+
- `${row.Date.toFormat("y")}` or "yyyy" shows the year eg: **2000**
39+
- `${row.Date.toFormat("yy")}` shows the last 2 digits of the year eg: **00**
40+
- `${row.Date.toFormat("L")}` shows the month number eg: **1**
41+
- `${row.Date.toFormat("LLL")}` shows the month short name eg: **Jan**
42+
- `${row.Date.toFormat("LLLL")}` shows the month full name eg: **January**
43+
- `${row.Date.toFormat("d")}` shows the day number eg: **1**
44+
- `${row.Date.toFormat("D")}` shows day/month/year eg: **01/01/2000**
45+
- `${row.Date.toFormat("DD")}` shows day/month(short name)/year eg: **01/Jan/2000**
46+
- `${row.Date.toFormat("DDD")}` shows day/month(full name)/year eg: **01/January/2000**
47+
- `${row.Date.toFormat("DDDD")}` shows day(name),day/month(full name)/year eg: **Saturday/January/2000**
48+
- `${row.Date.toFormat("h")}` shows 12 hour time eg: **1**
49+
- `${row.Date.toFormat("H")}` shows 24 hour time eg: **13**
50+
- `${row.Date.toFormat("m")}` shows minute time eg: **00**
51+
- `${row.Date.toFormat("f")}` shows day/month/year/ 24 hour time eg: **01/01/2000 13:00**
52+
- `${row.Date.toFormat("ff"})` shows day/month(short name)/year/ 24 hour time eg: **01/Jan/2000 13:00**
53+
- `${row.Date.toFormat("fff")}` shows day/month(full name)/year/ 24 hour time timezone eg: **01/January/2000 13:00 BST**
54+
- `${row.Date.toFormat("ffff")}` shows day(name), day/month(full name)/year/ 24 hour time, full timezone eg: **Saturday, 01 January 2000, 13:00, British Summer Time**
55+
56+
If you replace f with F then seconds will be included.
57+
58+
For further information go to the [Luxon Documentation](https://moment.github.io/luxon/#/).

docs/docs/media/videos.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
# Videos related to the plugin
2+
3+
## 2022-21-10 Notion databases in Obsidian
4+
<iframe width="560" height="315" src="https://www.youtube.com/embed/ibarYqG4W5I" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
5+
26
## 2022-09-08 Cómo hacer TABLAS tipo Notion con filtros y más cosas
37
<iframe width="560" height="315" src="https://www.youtube.com/embed/0OiCWflpYcs" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
48

manifest-beta.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"id": "dbfolder",
33
"name": "DB Folder",
4-
"version": "2.7.1",
5-
"minAppVersion": "0.15.9",
4+
"version": "2.7.4",
5+
"minAppVersion": "0.16.3",
66
"description": "Folder with the capability to store and retrieve data from a folder like database",
77
"author": "RafaelGB",
88
"authorUrl": "https://github.com/RafaelGB/obsidian-bd-folder",

manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"id": "dbfolder",
33
"name": "DB Folder",
4-
"version": "2.7.1",
5-
"minAppVersion": "0.15.9",
4+
"version": "2.7.4",
5+
"minAppVersion": "0.16.3",
66
"description": "Folder with the capability to store and retrieve data from a folder like database",
77
"author": "RafaelGB",
88
"authorUrl": "https://github.com/RafaelGB/obsidian-bd-folder",

package.json

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "obsidian-dbfolder",
3-
"version": "2.7.1",
3+
"version": "2.7.4",
44
"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
55
"main": "main.js",
66
"scripts": {
@@ -18,56 +18,54 @@
1818
"author": "Rafael Gomez Bermejo",
1919
"license": "MIT",
2020
"devDependencies": {
21-
"@faker-js/faker": "7.5.0",
22-
"@rollup/plugin-commonjs": "22.0.2",
23-
"@rollup/plugin-json": "4.1.0",
24-
"@rollup/plugin-node-resolve": "14.1.0",
25-
"@rollup/plugin-replace": "4.0.0",
26-
"@rollup/plugin-typescript": "8.5.0",
21+
"@faker-js/faker": "7.6.0",
22+
"@rollup/plugin-commonjs": "23.0.0",
23+
"@rollup/plugin-json": "5.0.0",
24+
"@rollup/plugin-node-resolve": "15.0.0",
25+
"@rollup/plugin-replace": "5.0.0",
26+
"@rollup/plugin-typescript": "9.0.1",
2727
"@testing-library/jest-dom": "5.16.5",
2828
"@testing-library/react": "13.4.0",
29-
"@types/jest": "29.0.3",
29+
"@types/jest": "29.1.2",
3030
"@types/luxon": "3.0.1",
31-
"@types/node": "18.7.22",
31+
"@types/node": "18.11.0",
3232
"@types/react": "18.0.21",
33-
"@types/react-color": "3.0.6",
3433
"@types/react-csv": "1.1.3",
3534
"@types/react-datepicker": "4.4.2",
3635
"@types/react-dom": "18.0.6",
3736
"@types/react-window": "1.8.5",
38-
"@typescript-eslint/eslint-plugin": "5.38.0",
39-
"@typescript-eslint/parser": "5.38.0",
40-
"eslint": "8.24.0",
41-
"jest": "29.0.3",
37+
"@typescript-eslint/eslint-plugin": "5.40.0",
38+
"@typescript-eslint/parser": "5.40.0",
39+
"eslint": "8.25.0",
40+
"jest": "29.2.0",
4241
"jest-mock-extended": "3.0.1",
4342
"obsidian": "0.16.3",
4443
"rollup": "2.79.1",
4544
"rollup-plugin-terser": "7.0.2",
46-
"rollup-plugin-typescript2": "0.34.0",
47-
"ts-jest": "29.0.2",
45+
"rollup-plugin-typescript2": "0.34.1",
46+
"ts-jest": "29.0.3",
4847
"tslib": "2.4.0",
49-
"typescript": "4.8.3"
48+
"typescript": "4.8.4"
5049
},
5150
"dependencies": {
5251
"@emotion/styled": "11.10.4",
53-
"@mui/icons-material": "5.10.6",
54-
"@mui/material": "5.10.8",
52+
"@mui/icons-material": "5.10.9",
53+
"@mui/material": "5.10.9",
5554
"@popperjs/core": "2.11.6",
5655
"@tanstack/match-sorter-utils": "8.5.14",
5756
"@tanstack/react-table": "8.5.15",
5857
"eventemitter3": "4.0.7",
5958
"fuse.js": "6.6.2",
6059
"luxon": "3.0.4",
6160
"monkey-around": "2.3.0",
62-
"obsidian-dataview": "0.5.46",
61+
"obsidian-dataview": "0.5.47",
6362
"react": "18.2.0",
64-
"react-color": "2.19.3",
6563
"react-csv": "2.2.2",
6664
"react-datepicker": "4.8.0",
6765
"react-dom": "18.2.0",
6866
"react-popper": "2.3.0",
69-
"react-select": "5.4.0",
67+
"react-select": "5.5.0",
7068
"react-window": "1.8.7",
71-
"zustand": "4.1.1"
69+
"zustand": "4.1.2"
7270
}
7371
}
File renamed without changes.

src/cdm/ComponentsModel.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ export type RowSelectOption = {
88
label: string,
99
}
1010

11+
export type SelectValue = {
12+
label: string;
13+
value: string;
14+
};
15+
1116
export type CellComponentProps = {
1217
defaultCell: CellContext<RowDataType, Literal>;
1318
}

src/cdm/FolderModel.ts

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,26 +34,36 @@ export type Models = {
3434
}
3535

3636
export interface ConfigColumn {
37+
/** Mandatory */
3738
enable_media_view: boolean;
38-
link_alias_enabled: boolean;
3939
media_width: number;
4040
media_height: number;
4141
isInline: boolean;
42+
/** Circunstancial */
4243
content_alignment?: string;
4344
wrap_content?: boolean;
45+
// Text
46+
link_alias_enabled?: boolean;
47+
// Tasks
4448
task_hide_completed?: boolean;
49+
// Formulas
4550
formula_query?: string;
4651
persist_formula?: boolean;
52+
/** Extras from yaml */
4753
[key: string]: Literal;
4854
}
4955

5056
export type BaseColumn = {
57+
/** Mandatory */
5158
accessorKey: string;
5259
label: string;
5360
key: string;
5461
input: string;
55-
csvCandidate?: boolean;
62+
config: ConfigColumn;
63+
/** Circunstancial */
64+
nestedKey?: string;
5665
options?: RowSelectOption[];
66+
csvCandidate?: boolean;
5767
width?: number;
5868
position?: number;
5969
isMetadata?: boolean;
@@ -63,7 +73,6 @@ export type BaseColumn = {
6373
isHidden?: boolean;
6474
skipPersist?: boolean;
6575
isDragDisabled?: boolean;
66-
config: ConfigColumn;
6776
}
6877
export type TableColumn = ColumnDef<RowDataType, Literal> & BaseColumn;
6978

0 commit comments

Comments
 (0)