From 7af4e527660761f65605ab5d0d65879d434e78e0 Mon Sep 17 00:00:00 2001
From: matt wilkie <maphew@gmail.com>
Date: Sun, 16 Feb 2025 21:29:38 -0700
Subject: [PATCH 01/62] brought over changes from 879035d

The last known good state before I got sidetracked into docker changes
---
 src/public/app/widgets/type_widgets/content_widget.ts | 4 +++-
 src/services/auth.ts                                  | 2 +-
 src/services/options_init.ts                          | 6 +++++-
 src/share/routes.ts                                   | 4 +++-
 src/views/share/page.ejs                              | 5 +++++
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/public/app/widgets/type_widgets/content_widget.ts b/src/public/app/widgets/type_widgets/content_widget.ts
index 1f19e2b81..d2ea5a971 100644
--- a/src/public/app/widgets/type_widgets/content_widget.ts
+++ b/src/public/app/widgets/type_widgets/content_widget.ts
@@ -35,6 +35,7 @@ import RibbonOptions from "./options/appearance/ribbon.js";
 import LocalizationOptions from "./options/appearance/i18n.js";
 import CodeBlockOptions from "./options/appearance/code_block.js";
 import EditorOptions from "./options/text_notes/editor.js";
+import ShareSettingsOptions from "./options/other/share_settings.js"; // added import statement
 import type FNote from "../../entities/fnote.js";
 import type NoteContextAwareWidget from "../note_context_aware_widget.js";
 
@@ -76,7 +77,8 @@ const CONTENT_WIDGETS: Record<string, (typeof NoteContextAwareWidget)[]> = {
         RevisionsSnapshotIntervalOptions,
         RevisionSnapshotsLimitOptions,
         NetworkConnectionsOptions,
-        HtmlImportTagsOptions
+        HtmlImportTagsOptions,
+        ShareSettingsOptions // moved to the end of the array
     ],
     _optionsAdvanced: [DatabaseIntegrityCheckOptions, DatabaseAnonymizationOptions, AdvancedSyncOptions, VacuumDatabaseOptions],
     _backendLog: [BackendLogWidget]
diff --git a/src/services/auth.ts b/src/services/auth.ts
index 3e8957100..d89fad633 100644
--- a/src/services/auth.ts
+++ b/src/services/auth.ts
@@ -15,7 +15,7 @@ function checkAuth(req: Request, res: Response, next: NextFunction) {
     if (!sqlInit.isDbInitialized()) {
         res.redirect("setup");
     } else if (!req.session.loggedIn && !isElectron && !noAuthentication) {
-        res.redirect("login");
+        res.redirect("share");
     } else {
         next();
     }
diff --git a/src/services/options_init.ts b/src/services/options_init.ts
index bb962835d..0c738a759 100644
--- a/src/services/options_init.ts
+++ b/src/services/options_init.ts
@@ -252,7 +252,11 @@ const defaultOptions: DefaultOption[] = [
             "tt"
         ]),
         isSynced: true
-    }
+    },
+
+    // Share settings
+    { name: 'redirectBareDomain', value: 'false', isSynced: true },
+    { name: 'showLoginInShareTheme', value: 'false', isSynced: true }
 ];
 
 /**
diff --git a/src/share/routes.ts b/src/share/routes.ts
index c77a41fc0..a1ea2ecf2 100644
--- a/src/share/routes.ts
+++ b/src/share/routes.ts
@@ -16,6 +16,7 @@ import type SNote from "./shaca/entities/snote.js";
 import type SBranch from "./shaca/entities/sbranch.js";
 import type SAttachment from "./shaca/entities/sattachment.js";
 import utils from "../services/utils.js";
+import optionService from '../services/option_service.js';
 
 function getSharedSubTreeRoot(note: SNote): { note?: SNote; branch?: SBranch } {
     if (note.noteId === shareRoot.SHARE_ROOT_NOTE_ID) {
@@ -151,7 +152,8 @@ function register(router: Router) {
 
         const { header, content, isEmpty } = contentRenderer.getContent(note);
         const subRoot = getSharedSubTreeRoot(note);
-        const opts = { note, header, content, isEmpty, subRoot, assetPath, appPath };
+        const showLoginInShareTheme = optionService.getOption('showLoginInShareTheme');
+        const opts = { note, header, content, isEmpty, subRoot, assetPath, appPath, showLoginInShareTheme };
         let useDefaultView = true;
 
         // Check if the user has their own template
diff --git a/src/views/share/page.ejs b/src/views/share/page.ejs
index 0ff04174d..35d01cd2c 100644
--- a/src/views/share/page.ejs
+++ b/src/views/share/page.ejs
@@ -88,5 +88,10 @@
         </nav>
     <% } %>
 </div>
+<footer>
+    <% if (showLoginInShareTheme === 'true') { %>
+        <p><a href="/login" class="login-link">Login</a></p>
+    <% } %>
+</footer>
 </body>
 </html>

From bc66e985331c00b1ccea3d6307a0f54ff714a252 Mon Sep 17 00:00:00 2001
From: matt wilkie <maphew@gmail.com>
Date: Sun, 16 Feb 2025 22:17:59 -0700
Subject: [PATCH 02/62] okay, we can start npm  server now, but new db
 redirects to share

---
 .../widgets/type_widgets/content_widget.ts    |  2 +-
 .../options/other/share_settings.ts           | 47 +++++++++++++++++++
 src/services/options_interface.ts             |  3 ++
 src/share/routes.ts                           |  4 +-
 4 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 src/public/app/widgets/type_widgets/options/other/share_settings.ts

diff --git a/src/public/app/widgets/type_widgets/content_widget.ts b/src/public/app/widgets/type_widgets/content_widget.ts
index d2ea5a971..e7a0533ff 100644
--- a/src/public/app/widgets/type_widgets/content_widget.ts
+++ b/src/public/app/widgets/type_widgets/content_widget.ts
@@ -35,7 +35,7 @@ import RibbonOptions from "./options/appearance/ribbon.js";
 import LocalizationOptions from "./options/appearance/i18n.js";
 import CodeBlockOptions from "./options/appearance/code_block.js";
 import EditorOptions from "./options/text_notes/editor.js";
-import ShareSettingsOptions from "./options/other/share_settings.js"; // added import statement
+import ShareSettingsOptions from "./options/other/share_settings.js";
 import type FNote from "../../entities/fnote.js";
 import type NoteContextAwareWidget from "../note_context_aware_widget.js";
 
diff --git a/src/public/app/widgets/type_widgets/options/other/share_settings.ts b/src/public/app/widgets/type_widgets/options/other/share_settings.ts
new file mode 100644
index 000000000..d90840948
--- /dev/null
+++ b/src/public/app/widgets/type_widgets/options/other/share_settings.ts
@@ -0,0 +1,47 @@
+import OptionsWidget from "../options_widget.js";
+import options from "../../../../services/options.js";
+import { t } from "../../../../services/i18n.js";
+
+const TPL = `
+<div class="card-body">
+    <h4>${t('Share Settings')}</h4>
+    
+    <div class="form-check">
+        <label class="form-check-label">
+            <input class="form-check-input" type="checkbox" name="redirectBareDomain" value="true">
+            ${t('Redirect bare domain to Share page')}
+        </label>
+        <p class="form-text">${t('When enabled, accessing the root URL will redirect to the Share page instead of Login')}</p>
+    </div>
+
+    <div class="form-check">
+        <label class="form-check-label">
+            <input class="form-check-input" type="checkbox" name="showLoginInShareTheme" value="true">
+            ${t('Show Login link in Share theme')}
+        </label>
+        <p class="form-text">${t('Add a login link to the Share page footer')}</p>
+    </div>
+</div>`;
+
+export default class ShareSettingsOptions extends OptionsWidget {
+    doRender() {
+        this.$widget = $(TPL);
+        this.contentSized();
+    }
+
+    async optionsLoaded(options: Record<string, any>) {
+        this.$widget.find('input[name="redirectBareDomain"]').prop('checked', 
+            options.redirectBareDomain === 'true');
+            
+        this.$widget.find('input[name="showLoginInShareTheme"]').prop('checked',
+            options.showLoginInShareTheme === 'true');
+    }
+
+    async save() {
+        const redirectBareDomain = this.$widget.find('input[name="redirectBareDomain"]').prop('checked');
+        await this.updateOption('redirectBareDomain', redirectBareDomain.toString());
+
+        const showLoginInShareTheme = this.$widget.find('input[name="showLoginInShareTheme"]').prop('checked');
+        await this.updateOption('showLoginInShareTheme', showLoginInShareTheme.toString());
+    }
+}
diff --git a/src/services/options_interface.ts b/src/services/options_interface.ts
index f3a92383b..ef55af6c5 100644
--- a/src/services/options_interface.ts
+++ b/src/services/options_interface.ts
@@ -29,6 +29,9 @@ export interface OptionDefinitions extends KeyboardShortcutsOptions<KeyboardActi
     detailFontFamily: FontFamily;
     monospaceFontFamily: FontFamily;
     spellCheckLanguageCode: string;
+    // Share settings
+    redirectBareDomain: string;
+    showLoginInShareTheme: string;
     codeNotesMimeTypes: string;
     headingStyle: string;
     highlightsList: string;
diff --git a/src/share/routes.ts b/src/share/routes.ts
index a1ea2ecf2..ae2b5d414 100644
--- a/src/share/routes.ts
+++ b/src/share/routes.ts
@@ -16,7 +16,7 @@ import type SNote from "./shaca/entities/snote.js";
 import type SBranch from "./shaca/entities/sbranch.js";
 import type SAttachment from "./shaca/entities/sattachment.js";
 import utils from "../services/utils.js";
-import optionService from '../services/option_service.js';
+import options from '../services/options.js';
 
 function getSharedSubTreeRoot(note: SNote): { note?: SNote; branch?: SBranch } {
     if (note.noteId === shareRoot.SHARE_ROOT_NOTE_ID) {
@@ -152,7 +152,7 @@ function register(router: Router) {
 
         const { header, content, isEmpty } = contentRenderer.getContent(note);
         const subRoot = getSharedSubTreeRoot(note);
-        const showLoginInShareTheme = optionService.getOption('showLoginInShareTheme');
+        const showLoginInShareTheme = options.getOption('showLoginInShareTheme');
         const opts = { note, header, content, isEmpty, subRoot, assetPath, appPath, showLoginInShareTheme };
         let useDefaultView = true;
 

From ed8b8e50a42730f6a32ecfaf31b382a97cba3047 Mon Sep 17 00:00:00 2001
From: matt wilkie <maphew@gmail.com>
Date: Sun, 16 Feb 2025 22:47:50 -0700
Subject: [PATCH 03/62] feature complete; tested and working on local linux
 machine

---
 .../type_widgets/options/other/share_settings.ts       | 10 +++++++---
 src/routes/api/options.ts                              |  4 +++-
 src/services/auth.ts                                   |  4 +++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/public/app/widgets/type_widgets/options/other/share_settings.ts b/src/public/app/widgets/type_widgets/options/other/share_settings.ts
index d90840948..d7743c63c 100644
--- a/src/public/app/widgets/type_widgets/options/other/share_settings.ts
+++ b/src/public/app/widgets/type_widgets/options/other/share_settings.ts
@@ -1,6 +1,7 @@
 import OptionsWidget from "../options_widget.js";
 import options from "../../../../services/options.js";
 import { t } from "../../../../services/i18n.js";
+import type { OptionMap, OptionNames } from "../../../../../../services/options_interface.js";
 
 const TPL = `
 <div class="card-body">
@@ -27,9 +28,12 @@ export default class ShareSettingsOptions extends OptionsWidget {
     doRender() {
         this.$widget = $(TPL);
         this.contentSized();
+
+        // Add change handlers for both checkboxes
+        this.$widget.find('input[type="checkbox"]').on('change', () => this.save());
     }
 
-    async optionsLoaded(options: Record<string, any>) {
+    async optionsLoaded(options: OptionMap) {
         this.$widget.find('input[name="redirectBareDomain"]').prop('checked', 
             options.redirectBareDomain === 'true');
             
@@ -39,9 +43,9 @@ export default class ShareSettingsOptions extends OptionsWidget {
 
     async save() {
         const redirectBareDomain = this.$widget.find('input[name="redirectBareDomain"]').prop('checked');
-        await this.updateOption('redirectBareDomain', redirectBareDomain.toString());
+        await this.updateOption<'redirectBareDomain'>('redirectBareDomain', redirectBareDomain.toString());
 
         const showLoginInShareTheme = this.$widget.find('input[name="showLoginInShareTheme"]').prop('checked');
-        await this.updateOption('showLoginInShareTheme', showLoginInShareTheme.toString());
+        await this.updateOption<'showLoginInShareTheme'>('showLoginInShareTheme', showLoginInShareTheme.toString());
     }
 }
diff --git a/src/routes/api/options.ts b/src/routes/api/options.ts
index 14cb7ec42..85272ea62 100644
--- a/src/routes/api/options.ts
+++ b/src/routes/api/options.ts
@@ -72,7 +72,9 @@ const ALLOWED_OPTIONS = new Set([
     "textNoteEditorMultilineToolbar",
     "layoutOrientation",
     "backgroundEffects",
-    "allowedHtmlTags" // Allow configuring HTML import tags
+    "allowedHtmlTags",
+    "redirectBareDomain",
+    "showLoginInShareTheme"
 ]);
 
 function getOptions() {
diff --git a/src/services/auth.ts b/src/services/auth.ts
index d89fad633..5ba56e426 100644
--- a/src/services/auth.ts
+++ b/src/services/auth.ts
@@ -7,6 +7,7 @@ import { isElectron } from "./utils.js";
 import passwordEncryptionService from "./encryption/password_encryption.js";
 import config from "./config.js";
 import passwordService from "./encryption/password.js";
+import options from "./options.js";
 import type { NextFunction, Request, Response } from "express";
 
 const noAuthentication = config.General && config.General.noAuthentication === true;
@@ -15,7 +16,8 @@ function checkAuth(req: Request, res: Response, next: NextFunction) {
     if (!sqlInit.isDbInitialized()) {
         res.redirect("setup");
     } else if (!req.session.loggedIn && !isElectron && !noAuthentication) {
-        res.redirect("share");
+        const redirectToShare = options.getOption('redirectBareDomain') === 'true';
+        res.redirect(redirectToShare ? "share" : "login");
     } else {
         next();
     }

From 2ec2d784ec8f6f6f4fda00d9aef32b7b264885d8 Mon Sep 17 00:00:00 2001
From: Matt Wilkie <matt.wilkie@yukon.ca>
Date: Mon, 17 Feb 2025 13:19:55 -0700
Subject: [PATCH 04/62] results of `npx prettier`

---
 .../widgets/type_widgets/content_widget.ts    |  1 -
 .../options/other/share_settings.ts           | 28 +++++++++----------
 src/services/auth.ts                          |  2 +-
 src/services/options_init.ts                  |  4 +--
 src/share/routes.ts                           |  4 +--
 5 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/src/public/app/widgets/type_widgets/content_widget.ts b/src/public/app/widgets/type_widgets/content_widget.ts
index e7a0533ff..5bd577fd2 100644
--- a/src/public/app/widgets/type_widgets/content_widget.ts
+++ b/src/public/app/widgets/type_widgets/content_widget.ts
@@ -85,7 +85,6 @@ const CONTENT_WIDGETS: Record<string, (typeof NoteContextAwareWidget)[]> = {
 };
 
 export default class ContentWidgetTypeWidget extends TypeWidget {
-
     private $content!: JQuery<HTMLElement>;
 
     static getType() {
diff --git a/src/public/app/widgets/type_widgets/options/other/share_settings.ts b/src/public/app/widgets/type_widgets/options/other/share_settings.ts
index d7743c63c..9c7cd1b2d 100644
--- a/src/public/app/widgets/type_widgets/options/other/share_settings.ts
+++ b/src/public/app/widgets/type_widgets/options/other/share_settings.ts
@@ -5,22 +5,22 @@ import type { OptionMap, OptionNames } from "../../../../../../services/options_
 
 const TPL = `
 <div class="card-body">
-    <h4>${t('Share Settings')}</h4>
+    <h4>${t("Share Settings")}</h4>
     
     <div class="form-check">
         <label class="form-check-label">
             <input class="form-check-input" type="checkbox" name="redirectBareDomain" value="true">
-            ${t('Redirect bare domain to Share page')}
+            ${t("Redirect bare domain to Share page")}
         </label>
-        <p class="form-text">${t('When enabled, accessing the root URL will redirect to the Share page instead of Login')}</p>
+        <p class="form-text">${t("When enabled, accessing the root URL will redirect to the Share page instead of Login")}</p>
     </div>
 
     <div class="form-check">
         <label class="form-check-label">
             <input class="form-check-input" type="checkbox" name="showLoginInShareTheme" value="true">
-            ${t('Show Login link in Share theme')}
+            ${t("Show Login link in Share theme")}
         </label>
-        <p class="form-text">${t('Add a login link to the Share page footer')}</p>
+        <p class="form-text">${t("Add a login link to the Share page footer")}</p>
     </div>
 </div>`;
 
@@ -30,22 +30,20 @@ export default class ShareSettingsOptions extends OptionsWidget {
         this.contentSized();
 
         // Add change handlers for both checkboxes
-        this.$widget.find('input[type="checkbox"]').on('change', () => this.save());
+        this.$widget.find('input[type="checkbox"]').on("change", () => this.save());
     }
 
     async optionsLoaded(options: OptionMap) {
-        this.$widget.find('input[name="redirectBareDomain"]').prop('checked', 
-            options.redirectBareDomain === 'true');
-            
-        this.$widget.find('input[name="showLoginInShareTheme"]').prop('checked',
-            options.showLoginInShareTheme === 'true');
+        this.$widget.find('input[name="redirectBareDomain"]').prop("checked", options.redirectBareDomain === "true");
+
+        this.$widget.find('input[name="showLoginInShareTheme"]').prop("checked", options.showLoginInShareTheme === "true");
     }
 
     async save() {
-        const redirectBareDomain = this.$widget.find('input[name="redirectBareDomain"]').prop('checked');
-        await this.updateOption<'redirectBareDomain'>('redirectBareDomain', redirectBareDomain.toString());
+        const redirectBareDomain = this.$widget.find('input[name="redirectBareDomain"]').prop("checked");
+        await this.updateOption<"redirectBareDomain">("redirectBareDomain", redirectBareDomain.toString());
 
-        const showLoginInShareTheme = this.$widget.find('input[name="showLoginInShareTheme"]').prop('checked');
-        await this.updateOption<'showLoginInShareTheme'>('showLoginInShareTheme', showLoginInShareTheme.toString());
+        const showLoginInShareTheme = this.$widget.find('input[name="showLoginInShareTheme"]').prop("checked");
+        await this.updateOption<"showLoginInShareTheme">("showLoginInShareTheme", showLoginInShareTheme.toString());
     }
 }
diff --git a/src/services/auth.ts b/src/services/auth.ts
index 5ba56e426..68c497b91 100644
--- a/src/services/auth.ts
+++ b/src/services/auth.ts
@@ -16,7 +16,7 @@ function checkAuth(req: Request, res: Response, next: NextFunction) {
     if (!sqlInit.isDbInitialized()) {
         res.redirect("setup");
     } else if (!req.session.loggedIn && !isElectron && !noAuthentication) {
-        const redirectToShare = options.getOption('redirectBareDomain') === 'true';
+        const redirectToShare = options.getOption("redirectBareDomain") === "true";
         res.redirect(redirectToShare ? "share" : "login");
     } else {
         next();
diff --git a/src/services/options_init.ts b/src/services/options_init.ts
index 0c738a759..da81abc90 100644
--- a/src/services/options_init.ts
+++ b/src/services/options_init.ts
@@ -255,8 +255,8 @@ const defaultOptions: DefaultOption[] = [
     },
 
     // Share settings
-    { name: 'redirectBareDomain', value: 'false', isSynced: true },
-    { name: 'showLoginInShareTheme', value: 'false', isSynced: true }
+    { name: "redirectBareDomain", value: "false", isSynced: true },
+    { name: "showLoginInShareTheme", value: "false", isSynced: true }
 ];
 
 /**
diff --git a/src/share/routes.ts b/src/share/routes.ts
index ae2b5d414..3b6258872 100644
--- a/src/share/routes.ts
+++ b/src/share/routes.ts
@@ -16,7 +16,7 @@ import type SNote from "./shaca/entities/snote.js";
 import type SBranch from "./shaca/entities/sbranch.js";
 import type SAttachment from "./shaca/entities/sattachment.js";
 import utils from "../services/utils.js";
-import options from '../services/options.js';
+import options from "../services/options.js";
 
 function getSharedSubTreeRoot(note: SNote): { note?: SNote; branch?: SBranch } {
     if (note.noteId === shareRoot.SHARE_ROOT_NOTE_ID) {
@@ -152,7 +152,7 @@ function register(router: Router) {
 
         const { header, content, isEmpty } = contentRenderer.getContent(note);
         const subRoot = getSharedSubTreeRoot(note);
-        const showLoginInShareTheme = options.getOption('showLoginInShareTheme');
+        const showLoginInShareTheme = options.getOption("showLoginInShareTheme");
         const opts = { note, header, content, isEmpty, subRoot, assetPath, appPath, showLoginInShareTheme };
         let useDefaultView = true;
 

From 657638ee54f93c5e278e2a65b68b98230de102a0 Mon Sep 17 00:00:00 2001
From: Matt Wilkie <matt.wilkie@yukon.ca>
Date: Mon, 17 Feb 2025 13:46:03 -0700
Subject: [PATCH 05/62] responding to code review (thanks pano!)

---
 .../widgets/type_widgets/content_widget.ts    |  2 +-
 .../options/other/share_settings.ts           | 13 ++++++-----
 src/public/translations/en/translation.json   | 22 +++++++++++++++++++
 src/services/options_interface.ts             |  7 +++---
 4 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/src/public/app/widgets/type_widgets/content_widget.ts b/src/public/app/widgets/type_widgets/content_widget.ts
index 5bd577fd2..e4cb81c10 100644
--- a/src/public/app/widgets/type_widgets/content_widget.ts
+++ b/src/public/app/widgets/type_widgets/content_widget.ts
@@ -78,7 +78,7 @@ const CONTENT_WIDGETS: Record<string, (typeof NoteContextAwareWidget)[]> = {
         RevisionSnapshotsLimitOptions,
         NetworkConnectionsOptions,
         HtmlImportTagsOptions,
-        ShareSettingsOptions // moved to the end of the array
+        ShareSettingsOptions
     ],
     _optionsAdvanced: [DatabaseIntegrityCheckOptions, DatabaseAnonymizationOptions, AdvancedSyncOptions, VacuumDatabaseOptions],
     _backendLog: [BackendLogWidget]
diff --git a/src/public/app/widgets/type_widgets/options/other/share_settings.ts b/src/public/app/widgets/type_widgets/options/other/share_settings.ts
index 9c7cd1b2d..c4c9d9421 100644
--- a/src/public/app/widgets/type_widgets/options/other/share_settings.ts
+++ b/src/public/app/widgets/type_widgets/options/other/share_settings.ts
@@ -5,22 +5,23 @@ import type { OptionMap, OptionNames } from "../../../../../../services/options_
 
 const TPL = `
 <div class="card-body">
-    <h4>${t("Share Settings")}</h4>
-    
+    <h4>${t("share.title")}</h4>
+
     <div class="form-check">
         <label class="form-check-label">
             <input class="form-check-input" type="checkbox" name="redirectBareDomain" value="true">
-            ${t("Redirect bare domain to Share page")}
+            ${t("share.redirect_bare_domain")}
         </label>
-        <p class="form-text">${t("When enabled, accessing the root URL will redirect to the Share page instead of Login")}</p>
+        <p class="form-text">${t("share.redirect_bare_domain_description")}</p>
     </div>
 
     <div class="form-check">
         <label class="form-check-label">
             <input class="form-check-input" type="checkbox" name="showLoginInShareTheme" value="true">
-            ${t("Show Login link in Share theme")}
+            ${t("share.show_login_link")}
         </label>
-        <p class="form-text">${t("Add a login link to the Share page footer")}</p>
+        <p class="form-text">${t("share.show_login_link_description")}</p>
+        <p>&nbsp;</p>
     </div>
 </div>`;
 
diff --git a/src/public/translations/en/translation.json b/src/public/translations/en/translation.json
index f8fdbc51a..7fed97206 100644
--- a/src/public/translations/en/translation.json
+++ b/src/public/translations/en/translation.json
@@ -1656,5 +1656,27 @@
     "minutes": "Minutes",
     "hours": "Hours",
     "days": "Days"
+  },
+  "share": {
+    "title": "Share Settings",
+    "redirect_bare_domain": "Redirect bare domain to Share page",
+    "redirect_bare_domain_description": "When enabled, accessing the root URL will redirect to the Share page instead of Login",
+    "show_login_link": "Show Login link in Share theme",
+    "show_login_link_description": "Add a login link to the Share page footer"
+  },
+  "sync_2": {
+    "config_title": "Sync Configuration",
+    "server_address": "Server instance address",
+    "timeout": "Sync timeout (milliseconds)",
+    "proxy_label": "Sync proxy server (optional)",
+    "note": "Note",
+    "note_description": "If you leave the proxy setting blank, the system proxy will be used (applies to desktop/electron build only).",
+    "special_value_description": "Another special value is <code>noproxy</code> which forces ignoring even the system proxy and respects <code>NODE_TLS_REJECT_UNAUTHORIZED</code>.",
+    "save": "Save",
+    "help": "Help",
+    "test_title": "Sync Test",
+    "test_description": "This will test the connection and handshake to the sync server. If the sync server isn't initialized, this will set it up to sync with the local document.",
+    "test_button": "Test sync",
+    "handshake_failed": "Sync server handshake failed, error: {{message}}"
   }
 }
diff --git a/src/services/options_interface.ts b/src/services/options_interface.ts
index ef55af6c5..9a89c9ac7 100644
--- a/src/services/options_interface.ts
+++ b/src/services/options_interface.ts
@@ -29,9 +29,6 @@ export interface OptionDefinitions extends KeyboardShortcutsOptions<KeyboardActi
     detailFontFamily: FontFamily;
     monospaceFontFamily: FontFamily;
     spellCheckLanguageCode: string;
-    // Share settings
-    redirectBareDomain: string;
-    showLoginInShareTheme: string;
     codeNotesMimeTypes: string;
     headingStyle: string;
     highlightsList: string;
@@ -97,6 +94,10 @@ export interface OptionDefinitions extends KeyboardShortcutsOptions<KeyboardActi
     codeBlockWordWrap: boolean;
     textNoteEditorMultilineToolbar: boolean;
     backgroundEffects: boolean;
+    // Share settings
+    redirectBareDomain: boolean;
+    showLoginInShareTheme: boolean;
+
 }
 
 export type OptionNames = keyof OptionDefinitions;

From 32bb43f9c1cda6abab9c3b5035925a2c7eaeb9cd Mon Sep 17 00:00:00 2001
From: Matt Wilkie <matt.wilkie@yukon.ca>
Date: Mon, 17 Feb 2025 13:55:55 -0700
Subject: [PATCH 06/62] fix indent

---
 src/public/translations/en/translation.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/public/translations/en/translation.json b/src/public/translations/en/translation.json
index 027c2f269..8cbe3aa9a 100644
--- a/src/public/translations/en/translation.json
+++ b/src/public/translations/en/translation.json
@@ -1677,7 +1677,7 @@
     "test_button": "Test sync",
     "handshake_failed": "Sync server handshake failed, error: {{message}}"
   },
-    "time_selector": {
+  "time_selector": {
     "invalid_input": "The entered time value is not a valid number."
-    }
+  }
 }

From bcb40b531f718b7d2e52977ba88a80464263ee6d Mon Sep 17 00:00:00 2001
From: "Romain DEP." <rom1dep@gmail.com>
Date: Mon, 17 Feb 2025 22:20:20 +0100
Subject: [PATCH 07/62] feat(view/calendar): support coloring

---
 src/public/app/widgets/view_widgets/calendar_view.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/public/app/widgets/view_widgets/calendar_view.ts b/src/public/app/widgets/view_widgets/calendar_view.ts
index 70b68e98f..fc1d2595f 100644
--- a/src/public/app/widgets/view_widgets/calendar_view.ts
+++ b/src/public/app/widgets/view_widgets/calendar_view.ts
@@ -192,6 +192,7 @@ export default class CalendarView extends ViewMode {
         for (const note of notes) {
             const startDate = note.getAttributeValue("label", "startDate");
             const customTitle = note.getAttributeValue("label", "calendar:title");
+            const color = note.getAttributeValue("label", "calendar:color") ??  note.getAttributeValue("label", "color") ?? undefined;
 
             if (!startDate) {
                 continue;
@@ -203,7 +204,8 @@ export default class CalendarView extends ViewMode {
                     title: title,
                     start: startDate,
                     url: `#${note.noteId}`,
-                    noteId: note.noteId
+                    noteId: note.noteId,
+                    color: color,
                 };
 
                 const endDate = CalendarView.#offsetDate(note.getAttributeValue("label", "endDate") ?? startDate, 1);

From aab35955bf6af74595a49e4737278709d8b907b8 Mon Sep 17 00:00:00 2001
From: Matt Wilkie <matt.wilkie@yukon.ca>
Date: Mon, 17 Feb 2025 16:45:47 -0700
Subject: [PATCH 08/62] remove duplicated sync_2

---
 src/public/translations/en/translation.json | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/src/public/translations/en/translation.json b/src/public/translations/en/translation.json
index 8cbe3aa9a..f2978237d 100644
--- a/src/public/translations/en/translation.json
+++ b/src/public/translations/en/translation.json
@@ -1662,21 +1662,6 @@
     "show_login_link": "Show Login link in Share theme",
     "show_login_link_description": "Add a login link to the Share page footer"
   },
-  "sync_2": {
-    "config_title": "Sync Configuration",
-    "server_address": "Server instance address",
-    "timeout": "Sync timeout (milliseconds)",
-    "proxy_label": "Sync proxy server (optional)",
-    "note": "Note",
-    "note_description": "If you leave the proxy setting blank, the system proxy will be used (applies to desktop/electron build only).",
-    "special_value_description": "Another special value is <code>noproxy</code> which forces ignoring even the system proxy and respects <code>NODE_TLS_REJECT_UNAUTHORIZED</code>.",
-    "save": "Save",
-    "help": "Help",
-    "test_title": "Sync Test",
-    "test_description": "This will test the connection and handshake to the sync server. If the sync server isn't initialized, this will set it up to sync with the local document.",
-    "test_button": "Test sync",
-    "handshake_failed": "Sync server handshake failed, error: {{message}}"
-  },
   "time_selector": {
     "invalid_input": "The entered time value is not a valid number."
   }

From eeb99cf37c821887543fa7abf3972006c28e06ca Mon Sep 17 00:00:00 2001
From: Panagiotis Papadopoulos <pano_90@gmx.net>
Date: Tue, 18 Feb 2025 08:57:58 +0100
Subject: [PATCH 09/62] feat: add revisionSnapshotTimeIntervalTimeScale option

to be used in the revision_snapshot_interval widget, when it is ported to use TimeSelector
---
 src/routes/api/options.ts         | 1 +
 src/services/options_init.ts      | 1 +
 src/services/options_interface.ts | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/routes/api/options.ts b/src/routes/api/options.ts
index 33cd5fa8c..29cea6200 100644
--- a/src/routes/api/options.ts
+++ b/src/routes/api/options.ts
@@ -15,6 +15,7 @@ const ALLOWED_OPTIONS = new Set([
     "eraseEntitiesAfterTimeScale",
     "protectedSessionTimeout",
     "revisionSnapshotTimeInterval",
+    "revisionSnapshotTimeIntervalTimeScale",
     "revisionSnapshotNumberLimit",
     "zoomFactor",
     "theme",
diff --git a/src/services/options_init.ts b/src/services/options_init.ts
index 3bb87703e..16eb28795 100644
--- a/src/services/options_init.ts
+++ b/src/services/options_init.ts
@@ -75,6 +75,7 @@ async function initNotSyncedOptions(initialized: boolean, opts: NotSyncedOpts =
  */
 const defaultOptions: DefaultOption[] = [
     { name: "revisionSnapshotTimeInterval", value: "600", isSynced: true },
+    { name: "revisionSnapshotTimeIntervalTimeScale", value: "60", isSynced: true }, // default to Minutes
     { name: "revisionSnapshotNumberLimit", value: "-1", isSynced: true },
     { name: "protectedSessionTimeout", value: "600", isSynced: true },
     { name: "zoomFactor", value: isWindows ? "0.9" : "1.0", isSynced: false },
diff --git a/src/services/options_interface.ts b/src/services/options_interface.ts
index fb234240c..c8a49518f 100644
--- a/src/services/options_interface.ts
+++ b/src/services/options_interface.ts
@@ -49,6 +49,7 @@ export interface OptionDefinitions extends KeyboardShortcutsOptions<KeyboardActi
     lastSyncedPull: number;
     lastSyncedPush: number;
     revisionSnapshotTimeInterval: number;
+    revisionSnapshotTimeIntervalTimeScale: number;
     revisionSnapshotNumberLimit: number;
     protectedSessionTimeout: number;
     zoomFactor: number;

From eb08a976dd65bee7c3da9c3ac816b11c0a7af511 Mon Sep 17 00:00:00 2001
From: Panagiotis Papadopoulos <pano_90@gmx.net>
Date: Tue, 18 Feb 2025 09:00:57 +0100
Subject: [PATCH 10/62] feat: use TimeSelector for revision_snapshot_interval

added one TODO that needs to be handled in TimeSelector: minimum allowed value (!in seconds!)
---
 .../other/revisions_snapshot_interval.ts      | 32 +++++++++----------
 .../type_widgets/options/time_selector.ts     |  1 +
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/public/app/widgets/type_widgets/options/other/revisions_snapshot_interval.ts b/src/public/app/widgets/type_widgets/options/other/revisions_snapshot_interval.ts
index 751f70653..db095fa81 100644
--- a/src/public/app/widgets/type_widgets/options/other/revisions_snapshot_interval.ts
+++ b/src/public/app/widgets/type_widgets/options/other/revisions_snapshot_interval.ts
@@ -1,30 +1,30 @@
-import OptionsWidget from "../options_widget.js";
 import { t } from "../../../../services/i18n.js";
-import type { OptionMap } from "../../../../../../services/options_interface.js";
+import TimeSelector from "../time_selector.js";
 
 const TPL = `
 <div class="options-section">
     <h4>${t("revisions_snapshot_interval.note_revisions_snapshot_interval_title")}</h4>
 
     <p class="use-tn-links">${t("revisions_snapshot_interval.note_revisions_snapshot_description")}</p>
-
-    <div class="form-group">
-        <label>${t("revisions_snapshot_interval.snapshot_time_interval_label")}</label>
-        <input class="revision-snapshot-time-interval-in-seconds form-control options-number-input" type="number" min="10">
-    </div>
+    <div id="time-selector-placeholder"></div>
 </div>`;
+//TriliumNextTODO: add support for setting minimum number of entered seconds -> snapshot revision should not be less than 10 seconds
+export default class RevisionsSnapshotIntervalOptions extends TimeSelector {
 
-export default class RevisionsSnapshotIntervalOptions extends OptionsWidget {
-
-    private $revisionsTimeInterval!: JQuery<HTMLElement>;
+    constructor() {
+        super({
+            widgetId: "revision-snapshot-time-interval",
+            widgetLabelId: "revisions_snapshot_interval.snapshot_time_interval_label",
+            optionValueId: "revisionSnapshotTimeInterval",
+            optionTimeScaleId: "revisionSnapshotTimeIntervalTimeScale"
+        });
+        super.doRender();
+    }
 
     doRender() {
+        const $timeSelector = this.$widget;
+        // inject TimeSelector widget template
         this.$widget = $(TPL);
-        this.$revisionsTimeInterval = this.$widget.find(".revision-snapshot-time-interval-in-seconds");
-        this.$revisionsTimeInterval.on("change", () => this.updateOption("revisionSnapshotTimeInterval", this.$revisionsTimeInterval.val()));
-    }
-
-    async optionsLoaded(options: OptionMap) {
-        this.$revisionsTimeInterval.val(options.revisionSnapshotTimeInterval);
+        this.$widget.find("#time-selector-placeholder").replaceWith($timeSelector)
     }
 }
diff --git a/src/public/app/widgets/type_widgets/options/time_selector.ts b/src/public/app/widgets/type_widgets/options/time_selector.ts
index a3ec7c9bb..74c85faa7 100644
--- a/src/public/app/widgets/type_widgets/options/time_selector.ts
+++ b/src/public/app/widgets/type_widgets/options/time_selector.ts
@@ -36,6 +36,7 @@ const TPL = (options: Omit<TimeSelectorConstructor, "optionValueId" | "optionTim
     }
 </style>`;
 
+//TriliumNextTODO: add support for setting minimum number of entered seconds
 export default class TimeSelector extends OptionsWidget {
     private $timeValueInput!: JQuery<HTMLInputElement>;
     private $timeScaleSelect!: JQuery<HTMLSelectElement>;

From 28148b32d23d66957d3669714681a1778e9e8877 Mon Sep 17 00:00:00 2001
From: Panagiotis Papadopoulos <pano_90@gmx.net>
Date: Tue, 18 Feb 2025 09:07:37 +0100
Subject: [PATCH 11/62] i18n: adjust labels for update
 revision_snapshot_interval options

we don't do seconds only anymore, so strings needed adjusting
---
 src/public/translations/cn/translation.json | 6 +++---
 src/public/translations/de/translation.json | 4 ++--
 src/public/translations/en/translation.json | 4 ++--
 src/public/translations/es/translation.json | 4 ++--
 src/public/translations/fr/translation.json | 4 ++--
 src/public/translations/ro/translation.json | 4 ++--
 src/public/translations/tw/translation.json | 6 +++---
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/public/translations/cn/translation.json b/src/public/translations/cn/translation.json
index 7deb0d59c..de278739b 100644
--- a/src/public/translations/cn/translation.json
+++ b/src/public/translations/cn/translation.json
@@ -1138,9 +1138,9 @@
     "deleted_notes_erased": "已删除的笔记已被清理。"
   },
   "revisions_snapshot_interval": {
-    "note_revisions_snapshot_interval_title": "笔记修改快照间隔",
-    "note_revisions_snapshot_description": "笔记修改快照时间间隔是指经过多少秒后会为笔记创建新的修改历史。更多信息请参见<a href=\"https://triliumnext.github.io/Docs/Wiki/note-revisions.html\" class=\"external\">wiki</a>。",
-    "snapshot_time_interval_label": "笔记修改快照时间间隔（单位:秒）"
+    "note_revisions_snapshot_interval_title": "Note Revision Snapshot Interval",
+    "note_revisions_snapshot_description": "The Note revision snapshot interval is the time after which a new note revision will be created for the note. See <a href=\"https://triliumnext.github.io/Docs/Wiki/note-revisions.html\" class=\"external\">wiki</a> for more info.",
+    "snapshot_time_interval_label": "Note revision snapshot time interval:"
   },
   "revisions_snapshot_limit": {
     "note_revisions_snapshot_limit_title": "笔记历史快照限制",
diff --git a/src/public/translations/de/translation.json b/src/public/translations/de/translation.json
index c450085e3..a38c09fcd 100644
--- a/src/public/translations/de/translation.json
+++ b/src/public/translations/de/translation.json
@@ -1107,8 +1107,8 @@
   },
   "revisions_snapshot_interval": {
     "note_revisions_snapshot_interval_title": "Snapshot-Intervall für Notizrevisionen",
-    "note_revisions_snapshot_description": "Das Snapshot-Zeitintervall für Notizrevisionen ist die Zeit in Sekunden, nach der eine neue Notizrevision erstellt wird. Weitere Informationen findest du im <a href=\"https://triliumnext.github.io/Docs/Wiki/note-revisions.html\" class=\"external\">Wiki</a>.",
-    "snapshot_time_interval_label": "Zeitintervall für Notiz-Revisions-Snapshot (in Sekunden)"
+    "note_revisions_snapshot_description": "Das Snapshot-Zeitintervall für Notizrevisionen ist die Zeit, nach der eine neue Notizrevision erstellt wird. Weitere Informationen findest du im <a href=\"https://triliumnext.github.io/Docs/Wiki/note-revisions.html\" class=\"external\">Wiki</a>.",
+    "snapshot_time_interval_label": "Zeitintervall für Notiz-Revisions-Snapshot:"
   },
   "revisions_snapshot_limit": {
     "note_revisions_snapshot_limit_title": "Limit für Notizrevision-Snapshots",
diff --git a/src/public/translations/en/translation.json b/src/public/translations/en/translation.json
index 32474d5c1..1dc443200 100644
--- a/src/public/translations/en/translation.json
+++ b/src/public/translations/en/translation.json
@@ -1165,8 +1165,8 @@
   },
   "revisions_snapshot_interval": {
     "note_revisions_snapshot_interval_title": "Note Revision Snapshot Interval",
-    "note_revisions_snapshot_description": "The Note revision snapshot interval is the time in seconds after which a new note revision will be created for the note. See <a href=\"https://triliumnext.github.io/Docs/Wiki/note-revisions.html\" class=\"external\">wiki</a> for more info.",
-    "snapshot_time_interval_label": "Note revision snapshot time interval (in seconds):"
+    "note_revisions_snapshot_description": "The Note revision snapshot interval is the time after which a new note revision will be created for the note. See <a href=\"https://triliumnext.github.io/Docs/Wiki/note-revisions.html\" class=\"external\">wiki</a> for more info.",
+    "snapshot_time_interval_label": "Note revision snapshot time interval:"
   },
   "revisions_snapshot_limit": {
     "note_revisions_snapshot_limit_title": "Note Revision Snapshot Limit",
diff --git a/src/public/translations/es/translation.json b/src/public/translations/es/translation.json
index 3810997c3..1902ba01a 100644
--- a/src/public/translations/es/translation.json
+++ b/src/public/translations/es/translation.json
@@ -1163,8 +1163,8 @@
   },
   "revisions_snapshot_interval": {
     "note_revisions_snapshot_interval_title": "Intervalo de instantáneas de revisiones de notas",
-    "note_revisions_snapshot_description": "El intervalo de tiempo de la instantánea de revisión de nota es el tiempo en segundos después de lo cual se creará una nueva revisión para la nota. Ver <a href=\"https://triliumnext.github.io/docs/wiki/note-revisions.html\" class=\"external\"> wiki </a> para obtener más información.",
-    "snapshot_time_interval_label": "Intervalo de tiempo de la instantánea de revisión de notas (en segundos)"
+    "note_revisions_snapshot_description": "El intervalo de tiempo de la instantánea de revisión de nota es el tiempo después de lo cual se creará una nueva revisión para la nota. Ver <a href=\"https://triliumnext.github.io/docs/wiki/note-revisions.html\" class=\"external\"> wiki </a> para obtener más información.",
+    "snapshot_time_interval_label": "Intervalo de tiempo de la instantánea de revisión de notas:"
   },
   "revisions_snapshot_limit": {
     "note_revisions_snapshot_limit_title": "Límite de respaldos de revisiones de nota",
diff --git a/src/public/translations/fr/translation.json b/src/public/translations/fr/translation.json
index 891760da8..bb99773c7 100644
--- a/src/public/translations/fr/translation.json
+++ b/src/public/translations/fr/translation.json
@@ -1108,8 +1108,8 @@
   },
   "revisions_snapshot_interval": {
     "note_revisions_snapshot_interval_title": "Intervalle d'enregistrement automatique des versions des notes",
-    "note_revisions_snapshot_description": "L'intervalle d'enregistrement automatique des versions de note est le temps en secondes après lequel une nouvelle version de note est créée pour une note. Consultez le <a href=\"https://triliumnext.github.io/Docs/Wiki/note-revisions.html\" class=\"external\">wiki</a> pour plus d'informations.",
-    "snapshot_time_interval_label": "Intervalle de temps entre deux enregistrements de version de note (en secondes) :"
+    "note_revisions_snapshot_description": "L'intervalle d'enregistrement automatique des versions de note est le temps après lequel une nouvelle version de note est créée pour une note. Consultez le <a href=\"https://triliumnext.github.io/Docs/Wiki/note-revisions.html\" class=\"external\">wiki</a> pour plus d'informations.",
+    "snapshot_time_interval_label": "Intervalle de temps entre deux enregistrements de version de note :"
   },
   "revisions_snapshot_limit": {
     "note_revisions_snapshot_limit_title": "Limite des enregistrements de version de note",
diff --git a/src/public/translations/ro/translation.json b/src/public/translations/ro/translation.json
index 2d22c2c3c..b0a3ccf40 100644
--- a/src/public/translations/ro/translation.json
+++ b/src/public/translations/ro/translation.json
@@ -1068,9 +1068,9 @@
     "note_revisions": "Revizii ale notiței"
   },
   "revisions_snapshot_interval": {
-    "note_revisions_snapshot_description": "Intervalul de salvare a reviziilor este timpul în secunde după care se crează o nouă revizie a unei notițe. Vedeți <a href=\"https://triliumnext.github.io/Docs/Wiki/note-revisions.html\" class=\"external\">wiki-ul</a> pentru mai multe informații.",
+    "note_revisions_snapshot_description": "Intervalul de salvare a reviziilor este timpul după care se crează o nouă revizie a unei notițe. Vedeți <a href=\"https://triliumnext.github.io/Docs/Wiki/note-revisions.html\" class=\"external\">wiki-ul</a> pentru mai multe informații.",
     "note_revisions_snapshot_interval_title": "Intervalul de salvare a reviziilor",
-    "snapshot_time_interval_label": "Intervalul de salvare a reviziilor (în secunde)"
+    "snapshot_time_interval_label": "Intervalul de salvare a reviziilor:"
   },
   "ribbon": {
     "edited_notes_message": "Tab-ul panglicii „Notițe editate” se va deschide automat pentru notițele zilnice",
diff --git a/src/public/translations/tw/translation.json b/src/public/translations/tw/translation.json
index 654033580..830c76167 100644
--- a/src/public/translations/tw/translation.json
+++ b/src/public/translations/tw/translation.json
@@ -1116,9 +1116,9 @@
     "deleted_notes_erased": "已刪除的筆記已被清理。"
   },
   "revisions_snapshot_interval": {
-    "note_revisions_snapshot_interval_title": "筆記修改快照間隔",
-    "note_revisions_snapshot_description": "筆記修改快照時間間隔是指經過多少秒後會為筆記新增新的修改歷史。更多資訊請參見<a href=\"https://triliumnext.github.io/Docs/Wiki/note-revisions.html\" class=\"external\">wiki</a>。",
-    "snapshot_time_interval_label": "筆記修改快照時間間隔（單位:秒）"
+    "note_revisions_snapshot_interval_title": "Note Revision Snapshot Interval",
+    "note_revisions_snapshot_description": "The Note revision snapshot interval is the time after which a new note revision will be created for the note. See <a href=\"https://triliumnext.github.io/Docs/Wiki/note-revisions.html\" class=\"external\">wiki</a> for more info.",
+    "snapshot_time_interval_label": "Note revision snapshot time interval:"
   },
   "revisions_snapshot_limit": {
     "note_revisions_snapshot_limit_title": "筆記歷史快照限制",

From bf41c54bd05f56643223b706c5ca4c44a2ff95bc Mon Sep 17 00:00:00 2001
From: Panagiotis Papadopoulos <pano_90@gmx.net>
Date: Tue, 18 Feb 2025 22:32:43 +0100
Subject: [PATCH 12/62] feat: set TimeSelector minimumSeconds for
 revision_snapshot_interval and remove TODO

---
 .../options/other/revisions_snapshot_interval.ts             | 5 +++--
 src/public/app/widgets/type_widgets/options/time_selector.ts | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/public/app/widgets/type_widgets/options/other/revisions_snapshot_interval.ts b/src/public/app/widgets/type_widgets/options/other/revisions_snapshot_interval.ts
index db095fa81..13c86fc88 100644
--- a/src/public/app/widgets/type_widgets/options/other/revisions_snapshot_interval.ts
+++ b/src/public/app/widgets/type_widgets/options/other/revisions_snapshot_interval.ts
@@ -8,7 +8,7 @@ const TPL = `
     <p class="use-tn-links">${t("revisions_snapshot_interval.note_revisions_snapshot_description")}</p>
     <div id="time-selector-placeholder"></div>
 </div>`;
-//TriliumNextTODO: add support for setting minimum number of entered seconds -> snapshot revision should not be less than 10 seconds
+
 export default class RevisionsSnapshotIntervalOptions extends TimeSelector {
 
     constructor() {
@@ -16,7 +16,8 @@ export default class RevisionsSnapshotIntervalOptions extends TimeSelector {
             widgetId: "revision-snapshot-time-interval",
             widgetLabelId: "revisions_snapshot_interval.snapshot_time_interval_label",
             optionValueId: "revisionSnapshotTimeInterval",
-            optionTimeScaleId: "revisionSnapshotTimeIntervalTimeScale"
+            optionTimeScaleId: "revisionSnapshotTimeIntervalTimeScale",
+            minimumSeconds: 10
         });
         super.doRender();
     }
diff --git a/src/public/app/widgets/type_widgets/options/time_selector.ts b/src/public/app/widgets/type_widgets/options/time_selector.ts
index 74c85faa7..a3ec7c9bb 100644
--- a/src/public/app/widgets/type_widgets/options/time_selector.ts
+++ b/src/public/app/widgets/type_widgets/options/time_selector.ts
@@ -36,7 +36,6 @@ const TPL = (options: Omit<TimeSelectorConstructor, "optionValueId" | "optionTim
     }
 </style>`;
 
-//TriliumNextTODO: add support for setting minimum number of entered seconds
 export default class TimeSelector extends OptionsWidget {
     private $timeValueInput!: JQuery<HTMLInputElement>;
     private $timeScaleSelect!: JQuery<HTMLSelectElement>;

From 9a1d26e129a192c064a6209a3a0427263eeedcff Mon Sep 17 00:00:00 2001
From: Panagiotis Papadopoulos <pano_90@gmx.net>
Date: Tue, 18 Feb 2025 09:20:57 +0100
Subject: [PATCH 13/62] feat: add protectedSessionTimeoutScale option

to be used in the protected_session_timeout widget, when it is ported to use TimeSelector
---
 src/routes/api/options.ts         | 1 +
 src/services/options_init.ts      | 1 +
 src/services/options_interface.ts | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/routes/api/options.ts b/src/routes/api/options.ts
index 33cd5fa8c..5cb103a31 100644
--- a/src/routes/api/options.ts
+++ b/src/routes/api/options.ts
@@ -14,6 +14,7 @@ const ALLOWED_OPTIONS = new Set([
     "eraseEntitiesAfterTimeInSeconds",
     "eraseEntitiesAfterTimeScale",
     "protectedSessionTimeout",
+    "protectedSessionTimeoutTimeScale",
     "revisionSnapshotTimeInterval",
     "revisionSnapshotNumberLimit",
     "zoomFactor",
diff --git a/src/services/options_init.ts b/src/services/options_init.ts
index 3bb87703e..394808c99 100644
--- a/src/services/options_init.ts
+++ b/src/services/options_init.ts
@@ -77,6 +77,7 @@ const defaultOptions: DefaultOption[] = [
     { name: "revisionSnapshotTimeInterval", value: "600", isSynced: true },
     { name: "revisionSnapshotNumberLimit", value: "-1", isSynced: true },
     { name: "protectedSessionTimeout", value: "600", isSynced: true },
+    { name: "protectedSessionTimeoutTimeScale", value: "60", isSynced: true },
     { name: "zoomFactor", value: isWindows ? "0.9" : "1.0", isSynced: false },
     { name: "overrideThemeFonts", value: "false", isSynced: false },
     { name: "mainFontFamily", value: "theme", isSynced: false },
diff --git a/src/services/options_interface.ts b/src/services/options_interface.ts
index fb234240c..c2da7e1b5 100644
--- a/src/services/options_interface.ts
+++ b/src/services/options_interface.ts
@@ -51,6 +51,7 @@ export interface OptionDefinitions extends KeyboardShortcutsOptions<KeyboardActi
     revisionSnapshotTimeInterval: number;
     revisionSnapshotNumberLimit: number;
     protectedSessionTimeout: number;
+    protectedSessionTimeoutTimeScale: number;
     zoomFactor: number;
     mainFontSize: number;
     treeFontSize: number;

From bd75a268036c16e9224f424cef4532630db370bd Mon Sep 17 00:00:00 2001
From: Panagiotis Papadopoulos <pano_90@gmx.net>
Date: Tue, 18 Feb 2025 09:24:22 +0100
Subject: [PATCH 14/62] feat: use TimeSelector for protected_session_timeout

to be used in the Password options
---
 .../password/protected_session_timeout.ts     | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 src/public/app/widgets/type_widgets/options/password/protected_session_timeout.ts

diff --git a/src/public/app/widgets/type_widgets/options/password/protected_session_timeout.ts b/src/public/app/widgets/type_widgets/options/password/protected_session_timeout.ts
new file mode 100644
index 000000000..ec40dcfac
--- /dev/null
+++ b/src/public/app/widgets/type_widgets/options/password/protected_session_timeout.ts
@@ -0,0 +1,30 @@
+import { t } from "../../../../services/i18n.js";
+import TimeSelector from "../time_selector.js";
+
+const TPL = `
+<div class="options-section">
+    <h4>${t("password.protected_session_timeout")}</h4>
+
+    <p>${t("password.protected_session_timeout_description")} <a class="tn-link" href="https://triliumnext.github.io/Docs/Wiki/protected-notes.html" class="external">${t("password.wiki")}</a> ${t("password.for_more_info")}</p>
+    <div id="time-selector-placeholder"></div>
+</div>`;
+
+// TriliumNextTODO: set minimum value to 60 seconds
+export default class ProtectedSessionTimeoutOption extends TimeSelector {
+    constructor() {
+        super({
+            widgetId: "protected-session-timeout",
+            widgetLabelId: "password.protected_session_timeout_label",
+            optionValueId: "protectedSessionTimeout",
+            optionTimeScaleId: "protectedSessionTimeoutTimeScale"
+        });
+        super.doRender();
+    }
+
+    doRender() {
+        const $timeSelector = this.$widget;
+        // inject TimeSelector widget template
+        this.$widget = $(TPL);
+        this.$widget.find("#time-selector-placeholder").replaceWith($timeSelector)
+    }
+}

From 5a6c3ae4263e289af0f241c9ca06df8eeb3a6a1d Mon Sep 17 00:00:00 2001
From: Matt Wilkie <matt.wilkie@yukon.ca>
Date: Wed, 19 Feb 2025 08:33:03 -0700
Subject: [PATCH 15/62] use the standard classes

per @pano9000 advice, https://github.com/TriliumNext/Notes/pull/1207#issuecomment-2667896424
---
 .../options/other/share_settings.ts           | 27 ++++++++-----------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/public/app/widgets/type_widgets/options/other/share_settings.ts b/src/public/app/widgets/type_widgets/options/other/share_settings.ts
index c4c9d9421..199605082 100644
--- a/src/public/app/widgets/type_widgets/options/other/share_settings.ts
+++ b/src/public/app/widgets/type_widgets/options/other/share_settings.ts
@@ -4,25 +4,20 @@ import { t } from "../../../../services/i18n.js";
 import type { OptionMap, OptionNames } from "../../../../../../services/options_interface.js";
 
 const TPL = `
-<div class="card-body">
+<div class="options-section">
     <h4>${t("share.title")}</h4>
 
-    <div class="form-check">
-        <label class="form-check-label">
-            <input class="form-check-input" type="checkbox" name="redirectBareDomain" value="true">
-            ${t("share.redirect_bare_domain")}
-        </label>
-        <p class="form-text">${t("share.redirect_bare_domain_description")}</p>
-    </div>
+    <label class="tn-checkbox">
+        <input class="form-check-input" type="checkbox" name="redirectBareDomain" value="true">
+        ${t("share.redirect_bare_domain")}
+    </label>
+    <p class="form-text">${t("share.redirect_bare_domain_description")}</p>
 
-    <div class="form-check">
-        <label class="form-check-label">
-            <input class="form-check-input" type="checkbox" name="showLoginInShareTheme" value="true">
-            ${t("share.show_login_link")}
-        </label>
-        <p class="form-text">${t("share.show_login_link_description")}</p>
-        <p>&nbsp;</p>
-    </div>
+    <label class="tn-checkbox">
+        <input class="form-check-input" type="checkbox" name="showLoginInShareTheme" value="true">
+        ${t("share.show_login_link")}
+    </label>
+    <p class="form-text">${t("share.show_login_link_description")}</p>
 </div>`;
 
 export default class ShareSettingsOptions extends OptionsWidget {

From 7f173b287aa85ebb463a98e3aa5342fb0d096325 Mon Sep 17 00:00:00 2001
From: Panagiotis Papadopoulos <pano_90@gmx.net>
Date: Wed, 19 Feb 2025 22:21:49 +0100
Subject: [PATCH 16/62] feat(protected_session_timeout): add minimumSeconds

---
 .../options/password/protected_session_timeout.ts             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/public/app/widgets/type_widgets/options/password/protected_session_timeout.ts b/src/public/app/widgets/type_widgets/options/password/protected_session_timeout.ts
index ec40dcfac..9608b14e7 100644
--- a/src/public/app/widgets/type_widgets/options/password/protected_session_timeout.ts
+++ b/src/public/app/widgets/type_widgets/options/password/protected_session_timeout.ts
@@ -9,14 +9,14 @@ const TPL = `
     <div id="time-selector-placeholder"></div>
 </div>`;
 
-// TriliumNextTODO: set minimum value to 60 seconds
 export default class ProtectedSessionTimeoutOption extends TimeSelector {
     constructor() {
         super({
             widgetId: "protected-session-timeout",
             widgetLabelId: "password.protected_session_timeout_label",
             optionValueId: "protectedSessionTimeout",
-            optionTimeScaleId: "protectedSessionTimeoutTimeScale"
+            optionTimeScaleId: "protectedSessionTimeoutTimeScale",
+            minimumSeconds: 60
         });
         super.doRender();
     }

From 739eaf9fc073a5b398d9ad2c72f83597bd51fa20 Mon Sep 17 00:00:00 2001
From: Panagiotis Papadopoulos <pano_90@gmx.net>
Date: Wed, 19 Feb 2025 22:27:35 +0100
Subject: [PATCH 17/62] refactor(password): remove protected_session_timeout
 TPL element

-> now part of protected_session_timeout widget
---
 .../app/widgets/type_widgets/options/password.ts     | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/public/app/widgets/type_widgets/options/password.ts b/src/public/app/widgets/type_widgets/options/password.ts
index 9a838f9aa..d3800f85e 100644
--- a/src/public/app/widgets/type_widgets/options/password.ts
+++ b/src/public/app/widgets/type_widgets/options/password.ts
@@ -32,17 +32,7 @@ const TPL = `
         <button class="save-password-button btn btn-primary">${t("password.change_password")}</button>
     </form>
 </div>
-
-<div class="options-section">
-    <h4>${t("password.protected_session_timeout")}</h4>
-
-    <p>${t("password.protected_session_timeout_description")} <a class="tn-link" href="https://triliumnext.github.io/Docs/Wiki/protected-notes.html" class="external">${t("password.wiki")}</a> ${t("password.for_more_info")}</p>
-
-    <div class="form-group">
-        <label for="protected-session-timeout-in-seconds">${t("password.protected_session_timeout_label")}</label>
-        <input id="protected-session-timeout-in-seconds" class="protected-session-timeout-in-seconds form-control options-number-input" type="number" min="60">
-    </div>
-</div>`;
+`;
 
 // TODO: Deduplicate
 interface ChangePasswordResponse {

From 1a80a379dc9625a4e25168c7cdd8270df8976350 Mon Sep 17 00:00:00 2001
From: Panagiotis Papadopoulos <pano_90@gmx.net>
Date: Wed, 19 Feb 2025 22:32:48 +0100
Subject: [PATCH 18/62] refactor(password): move password.ts to password
 subfolder

---
 .../app/widgets/type_widgets/content_widget.ts       |  2 +-
 .../type_widgets/options/{ => password}/password.ts  | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename src/public/app/widgets/type_widgets/options/{ => password}/password.ts (92%)

diff --git a/src/public/app/widgets/type_widgets/content_widget.ts b/src/public/app/widgets/type_widgets/content_widget.ts
index 1f19e2b81..96252d251 100644
--- a/src/public/app/widgets/type_widgets/content_widget.ts
+++ b/src/public/app/widgets/type_widgets/content_widget.ts
@@ -14,7 +14,7 @@ import CodeAutoReadOnlySizeOptions from "./options/code_notes/code_auto_read_onl
 import CodeMimeTypesOptions from "./options/code_notes/code_mime_types.js";
 import ImageOptions from "./options/images/images.js";
 import SpellcheckOptions from "./options/spellcheck.js";
-import PasswordOptions from "./options/password.js";
+import PasswordOptions from "./options/password/password.js";
 import EtapiOptions from "./options/etapi.js";
 import BackupOptions from "./options/backup.js";
 import SyncOptions from "./options/sync.js";
diff --git a/src/public/app/widgets/type_widgets/options/password.ts b/src/public/app/widgets/type_widgets/options/password/password.ts
similarity index 92%
rename from src/public/app/widgets/type_widgets/options/password.ts
rename to src/public/app/widgets/type_widgets/options/password/password.ts
index d3800f85e..3813d2aee 100644
--- a/src/public/app/widgets/type_widgets/options/password.ts
+++ b/src/public/app/widgets/type_widgets/options/password/password.ts
@@ -1,9 +1,9 @@
-import { t } from "../../../services/i18n.js";
-import server from "../../../services/server.js";
-import protectedSessionHolder from "../../../services/protected_session_holder.js";
-import toastService from "../../../services/toast.js";
-import OptionsWidget from "./options_widget.js";
-import type { OptionMap } from "../../../../../services/options_interface.js";
+import { t } from "../../../../services/i18n.js";
+import server from "../../../../services/server.js";
+import protectedSessionHolder from "../../../../services/protected_session_holder.js";
+import toastService from "../../../../services/toast.js";
+import OptionsWidget from "../options_widget.js";
+import type { OptionMap } from "../../../../../../services/options_interface.js";
 
 const TPL = `
 <div class="options-section">

From cecde349b7cf3c9e7a92b46ea458280bdf833b1c Mon Sep 17 00:00:00 2001
From: Panagiotis Papadopoulos <pano_90@gmx.net>
Date: Wed, 19 Feb 2025 22:35:02 +0100
Subject: [PATCH 19/62] feat: add ProtectedSessionTimeoutOption to
 content_widget

---
 src/public/app/widgets/type_widgets/content_widget.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/public/app/widgets/type_widgets/content_widget.ts b/src/public/app/widgets/type_widgets/content_widget.ts
index 96252d251..d99865648 100644
--- a/src/public/app/widgets/type_widgets/content_widget.ts
+++ b/src/public/app/widgets/type_widgets/content_widget.ts
@@ -15,6 +15,7 @@ import CodeMimeTypesOptions from "./options/code_notes/code_mime_types.js";
 import ImageOptions from "./options/images/images.js";
 import SpellcheckOptions from "./options/spellcheck.js";
 import PasswordOptions from "./options/password/password.js";
+import ProtectedSessionTimeoutOption from "./options/password/protected_session_timeout.js"
 import EtapiOptions from "./options/etapi.js";
 import BackupOptions from "./options/backup.js";
 import SyncOptions from "./options/sync.js";

From 19816493d6c2b69bd73bd94326b8f73a1c3a7545 Mon Sep 17 00:00:00 2001
From: Panagiotis Papadopoulos <pano_90@gmx.net>
Date: Wed, 19 Feb 2025 22:37:08 +0100
Subject: [PATCH 20/62] chore: rename ProtectedSessionTimeoutOption to plural

matches the remaining Options widgets
---
 src/public/app/widgets/type_widgets/content_widget.ts         | 4 ++--
 .../options/password/protected_session_timeout.ts             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/public/app/widgets/type_widgets/content_widget.ts b/src/public/app/widgets/type_widgets/content_widget.ts
index d99865648..15a4d23fa 100644
--- a/src/public/app/widgets/type_widgets/content_widget.ts
+++ b/src/public/app/widgets/type_widgets/content_widget.ts
@@ -15,7 +15,7 @@ import CodeMimeTypesOptions from "./options/code_notes/code_mime_types.js";
 import ImageOptions from "./options/images/images.js";
 import SpellcheckOptions from "./options/spellcheck.js";
 import PasswordOptions from "./options/password/password.js";
-import ProtectedSessionTimeoutOption from "./options/password/protected_session_timeout.js"
+import ProtectedSessionTimeoutOptions from "./options/password/protected_session_timeout.js"
 import EtapiOptions from "./options/etapi.js";
 import BackupOptions from "./options/backup.js";
 import SyncOptions from "./options/sync.js";
@@ -65,7 +65,7 @@ const CONTENT_WIDGETS: Record<string, (typeof NoteContextAwareWidget)[]> = {
     _optionsCodeNotes: [VimKeyBindingsOptions, WrapLinesOptions, CodeAutoReadOnlySizeOptions, CodeMimeTypesOptions],
     _optionsImages: [ImageOptions],
     _optionsSpellcheck: [SpellcheckOptions],
-    _optionsPassword: [PasswordOptions],
+    _optionsPassword: [PasswordOptions, ProtectedSessionTimeoutOptions],
     _optionsEtapi: [EtapiOptions],
     _optionsBackup: [BackupOptions],
     _optionsSync: [SyncOptions],
diff --git a/src/public/app/widgets/type_widgets/options/password/protected_session_timeout.ts b/src/public/app/widgets/type_widgets/options/password/protected_session_timeout.ts
index 9608b14e7..20d84a1ad 100644
--- a/src/public/app/widgets/type_widgets/options/password/protected_session_timeout.ts
+++ b/src/public/app/widgets/type_widgets/options/password/protected_session_timeout.ts
@@ -9,7 +9,7 @@ const TPL = `
     <div id="time-selector-placeholder"></div>
 </div>`;
 
-export default class ProtectedSessionTimeoutOption extends TimeSelector {
+export default class ProtectedSessionTimeoutOptions extends TimeSelector {
     constructor() {
         super({
             widgetId: "protected-session-timeout",

From bf6c5dfb202d5d58eb3968020103d42052e90ded Mon Sep 17 00:00:00 2001
From: Panagiotis Papadopoulos <pano_90@gmx.net>
Date: Wed, 19 Feb 2025 22:45:07 +0100
Subject: [PATCH 21/62] i18n: adjust protected_session_timeout_label

we are not limited to seconds now anymore (at least in the UI :-))
---
 src/public/translations/cn/translation.json | 2 +-
 src/public/translations/de/translation.json | 2 +-
 src/public/translations/en/translation.json | 2 +-
 src/public/translations/es/translation.json | 2 +-
 src/public/translations/fr/translation.json | 2 +-
 src/public/translations/ro/translation.json | 2 +-
 src/public/translations/tw/translation.json | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/public/translations/cn/translation.json b/src/public/translations/cn/translation.json
index 7deb0d59c..5c4085fdc 100644
--- a/src/public/translations/cn/translation.json
+++ b/src/public/translations/cn/translation.json
@@ -1259,7 +1259,7 @@
     "protected_session_timeout_description": "保护会话超时是一个时间段，超时后保护会话会从浏览器内存中清除。这是从最后一次与保护笔记的交互开始计时的。更多信息请见",
     "wiki": "维基",
     "for_more_info": "更多信息。",
-    "protected_session_timeout_label": "保护会话超时（秒）",
+    "protected_session_timeout_label": "Protected session timeout:",
     "reset_confirmation": "重置密码将永久丧失对所有现受保护笔记的访问。您真的要重置密码吗？",
     "reset_success_message": "密码已重置。请设置新密码",
     "change_password_heading": "更改密码",
diff --git a/src/public/translations/de/translation.json b/src/public/translations/de/translation.json
index c450085e3..bc37422a1 100644
--- a/src/public/translations/de/translation.json
+++ b/src/public/translations/de/translation.json
@@ -1225,7 +1225,7 @@
     "protected_session_timeout_description": "Das Zeitlimit für geschützte Sitzungen ist ein Zeitraum, nach dem die geschützte Sitzung aus dem Speicher des Browsers gelöscht wird. Dies wird ab der letzten Interaktion mit geschützten Notizen gemessen. Sehen",
     "wiki": "Wiki",
     "for_more_info": "für weitere Informationen.",
-    "protected_session_timeout_label": "Zeitüberschreitung der geschützten Sitzung (in Sekunden)",
+    "protected_session_timeout_label": "Zeitüberschreitung der geschützten Sitzung:",
     "reset_confirmation": "Durch das Zurücksetzen des Passworts verlierst du für immer den Zugriff auf alle Ihre bestehenden geschützten Notizen. Möchtest du das Passwort wirklich zurücksetzen?",
     "reset_success_message": "Das Passwort wurde zurückgesetzt. Bitte lege ein neues Passwort fest",
     "change_password_heading": "Kennwort ändern",
diff --git a/src/public/translations/en/translation.json b/src/public/translations/en/translation.json
index 32474d5c1..bf2b94a3e 100644
--- a/src/public/translations/en/translation.json
+++ b/src/public/translations/en/translation.json
@@ -1285,7 +1285,7 @@
     "protected_session_timeout_description": "Protected session timeout is a time period after which the protected session is wiped from the browser's memory. This is measured from the last interaction with protected notes. See",
     "wiki": "wiki",
     "for_more_info": "for more info.",
-    "protected_session_timeout_label": "Protected session timeout (in seconds)",
+    "protected_session_timeout_label": "Protected session timeout:",
     "reset_confirmation": "By resetting the password you will forever lose access to all your existing protected notes. Do you really want to reset the password?",
     "reset_success_message": "Password has been reset. Please set new password",
     "change_password_heading": "Change Password",
diff --git a/src/public/translations/es/translation.json b/src/public/translations/es/translation.json
index 3810997c3..65c15ad88 100644
--- a/src/public/translations/es/translation.json
+++ b/src/public/translations/es/translation.json
@@ -1283,7 +1283,7 @@
     "protected_session_timeout_description": "El tiempo de espera de la sesión protegida es el período de tiempo después del cual la sesión protegida se borra de la memoria del navegador. Esto se mide desde la última interacción con notas protegidas. Ver",
     "wiki": "wiki",
     "for_more_info": "para más información.",
-    "protected_session_timeout_label": "Tiempo de espera de sesión protegida (en segundos)",
+    "protected_session_timeout_label": "Tiempo de espera de sesión protegida:",
     "reset_confirmation": "Al restablecer la contraseña, perderá para siempre el acceso a todas sus notas protegidas existentes. ¿Realmente quieres restablecer la contraseña?",
     "reset_success_message": "La contraseña ha sido restablecida. Por favor establezca una nueva contraseña",
     "change_password_heading": "Cambiar contraseña",
diff --git a/src/public/translations/fr/translation.json b/src/public/translations/fr/translation.json
index 891760da8..8e136200a 100644
--- a/src/public/translations/fr/translation.json
+++ b/src/public/translations/fr/translation.json
@@ -1226,7 +1226,7 @@
     "protected_session_timeout_description": "Le délai d'expiration de la session protégée est une période de temps après laquelle la session protégée est effacée de la mémoire du navigateur. Il est mesuré à partir de la dernière interaction avec des notes protégées. Voir",
     "wiki": "wiki",
     "for_more_info": "pour plus d'informations.",
-    "protected_session_timeout_label": "Délai d'expiration de la session protégée (en secondes)",
+    "protected_session_timeout_label": "Délai d'expiration de la session protégée :",
     "reset_confirmation": "En réinitialisant le mot de passe, vous perdrez à jamais l'accès à toutes vos notes protégées existantes. Voulez-vous vraiment réinitialiser le mot de passe ?",
     "reset_success_message": "Le mot de passe a été réinitialisé. Veuillez définir un nouveau mot de passe",
     "change_password_heading": "Changer le mot de passe",
diff --git a/src/public/translations/ro/translation.json b/src/public/translations/ro/translation.json
index 2d22c2c3c..442507833 100644
--- a/src/public/translations/ro/translation.json
+++ b/src/public/translations/ro/translation.json
@@ -923,7 +923,7 @@
     "password_mismatch": "Noile parole nu coincid.",
     "protected_session_timeout": "Timpul de expirare a sesiunii protejate",
     "protected_session_timeout_description": "Timpul de expirare a sesiunii protejate este o perioadă de timp după care sesiunea protejată este ștearsă din memoria navigatorului. Aceasta este măsurată de la timpul ultimei interacțiuni cu notițele protejate. Vezi",
-    "protected_session_timeout_label": "Timpul de expirare a sesiunii protejate (în secunde)",
+    "protected_session_timeout_label": "Timpul de expirare a sesiunii protejate:",
     "reset_confirmation": "Prin resetarea parolei se va pierde pentru totdeauna accesul la notițele protejate existente. Sigur doriți resetarea parolei?",
     "reset_link": "click aici pentru a o reseta.",
     "reset_success_message": "Parola a fost resetată. Setați o nouă parolă",
diff --git a/src/public/translations/tw/translation.json b/src/public/translations/tw/translation.json
index 654033580..cbf60c297 100644
--- a/src/public/translations/tw/translation.json
+++ b/src/public/translations/tw/translation.json
@@ -1237,7 +1237,7 @@
     "protected_session_timeout_description": "保護會話超時是一個時間段，超時後保護會話會從瀏覽器內存中清除。這是從最後一次與保護筆記的交互開始計時的。更多資訊請見",
     "wiki": "維基",
     "for_more_info": "更多資訊。",
-    "protected_session_timeout_label": "保護會話超時（秒）",
+    "protected_session_timeout_label": "Protected session timeout:",
     "reset_confirmation": "重置密碼將永久喪失對所有現受保護筆記的訪問。您真的要重置密碼嗎？",
     "reset_success_message": "密碼已重置。請設定新密碼",
     "change_password_heading": "更改密碼",

From 2734e230ab07fcc802ca988ff92094ff4abf4f69 Mon Sep 17 00:00:00 2001
From: matt wilkie <maphew@gmail.com>
Date: Thu, 20 Feb 2025 08:12:51 -0700
Subject: [PATCH 22/62] WIP: 1st step at verifying shareRoot is set

---
 .../options/other/share_settings.ts           | 71 +++++++++++++++----
 src/public/translations/en/translation.json   |  5 +-
 src/services/auth.ts                          | 11 ++-
 3 files changed, 73 insertions(+), 14 deletions(-)

diff --git a/src/public/app/widgets/type_widgets/options/other/share_settings.ts b/src/public/app/widgets/type_widgets/options/other/share_settings.ts
index 199605082..abc540b49 100644
--- a/src/public/app/widgets/type_widgets/options/other/share_settings.ts
+++ b/src/public/app/widgets/type_widgets/options/other/share_settings.ts
@@ -2,44 +2,91 @@ import OptionsWidget from "../options_widget.js";
 import options from "../../../../services/options.js";
 import { t } from "../../../../services/i18n.js";
 import type { OptionMap, OptionNames } from "../../../../../../services/options_interface.js";
+import searchService from "../../../../services/search.js";
 
 const TPL = `
 <div class="options-section">
-    <h4>${t("share.title")}</h4>
-
     <label class="tn-checkbox">
-        <input class="form-check-input" type="checkbox" name="redirectBareDomain" value="true">
-        ${t("share.redirect_bare_domain")}
+        <input type="checkbox" name="redirectBareDomain">
+        <span>${t("share.redirect_bare_domain")}</span>
     </label>
     <p class="form-text">${t("share.redirect_bare_domain_description")}</p>
 
+    <div class="share-root-check mt-2 mb-2" style="display: none;">
+        <button class="btn btn-sm btn-secondary check-share-root">${t("share.check_share_root")}</button>
+        <div class="share-root-status form-text mt-2"></div>
+    </div>
+
     <label class="tn-checkbox">
-        <input class="form-check-input" type="checkbox" name="showLoginInShareTheme" value="true">
-        ${t("share.show_login_link")}
+        <input type="checkbox" name="shareSubtree">
+        <span>${t("share.share_subtree")}</span>
     </label>
-    <p class="form-text">${t("share.show_login_link_description")}</p>
 </div>`;
 
 export default class ShareSettingsOptions extends OptionsWidget {
+    private $shareRootCheck!: JQuery<HTMLElement>;
+    private $shareRootStatus!: JQuery<HTMLElement>;
+
     doRender() {
         this.$widget = $(TPL);
         this.contentSized();
 
+        this.$shareRootCheck = this.$widget.find('.share-root-check');
+        this.$shareRootStatus = this.$widget.find('.share-root-status');
+
         // Add change handlers for both checkboxes
-        this.$widget.find('input[type="checkbox"]').on("change", () => this.save());
+        this.$widget.find('input[type="checkbox"]').on("change", (e: JQuery.ChangeEvent) => {
+            this.save();
+            
+            // Show/hide share root status section based on redirectBareDomain checkbox
+            const target = e.target as HTMLInputElement;
+            if (target.name === 'redirectBareDomain') {
+                this.$shareRootCheck.toggle(target.checked);
+                if (target.checked) {
+                    this.checkShareRoot();
+                }
+            }
+        });
+
+        // Add click handler for check share root button
+        this.$widget.find('.check-share-root').on("click", () => this.checkShareRoot());
     }
 
     async optionsLoaded(options: OptionMap) {
-        this.$widget.find('input[name="redirectBareDomain"]').prop("checked", options.redirectBareDomain === "true");
+        const redirectBareDomain = options.redirectBareDomain === "true";
+        this.$widget.find('input[name="redirectBareDomain"]').prop("checked", redirectBareDomain);
+        this.$shareRootCheck.toggle(redirectBareDomain);
+        if (redirectBareDomain) {
+            await this.checkShareRoot();
+        }
 
-        this.$widget.find('input[name="showLoginInShareTheme"]').prop("checked", options.showLoginInShareTheme === "true");
+        this.$widget.find('input[name="shareSubtree"]').prop("checked", options.shareSubtree === "true");
+    }
+
+    async checkShareRoot() {
+        const shareRootNotes = await searchService.searchNotes("#shareRoot", {
+            includeArchivedNotes: true,
+            ignoreHoistedNote: true
+        });
+
+        if (shareRootNotes.length > 0) {
+            this.$shareRootStatus
+                .removeClass('text-danger')
+                .addClass('text-success')
+                .text(t("share.share_root_found", {noteTitle: shareRootNotes[0].title}));
+        } else {
+            this.$shareRootStatus
+                .removeClass('text-success')
+                .addClass('text-danger')
+                .text(t("share.share_root_not_found"));
+        }
     }
 
     async save() {
         const redirectBareDomain = this.$widget.find('input[name="redirectBareDomain"]').prop("checked");
         await this.updateOption<"redirectBareDomain">("redirectBareDomain", redirectBareDomain.toString());
 
-        const showLoginInShareTheme = this.$widget.find('input[name="showLoginInShareTheme"]').prop("checked");
-        await this.updateOption<"showLoginInShareTheme">("showLoginInShareTheme", showLoginInShareTheme.toString());
+        const showLoginInShareTheme = this.$widget.find('input[name="shareSubtree"]').prop("checked");
+        await this.updateOption<"shareSubtree">("shareSubtree", showLoginInShareTheme.toString());
     }
 }
diff --git a/src/public/translations/en/translation.json b/src/public/translations/en/translation.json
index f2978237d..c0ee99e4b 100644
--- a/src/public/translations/en/translation.json
+++ b/src/public/translations/en/translation.json
@@ -1660,7 +1660,10 @@
     "redirect_bare_domain": "Redirect bare domain to Share page",
     "redirect_bare_domain_description": "When enabled, accessing the root URL will redirect to the Share page instead of Login",
     "show_login_link": "Show Login link in Share theme",
-    "show_login_link_description": "Add a login link to the Share page footer"
+    "show_login_link_description": "Add a login link to the Share page footer",
+    "check_share_root": "Check Share Root Status",
+    "share_root_found": "Share root found: {{noteTitle}}",
+    "share_root_not_found": "No note with #shareRoot label found. Set up a note with #shareRoot label first."
   },
   "time_selector": {
     "invalid_input": "The entered time value is not a valid number."
diff --git a/src/services/auth.ts b/src/services/auth.ts
index 68c497b91..03f40e6e7 100644
--- a/src/services/auth.ts
+++ b/src/services/auth.ts
@@ -8,6 +8,7 @@ import passwordEncryptionService from "./encryption/password_encryption.js";
 import config from "./config.js";
 import passwordService from "./encryption/password.js";
 import options from "./options.js";
+import attributes from "./attributes.js";
 import type { NextFunction, Request, Response } from "express";
 
 const noAuthentication = config.General && config.General.noAuthentication === true;
@@ -16,7 +17,15 @@ function checkAuth(req: Request, res: Response, next: NextFunction) {
     if (!sqlInit.isDbInitialized()) {
         res.redirect("setup");
     } else if (!req.session.loggedIn && !isElectron && !noAuthentication) {
-        const redirectToShare = options.getOption("redirectBareDomain") === "true";
+        const redirectToShare = options.getOptionBool("redirectBareDomain");
+        if (redirectToShare) {
+            // Check if any note has the #shareRoot label
+            const shareRootNotes = attributes.getNotesWithLabel("shareRoot");
+            if (shareRootNotes.length === 0) {
+                res.status(404).json({ message: "Share root not found. Please set up a note with #shareRoot label first." });
+                return;
+            }
+        }
         res.redirect(redirectToShare ? "share" : "login");
     } else {
         next();

From bdd6395a762f29b46e3fecadb5c7783af57e132a Mon Sep 17 00:00:00 2001
From: matt wilkie <maphew@gmail.com>
Date: Thu, 20 Feb 2025 09:08:24 -0700
Subject: [PATCH 23/62] works! verify shareRoot is set and note is shared

---
 .../options/other/share_settings.ts           | 47 +++++++++++--------
 src/public/translations/en/translation.json   |  7 +--
 2 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/src/public/app/widgets/type_widgets/options/other/share_settings.ts b/src/public/app/widgets/type_widgets/options/other/share_settings.ts
index abc540b49..d2d77bc6d 100644
--- a/src/public/app/widgets/type_widgets/options/other/share_settings.ts
+++ b/src/public/app/widgets/type_widgets/options/other/share_settings.ts
@@ -6,11 +6,11 @@ import searchService from "../../../../services/search.js";
 
 const TPL = `
 <div class="options-section">
+    <p>${t("share.redirect_bare_domain_description")}</p>
     <label class="tn-checkbox">
         <input type="checkbox" name="redirectBareDomain">
         <span>${t("share.redirect_bare_domain")}</span>
     </label>
-    <p class="form-text">${t("share.redirect_bare_domain_description")}</p>
 
     <div class="share-root-check mt-2 mb-2" style="display: none;">
         <button class="btn btn-sm btn-secondary check-share-root">${t("share.check_share_root")}</button>
@@ -18,8 +18,8 @@ const TPL = `
     </div>
 
     <label class="tn-checkbox">
-        <input type="checkbox" name="shareSubtree">
-        <span>${t("share.share_subtree")}</span>
+        <input type="checkbox" name="showLoginInShareTheme">
+        <span>${t("share.show_login_link")}</span>
     </label>
 </div>`;
 
@@ -60,25 +60,32 @@ export default class ShareSettingsOptions extends OptionsWidget {
             await this.checkShareRoot();
         }
 
-        this.$widget.find('input[name="shareSubtree"]').prop("checked", options.shareSubtree === "true");
+        this.$widget.find('input[name="showLoginInShareTheme"]').prop("checked", options.showLoginInShareTheme === "true");
     }
 
     async checkShareRoot() {
-        const shareRootNotes = await searchService.searchNotes("#shareRoot", {
-            includeArchivedNotes: true,
-            ignoreHoistedNote: true
-        });
+        const $button = this.$widget.find('.check-share-root');
+        $button.prop('disabled', true);
+        
+        try {
+            const shareRootNotes = await searchService.searchForNotes("#shareRoot");
+            const sharedShareRootNote = shareRootNotes.find(note => note.isShared());
 
-        if (shareRootNotes.length > 0) {
-            this.$shareRootStatus
-                .removeClass('text-danger')
-                .addClass('text-success')
-                .text(t("share.share_root_found", {noteTitle: shareRootNotes[0].title}));
-        } else {
-            this.$shareRootStatus
-                .removeClass('text-success')
-                .addClass('text-danger')
-                .text(t("share.share_root_not_found"));
+            if (sharedShareRootNote) {
+                this.$shareRootStatus
+                    .removeClass('text-danger')
+                    .addClass('text-success')
+                    .text(t("share.share_root_found", {noteTitle: sharedShareRootNote.title}));
+            } else {
+                this.$shareRootStatus
+                    .removeClass('text-success')
+                    .addClass('text-danger')
+                    .text(shareRootNotes.length > 0 
+                        ? t("share.share_root_not_shared", {noteTitle: shareRootNotes[0].title})
+                        : t("share.share_root_not_found"));
+            }
+        } finally {
+            $button.prop('disabled', false);
         }
     }
 
@@ -86,7 +93,7 @@ export default class ShareSettingsOptions extends OptionsWidget {
         const redirectBareDomain = this.$widget.find('input[name="redirectBareDomain"]').prop("checked");
         await this.updateOption<"redirectBareDomain">("redirectBareDomain", redirectBareDomain.toString());
 
-        const showLoginInShareTheme = this.$widget.find('input[name="shareSubtree"]').prop("checked");
-        await this.updateOption<"shareSubtree">("shareSubtree", showLoginInShareTheme.toString());
+        const showLoginInShareTheme = this.$widget.find('input[name="showLoginInShareTheme"]').prop("checked");
+        await this.updateOption<"showLoginInShareTheme">("showLoginInShareTheme", showLoginInShareTheme.toString());
     }
 }
diff --git a/src/public/translations/en/translation.json b/src/public/translations/en/translation.json
index c0ee99e4b..506952623 100644
--- a/src/public/translations/en/translation.json
+++ b/src/public/translations/en/translation.json
@@ -1658,12 +1658,13 @@
   "share": {
     "title": "Share Settings",
     "redirect_bare_domain": "Redirect bare domain to Share page",
-    "redirect_bare_domain_description": "When enabled, accessing the root URL will redirect to the Share page instead of Login",
+    "redirect_bare_domain_description": "Redirect anonymous users to the Share page instead of showing Login",
     "show_login_link": "Show Login link in Share theme",
     "show_login_link_description": "Add a login link to the Share page footer",
     "check_share_root": "Check Share Root Status",
-    "share_root_found": "Share root found: {{noteTitle}}",
-    "share_root_not_found": "No note with #shareRoot label found. Set up a note with #shareRoot label first."
+    "share_root_found": "Share root note '{{noteTitle}}' is ready",
+    "share_root_not_found": "No note with #shareRoot label found",
+    "share_root_not_shared": "Note '{{noteTitle}}' has #shareRoot label but is not Shared"
   },
   "time_selector": {
     "invalid_input": "The entered time value is not a valid number."

From 16b16927efda18a67e218431ab6fe6e2060000c4 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Thu, 20 Feb 2025 22:08:04 +0200
Subject: [PATCH 24/62] feat(settings/share): add title to section

---
 .../widgets/type_widgets/options/other/share_settings.ts  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/public/app/widgets/type_widgets/options/other/share_settings.ts b/src/public/app/widgets/type_widgets/options/other/share_settings.ts
index d2d77bc6d..52d41552c 100644
--- a/src/public/app/widgets/type_widgets/options/other/share_settings.ts
+++ b/src/public/app/widgets/type_widgets/options/other/share_settings.ts
@@ -6,6 +6,8 @@ import searchService from "../../../../services/search.js";
 
 const TPL = `
 <div class="options-section">
+    <h4>${t("share.title")}</h4>
+
     <p>${t("share.redirect_bare_domain_description")}</p>
     <label class="tn-checkbox">
         <input type="checkbox" name="redirectBareDomain">
@@ -37,7 +39,7 @@ export default class ShareSettingsOptions extends OptionsWidget {
         // Add change handlers for both checkboxes
         this.$widget.find('input[type="checkbox"]').on("change", (e: JQuery.ChangeEvent) => {
             this.save();
-            
+
             // Show/hide share root status section based on redirectBareDomain checkbox
             const target = e.target as HTMLInputElement;
             if (target.name === 'redirectBareDomain') {
@@ -66,7 +68,7 @@ export default class ShareSettingsOptions extends OptionsWidget {
     async checkShareRoot() {
         const $button = this.$widget.find('.check-share-root');
         $button.prop('disabled', true);
-        
+
         try {
             const shareRootNotes = await searchService.searchForNotes("#shareRoot");
             const sharedShareRootNote = shareRootNotes.find(note => note.isShared());
@@ -80,7 +82,7 @@ export default class ShareSettingsOptions extends OptionsWidget {
                 this.$shareRootStatus
                     .removeClass('text-success')
                     .addClass('text-danger')
-                    .text(shareRootNotes.length > 0 
+                    .text(shareRootNotes.length > 0
                         ? t("share.share_root_not_shared", {noteTitle: shareRootNotes[0].title})
                         : t("share.share_root_not_found"));
             }

From 946d9aee403aaf75e165c95c5345f5e81d1ef715 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Thu, 20 Feb 2025 22:34:51 +0200
Subject: [PATCH 25/62] feat(settings/share): add subtitles

---
 .../type_widgets/options/other/share_settings.ts | 16 ++++++----------
 src/public/stylesheets/theme-next/forms.css      |  5 +++++
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/public/app/widgets/type_widgets/options/other/share_settings.ts b/src/public/app/widgets/type_widgets/options/other/share_settings.ts
index 52d41552c..e43adc5e1 100644
--- a/src/public/app/widgets/type_widgets/options/other/share_settings.ts
+++ b/src/public/app/widgets/type_widgets/options/other/share_settings.ts
@@ -8,21 +8,17 @@ const TPL = `
 <div class="options-section">
     <h4>${t("share.title")}</h4>
 
-    <p>${t("share.redirect_bare_domain_description")}</p>
     <label class="tn-checkbox">
-        <input type="checkbox" name="redirectBareDomain">
-        <span>${t("share.redirect_bare_domain")}</span>
+        <input class="form-check-input" type="checkbox" name="redirectBareDomain" value="true">
+        ${t("share.redirect_bare_domain")}
     </label>
-
-    <div class="share-root-check mt-2 mb-2" style="display: none;">
-        <button class="btn btn-sm btn-secondary check-share-root">${t("share.check_share_root")}</button>
-        <div class="share-root-status form-text mt-2"></div>
-    </div>
+    <p class="form-text">${t("share.redirect_bare_domain_description")}</p>
 
     <label class="tn-checkbox">
-        <input type="checkbox" name="showLoginInShareTheme">
-        <span>${t("share.show_login_link")}</span>
+        <input class="form-check-input" type="checkbox" name="showLoginInShareTheme" value="true">
+        ${t("share.show_login_link")}
     </label>
+    <p class="form-text">${t("share.show_login_link_description")}</p>
 </div>`;
 
 export default class ShareSettingsOptions extends OptionsWidget {
diff --git a/src/public/stylesheets/theme-next/forms.css b/src/public/stylesheets/theme-next/forms.css
index cd4f51073..21a44f247 100644
--- a/src/public/stylesheets/theme-next/forms.css
+++ b/src/public/stylesheets/theme-next/forms.css
@@ -193,6 +193,11 @@ input::selection,
     color: var(--input-selection-text-color);
 }
 
+.form-text {
+    color: var(--main-text-color);
+    opacity: 0.8;
+}
+
 /* Input groups */
 
 .input-group {

From 6fae7a98f58ec46bad9c45d7c575fb4b0293b103 Mon Sep 17 00:00:00 2001
From: Panagiotis Papadopoulos <pano_90@gmx.net>
Date: Fri, 21 Feb 2025 07:41:50 +0100
Subject: [PATCH 26/62] i18n: use empty string instead of English string

it will fallback to the English string by default
---
 src/public/translations/cn/translation.json | 6 +++---
 src/public/translations/tw/translation.json | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/public/translations/cn/translation.json b/src/public/translations/cn/translation.json
index 5aa329df0..b7771755a 100644
--- a/src/public/translations/cn/translation.json
+++ b/src/public/translations/cn/translation.json
@@ -1138,9 +1138,9 @@
     "deleted_notes_erased": "已删除的笔记已被清理。"
   },
   "revisions_snapshot_interval": {
-    "note_revisions_snapshot_interval_title": "Note Revision Snapshot Interval",
-    "note_revisions_snapshot_description": "The Note revision snapshot interval is the time after which a new note revision will be created for the note. See <a href=\"https://triliumnext.github.io/Docs/Wiki/note-revisions.html\" class=\"external\">wiki</a> for more info.",
-    "snapshot_time_interval_label": "Note revision snapshot time interval:"
+    "note_revisions_snapshot_interval_title": "",
+    "note_revisions_snapshot_description": "",
+    "snapshot_time_interval_label": ""
   },
   "revisions_snapshot_limit": {
     "note_revisions_snapshot_limit_title": "笔记历史快照限制",
diff --git a/src/public/translations/tw/translation.json b/src/public/translations/tw/translation.json
index 830c76167..a5a5191b1 100644
--- a/src/public/translations/tw/translation.json
+++ b/src/public/translations/tw/translation.json
@@ -1116,9 +1116,9 @@
     "deleted_notes_erased": "已刪除的筆記已被清理。"
   },
   "revisions_snapshot_interval": {
-    "note_revisions_snapshot_interval_title": "Note Revision Snapshot Interval",
-    "note_revisions_snapshot_description": "The Note revision snapshot interval is the time after which a new note revision will be created for the note. See <a href=\"https://triliumnext.github.io/Docs/Wiki/note-revisions.html\" class=\"external\">wiki</a> for more info.",
-    "snapshot_time_interval_label": "Note revision snapshot time interval:"
+    "note_revisions_snapshot_interval_title": "",
+    "note_revisions_snapshot_description": "",
+    "snapshot_time_interval_label": ""
   },
   "revisions_snapshot_limit": {
     "note_revisions_snapshot_limit_title": "筆記歷史快照限制",

From 15209136867627dfbb2a022e5657f34371ec380c Mon Sep 17 00:00:00 2001
From: Panagiotis Papadopoulos <pano_90@gmx.net>
Date: Fri, 21 Feb 2025 07:57:07 +0100
Subject: [PATCH 27/62] i18n: use empty string instead of English string

it will fallback to the English string by default
---
 src/public/translations/cn/translation.json | 2 +-
 src/public/translations/tw/translation.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/public/translations/cn/translation.json b/src/public/translations/cn/translation.json
index 3621c8bf0..5fcd7f392 100644
--- a/src/public/translations/cn/translation.json
+++ b/src/public/translations/cn/translation.json
@@ -1259,7 +1259,7 @@
     "protected_session_timeout_description": "保护会话超时是一个时间段，超时后保护会话会从浏览器内存中清除。这是从最后一次与保护笔记的交互开始计时的。更多信息请见",
     "wiki": "维基",
     "for_more_info": "更多信息。",
-    "protected_session_timeout_label": "Protected session timeout:",
+    "protected_session_timeout_label": "",
     "reset_confirmation": "重置密码将永久丧失对所有现受保护笔记的访问。您真的要重置密码吗？",
     "reset_success_message": "密码已重置。请设置新密码",
     "change_password_heading": "更改密码",
diff --git a/src/public/translations/tw/translation.json b/src/public/translations/tw/translation.json
index cbf60c297..4e86b58f9 100644
--- a/src/public/translations/tw/translation.json
+++ b/src/public/translations/tw/translation.json
@@ -1237,7 +1237,7 @@
     "protected_session_timeout_description": "保護會話超時是一個時間段，超時後保護會話會從瀏覽器內存中清除。這是從最後一次與保護筆記的交互開始計時的。更多資訊請見",
     "wiki": "維基",
     "for_more_info": "更多資訊。",
-    "protected_session_timeout_label": "Protected session timeout:",
+    "protected_session_timeout_label": "",
     "reset_confirmation": "重置密碼將永久喪失對所有現受保護筆記的訪問。您真的要重置密碼嗎？",
     "reset_success_message": "密碼已重置。請設定新密碼",
     "change_password_heading": "更改密碼",

From 96961898cac76aaa8d4a6447e017c39fc1632ea1 Mon Sep 17 00:00:00 2001
From: Panagiotis Papadopoulos <pano_90@gmx.net>
Date: Fri, 21 Feb 2025 08:04:19 +0100
Subject: [PATCH 28/62] i18n: use empty string instead of English string

it will fallback to the English string by default
---
 src/public/translations/cn/translation.json | 4 ++--
 src/public/translations/tw/translation.json | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/public/translations/cn/translation.json b/src/public/translations/cn/translation.json
index 296a46136..6f7c7b1db 100644
--- a/src/public/translations/cn/translation.json
+++ b/src/public/translations/cn/translation.json
@@ -1120,7 +1120,7 @@
   "attachment_erasure_timeout": {
     "attachment_erasure_timeout": "附件清理超时",
     "attachment_auto_deletion_description": "如果附件在一段时间后不再被笔记引用，它们将自动被删除（并被清理）。",
-    "erase_attachments_after": "Erase unused attachments after:",
+    "erase_attachments_after": "",
     "manual_erasing_description": "您还可以手动触发清理（而不考虑上述定义的超时时间）：",
     "erase_unused_attachments_now": "立即清理未使用的附件笔记",
     "unused_attachments_erased": "未使用的附件已被删除。"
@@ -1132,7 +1132,7 @@
   "note_erasure_timeout": {
     "note_erasure_timeout_title": "笔记清理超时",
     "note_erasure_description": "被删除的笔记（以及属性、历史版本等）最初仅被标记为“删除”，可以从“最近修改”对话框中恢复它们。经过一段时间后，已删除的笔记会被“清理”，这意味着它们的内容将无法恢复。此设置允许您配置从删除到清除笔记之间的时间长度。",
-    "erase_notes_after": "Erase notes after:",
+    "erase_notes_after": "",
     "manual_erasing_description": "您还可以手动触发清理（不考虑上述定义的超时）：",
     "erase_deleted_notes_now": "立即清理已删除的笔记",
     "deleted_notes_erased": "已删除的笔记已被清理。"
diff --git a/src/public/translations/tw/translation.json b/src/public/translations/tw/translation.json
index 654033580..042dede1f 100644
--- a/src/public/translations/tw/translation.json
+++ b/src/public/translations/tw/translation.json
@@ -1098,7 +1098,7 @@
   "attachment_erasure_timeout": {
     "attachment_erasure_timeout": "附件清理超時",
     "attachment_auto_deletion_description": "如果附件在一段時間後不再被筆記引用，它們將自動被刪除（並被清理）。",
-    "erase_attachments_after": "Erase unused attachments after:",
+    "erase_attachments_after": "",
     "manual_erasing_description": "您還可以手動觸發清理（而不考慮上述定義的超時時間）：",
     "erase_unused_attachments_now": "立即清理未使用的附件筆記",
     "unused_attachments_erased": "未使用的附件已被刪除。"
@@ -1110,7 +1110,7 @@
   "note_erasure_timeout": {
     "note_erasure_timeout_title": "筆記清理超時",
     "note_erasure_description": "被刪除的筆記（以及屬性、歷史版本等）最初僅被標記為「刪除」，可以從「最近修改」對話框中恢復它們。經過一段時間後，已刪除的筆記會被「清理」，這意味著它們的內容將無法恢復。此設定允許您設定從刪除到清除筆記之間的時間長度。",
-    "erase_notes_after": "Erase notes after:",
+    "erase_notes_after": "",
     "manual_erasing_description": "您還可以手動觸發清理（不考慮上述定義的超時）：",
     "erase_deleted_notes_now": "立即清理已刪除的筆記",
     "deleted_notes_erased": "已刪除的筆記已被清理。"

From 710cf68c062457bf62a2a47babce3003fd0c812d Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Fri, 21 Feb 2025 17:17:53 +0200
Subject: [PATCH 29/62] feat(views/calendar): make calendar full height

---
 src/public/app/services/note_list_renderer.ts        | 4 ++++
 src/public/app/widgets/note_list.ts                  | 6 ++++++
 src/public/app/widgets/view_widgets/calendar_view.ts | 7 ++++++-
 src/public/app/widgets/view_widgets/view_mode.ts     | 5 +++++
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/public/app/services/note_list_renderer.ts b/src/public/app/services/note_list_renderer.ts
index 125e93005..f9a9d0d66 100644
--- a/src/public/app/services/note_list_renderer.ts
+++ b/src/public/app/services/note_list_renderer.ts
@@ -40,6 +40,10 @@ export default class NoteListRenderer {
         }
     }
 
+    get isFullHeight() {
+        return this.viewMode?.isFullHeight;
+    }
+
     async renderList() {
         if (!this.viewMode) {
             return null;
diff --git a/src/public/app/widgets/note_list.ts b/src/public/app/widgets/note_list.ts
index 2775aea78..1ff4ffb90 100644
--- a/src/public/app/widgets/note_list.ts
+++ b/src/public/app/widgets/note_list.ts
@@ -15,6 +15,11 @@ const TPL = `
     .note-list-widget .note-list {
         padding: 10px;
     }
+
+    .note-list-widget.full-height,
+    .note-list-widget.full-height .note-list-widget-content {
+        height: 100%;
+    }
     </style>
 
     <div class="note-list-widget-content">
@@ -68,6 +73,7 @@ export default class NoteListWidget extends NoteContextAwareWidget {
 
     async renderNoteList(note: FNote) {
         const noteListRenderer = new NoteListRenderer(this.$content, note, note.getChildNoteIds());
+        this.$widget.toggleClass("full-height", noteListRenderer.isFullHeight);
         await noteListRenderer.renderList();
         this.viewMode = noteListRenderer.viewMode;
     }
diff --git a/src/public/app/widgets/view_widgets/calendar_view.ts b/src/public/app/widgets/view_widgets/calendar_view.ts
index fc1d2595f..bf913c9e9 100644
--- a/src/public/app/widgets/view_widgets/calendar_view.ts
+++ b/src/public/app/widgets/view_widgets/calendar_view.ts
@@ -78,6 +78,10 @@ export default class CalendarView extends ViewMode {
         args.$parent.append(this.$root);
     }
 
+    get isFullHeight(): boolean {
+        return true;
+    }
+
     async renderList(): Promise<JQuery<HTMLElement> | undefined> {
         const isEditable = true;
 
@@ -98,7 +102,8 @@ export default class CalendarView extends ViewMode {
             select: (e) => this.#onCalendarSelection(e),
             eventChange: (e) => this.#onEventMoved(e),
             firstDay: options.getInt("firstDayOfWeek") ?? 0,
-            locale: await CalendarView.#getLocale()
+            locale: await CalendarView.#getLocale(),
+            height: "100%"
         });
         calendar.render();
         this.calendar = calendar;
diff --git a/src/public/app/widgets/view_widgets/view_mode.ts b/src/public/app/widgets/view_widgets/view_mode.ts
index e17d3cebf..719f04bc1 100644
--- a/src/public/app/widgets/view_widgets/view_mode.ts
+++ b/src/public/app/widgets/view_widgets/view_mode.ts
@@ -21,4 +21,9 @@ export default abstract class ViewMode {
         // Do nothing by default.
     }
 
+    get isFullHeight() {
+        // Override to change its value.
+        return false;
+    }
+
 }

From 42d46bdb725b19600c54373205e9c5cec7bbbd90 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Fri, 21 Feb 2025 17:52:11 +0200
Subject: [PATCH 30/62] feat(views/calendar): add option to hide weekends

---
 src/public/app/widgets/note_list.ts                  |  6 ++++--
 src/public/app/widgets/view_widgets/calendar_view.ts | 11 +++++++++--
 src/public/app/widgets/view_widgets/view_mode.ts     |  8 +++++++-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/public/app/widgets/note_list.ts b/src/public/app/widgets/note_list.ts
index 1ff4ffb90..84599d42b 100644
--- a/src/public/app/widgets/note_list.ts
+++ b/src/public/app/widgets/note_list.ts
@@ -117,8 +117,10 @@ export default class NoteListWidget extends NoteContextAwareWidget {
             this.checkRenderStatus();
         }
 
-        if (this.viewMode) {
-            this.viewMode.entitiesReloadedEvents(e);
+        // Inform the view mode of changes and refresh if needed.
+        if (this.viewMode && this.viewMode.onEntitiesReloaded(e)) {
+            this.refresh();
+            this.checkRenderStatus();
         }
     }
 }
diff --git a/src/public/app/widgets/view_widgets/calendar_view.ts b/src/public/app/widgets/view_widgets/calendar_view.ts
index bf913c9e9..c5caafad8 100644
--- a/src/public/app/widgets/view_widgets/calendar_view.ts
+++ b/src/public/app/widgets/view_widgets/calendar_view.ts
@@ -102,6 +102,7 @@ export default class CalendarView extends ViewMode {
             select: (e) => this.#onCalendarSelection(e),
             eventChange: (e) => this.#onEventMoved(e),
             firstDay: options.getInt("firstDayOfWeek") ?? 0,
+            weekends: !this.parentNote.hasAttribute("label", "calendar:hideWeekends"),
             locale: await CalendarView.#getLocale(),
             height: "100%"
         });
@@ -179,12 +180,18 @@ export default class CalendarView extends ViewMode {
         CalendarView.#setAttribute(note, "label", "endDate", endDate);
     }
 
-    entitiesReloadedEvents({ loadResults }: EventData<"entitiesReloaded">): void {
+    onEntitiesReloaded({ loadResults }: EventData<"entitiesReloaded">) {
         // Refresh note IDs if they got changed.
-        if (loadResults.getBranchRows().some((branch) => branch.parentNoteId == this.parentNote.noteId)) {
+        if (loadResults.getBranchRows().some((branch) => branch.parentNoteId === this.parentNote.noteId)) {
             this.noteIds = this.parentNote.getChildNoteIds();
         }
 
+        // Refresh calendar on attribute change.
+        if (loadResults.getAttributeRows().some((attribute) => attribute.noteId === this.parentNote.noteId && attribute.name?.startsWith("calendar:"))) {
+            return true;
+        }
+
+        // Refresh dataset on subnote change.
         if (this.calendar && loadResults.getAttributeRows().some((a) => this.noteIds.includes(a.noteId ?? ""))) {
             this.calendar.refetchEvents();
         }
diff --git a/src/public/app/widgets/view_widgets/view_mode.ts b/src/public/app/widgets/view_widgets/view_mode.ts
index 719f04bc1..b7454919e 100644
--- a/src/public/app/widgets/view_widgets/view_mode.ts
+++ b/src/public/app/widgets/view_widgets/view_mode.ts
@@ -17,7 +17,13 @@ export default abstract class ViewMode {
 
     abstract renderList(): Promise<JQuery<HTMLElement> | undefined>;
 
-    entitiesReloadedEvents(e: EventData<"entitiesReloaded">) {
+    /**
+     * Called whenever an "entitiesReloaded" event has been received by the parent component.
+     *
+     * @param e the event data.
+     * @return {@code true} if the view should be re-rendered, a falsy value otherwise.
+     */
+    onEntitiesReloaded(e: EventData<"entitiesReloaded">): boolean | void {
         // Do nothing by default.
     }
 

From fe5182ebc6bf02494435aac57fa7809506fcc60a Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Fri, 21 Feb 2025 17:54:13 +0200
Subject: [PATCH 31/62] feat(views/calendar): add option to show week numbers

---
 src/public/app/widgets/view_widgets/calendar_view.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/public/app/widgets/view_widgets/calendar_view.ts b/src/public/app/widgets/view_widgets/calendar_view.ts
index c5caafad8..ebf77cde2 100644
--- a/src/public/app/widgets/view_widgets/calendar_view.ts
+++ b/src/public/app/widgets/view_widgets/calendar_view.ts
@@ -103,6 +103,7 @@ export default class CalendarView extends ViewMode {
             eventChange: (e) => this.#onEventMoved(e),
             firstDay: options.getInt("firstDayOfWeek") ?? 0,
             weekends: !this.parentNote.hasAttribute("label", "calendar:hideWeekends"),
+            weekNumbers: this.parentNote.hasAttribute("label", "calendar:weekNumbers"),
             locale: await CalendarView.#getLocale(),
             height: "100%"
         });

From 81bdd5739876a84f9cf3d34e1625c8edf23506e4 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Fri, 21 Feb 2025 18:40:54 +0200
Subject: [PATCH 32/62] feat(views/calendar): display event icon

---
 .../app/widgets/view_widgets/calendar_view.ts     | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/public/app/widgets/view_widgets/calendar_view.ts b/src/public/app/widgets/view_widgets/calendar_view.ts
index ebf77cde2..8a7e797bb 100644
--- a/src/public/app/widgets/view_widgets/calendar_view.ts
+++ b/src/public/app/widgets/view_widgets/calendar_view.ts
@@ -9,6 +9,7 @@ import options from "../../services/options.js";
 import dialogService from "../../services/dialog.js";
 import attributes from "../../services/attributes.js";
 import type { EventData } from "../../components/app_context.js";
+import utils from "../../services/utils.js";
 
 const TPL = `
 <div class="calendar-view">
@@ -105,7 +106,18 @@ export default class CalendarView extends ViewMode {
             weekends: !this.parentNote.hasAttribute("label", "calendar:hideWeekends"),
             weekNumbers: this.parentNote.hasAttribute("label", "calendar:weekNumbers"),
             locale: await CalendarView.#getLocale(),
-            height: "100%"
+            height: "100%",
+            eventContent: (e => {
+                let html = "";
+
+                const iconClass = e.event.extendedProps.iconClass;
+                if (iconClass) {
+                    html += `<span class="${iconClass}"></span> `;
+                }
+
+                html += utils.escapeHtml(e.event.title);
+                return { html };
+            })
         });
         calendar.render();
         this.calendar = calendar;
@@ -219,6 +231,7 @@ export default class CalendarView extends ViewMode {
                     url: `#${note.noteId}`,
                     noteId: note.noteId,
                     color: color,
+                    iconClass: note.getLabelValue("iconClass")
                 };
 
                 const endDate = CalendarView.#offsetDate(note.getAttributeValue("label", "endDate") ?? startDate, 1);

From 0c88c4c3eeb59ae05001a0829293b82c376d8335 Mon Sep 17 00:00:00 2001
From: Adorian Doran <adorian@esevo.ro>
Date: Fri, 21 Feb 2025 21:31:26 +0200
Subject: [PATCH 33/62] style(next): partially restyle the promoted attributes
 widget

---
 src/public/stylesheets/theme-next/shell.css | 41 +++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/src/public/stylesheets/theme-next/shell.css b/src/public/stylesheets/theme-next/shell.css
index e35972cf2..a95bbaeb3 100644
--- a/src/public/stylesheets/theme-next/shell.css
+++ b/src/public/stylesheets/theme-next/shell.css
@@ -1836,3 +1836,44 @@ body.background-effects.zen #root-widget {
     animation: alert-show 300ms ease-in;
     border-bottom: 2px solid #0000001c !important;
 }
+
+/* Promoted attributes */
+
+div.promoted-attributes-container {
+    display: flex;
+    padding: 6px 0;
+    gap: 8px;
+    font-size: .85em;
+    align-items: stretch;
+}
+
+div.promoted-attribute-cell {
+    --input-background-color: transparent;
+
+    box-shadow: 1px 1px 2px rgba(0, 0, 0, .2);
+    display: inline-flex;
+    margin: 0;
+    border-radius: 8px;
+    padding: 4px 16px;
+    background: var(--card-background-color);
+    overflow-y: visible;
+}
+
+div.promoted-attribute-cell > * {
+    display: inline-block;
+}
+
+div.promoted-attribute-cell label {
+    font-weight: normal;
+    white-space: nowrap;
+    opacity: .75;
+}
+
+div.promoted-attribute-cell div.input-group {
+    min-height: auto;
+}
+
+div.promoted-attribute-cell input {
+    padding: 2px 8px;
+    font-weight: 500;
+}
\ No newline at end of file

From e93d47f6643b266edf488966c1670699a0b01d2e Mon Sep 17 00:00:00 2001
From: Adorian Doran <adorian@esevo.ro>
Date: Sat, 22 Feb 2025 00:53:24 +0200
Subject: [PATCH 34/62] style(next): promoted attributes widget: tweak buttons

---
 .../widgets/ribbon_widgets/promoted_attributes.js    | 12 ++++++------
 src/public/stylesheets/theme-next/shell.css          |  7 +++++++
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/public/app/widgets/ribbon_widgets/promoted_attributes.js b/src/public/app/widgets/ribbon_widgets/promoted_attributes.js
index a538e43f8..9cf0951ff 100644
--- a/src/public/app/widgets/ribbon_widgets/promoted_attributes.js
+++ b/src/public/app/widgets/ribbon_widgets/promoted_attributes.js
@@ -16,7 +16,7 @@ const TPL = `
         flex-shrink: 0.4;
         overflow: auto;
     }
-    
+
     .promoted-attributes-container {
         margin: 0 1.5em;
         overflow: auto;
@@ -39,7 +39,7 @@ const TPL = `
         display: table-cell;
         padding: 1px 0;
     }
-    
+
     .promoted-attribute-cell div.input-group {
         margin-left: 10px;
         display: flex;
@@ -54,9 +54,9 @@ const TPL = `
         flex-grow: 0;
         width: unset;
     }
-    
+
     </style>
-    
+
     <div class="promoted-attributes-container"></div>
 </div>`;
 
@@ -272,7 +272,7 @@ export default class PromotedAttributesWidget extends NoteContextAwareWidget {
 
         if (definition.multiplicity === "multi") {
             const $addButton = $("<span>")
-                .addClass("bx bx-plus pointer")
+                .addClass("bx bx-plus pointer tn-tool-button")
                 .prop("title", t("promoted_attributes.add_new_attribute"))
                 .on("click", async () => {
                     const $new = await this.createPromotedAttributeCell(
@@ -292,7 +292,7 @@ export default class PromotedAttributesWidget extends NoteContextAwareWidget {
                 });
 
             const $removeButton = $("<span>")
-                .addClass("bx bx-trash pointer")
+                .addClass("bx bx-trash pointer tn-tool-button")
                 .prop("title", t("promoted_attributes.remove_this_attribute"))
                 .on("click", async () => {
                     const attributeId = $input.attr("data-attribute-id");
diff --git a/src/public/stylesheets/theme-next/shell.css b/src/public/stylesheets/theme-next/shell.css
index a95bbaeb3..64d5f508b 100644
--- a/src/public/stylesheets/theme-next/shell.css
+++ b/src/public/stylesheets/theme-next/shell.css
@@ -1876,4 +1876,11 @@ div.promoted-attribute-cell div.input-group {
 div.promoted-attribute-cell input {
     padding: 2px 8px;
     font-weight: 500;
+}
+
+div.promoted-attribute-cell .multiplicity {
+    --icon-button-size: 28px;
+
+    margin-left: 8px;
+    font-size: 0; /* Prevent whitespaces creating a gap between buttons */
 }
\ No newline at end of file

From ee2d4c683041c9709e64e42fe7badd43e4e92ed4 Mon Sep 17 00:00:00 2001
From: Adorian Doran <adorian@esevo.ro>
Date: Sat, 22 Feb 2025 01:30:55 +0200
Subject: [PATCH 35/62] style(next): promoted attributes widget: tweak
 checkboxes

---
 .../app/widgets/ribbon_widgets/promoted_attributes.js      | 3 +++
 src/public/stylesheets/theme-next/shell.css                | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/src/public/app/widgets/ribbon_widgets/promoted_attributes.js b/src/public/app/widgets/ribbon_widgets/promoted_attributes.js
index 9cf0951ff..75ed276ec 100644
--- a/src/public/app/widgets/ribbon_widgets/promoted_attributes.js
+++ b/src/public/app/widgets/ribbon_widgets/promoted_attributes.js
@@ -226,6 +226,9 @@ export default class PromotedAttributesWidget extends NoteContextAwareWidget {
             } else if (definition.labelType === "boolean") {
                 $input.prop("type", "checkbox");
 
+                $input.wrap($(`<label class="tn-checkbox"></label>`));
+                $wrapper.find(".input-group").removeClass("input-group");
+
                 if (valueAttr.value === "true") {
                     $input.prop("checked", "checked");
                 }
diff --git a/src/public/stylesheets/theme-next/shell.css b/src/public/stylesheets/theme-next/shell.css
index 64d5f508b..a4ab77af2 100644
--- a/src/public/stylesheets/theme-next/shell.css
+++ b/src/public/stylesheets/theme-next/shell.css
@@ -1878,6 +1878,13 @@ div.promoted-attribute-cell input {
     font-weight: 500;
 }
 
+div.promoted-attribute-cell .tn-checkbox {
+    --box-label-gap: 0;
+
+    height: 1cap;
+    margin: 0 1em;
+}
+
 div.promoted-attribute-cell .multiplicity {
     --icon-button-size: 28px;
 

From 39f00bd56816d9b395a651db9ac5cd5742f7543f Mon Sep 17 00:00:00 2001
From: Adorian Doran <adorian@esevo.ro>
Date: Sat, 22 Feb 2025 01:35:10 +0200
Subject: [PATCH 36/62] style(next): promoted attributes widget: tweak input
 groups

---
 src/public/stylesheets/theme-next/shell.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/public/stylesheets/theme-next/shell.css b/src/public/stylesheets/theme-next/shell.css
index a4ab77af2..30a6ad318 100644
--- a/src/public/stylesheets/theme-next/shell.css
+++ b/src/public/stylesheets/theme-next/shell.css
@@ -1871,6 +1871,7 @@ div.promoted-attribute-cell label {
 
 div.promoted-attribute-cell div.input-group {
     min-height: auto;
+    padding: 2px 6px;
 }
 
 div.promoted-attribute-cell input {

From fd4f35e8791ff6681a790efc2b6c4cd3d7094663 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Sat, 22 Feb 2025 00:50:19 +0200
Subject: [PATCH 37/62] feat(import/single): support UTF-16 LE with BOM for
 HTML

---
 package-lock.json                             |  30 ++++++--
 package.json                                  |  10 +--
 .../samples/IREN Reports Q2 FY25 Results.htm  | Bin 0 -> 693586 bytes
 src/services/import/single.spec.ts            |  71 ++++++++++--------
 src/services/import/single.ts                 |  19 ++++-
 5 files changed, 85 insertions(+), 45 deletions(-)
 create mode 100644 src/services/import/samples/IREN Reports Q2 FY25 Results.htm

diff --git a/package-lock.json b/package-lock.json
index 894c82f64..8eb6db485 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -31,6 +31,7 @@
         "better-sqlite3": "11.8.1",
         "bootstrap": "5.3.3",
         "boxicons": "2.1.4",
+        "chardet": "2.0.0",
         "cheerio": "1.0.0",
         "chokidar": "4.0.3",
         "cls-hooked": "4.2.2",
@@ -97,6 +98,7 @@
         "source-map-support": "0.5.21",
         "split.js": "1.6.5",
         "stream-throttle": "0.1.3",
+        "strip-bom": "5.0.0",
         "striptags": "3.2.0",
         "swagger-ui-express": "5.0.1",
         "tmp": "0.2.3",
@@ -6175,6 +6177,12 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
+    "node_modules/chardet": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-2.0.0.tgz",
+      "integrity": "sha512-xVgPpulCooDjY6zH4m9YW3jbkaBe3FKIAvF5sj5t7aBNsVl2ljIE+xwJ4iNgiDZHFQvNIpjdKdVOQvvk5ZfxbQ==",
+      "license": "MIT"
+    },
     "node_modules/check-error": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz",
@@ -11889,6 +11897,16 @@
         "node": ">=4"
       }
     },
+    "node_modules/load-json-file/node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/loader-runner": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
@@ -15917,13 +15935,15 @@
       }
     },
     "node_modules/strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
-      "dev": true,
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-5.0.0.tgz",
+      "integrity": "sha512-p+byADHF7SzEcVnLvc/r3uognM1hUhObuHXxJcgLCfD194XAkaLbjq3Wzb0N5G2tgIjH0dgT708Z51QxMeu60A==",
       "license": "MIT",
       "engines": {
-        "node": ">=4"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/strip-eof": {
diff --git a/package.json b/package.json
index e14d45979..401f3d5ad 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,6 @@
     "server:start-test": "npm run server:switch && rimraf ./data-test && cross-env TRILIUM_DATA_DIR=./data-test TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev TRILIUM_PORT=9999 nodemon src/main.ts",
     "server:qstart": "npm run server:switch && npm run server:start",
     "server:switch": "rimraf ./node_modules/better-sqlite3 && npm install",
-
     "electron:start": "cross-env NODE_OPTIONS=\"--import tsx\" TRILIUM_DATA_DIR=./data TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev electron ./electron-main.ts --inspect=5858 .",
     "electron:start-no-dir": "cross-env NODE_OPTIONS=\"--import tsx\" TRILIUM_ENV=dev electron --inspect=5858 .",
     "electron:start-nix": "electron-rebuild --version 33.3.1 && cross-env NODE_OPTIONS=\"--import tsx\" TRILIUM_DATA_DIR=./data TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev nix-shell -p electron_33 --run \"electron ./electron-main.ts --inspect=5858 .\"",
@@ -37,30 +36,23 @@
     "electron:start-prod-nix-no-dir": "electron-rebuild --version 33.3.1 && npm run build:prepare-dist && cross-env TRILIUM_ENV=dev nix-shell -p electron_33 --run \"electron ./dist/electron-main.js --inspect=5858 .\"",
     "electron:qstart": "npm run electron:switch && npm run electron:start",
     "electron:switch": "electron-rebuild",
-
     "electron-forge:start": "npm run build:prepare-dist && electron-forge start",
     "electron-forge:make": "npm run build:prepare-dist && electron-forge make",
     "electron-forge:package": "npm run build:prepare-dist && electron-forge package",
-
     "docs:build-backend": "rimraf ./docs/backend_api && typedoc ./docs/backend_api src/becca/entities/*.ts src/services/backend_script_api.ts src/services/sql.ts",
     "docs:build-frontend": "rimraf ./docs/frontend_api && jsdoc -c jsdoc-conf.json -d ./docs/frontend_api src/public/app/entities/*.js src/public/app/services/frontend_script_api.js src/public/app/widgets/basic_widget.js src/public/app/widgets/note_context_aware_widget.js src/public/app/widgets/right_panel_widget.js",
     "docs:build": "npm run docs:build-backend && npm run docs:build-frontend",
-
     "build:webpack": "tsx node_modules/webpack/bin/webpack.js -c webpack.config.ts",
     "build:prepare-dist": "npm run build:webpack && rimraf ./dist && tsc && tsx ./bin/copy-dist.ts",
-
     "test": "cross-env TRILIUM_DATA_DIR=./integration-tests/db TRILIUM_INTEGRATION_TEST=memory vitest",
     "test:coverage": "cross-env TRILIUM_DATA_DIR=./integration-tests/db vitest --coverage",
     "test:playwright": "playwright test",
-
     "test:integration-edit-db": "cross-env TRILIUM_INTEGRATION_TEST=edit TRILIUM_PORT=8081 TRILIUM_ENV=dev TRILIUM_DATA_DIR=./integration-tests/db nodemon src/main.ts",
     "test:integration-mem-db": "cross-env TRILIUM_INTEGRATION_TEST=memory TRILIUM_PORT=8082 TRILIUM_DATA_DIR=./integration-tests/db nodemon src/main.ts",
     "test:integration-mem-db-dev": "cross-env TRILIUM_INTEGRATION_TEST=memory TRILIUM_PORT=8082 TRILIUM_ENV=dev TRILIUM_DATA_DIR=./integration-tests/db nodemon src/main.ts",
-
     "dev:watch-dist": "tsx ./bin/watch-dist.ts",
     "dev:prettier-check": "prettier . --check",
     "dev:prettier-fix": "prettier . --write",
-
     "chore:update-build-info": "tsx bin/update-build-info.ts",
     "chore:ci-update-nightly-version": "tsx ./bin/update-nightly-version.ts",
     "chore:generate-document": "cross-env nodemon ./bin/generate_document.ts 1000",
@@ -89,6 +81,7 @@
     "better-sqlite3": "11.8.1",
     "bootstrap": "5.3.3",
     "boxicons": "2.1.4",
+    "chardet": "2.0.0",
     "cheerio": "1.0.0",
     "chokidar": "4.0.3",
     "cls-hooked": "4.2.2",
@@ -155,6 +148,7 @@
     "source-map-support": "0.5.21",
     "split.js": "1.6.5",
     "stream-throttle": "0.1.3",
+    "strip-bom": "5.0.0",
     "striptags": "3.2.0",
     "swagger-ui-express": "5.0.1",
     "tmp": "0.2.3",
diff --git a/src/services/import/samples/IREN Reports Q2 FY25 Results.htm b/src/services/import/samples/IREN Reports Q2 FY25 Results.htm
new file mode 100644
index 0000000000000000000000000000000000000000..361ceb340c4e2520d6d5be64b239de901ad29ef0
GIT binary patch
literal 693586
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

literal 0
HcmV?d00001

diff --git a/src/services/import/single.spec.ts b/src/services/import/single.spec.ts
index 716eb7b91..e650c8e98 100644
--- a/src/services/import/single.spec.ts
+++ b/src/services/import/single.spec.ts
@@ -1,4 +1,4 @@
-import { describe, expect, it } from "vitest";
+import { beforeAll, describe, expect, it } from "vitest";
 import fs from "fs";
 import path from "path";
 import { fileURLToPath } from "url";
@@ -12,38 +12,47 @@ import { initializeTranslations } from "../i18n.js";
 import single from "./single.js";
 const scriptDir = dirname(fileURLToPath(import.meta.url));
 
-describe("processNoteContent", () => {
-    it("treats single MDX as Markdown", async () => {
-        const mdxSample = fs.readFileSync(path.join(scriptDir, "samples", "Text Note.mdx"));
-        const taskContext = TaskContext.getInstance("import-mdx", "import", {
-            textImportedAsText: true
-        });
+async function testImport(fileName: string, mimetype: string): Promise<BNote> {
+    const mdxSample = fs.readFileSync(path.join(scriptDir, "samples", fileName));
+    const taskContext = TaskContext.getInstance("import-mdx", "import", {
+        textImportedAsText: true
+    });
 
-        await new Promise<void>((resolve, reject) => {
-            cls.init(async () => {
-                initializeTranslations();
-                sql_init.initializeDb();
-                await sql_init.dbReady;
+    return new Promise<BNote>((resolve, reject) => {
+        cls.init(async () => {
+            const rootNote = becca.getNote("root");
+            if (!rootNote) {
+                reject("Missing root note.");
+            }
 
-                const rootNote = becca.getNote("root");
-                if (!rootNote) {
-                    reject("Missing root note.");
-                }
-
-                const importedNote = single.importSingleFile(taskContext, {
-                    originalname: "Text Note.mdx",
-                    mimetype: "text/mdx",
-                    buffer: mdxSample
-                }, rootNote as BNote);
-                try {
-                    expect(importedNote.mime).toBe("text/html");
-                    expect(importedNote.type).toBe("text");
-                    expect(importedNote.title).toBe("Text Note");
-                } catch (e) {
-                    reject(e);
-                }
-                resolve();
-            });
+            const importedNote = single.importSingleFile(taskContext, {
+                originalname: fileName,
+                mimetype,
+                buffer: mdxSample
+            }, rootNote as BNote);
+            resolve(importedNote);
         });
     });
+}
+
+describe("processNoteContent", () => {
+    beforeAll(async () => {
+        initializeTranslations();
+        sql_init.initializeDb();
+        await sql_init.dbReady;
+    });
+
+    it("treats single MDX as Markdown", async () => {
+        const importedNote = await testImport("Text Note.mdx", "text/mdx");
+        expect(importedNote.mime).toBe("text/html");
+        expect(importedNote.type).toBe("text");
+        expect(importedNote.title).toBe("Text Note");
+    });
+
+    it("supports HTML note with UTF-16 (w/ BOM) from Microsoft Outlook", async () => {
+        const importedNote = await testImport("IREN Reports Q2 FY25 Results.htm", "text/html");
+        expect(importedNote.mime).toBe("text/html");
+        expect(importedNote.title).toBe("IREN Reports Q2 FY25 Results");
+        expect(importedNote.getContent().toString().substring(0, 5)).toEqual("<html");
+    });
 })
diff --git a/src/services/import/single.ts b/src/services/import/single.ts
index 79f90ca2d..e4ff7a068 100644
--- a/src/services/import/single.ts
+++ b/src/services/import/single.ts
@@ -3,6 +3,8 @@
 import type BNote from "../../becca/entities/bnote.js";
 import type TaskContext from "../task_context.js";
 
+import chardet from "chardet";
+import stripBom from "strip-bom";
 import noteService from "../../services/notes.js";
 import imageService from "../../services/image.js";
 import protectedSessionService from "../protected_session.js";
@@ -146,8 +148,23 @@ function importMarkdown(taskContext: TaskContext, file: File, parentNote: BNote)
     return note;
 }
 
+function processStringOrBuffer(data: string | Buffer) {
+    if (!Buffer.isBuffer(data)) {
+        return data;
+    }
+
+    const detectedEncoding = chardet.detect(data);
+    switch (detectedEncoding) {
+        case "UTF-16LE":
+            return stripBom(data.toString("utf-16le"));
+        case "UTF-8":
+        default:
+            return data.toString("utf-8");
+    }
+}
+
 function importHtml(taskContext: TaskContext, file: File, parentNote: BNote) {
-    let content = file.buffer.toString("utf-8");
+    let content = processStringOrBuffer(file.buffer);
 
     // Try to get title from HTML first, fall back to filename
     // We do this before sanitization since that turns all <h1>s into <h2>

From cadd78524c2188320c99ed9420e1d5fbe412b63c Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Sat, 22 Feb 2025 01:01:15 +0200
Subject: [PATCH 38/62] feat(import/single): support UTF-16 LE with BOM for
 code notes

---
 .../import/samples/UTF-16LE Code Note.json    | Bin 0 -> 50 bytes
 src/services/import/single.spec.ts            |  27 ++++++++++++------
 src/services/import/single.ts                 |   2 +-
 3 files changed, 20 insertions(+), 9 deletions(-)
 create mode 100644 src/services/import/samples/UTF-16LE Code Note.json

diff --git a/src/services/import/samples/UTF-16LE Code Note.json b/src/services/import/samples/UTF-16LE Code Note.json
new file mode 100644
index 0000000000000000000000000000000000000000..a9d06ee69761ef2fd6f752ba345bc3dd19329a1a
GIT binary patch
literal 50
tcmezWubP32K>-St7(5tK8FGLypFxSi3Mi_?P!41l0Yy@PY%Ydc1_1Zq2#5dx

literal 0
HcmV?d00001

diff --git a/src/services/import/single.spec.ts b/src/services/import/single.spec.ts
index e650c8e98..f4e0cff11 100644
--- a/src/services/import/single.spec.ts
+++ b/src/services/import/single.spec.ts
@@ -10,15 +10,17 @@ import cls from "../cls.js";
 import sql_init from "../sql_init.js";
 import { initializeTranslations } from "../i18n.js";
 import single from "./single.js";
+import stripBom from "strip-bom";
 const scriptDir = dirname(fileURLToPath(import.meta.url));
 
-async function testImport(fileName: string, mimetype: string): Promise<BNote> {
-    const mdxSample = fs.readFileSync(path.join(scriptDir, "samples", fileName));
+async function testImport(fileName: string, mimetype: string) {
+    const buffer = fs.readFileSync(path.join(scriptDir, "samples", fileName));
     const taskContext = TaskContext.getInstance("import-mdx", "import", {
-        textImportedAsText: true
+        textImportedAsText: true,
+        codeImportedAsCode: true
     });
 
-    return new Promise<BNote>((resolve, reject) => {
+    return new Promise<{ buffer: Buffer, importedNote: BNote }>((resolve, reject) => {
         cls.init(async () => {
             const rootNote = becca.getNote("root");
             if (!rootNote) {
@@ -28,9 +30,12 @@ async function testImport(fileName: string, mimetype: string): Promise<BNote> {
             const importedNote = single.importSingleFile(taskContext, {
                 originalname: fileName,
                 mimetype,
-                buffer: mdxSample
+                buffer: buffer
             }, rootNote as BNote);
-            resolve(importedNote);
+            resolve({
+                buffer,
+                importedNote
+            });
         });
     });
 }
@@ -43,16 +48,22 @@ describe("processNoteContent", () => {
     });
 
     it("treats single MDX as Markdown", async () => {
-        const importedNote = await testImport("Text Note.mdx", "text/mdx");
+        const { importedNote } = await testImport("Text Note.mdx", "text/mdx");
         expect(importedNote.mime).toBe("text/html");
         expect(importedNote.type).toBe("text");
         expect(importedNote.title).toBe("Text Note");
     });
 
     it("supports HTML note with UTF-16 (w/ BOM) from Microsoft Outlook", async () => {
-        const importedNote = await testImport("IREN Reports Q2 FY25 Results.htm", "text/html");
+        const { importedNote } = await testImport("IREN Reports Q2 FY25 Results.htm", "text/html");
         expect(importedNote.mime).toBe("text/html");
         expect(importedNote.title).toBe("IREN Reports Q2 FY25 Results");
         expect(importedNote.getContent().toString().substring(0, 5)).toEqual("<html");
     });
+
+    it("supports code note with UTF-16", async () => {
+        const { importedNote, buffer } = await testImport("UTF-16LE Code Note.json", "application/json");
+        expect(importedNote.mime).toBe("application/json");
+        expect(importedNote.getContent().toString()).toStrictEqual(stripBom(buffer.toString("utf-16le")));
+    });
 })
diff --git a/src/services/import/single.ts b/src/services/import/single.ts
index e4ff7a068..f9b96cfcd 100644
--- a/src/services/import/single.ts
+++ b/src/services/import/single.ts
@@ -71,7 +71,7 @@ function importFile(taskContext: TaskContext, file: File, parentNote: BNote) {
 
 function importCodeNote(taskContext: TaskContext, file: File, parentNote: BNote) {
     const title = getNoteTitle(file.originalname, !!taskContext.data?.replaceUnderscoresWithSpaces);
-    const content = file.buffer.toString("utf-8");
+    const content = processStringOrBuffer(file.buffer);
     const detectedMime = mimeService.getMime(file.originalname) || file.mimetype;
     const mime = mimeService.normalizeMimeType(detectedMime);
 

From 77ee7f96c1f8f976a2ed9b163d6158d26b380fa5 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Sat, 22 Feb 2025 01:06:25 +0200
Subject: [PATCH 39/62] feat(import/single): support UTF-16 LE with BOM for
 text notes

---
 src/services/import/samples/UTF-16LE Text Note.txt | Bin 0 -> 46 bytes
 src/services/import/single.spec.ts                 |   6 ++++++
 src/services/import/single.ts                      |   2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 src/services/import/samples/UTF-16LE Text Note.txt

diff --git a/src/services/import/samples/UTF-16LE Text Note.txt b/src/services/import/samples/UTF-16LE Text Note.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c76e1ddd765fdb79d94c6fd718927a5a352d4607
GIT binary patch
literal 46
ucmezWFMuJ3A(0`IA&)_Up@boop#n%MFr+i&1KGtuRtAtR0%AP|E(QP-{RyD}

literal 0
HcmV?d00001

diff --git a/src/services/import/single.spec.ts b/src/services/import/single.spec.ts
index f4e0cff11..6e35ebe1a 100644
--- a/src/services/import/single.spec.ts
+++ b/src/services/import/single.spec.ts
@@ -66,4 +66,10 @@ describe("processNoteContent", () => {
         expect(importedNote.mime).toBe("application/json");
         expect(importedNote.getContent().toString()).toStrictEqual(stripBom(buffer.toString("utf-16le")));
     });
+
+    it("supports plain text note with UTF-16", async () => {
+        const { importedNote } = await testImport("UTF-16LE Text Note.txt", "text/plain");
+        expect(importedNote.mime).toBe("text/html");
+        expect(importedNote.getContent().toString()).toBe("<p>Plain text goes here.<br></p>");
+    });
 })
diff --git a/src/services/import/single.ts b/src/services/import/single.ts
index f9b96cfcd..f55c84bfc 100644
--- a/src/services/import/single.ts
+++ b/src/services/import/single.ts
@@ -91,7 +91,7 @@ function importCodeNote(taskContext: TaskContext, file: File, parentNote: BNote)
 
 function importPlainText(taskContext: TaskContext, file: File, parentNote: BNote) {
     const title = getNoteTitle(file.originalname, !!taskContext.data?.replaceUnderscoresWithSpaces);
-    const plainTextContent = file.buffer.toString("utf-8");
+    const plainTextContent = processStringOrBuffer(file.buffer);
     const htmlContent = convertTextToHtml(plainTextContent);
 
     const { note } = noteService.createNewNote({

From c925ae5f15fb37a9e83d1af5cc34c24fd49a6b79 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Sat, 22 Feb 2025 01:09:24 +0200
Subject: [PATCH 40/62] feat(import/single): support UTF-16 LE with BOM for
 markdown notes

---
 src/services/import/samples/UTF-16LE Text Note.md | Bin 0 -> 76 bytes
 src/services/import/single.spec.ts                |   6 ++++++
 src/services/import/single.ts                     |   2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 src/services/import/samples/UTF-16LE Text Note.md

diff --git a/src/services/import/samples/UTF-16LE Text Note.md b/src/services/import/samples/UTF-16LE Text Note.md
new file mode 100644
index 0000000000000000000000000000000000000000..a0fec98d61b864cf262f553a82ac404bcb7c76f8
GIT binary patch
literal 76
zcmezWPnki1!Gj@{AqNQaf$VZ1Sp;OKFmM530Faf)kjan-lqmtKssNG-4Cz2MsSL$H
NRtAtR0%AR&S^#4j4m1D&

literal 0
HcmV?d00001

diff --git a/src/services/import/single.spec.ts b/src/services/import/single.spec.ts
index 6e35ebe1a..74b4746ab 100644
--- a/src/services/import/single.spec.ts
+++ b/src/services/import/single.spec.ts
@@ -72,4 +72,10 @@ describe("processNoteContent", () => {
         expect(importedNote.mime).toBe("text/html");
         expect(importedNote.getContent().toString()).toBe("<p>Plain text goes here.<br></p>");
     });
+
+    it("supports markdown note with UTF-16", async () => {
+        const { importedNote } = await testImport("UTF-16LE Text Note.md", "text/markdown");
+        expect(importedNote.mime).toBe("text/html");
+        expect(importedNote.getContent().toString()).toBe("<h2>Hello world</h2>\n<p>Plain text goes here.</p>\n");
+    });
 })
diff --git a/src/services/import/single.ts b/src/services/import/single.ts
index f55c84bfc..85bd3d48a 100644
--- a/src/services/import/single.ts
+++ b/src/services/import/single.ts
@@ -127,7 +127,7 @@ function convertTextToHtml(text: string) {
 function importMarkdown(taskContext: TaskContext, file: File, parentNote: BNote) {
     const title = getNoteTitle(file.originalname, !!taskContext.data?.replaceUnderscoresWithSpaces);
 
-    const markdownContent = file.buffer.toString("utf-8");
+    const markdownContent = processStringOrBuffer(file.buffer);
     let htmlContent = markdownService.renderToHtml(markdownContent, title);
 
     if (taskContext.data?.safeImport) {

From bedc61c3d0346c62bb72605a5456503205a820ce Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Sat, 22 Feb 2025 01:37:02 +0200
Subject: [PATCH 41/62] feat(import/zip): support UTF-16 LE with BOM (closes
 #1241)

---
 .../IREN.Reports.Q2.FY25.Results_files.zip    | Bin 0 -> 22428 bytes
 src/services/import/single.ts                 |  19 +----
 src/services/import/zip.spec.ts               |  65 ++++++++++--------
 src/services/import/zip.ts                    |   4 +-
 src/services/utils.ts                         |  32 +++++++++
 5 files changed, 73 insertions(+), 47 deletions(-)
 create mode 100644 src/services/import/samples/IREN.Reports.Q2.FY25.Results_files.zip

diff --git a/src/services/import/samples/IREN.Reports.Q2.FY25.Results_files.zip b/src/services/import/samples/IREN.Reports.Q2.FY25.Results_files.zip
new file mode 100644
index 0000000000000000000000000000000000000000..86c9de9b5c89968bf36494767960305f95f39570
GIT binary patch
literal 22428
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

literal 0
HcmV?d00001

diff --git a/src/services/import/single.ts b/src/services/import/single.ts
index 85bd3d48a..b572aea7f 100644
--- a/src/services/import/single.ts
+++ b/src/services/import/single.ts
@@ -3,14 +3,12 @@
 import type BNote from "../../becca/entities/bnote.js";
 import type TaskContext from "../task_context.js";
 
-import chardet from "chardet";
-import stripBom from "strip-bom";
 import noteService from "../../services/notes.js";
 import imageService from "../../services/image.js";
 import protectedSessionService from "../protected_session.js";
 import markdownService from "./markdown.js";
 import mimeService from "./mime.js";
-import { getNoteTitle } from "../../services/utils.js";
+import { getNoteTitle, processStringOrBuffer } from "../../services/utils.js";
 import importUtils from "./utils.js";
 import htmlSanitizer from "../html_sanitizer.js";
 import type { File } from "./common.js";
@@ -148,21 +146,6 @@ function importMarkdown(taskContext: TaskContext, file: File, parentNote: BNote)
     return note;
 }
 
-function processStringOrBuffer(data: string | Buffer) {
-    if (!Buffer.isBuffer(data)) {
-        return data;
-    }
-
-    const detectedEncoding = chardet.detect(data);
-    switch (detectedEncoding) {
-        case "UTF-16LE":
-            return stripBom(data.toString("utf-16le"));
-        case "UTF-8":
-        default:
-            return data.toString("utf-8");
-    }
-}
-
 function importHtml(taskContext: TaskContext, file: File, parentNote: BNote) {
     let content = processStringOrBuffer(file.buffer);
 
diff --git a/src/services/import/zip.spec.ts b/src/services/import/zip.spec.ts
index c29459f93..67f0175f3 100644
--- a/src/services/import/zip.spec.ts
+++ b/src/services/import/zip.spec.ts
@@ -1,4 +1,4 @@
-import { describe, expect, it } from "vitest";
+import { beforeAll, describe, expect, it } from "vitest";
 import fs from "fs";
 import path from "path";
 import { fileURLToPath } from "url";
@@ -12,35 +12,46 @@ import sql_init from "../sql_init.js";
 import { initializeTranslations } from "../i18n.js";
 const scriptDir = dirname(fileURLToPath(import.meta.url));
 
-describe("processNoteContent", () => {
-    it("treats single MDX as Markdown in ZIP as text note", async () => {
-        const mdxSample = fs.readFileSync(path.join(scriptDir, "samples", "mdx.zip"));
-        const taskContext = TaskContext.getInstance("import-mdx", "import", {
-            textImportedAsText: true
-        });
+async function testImport(fileName: string) {
+    const mdxSample = fs.readFileSync(path.join(scriptDir, "samples", fileName));
+    const taskContext = TaskContext.getInstance("import-mdx", "import", {
+        textImportedAsText: true
+    });
 
-        await new Promise<void>((resolve, reject) => {
-            cls.init(async () => {
-                initializeTranslations();
-                sql_init.initializeDb();
-                await sql_init.dbReady;
+    return new Promise<{ importedNote: BNote; rootNote: BNote }>((resolve, reject) => {
+        cls.init(async () => {
+            const rootNote = becca.getNote("root");
+            if (!rootNote) {
+                expect(rootNote).toBeTruthy();
+                return;
+            }
 
-                const rootNote = becca.getNote("root");
-                if (!rootNote) {
-                    expect(rootNote).toBeTruthy();
-                    return;
-                }
-
-                const importedNote = await zip.importZip(taskContext, mdxSample, rootNote as BNote);
-                try {
-                    expect(importedNote.mime).toBe("text/mdx");
-                    expect(importedNote.type).toBe("text");
-                    expect(importedNote.title).toBe("Text Note");
-                } catch (e) {
-                    reject(e);
-                }
-                resolve();
+            const importedNote = await zip.importZip(taskContext, mdxSample, rootNote as BNote);
+            resolve({
+                importedNote,
+                rootNote
             });
         });
     });
+}
+
+describe("processNoteContent", () => {
+    beforeAll(async () => {
+        initializeTranslations();
+        sql_init.initializeDb();
+        await sql_init.dbReady;
+    });
+
+    it("treats single MDX as Markdown in ZIP as text note", async () => {
+        const { importedNote } = await testImport("mdx.zip");
+        expect(importedNote.mime).toBe("text/mdx");
+        expect(importedNote.type).toBe("text");
+        expect(importedNote.title).toBe("Text Note");
+    });
+
+    it("can import email from Microsoft Outlook with UTF-16 with BOM", async () => {
+        const { rootNote, importedNote } = await testImport("IREN.Reports.Q2.FY25.Results_files.zip");
+        const htmlNote = rootNote.children.find((ch) => ch.title === "IREN Reports Q2 FY25 Results");
+        expect(htmlNote?.getContent().toString().substring(0, 4)).toEqual("<div");
+    });
 })
diff --git a/src/services/import/zip.ts b/src/services/import/zip.ts
index 504f28382..5251b9546 100644
--- a/src/services/import/zip.ts
+++ b/src/services/import/zip.ts
@@ -1,7 +1,7 @@
 "use strict";
 
 import BAttribute from "../../becca/entities/battribute.js";
-import { removeTextFileExtension, newEntityId, getNoteTitle } from "../../services/utils.js";
+import { removeTextFileExtension, newEntityId, getNoteTitle, processStringOrBuffer } from "../../services/utils.js";
 import log from "../../services/log.js";
 import noteService from "../../services/notes.js";
 import attributeService from "../../services/attributes.js";
@@ -457,7 +457,7 @@ async function importZip(taskContext: TaskContext, fileBuffer: Buffer, importRoo
         }
 
         if (type !== "file" && type !== "image") {
-            content = content.toString("utf-8");
+            content = processStringOrBuffer(content);
         }
 
         const noteTitle = getNoteTitle(filePath, taskContext.data?.replaceUnderscoresWithSpaces || false, noteMeta);
diff --git a/src/services/utils.ts b/src/services/utils.ts
index 660bbbcc7..a2e5da3f6 100644
--- a/src/services/utils.ts
+++ b/src/services/utils.ts
@@ -1,5 +1,7 @@
 "use strict";
 
+import chardet from "chardet";
+import stripBom from "strip-bom";
 import crypto from "crypto";
 import { generator } from "rand-token";
 import unescape from "unescape";
@@ -330,6 +332,36 @@ function compareVersions(v1: string, v2: string): number {
     return 0;
 }
 
+/**
+ * For buffers, they are scanned for a supported encoding and decoded (UTF-8, UTF-16). In some cases, the BOM is also stripped.
+ *
+ * For strings, they are returned immediately without any transformation.
+ *
+ * For nullish values, an empty string is returned.
+ *
+ * @param data the string or buffer to process.
+ * @returns the string representation of the buffer, or the same string is it's a string.
+ */
+export function processStringOrBuffer(data: string | Buffer | null) {
+    if (!data) {
+        return "";
+    }
+
+    if (!Buffer.isBuffer(data)) {
+        return data;
+    }
+
+    const detectedEncoding = chardet.detect(data);
+    console.log("Detected as ", detectedEncoding);
+    switch (detectedEncoding) {
+        case "UTF-16LE":
+            return stripBom(data.toString("utf-16le"));
+        case "UTF-8":
+        default:
+            return data.toString("utf-8");
+    }
+}
+
 export default {
     compareVersions,
     crash,

From bf0b6ce554ce02f335fb5410a29483529442c966 Mon Sep 17 00:00:00 2001
From: Adorian Doran <adorian@esevo.ro>
Date: Sat, 22 Feb 2025 02:05:19 +0200
Subject: [PATCH 42/62] style(next): promoted attributes widget: improve
 appearance

---
 src/public/stylesheets/theme-next/shell.css | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/public/stylesheets/theme-next/shell.css b/src/public/stylesheets/theme-next/shell.css
index 30a6ad318..898593a66 100644
--- a/src/public/stylesheets/theme-next/shell.css
+++ b/src/public/stylesheets/theme-next/shell.css
@@ -1848,17 +1848,24 @@ div.promoted-attributes-container {
 }
 
 div.promoted-attribute-cell {
+    --pa-card-padding-left: 16px;
+    --pa-card-padding-right: 4px;
     --input-background-color: transparent;
 
     box-shadow: 1px 1px 2px rgba(0, 0, 0, .2);
     display: inline-flex;
     margin: 0;
     border-radius: 8px;
-    padding: 4px 16px;
+    padding: 4px var(--pa-card-padding-right) 4px var(--pa-card-padding-left);
     background: var(--card-background-color);
     overflow-y: visible;
 }
 
+div.promoted-attribute-cell:has(input[type="checkbox"]):not(:has(.multiplicity > span)) {
+    /* Checbox attribute, without multiplicity */
+    padding-right: var(--pa-card-padding-left);
+}
+
 div.promoted-attribute-cell > * {
     display: inline-block;
 }
@@ -1871,7 +1878,7 @@ div.promoted-attribute-cell label {
 
 div.promoted-attribute-cell div.input-group {
     min-height: auto;
-    padding: 2px 6px;
+    padding: 1px 6px;
 }
 
 div.promoted-attribute-cell input {
@@ -1883,12 +1890,17 @@ div.promoted-attribute-cell .tn-checkbox {
     --box-label-gap: 0;
 
     height: 1cap;
-    margin: 0 1em;
 }
 
-div.promoted-attribute-cell .multiplicity {
+div.promoted-attribute-cell div:has(input[type="checkbox"]) {
+    order: -1;    
+    margin-right: 1.5em;
+}
+
+div.promoted-attribute-cell .multiplicity:has(span) {
     --icon-button-size: 28px;
 
     margin-left: 8px;
+    margin-right: calc(var(--pa-card-padding-left) - var(--pa-card-padding-right));
     font-size: 0; /* Prevent whitespaces creating a gap between buttons */
 }
\ No newline at end of file

From 7dab171a0c71e98af53b47bf2773e002c06815ee Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 22 Feb 2025 00:06:04 +0000
Subject: [PATCH 43/62] chore(deps): update dependency @types/node to v22.13.5

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8eb6db485..c0cd0da75 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -145,7 +145,7 @@
         "@types/leaflet-gpx": "1.3.7",
         "@types/mime-types": "2.1.4",
         "@types/multer": "1.4.12",
-        "@types/node": "22.13.4",
+        "@types/node": "22.13.5",
         "@types/react": "18.3.18",
         "@types/safe-compare": "1.1.2",
         "@types/sanitize-html": "2.13.0",
@@ -4273,9 +4273,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "22.13.4",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.4.tgz",
-      "integrity": "sha512-ywP2X0DYtX3y08eFVx5fNIw7/uIv8hYUKgXoK8oayJlLnKcRfEYCxWMVE1XagUdVtCJlZT1AU4LXEABW+L1Peg==",
+      "version": "22.13.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.5.tgz",
+      "integrity": "sha512-+lTU0PxZXn0Dr1NBtC7Y8cR21AJr87dLLU953CWA6pMxxv/UDc7jYAY90upcrie1nRcD6XNG5HOYEDtgW5TxAg==",
       "license": "MIT",
       "dependencies": {
         "undici-types": "~6.20.0"
diff --git a/package.json b/package.json
index 401f3d5ad..dd8f86951 100644
--- a/package.json
+++ b/package.json
@@ -192,7 +192,7 @@
     "@types/leaflet-gpx": "1.3.7",
     "@types/mime-types": "2.1.4",
     "@types/multer": "1.4.12",
-    "@types/node": "22.13.4",
+    "@types/node": "22.13.5",
     "@types/react": "18.3.18",
     "@types/safe-compare": "1.1.2",
     "@types/sanitize-html": "2.13.0",

From 6c818427fc1009eba81963be2705cf6eb0fabd2c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 22 Feb 2025 00:06:14 +0000
Subject: [PATCH 44/62] chore(deps): update dependency typedoc to v0.27.8

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8eb6db485..6fa636f0d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -172,7 +172,7 @@
         "swagger-jsdoc": "6.2.8",
         "tslib": "2.8.1",
         "tsx": "4.19.3",
-        "typedoc": "0.27.7",
+        "typedoc": "0.27.8",
         "typescript": "5.7.3",
         "vitest": "3.0.6",
         "webpack": "5.98.0",
@@ -16860,9 +16860,9 @@
       }
     },
     "node_modules/typedoc": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.27.7.tgz",
-      "integrity": "sha512-K/JaUPX18+61W3VXek1cWC5gwmuLvYTOXJzBvD9W7jFvbPnefRnCHQCEPw7MSNrP/Hj7JJrhZtDDLKdcYm6ucg==",
+      "version": "0.27.8",
+      "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.27.8.tgz",
+      "integrity": "sha512-q0/2TUunNEDmWkn23ULKGXieK8cgGuAmBUXC/HcZ/rgzMI9Yr4Nq3in1K1vT1NZ9zx6M78yTk3kmIPbwJgK5KA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
diff --git a/package.json b/package.json
index 401f3d5ad..41611aa78 100644
--- a/package.json
+++ b/package.json
@@ -219,7 +219,7 @@
     "swagger-jsdoc": "6.2.8",
     "tslib": "2.8.1",
     "tsx": "4.19.3",
-    "typedoc": "0.27.7",
+    "typedoc": "0.27.8",
     "typescript": "5.7.3",
     "vitest": "3.0.6",
     "webpack": "5.98.0",

From 9ab2fe85bd5cffff679de5d9aec142f3b22c836b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 22 Feb 2025 00:06:21 +0000
Subject: [PATCH 45/62] fix(deps): update dependency @types/swagger-ui-express
 to v4.1.8

---
 package-lock.json | 9 +++++----
 package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8eb6db485..d4ae3d8d2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,7 +23,7 @@
         "@types/js-yaml": "4.0.9",
         "@types/leaflet": "1.9.16",
         "@types/react-dom": "18.3.5",
-        "@types/swagger-ui-express": "4.1.7",
+        "@types/swagger-ui-express": "4.1.8",
         "archiver": "7.0.1",
         "async-mutex": "0.5.0",
         "autocomplete.js": "0.38.1",
@@ -4434,9 +4434,10 @@
       }
     },
     "node_modules/@types/swagger-ui-express": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/@types/swagger-ui-express/-/swagger-ui-express-4.1.7.tgz",
-      "integrity": "sha512-ovLM9dNincXkzH4YwyYpll75vhzPBlWx6La89wwvYH7mHjVpf0X0K/vR/aUM7SRxmr5tt9z7E5XJcjQ46q+S3g==",
+      "version": "4.1.8",
+      "resolved": "https://registry.npmjs.org/@types/swagger-ui-express/-/swagger-ui-express-4.1.8.tgz",
+      "integrity": "sha512-AhZV8/EIreHFmBV5wAs0gzJUNq9JbbSXgJLQubCC0jtIo6prnI9MIRRxnU4MZX9RB9yXxF1V4R7jtLl/Wcj31g==",
+      "license": "MIT",
       "dependencies": {
         "@types/express": "*",
         "@types/serve-static": "*"
diff --git a/package.json b/package.json
index 401f3d5ad..5fca22358 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
     "@types/js-yaml": "4.0.9",
     "@types/leaflet": "1.9.16",
     "@types/react-dom": "18.3.5",
-    "@types/swagger-ui-express": "4.1.7",
+    "@types/swagger-ui-express": "4.1.8",
     "archiver": "7.0.1",
     "async-mutex": "0.5.0",
     "autocomplete.js": "0.38.1",

From 8011969b9dc69fe05056b3ab69fd4050fa4771ad Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 22 Feb 2025 00:06:30 +0000
Subject: [PATCH 46/62] fix(deps): update dependency ws to v8.18.1

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8eb6db485..861839349 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -106,7 +106,7 @@
         "turndown": "7.2.0",
         "unescape": "1.0.1",
         "vanilla-js-wheel-zoom": "9.0.4",
-        "ws": "8.18.0",
+        "ws": "8.18.1",
         "xml2js": "0.6.2",
         "yauzl": "3.2.0"
       },
@@ -18320,9 +18320,9 @@
       }
     },
     "node_modules/ws": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
-      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.1.tgz",
+      "integrity": "sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==",
       "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
diff --git a/package.json b/package.json
index 401f3d5ad..77293d3d0 100644
--- a/package.json
+++ b/package.json
@@ -156,7 +156,7 @@
     "turndown": "7.2.0",
     "unescape": "1.0.1",
     "vanilla-js-wheel-zoom": "9.0.4",
-    "ws": "8.18.0",
+    "ws": "8.18.1",
     "xml2js": "0.6.2",
     "yauzl": "3.2.0"
   },

From 789178061bf2d61a6a8ed11131ce0d527ae0b50e Mon Sep 17 00:00:00 2001
From: Adorian Doran <adorian@esevo.ro>
Date: Sat, 22 Feb 2025 02:21:19 +0200
Subject: [PATCH 47/62] style(next): promoted attributes widget: improve CSS,
 add right margin

---
 src/public/stylesheets/theme-next/shell.css | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/public/stylesheets/theme-next/shell.css b/src/public/stylesheets/theme-next/shell.css
index 898593a66..d4b748652 100644
--- a/src/public/stylesheets/theme-next/shell.css
+++ b/src/public/stylesheets/theme-next/shell.css
@@ -1837,16 +1837,21 @@ body.background-effects.zen #root-widget {
     border-bottom: 2px solid #0000001c !important;
 }
 
-/* Promoted attributes */
+/*
+ * Promoted attributes
+ */
 
+/* The promoted attributes section */
 div.promoted-attributes-container {
     display: flex;
+    margin-right: 15%;
     padding: 6px 0;
     gap: 8px;
     font-size: .85em;
     align-items: stretch;
 }
 
+/* A promoted attribute card */
 div.promoted-attribute-cell {
     --pa-card-padding-left: 16px;
     --pa-card-padding-right: 4px;
@@ -1861,6 +1866,7 @@ div.promoted-attribute-cell {
     overflow-y: visible;
 }
 
+/* A promoted attribute card (boolean attribute) */
 div.promoted-attribute-cell:has(input[type="checkbox"]):not(:has(.multiplicity > span)) {
     /* Checbox attribute, without multiplicity */
     padding-right: var(--pa-card-padding-left);
@@ -1892,11 +1898,13 @@ div.promoted-attribute-cell .tn-checkbox {
     height: 1cap;
 }
 
+/* The <div> containing the checkbox for a promoted boolean attribute */
 div.promoted-attribute-cell div:has(input[type="checkbox"]) {
-    order: -1;    
+    order: -1; /* Relocate the checkbox before the label */
     margin-right: 1.5em;
 }
 
+/* The element containing the "new attribute" and "remove this attribute button" */
 div.promoted-attribute-cell .multiplicity:has(span) {
     --icon-button-size: 28px;
 

From 41e925dc94ed6c4dfb9576d40b7000478943fa38 Mon Sep 17 00:00:00 2001
From: Adorian Doran <adorian@esevo.ro>
Date: Sat, 22 Feb 2025 02:31:20 +0200
Subject: [PATCH 48/62] style(next): forms: add support for date and time input
 fields

---
 src/public/stylesheets/theme-next/forms.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/public/stylesheets/theme-next/forms.css b/src/public/stylesheets/theme-next/forms.css
index cd4f51073..654f4368e 100644
--- a/src/public/stylesheets/theme-next/forms.css
+++ b/src/public/stylesheets/theme-next/forms.css
@@ -140,6 +140,8 @@ input:not([type]),
 input[type="text"],
 input[type="number"],
 input[type="password"],
+input[type="date"],
+input[type="time"],
 input[type="datetime-local"],
 textarea.form-control,
 textarea,
@@ -156,6 +158,8 @@ input:not([type]):hover,
 input[type="text"]:hover,
 input[type="number"]:hover,
 input[type="password"]:hover,
+input[type="date"]:hover,
+input[type="time"]:hover,
 input[type="datetime-local"]:hover,
 textarea.form-control:hover,
 textarea:hover,
@@ -168,6 +172,8 @@ input:not([type]):focus,
 input[type="text"]:focus,
 input[type="number"]:focus,
 input[type="password"]:focus,
+input[type="date"]:focus,
+input[type="time"]:focus,
 input[type="datetime-local"]:focus,
 textarea.form-control:focus,
 textarea:focus,

From 77264b5385303a5573950ad732b226d07d33e7f4 Mon Sep 17 00:00:00 2001
From: Adorian Doran <adorian@esevo.ro>
Date: Sat, 22 Feb 2025 02:35:24 +0200
Subject: [PATCH 49/62] style(next): forms/input groups: fix icons being skewed
 in certain conditions

---
 src/public/stylesheets/theme-next/forms.css | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/public/stylesheets/theme-next/forms.css b/src/public/stylesheets/theme-next/forms.css
index 654f4368e..9f721dea5 100644
--- a/src/public/stylesheets/theme-next/forms.css
+++ b/src/public/stylesheets/theme-next/forms.css
@@ -281,12 +281,15 @@ input::selection,
     --accented-background-color: transparent;
     
     border: none;
-    font-style: italic;
     color: var(--input-placeholder-color);
     user-select: none;
     cursor: default;
 }
 
+.input-group .input-group-text:not(button):not(a):not(.bx) {
+    font-style: italic;
+}
+
 /* Combo box-like dropdown buttons */
 
 .select-button.dropdown-toggle::after {

From 1d47df5f28d92ba93bedc4efc3be54e2c7f58ad0 Mon Sep 17 00:00:00 2001
From: Adorian Doran <adorian@esevo.ro>
Date: Sat, 22 Feb 2025 02:37:13 +0200
Subject: [PATCH 50/62] style(next): forms/input groups: improve CSS

---
 src/public/stylesheets/theme-next/forms.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/public/stylesheets/theme-next/forms.css b/src/public/stylesheets/theme-next/forms.css
index 9f721dea5..a74386b63 100644
--- a/src/public/stylesheets/theme-next/forms.css
+++ b/src/public/stylesheets/theme-next/forms.css
@@ -276,7 +276,7 @@ input::selection,
     background: transparent !important;
 }
 
-.input-group .input-group-text:not(button):not(a) {
+.input-group .input-group-text {
     /* Background color hijack */
     --accented-background-color: transparent;
     

From ef4fc0a18002bec761d572c5a9a1c29ab2e6674a Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Sat, 22 Feb 2025 09:18:47 +0200
Subject: [PATCH 51/62] feat(html_sanitizer): enforce strict style rules
 (closes #931)

---
 src/services/html_sanitizer.spec.ts | 53 +++++++++++++++++++++++++++++
 src/services/html_sanitizer.ts      | 21 ++++++++++++
 2 files changed, 74 insertions(+)
 create mode 100644 src/services/html_sanitizer.spec.ts

diff --git a/src/services/html_sanitizer.spec.ts b/src/services/html_sanitizer.spec.ts
new file mode 100644
index 000000000..7f5888380
--- /dev/null
+++ b/src/services/html_sanitizer.spec.ts
@@ -0,0 +1,53 @@
+import { describe, expect, it } from "vitest";
+import html_sanitizer from "./html_sanitizer.js";
+import { trimIndentation } from "../../spec/support/utils.js";
+
+describe("sanitize", () => {
+    it("filters out position inline CSS", () => {
+        const dirty = `<div style="z-index:999999999;margin:0px;left:250px;height:100px;display:table;background:none;position:fixed;top:250px;"></div>`;
+        const clean = `<div></div>`;
+        expect(html_sanitizer.sanitize(dirty)).toBe(clean);
+    });
+
+    it("keeps inline styles defined in CKEDitor", () => {
+        const dirty = trimIndentation`\
+            <p>
+                <span style="color:hsl(0, 0%, 90%);">
+                    Hi
+                </span>
+
+                <span style="background-color:hsl(30, 75%, 60%);">
+                    there
+                </span>
+            </p>
+            <figure class="table" style="float:left;height:800px;width:600px;">
+                <table style="background-color:hsl(0, 0%, 90%);border-color:hsl(0, 0%, 0%);border-style:dotted;">
+                    <tbody>
+                        <tr>
+                            <td style="border:2px groove hsl(60, 75%, 60%);"></td>
+                        </tr>
+                    </tbody>
+                </table>
+            </figure>`;
+    const clean = trimIndentation`\
+            <p>
+                <span style="color:hsl(0, 0%, 90%)">
+                    Hi
+                </span>
+
+                <span style="background-color:hsl(30, 75%, 60%)">
+                    there
+                </span>
+            </p>
+            <figure class="table" style="float:left;height:800px;width:600px">
+                <table style="background-color:hsl(0, 0%, 90%);border-color:hsl(0, 0%, 0%);border-style:dotted">
+                    <tbody>
+                        <tr>
+                            <td style="border:2px groove hsl(60, 75%, 60%)"></td>
+                        </tr>
+                    </tbody>
+                </table>
+            </figure>`;
+        expect(html_sanitizer.sanitize(dirty)) .toBe(clean);
+    });
+});
diff --git a/src/services/html_sanitizer.ts b/src/services/html_sanitizer.ts
index 3acfde469..35e04c0b7 100644
--- a/src/services/html_sanitizer.ts
+++ b/src/services/html_sanitizer.ts
@@ -141,6 +141,9 @@ function sanitize(dirtyHtml: string) {
         allowedTags = DEFAULT_ALLOWED_TAGS;
     }
 
+    const colorRegex = [/^#(0x)?[0-9a-f]+$/i, /^rgb\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*\)$/, /^hsl\(\s*(\d{1,3})\s*,\s*(\d{1,3})%\s*,\s*(\d{1,3})%\s*\)$/];
+    const sizeRegex = [/^\d+(?:px|em|%)$/];
+
     // to minimize document changes, compress H
     return sanitizeHtml(dirtyHtml, {
         allowedTags,
@@ -148,6 +151,24 @@ function sanitize(dirtyHtml: string) {
             "*": ["class", "style", "title", "src", "href", "hash", "disabled", "align", "alt", "center", "data-*"],
             input: ["type", "checked"]
         },
+        allowedStyles: {
+            "*": {
+                "color": colorRegex,
+                "background-color": colorRegex
+            },
+            "figure": {
+                "float": [ /^\s*(left|right|none)\s*$/ ],
+                "width": sizeRegex,
+                "height": sizeRegex
+            },
+            "table": {
+                "border-color": colorRegex,
+                "border-style": [ /^\s*(none|hidden|dotted|dashed|solid|double|groove|ridge|inset|outset)\s*$/ ]
+            },
+            "td": {
+                "border": [ /^\s*\d+(?:px|em|%)\s*(none|hidden|dotted|dashed|solid|double|groove|ridge|inset|outset)\s*(#(0x)?[0-9a-fA-F]+|rgb\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*\)|hsl\(\s*(\d{1,3})\s*,\s*(\d{1,3})%\s*,\s*(\d{1,3})%\))\s*$/ ]
+            }
+        },
         allowedSchemes: ALLOWED_PROTOCOLS,
         nonTextTags: ["head"],
         transformTags

From 8e69cf79a6372b90ce2abf9c71620bf7106c77c6 Mon Sep 17 00:00:00 2001
From: Adorian Doran <adorian@esevo.ro>
Date: Sat, 22 Feb 2025 10:05:14 +0200
Subject: [PATCH 52/62] client: promoted attributes widget: add placeholder for
 blank input fields

---
 src/public/app/widgets/ribbon_widgets/promoted_attributes.js | 1 +
 src/public/translations/en/translation.json                  | 1 +
 src/public/translations/ro/translation.json                  | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/public/app/widgets/ribbon_widgets/promoted_attributes.js b/src/public/app/widgets/ribbon_widgets/promoted_attributes.js
index 75ed276ec..3a298047e 100644
--- a/src/public/app/widgets/ribbon_widgets/promoted_attributes.js
+++ b/src/public/app/widgets/ribbon_widgets/promoted_attributes.js
@@ -155,6 +155,7 @@ export default class PromotedAttributesWidget extends NoteContextAwareWidget {
             .attr("data-attribute-type", valueAttr.type)
             .attr("data-attribute-name", valueAttr.name)
             .prop("value", valueAttr.value)
+            .prop("placeholder", t("promoted_attributes.unset-field-placeholder"))
             .addClass("form-control")
             .addClass("promoted-attribute-input")
             .on("change", (event) => this.promotedAttributeChanged(event));
diff --git a/src/public/translations/en/translation.json b/src/public/translations/en/translation.json
index ea7dc176e..a915f3cca 100644
--- a/src/public/translations/en/translation.json
+++ b/src/public/translations/en/translation.json
@@ -824,6 +824,7 @@
   },
   "promoted_attributes": {
     "promoted_attributes": "Promoted Attributes",
+    "unset-field-placeholder": "not set",
     "url_placeholder": "http://website...",
     "open_external_link": "Open external link",
     "unknown_label_type": "Unknown label type '{{type}}'",
diff --git a/src/public/translations/ro/translation.json b/src/public/translations/ro/translation.json
index 10fffdb76..5ed59339e 100644
--- a/src/public/translations/ro/translation.json
+++ b/src/public/translations/ro/translation.json
@@ -944,7 +944,8 @@
     "remove_this_attribute": "Elimină acest atribut",
     "unknown_attribute_type": "Tip de atribut necunoscut „{{type}}”",
     "unknown_label_type": "Tip de etichetă necunoscut „{{type}}”",
-    "url_placeholder": "http://siteweb..."
+    "url_placeholder": "http://siteweb...",
+    "unset-field-placeholder": "nesetat"
   },
   "prompt": {
     "defaultTitle": "Aviz",

From 7269c1b0aa1bb5a0eef8828c718d8d6ff077e19d Mon Sep 17 00:00:00 2001
From: Adorian Doran <adorian@esevo.ro>
Date: Sat, 22 Feb 2025 10:10:58 +0200
Subject: [PATCH 53/62] style(next): promoted attributes widget: improve
 appearance

---
 src/public/stylesheets/theme-next-dark.css  |  3 +++
 src/public/stylesheets/theme-next-light.css |  3 +++
 src/public/stylesheets/theme-next/shell.css | 20 ++++++++++++++------
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/public/stylesheets/theme-next-dark.css b/src/public/stylesheets/theme-next-dark.css
index 965c7d274..47dcc2ae6 100644
--- a/src/public/stylesheets/theme-next-dark.css
+++ b/src/public/stylesheets/theme-next-dark.css
@@ -144,6 +144,9 @@
 
     --alert-bar-background: #6b6b6b3b;
 
+    --promoted-attribute-card-background-color: var(--card-background-color);
+    --promoted-attribute-card-shadow-color: #000000b3;
+
     --right-pane-item-hover-background: #ffffff26;
     --right-pane-item-hover-color: white;
 
diff --git a/src/public/stylesheets/theme-next-light.css b/src/public/stylesheets/theme-next-light.css
index c67c93274..c648f519a 100644
--- a/src/public/stylesheets/theme-next-light.css
+++ b/src/public/stylesheets/theme-next-light.css
@@ -138,6 +138,9 @@
 
     --alert-bar-background: #32637b29;
 
+    --promoted-attribute-card-background-color: var(--card-background-color);
+    --promoted-attribute-card-shadow-color: #00000033;
+
     --new-tab-button-background: #d8d8d8;
     --new-tab-button-color: #3a3a3a;
     --new-tab-button-shadow: 2px 2px 4px rgba(0, 0, 0, 0.2);
diff --git a/src/public/stylesheets/theme-next/shell.css b/src/public/stylesheets/theme-next/shell.css
index d4b748652..c56f3f3b3 100644
--- a/src/public/stylesheets/theme-next/shell.css
+++ b/src/public/stylesheets/theme-next/shell.css
@@ -1847,22 +1847,26 @@ div.promoted-attributes-container {
     margin-right: 15%;
     padding: 6px 0;
     gap: 8px;
-    font-size: .85em;
     align-items: stretch;
 }
 
+div.promoted-attributes-container,
+div.promoted-attributes-container input {
+    font-size: .9rem;
+}
+
 /* A promoted attribute card */
 div.promoted-attribute-cell {
     --pa-card-padding-left: 16px;
-    --pa-card-padding-right: 4px;
+    --pa-card-padding-right: 2px;
     --input-background-color: transparent;
 
-    box-shadow: 1px 1px 2px rgba(0, 0, 0, .2);
+    box-shadow: 1px 1px 2px var(--promoted-attribute-card-shadow-color);
     display: inline-flex;
     margin: 0;
     border-radius: 8px;
-    padding: 4px var(--pa-card-padding-right) 4px var(--pa-card-padding-left);
-    background: var(--card-background-color);
+    padding: 2px var(--pa-card-padding-right) 2px var(--pa-card-padding-left);
+    background: var(--promoted-attribute-card-background-color);
     overflow-y: visible;
 }
 
@@ -1882,6 +1886,10 @@ div.promoted-attribute-cell label {
     opacity: .75;
 }
 
+div.promoted-attribute-cell label::after {
+    content: ":";
+}
+
 div.promoted-attribute-cell div.input-group {
     min-height: auto;
     padding: 1px 6px;
@@ -1906,7 +1914,7 @@ div.promoted-attribute-cell div:has(input[type="checkbox"]) {
 
 /* The element containing the "new attribute" and "remove this attribute button" */
 div.promoted-attribute-cell .multiplicity:has(span) {
-    --icon-button-size: 28px;
+    --icon-button-size: 24px;
 
     margin-left: 8px;
     margin-right: calc(var(--pa-card-padding-left) - var(--pa-card-padding-right));

From 6d19e315f47739e592970cc00415b9a9d9565302 Mon Sep 17 00:00:00 2001
From: Adorian Doran <adorian@esevo.ro>
Date: Sat, 22 Feb 2025 10:19:26 +0200
Subject: [PATCH 54/62] style(next): promoted attributes widget: improve
 appearance on narrow width

---
 src/public/stylesheets/theme-next/shell.css | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/public/stylesheets/theme-next/shell.css b/src/public/stylesheets/theme-next/shell.css
index c56f3f3b3..0161eded6 100644
--- a/src/public/stylesheets/theme-next/shell.css
+++ b/src/public/stylesheets/theme-next/shell.css
@@ -1848,6 +1848,7 @@ div.promoted-attributes-container {
     padding: 6px 0;
     gap: 8px;
     align-items: stretch;
+    container-type: inline-size;
 }
 
 div.promoted-attributes-container,
@@ -1870,6 +1871,13 @@ div.promoted-attribute-cell {
     overflow-y: visible;
 }
 
+@container (max-width: 400px) {
+    /* Narrow promoted attributes section */
+    div.promoted-attribute-cell {
+        flex-grow: 1;
+    }
+}
+
 /* A promoted attribute card (boolean attribute) */
 div.promoted-attribute-cell:has(input[type="checkbox"]):not(:has(.multiplicity > span)) {
     /* Checbox attribute, without multiplicity */

From fcc1068b0634091fb7501648f00b5ea2121ff9ab Mon Sep 17 00:00:00 2001
From: Adorian Doran <adorian@esevo.ro>
Date: Sat, 22 Feb 2025 10:55:01 +0200
Subject: [PATCH 55/62] style(next): promoted attributes widget: improve
 appearance

---
 src/public/stylesheets/theme-next/shell.css | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/public/stylesheets/theme-next/shell.css b/src/public/stylesheets/theme-next/shell.css
index 0161eded6..26fc999ab 100644
--- a/src/public/stylesheets/theme-next/shell.css
+++ b/src/public/stylesheets/theme-next/shell.css
@@ -1844,7 +1844,7 @@ body.background-effects.zen #root-widget {
 /* The promoted attributes section */
 div.promoted-attributes-container {
     display: flex;
-    margin-right: 15%;
+    margin-right: 10%;
     padding: 6px 0;
     gap: 8px;
     align-items: stretch;
@@ -1863,6 +1863,7 @@ div.promoted-attribute-cell {
     --input-background-color: transparent;
 
     box-shadow: 1px 1px 2px var(--promoted-attribute-card-shadow-color);
+
     display: inline-flex;
     margin: 0;
     border-radius: 8px;
@@ -1888,13 +1889,13 @@ div.promoted-attribute-cell > * {
     display: inline-block;
 }
 
-div.promoted-attribute-cell label {
+div.promoted-attribute-cell > label {
     font-weight: normal;
     white-space: nowrap;
     opacity: .75;
 }
 
-div.promoted-attribute-cell label::after {
+div.promoted-attribute-cell:not(:has(input[type="checkbox"])) > label::after {
     content: ":";
 }
 
@@ -1908,6 +1909,20 @@ div.promoted-attribute-cell input {
     font-weight: 500;
 }
 
+div.promoted-attribute-cell input[type="text"] {
+    width: 10em !important;
+}
+
+div.promoted-attribute-cell input[type="number"] {
+    width: 6em !important;
+}
+
+div.promoted-attribute-cell span.open-external-link-button {
+    display: flex;
+    padding: 0;
+    font-size: 1.2em;
+}
+
 div.promoted-attribute-cell .tn-checkbox {
     --box-label-gap: 0;
 

From 530340f753f04c059d27dc676dd901e95bf9dbd3 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Sat, 22 Feb 2025 09:37:20 +0200
Subject: [PATCH 56/62] fix(client): sporadious crash with classic toolbar not
 being available

---
 src/public/app/widgets/type_widgets/editable_text.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/public/app/widgets/type_widgets/editable_text.js b/src/public/app/widgets/type_widgets/editable_text.js
index acd006e9b..c5f2df34b 100644
--- a/src/public/app/widgets/type_widgets/editable_text.js
+++ b/src/public/app/widgets/type_widgets/editable_text.js
@@ -223,7 +223,9 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget {
                 }
 
                 $classicToolbarWidget.empty();
-                $classicToolbarWidget[0].appendChild(editor.ui.view.toolbar.element);
+                if ($classicToolbarWidget.length) {
+                    $classicToolbarWidget[0].appendChild(editor.ui.view.toolbar.element);
+                }
 
                 if (utils.isMobile()) {
                     $classicToolbarWidget.addClass("visible");

From f4e6edd19edd626bdfc6aab7a2d923b2f4375770 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Sat, 22 Feb 2025 09:47:48 +0200
Subject: [PATCH 57/62] feat(views/calendar): basic recursion for calendar root

---
 src/public/app/widgets/view_widgets/calendar_view.ts | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/public/app/widgets/view_widgets/calendar_view.ts b/src/public/app/widgets/view_widgets/calendar_view.ts
index 8a7e797bb..9cdb06978 100644
--- a/src/public/app/widgets/view_widgets/calendar_view.ts
+++ b/src/public/app/widgets/view_widgets/calendar_view.ts
@@ -215,10 +215,17 @@ export default class CalendarView extends ViewMode {
         const events: EventSourceInput = [];
 
         for (const note of notes) {
-            const startDate = note.getAttributeValue("label", "startDate");
+            const startDate = note.getLabelValue("startDate") ?? note.getLabelValue("dateNote");
             const customTitle = note.getAttributeValue("label", "calendar:title");
             const color = note.getAttributeValue("label", "calendar:color") ??  note.getAttributeValue("label", "color") ?? undefined;
 
+            if (note.hasChildren()) {
+                const childrenEventData = await this.#buildEvents(note.getChildNoteIds());
+                if (childrenEventData.length > 0) {
+                    events.push(childrenEventData);
+                }
+            }
+
             if (!startDate) {
                 continue;
             }
@@ -243,7 +250,7 @@ export default class CalendarView extends ViewMode {
             }
         }
 
-        return events;
+        return events.flat();
     }
 
     static async #parseCustomTitle(customTitleValue: string | null, note: FNote, allowRelations = true): Promise<string[]> {

From bc4d820cb0ece48cc7c544fbb26836c797d03e62 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Sat, 22 Feb 2025 10:00:18 +0200
Subject: [PATCH 58/62] feat(views/calendar): display child notes of days

---
 .../app/widgets/view_widgets/calendar_view.ts | 27 +++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/public/app/widgets/view_widgets/calendar_view.ts b/src/public/app/widgets/view_widgets/calendar_view.ts
index 9cdb06978..f0582d5ce 100644
--- a/src/public/app/widgets/view_widgets/calendar_view.ts
+++ b/src/public/app/widgets/view_widgets/calendar_view.ts
@@ -67,6 +67,7 @@ export default class CalendarView extends ViewMode {
     private noteIds: string[];
     private parentNote: FNote;
     private calendar?: Calendar;
+    private isCalendarRoot: boolean;
 
     constructor(args: ViewModeArgs) {
         super(args);
@@ -75,7 +76,7 @@ export default class CalendarView extends ViewMode {
         this.$calendarContainer = this.$root.find(".calendar-container");
         this.noteIds = args.noteIds;
         this.parentNote = args.parentNote;
-        console.log(args);
+        this.isCalendarRoot = false;
         args.$parent.append(this.$root);
     }
 
@@ -97,7 +98,7 @@ export default class CalendarView extends ViewMode {
         const calendar = new Calendar(this.$calendarContainer[0], {
             plugins,
             initialView: "dayGridMonth",
-            events: async () => await CalendarView.#buildEvents(this.noteIds),
+            events: async () => await this.#buildEvents(this.noteIds),
             editable: isEditable,
             selectable: isEditable,
             select: (e) => this.#onCalendarSelection(e),
@@ -121,6 +122,7 @@ export default class CalendarView extends ViewMode {
         });
         calendar.render();
         this.calendar = calendar;
+        this.isCalendarRoot = this.parentNote.hasLabel("calendarRoot");
 
         return this.$root;
     }
@@ -210,17 +212,32 @@ export default class CalendarView extends ViewMode {
         }
     }
 
-    static async #buildEvents(noteIds: string[]) {
+    async #buildEvents(noteIds: string[], enforcedStartDate?: string) {
         const notes = await froca.getNotes(noteIds);
         const events: EventSourceInput = [];
 
         for (const note of notes) {
-            const startDate = note.getLabelValue("startDate") ?? note.getLabelValue("dateNote");
+            let startDate;
+
+            if (enforcedStartDate) {
+                startDate = enforcedStartDate;
+            } else if (!this.isCalendarRoot) {
+                startDate = note.getLabelValue("startDate");
+            } else {
+                startDate = note.getLabelValue("dateNote");
+            }
             const customTitle = note.getAttributeValue("label", "calendar:title");
             const color = note.getAttributeValue("label", "calendar:color") ??  note.getAttributeValue("label", "color") ?? undefined;
 
             if (note.hasChildren()) {
-                const childrenEventData = await this.#buildEvents(note.getChildNoteIds());
+                const dateNote = note.getLabelValue("dateNote");
+                let enforcedStartDate = undefined;
+                if (dateNote) {
+                    // This is a day note which can have children. Make sure the children are added to the calendar even if they themselves don't have it.
+                    enforcedStartDate = dateNote;
+                }
+
+                const childrenEventData = await this.#buildEvents(note.getChildNoteIds(), enforcedStartDate);
                 if (childrenEventData.length > 0) {
                     events.push(childrenEventData);
                 }

From 5c1db3cab2f31c283ea4dfe35c29dc74541395cc Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Sat, 22 Feb 2025 10:03:38 +0200
Subject: [PATCH 59/62] feat(views/calendar): disable interaction in calendar
 root mode

---
 src/public/app/widgets/view_widgets/calendar_view.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/public/app/widgets/view_widgets/calendar_view.ts b/src/public/app/widgets/view_widgets/calendar_view.ts
index f0582d5ce..ebce0c0d7 100644
--- a/src/public/app/widgets/view_widgets/calendar_view.ts
+++ b/src/public/app/widgets/view_widgets/calendar_view.ts
@@ -85,7 +85,8 @@ export default class CalendarView extends ViewMode {
     }
 
     async renderList(): Promise<JQuery<HTMLElement> | undefined> {
-        const isEditable = true;
+        this.isCalendarRoot = this.parentNote.hasLabel("calendarRoot");
+        const isEditable = !this.isCalendarRoot;
 
         const { Calendar } = await import("@fullcalendar/core");
         const plugins: PluginDef[] = [];
@@ -122,7 +123,6 @@ export default class CalendarView extends ViewMode {
         });
         calendar.render();
         this.calendar = calendar;
-        this.isCalendarRoot = this.parentNote.hasLabel("calendarRoot");
 
         return this.$root;
     }

From 43f79ca813efe1ecd9a9f648bb09880c088132b4 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Sat, 22 Feb 2025 10:12:36 +0200
Subject: [PATCH 60/62] feat(views/calendar): click to go to day note

---
 .../app/widgets/view_widgets/calendar_view.ts   | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/public/app/widgets/view_widgets/calendar_view.ts b/src/public/app/widgets/view_widgets/calendar_view.ts
index ebce0c0d7..bfbafb847 100644
--- a/src/public/app/widgets/view_widgets/calendar_view.ts
+++ b/src/public/app/widgets/view_widgets/calendar_view.ts
@@ -10,6 +10,8 @@ import dialogService from "../../services/dialog.js";
 import attributes from "../../services/attributes.js";
 import type { EventData } from "../../components/app_context.js";
 import utils from "../../services/utils.js";
+import date_notes from "../../services/date_notes.js";
+import appContext from "../../components/app_context.js";
 
 const TPL = `
 <div class="calendar-view">
@@ -91,8 +93,7 @@ export default class CalendarView extends ViewMode {
         const { Calendar } = await import("@fullcalendar/core");
         const plugins: PluginDef[] = [];
         plugins.push((await import("@fullcalendar/daygrid")).default);
-
-        if (isEditable) {
+        if (isEditable || this.isCalendarRoot) {
             plugins.push((await import("@fullcalendar/interaction")).default);
         }
 
@@ -119,7 +120,17 @@ export default class CalendarView extends ViewMode {
 
                 html += utils.escapeHtml(e.event.title);
                 return { html };
-            })
+            }),
+            dateClick: async (e) => {
+                if (!this.isCalendarRoot) {
+                    return;
+                }
+
+                const note = await date_notes.getDayNote(e.dateStr);
+                if (note) {
+                    appContext.tabManager.getActiveContext().setNote(note.noteId);
+                }
+            }
         });
         calendar.render();
         this.calendar = calendar;

From a9cebe312fa6f3fc7d70730164cbf57d831d9c56 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Sat, 22 Feb 2025 10:56:10 +0200
Subject: [PATCH 61/62] refactor(views/calendar): use specific API for date
 notes for performance

---
 src/public/app/services/utils.ts              |  22 ++++
 .../app/widgets/view_widgets/calendar_view.ts | 122 ++++++++++++------
 2 files changed, 104 insertions(+), 40 deletions(-)

diff --git a/src/public/app/services/utils.ts b/src/public/app/services/utils.ts
index 6fd5678de..7accea1fb 100644
--- a/src/public/app/services/utils.ts
+++ b/src/public/app/services/utils.ts
@@ -30,6 +30,27 @@ function parseDate(str: string) {
     }
 }
 
+// Source: https://stackoverflow.com/a/30465299/4898894
+function getMonthsInDateRange(startDate: string, endDate: string) {
+    const start = startDate.split('-');
+    const end = endDate.split('-');
+    const startYear = parseInt(start[0]);
+    const endYear = parseInt(end[0]);
+    const dates = [];
+
+    for (let i = startYear; i <= endYear; i++) {
+        const endMonth = i != endYear ? 11 : parseInt(end[1]) - 1;
+        const startMon = i === startYear ? parseInt(start[1])-1 : 0;
+
+        for(let j = startMon; j <= endMonth; j = j > 12 ? j % 12 || 11 : j+1) {
+            const month = j+1;
+            const displayMonth = month < 10 ? '0'+month : month;
+            dates.push([i, displayMonth].join('-'));
+        }
+    }
+    return dates;
+}
+
 function padNum(num: number) {
     return `${num <= 9 ? "0" : ""}${num}`;
 }
@@ -621,6 +642,7 @@ export default {
     reloadFrontendApp,
     reloadTray,
     parseDate,
+    getMonthsInDateRange,
     formatDateISO,
     formatDateTime,
     formatTimeInterval,
diff --git a/src/public/app/widgets/view_widgets/calendar_view.ts b/src/public/app/widgets/view_widgets/calendar_view.ts
index bfbafb847..87b94e3e8 100644
--- a/src/public/app/widgets/view_widgets/calendar_view.ts
+++ b/src/public/app/widgets/view_widgets/calendar_view.ts
@@ -1,4 +1,4 @@
-import type { Calendar, DateSelectArg, EventChangeArg, EventDropArg, EventSourceInput, PluginDef } from "@fullcalendar/core";
+import type { Calendar, DateSelectArg, EventChangeArg, EventDropArg, EventInput, EventSourceFunc, EventSourceFuncArg, EventSourceInput, PluginDef } from "@fullcalendar/core";
 import froca from "../../services/froca.js";
 import ViewMode, { type ViewModeArgs } from "./view_mode.js";
 import type FNote from "../../entities/fnote.js";
@@ -97,10 +97,17 @@ export default class CalendarView extends ViewMode {
             plugins.push((await import("@fullcalendar/interaction")).default);
         }
 
+        let eventBuilder: EventSourceFunc;
+        if (!this.isCalendarRoot) {
+            eventBuilder = async () => await this.#buildEvents(this.noteIds)
+        } else {
+            eventBuilder = async (e: EventSourceFuncArg) => await this.#buildEventsForCalendar(e);
+        }
+
         const calendar = new Calendar(this.$calendarContainer[0], {
             plugins,
             initialView: "dayGridMonth",
-            events: async () => await this.#buildEvents(this.noteIds),
+            events: eventBuilder,
             editable: isEditable,
             selectable: isEditable,
             select: (e) => this.#onCalendarSelection(e),
@@ -223,32 +230,59 @@ export default class CalendarView extends ViewMode {
         }
     }
 
-    async #buildEvents(noteIds: string[], enforcedStartDate?: string) {
+    async #buildEventsForCalendar(e: EventSourceFuncArg) {
+        const events = [];
+
+        // Gather all the required date note IDs.
+        const dateRange = utils.getMonthsInDateRange(e.startStr, e.endStr);
+        let allDateNoteIds: string[] = [];
+        for (const month of dateRange) {
+            // TODO: Deduplicate get type.
+            const dateNotesForMonth = await server.get<Record<string, string>>(`special-notes/notes-for-month/${month}`);
+            const dateNoteIds = Object.values(dateNotesForMonth);
+            allDateNoteIds = [ ...allDateNoteIds, ...dateNoteIds ];
+        }
+
+        // Request all the date notes.
+        const dateNotes = await froca.getNotes(allDateNoteIds);
+        const childNoteToDateMapping: Record<string, string> = {};
+        for (const dateNote of dateNotes) {
+            const startDate = dateNote.getLabelValue("dateNote");
+            if (!startDate) {
+                continue;
+            }
+
+            events.push(await CalendarView.#buildEvent(dateNote, startDate));
+
+            if (dateNote.hasChildren()) {
+                const childNoteIds = dateNote.getChildNoteIds();
+                for (const childNoteId of childNoteIds) {
+                    childNoteToDateMapping[childNoteId] = startDate;
+                }
+            }
+        }
+
+        // Request all child notes of date notes in a single run.
+        const childNoteIds = Object.keys(childNoteToDateMapping);
+        const childNotes = await froca.getNotes(childNoteIds);
+        for (const childNote of childNotes) {
+            const startDate = childNoteToDateMapping[childNote.noteId];
+            const event = await CalendarView.#buildEvent(childNote, startDate);
+            events.push(event);
+        }
+
+        return events.flat();
+    }
+
+    async #buildEvents(noteIds: string[]) {
         const notes = await froca.getNotes(noteIds);
         const events: EventSourceInput = [];
 
         for (const note of notes) {
-            let startDate;
-
-            if (enforcedStartDate) {
-                startDate = enforcedStartDate;
-            } else if (!this.isCalendarRoot) {
-                startDate = note.getLabelValue("startDate");
-            } else {
-                startDate = note.getLabelValue("dateNote");
-            }
-            const customTitle = note.getAttributeValue("label", "calendar:title");
-            const color = note.getAttributeValue("label", "calendar:color") ??  note.getAttributeValue("label", "color") ?? undefined;
+            let startDate = note.getLabelValue("startDate");
 
             if (note.hasChildren()) {
-                const dateNote = note.getLabelValue("dateNote");
-                let enforcedStartDate = undefined;
-                if (dateNote) {
-                    // This is a day note which can have children. Make sure the children are added to the calendar even if they themselves don't have it.
-                    enforcedStartDate = dateNote;
-                }
-
-                const childrenEventData = await this.#buildEvents(note.getChildNoteIds(), enforcedStartDate);
+                const childrenEventData = await this.#buildEvents(note.getChildNoteIds());
                 if (childrenEventData.length > 0) {
                     events.push(childrenEventData);
                 }
@@ -258,29 +292,37 @@ export default class CalendarView extends ViewMode {
                 continue;
             }
 
-            const titles = await CalendarView.#parseCustomTitle(customTitle, note);
-            for (const title of titles) {
-                const eventData: typeof events[0] = {
-                    title: title,
-                    start: startDate,
-                    url: `#${note.noteId}`,
-                    noteId: note.noteId,
-                    color: color,
-                    iconClass: note.getLabelValue("iconClass")
-                };
-
-                const endDate = CalendarView.#offsetDate(note.getAttributeValue("label", "endDate") ?? startDate, 1);
-                if (endDate) {
-                    eventData.end = CalendarView.#formatDateToLocalISO(endDate);
-                }
-
-                events.push(eventData);
-            }
+            const endDate = note.getAttributeValue("label", "endDate");
+            events.push(await CalendarView.#buildEvent(note, startDate, endDate));
         }
 
         return events.flat();
     }
 
+    static async #buildEvent(note: FNote, startDate: string, endDate?: string | null) {
+        const customTitle = note.getLabelValue("calendar:title");
+        const titles = await CalendarView.#parseCustomTitle(customTitle, note);
+        const color = note.getLabelValue("calendar:color") ?? note.getLabelValue("color");
+        const events: EventInput[] = [];
+        for (const title of titles) {
+            const eventData: EventInput = {
+                title: title,
+                start: startDate,
+                url: `#${note.noteId}`,
+                noteId: note.noteId,
+                color: color ?? undefined,
+                iconClass: note.getLabelValue("iconClass")
+            };
+
+            const endDateOffset = CalendarView.#offsetDate(endDate ?? startDate, 1);
+            if (endDateOffset) {
+                eventData.end = CalendarView.#formatDateToLocalISO(endDateOffset);
+            }
+            events.push(eventData);
+        }
+        return events;
+    }
+
     static async #parseCustomTitle(customTitleValue: string | null, note: FNote, allowRelations = true): Promise<string[]> {
         if (customTitleValue) {
             const attributeName = customTitleValue.substring(1);

From 5a8d5c59f5010758228e50c6003c30029195b0eb Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Sat, 22 Feb 2025 10:57:40 +0200
Subject: [PATCH 62/62] feat(views/calendar): support workspaceCalendarRoot

---
 src/public/app/widgets/view_widgets/calendar_view.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/public/app/widgets/view_widgets/calendar_view.ts b/src/public/app/widgets/view_widgets/calendar_view.ts
index 87b94e3e8..11e6553ff 100644
--- a/src/public/app/widgets/view_widgets/calendar_view.ts
+++ b/src/public/app/widgets/view_widgets/calendar_view.ts
@@ -87,7 +87,7 @@ export default class CalendarView extends ViewMode {
     }
 
     async renderList(): Promise<JQuery<HTMLElement> | undefined> {
-        this.isCalendarRoot = this.parentNote.hasLabel("calendarRoot");
+        this.isCalendarRoot = this.parentNote.hasLabel("calendarRoot") || this.parentNote.hasLabel("workspaceCalendarRoot");
         const isEditable = !this.isCalendarRoot;
 
         const { Calendar } = await import("@fullcalendar/core");