Skip to content

Build your personal knowledge base with Trilium Notes

fix(icon packs): stop querying missing options on an uninitialized database

Elian Doranead71749a1f8
diff --git a/apps/server/src/routes/index.ts b/apps/server/src/routes/index.ts
index bb64f975d1..f6b73eb9d2 100644
--- a/apps/server/src/routes/index.ts
+++ b/apps/server/src/routes/index.ts
@@ -187,7 +187,7 @@ export function bootstrap(req: Request, res: Response) {
.map((p: iconPackService.ProcessedIconPack) => iconPackService.generateCss(p, p.builtin
? `${assetPath}/fonts/${p.fontAttachmentId}.${iconPackService.MIME_TO_EXTENSION_MAPPINGS[p.fontMime]}`
: `api/attachments/download/${p.fontAttachmentId}`)),
- task_states.generateTaskStateCss()
+ task_states.generateTaskStateCss(iconPacks)
]
.filter(Boolean)
.join("\n\n"),
diff --git a/packages/trilium-core/src/services/bootstrap_utils.ts b/packages/trilium-core/src/services/bootstrap_utils.ts
index 1f6f0726c4..e5e3d6c44c 100644
--- a/packages/trilium-core/src/services/bootstrap_utils.ts
+++ b/packages/trilium-core/src/services/bootstrap_utils.ts
@@ -82,7 +82,7 @@ export function getIconConfig(assetPath: string): Pick<BootstrapDefinition, "ico
...iconPacks.map(p => generateCss(p, p.builtin
? `${assetPath}/fonts/${p.fontAttachmentId}.${MIME_TO_EXTENSION_MAPPINGS[p.fontMime]}`
: `api/attachments/download/${p.fontAttachmentId}`)),
- generateTaskStateCss()
+ generateTaskStateCss(iconPacks)
]
.filter(Boolean)
.join("\n\n"),
diff --git a/packages/trilium-core/src/services/icon_packs.spec.ts b/packages/trilium-core/src/services/icon_packs.spec.ts
index dedc8d0eb9..44201643b7 100644
--- a/packages/trilium-core/src/services/icon_packs.spec.ts
+++ b/packages/trilium-core/src/services/icon_packs.spec.ts
@@ -1,7 +1,9 @@
-import { describe, expect, it } from "vitest";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import becca from "../becca/becca";
import { buildNote } from "../test/becca_easy_mocking";
-import { determineBestFontAttachment, generateCss, generateIconRegistry, generateIconTransformCss, IconPackManifest, processIconPack } from "./icon_packs";
+import { determineBestFontAttachment, generateCss, generateIconRegistry, generateIconTransformCss, getIconPacks, IconPackManifest, processIconPack } from "./icon_packs";
+import search from "./search/services/search";
const manifest: IconPackManifest = {
icons: {
@@ -343,3 +345,23 @@ describe("Generating CSS for icon transforms", () => {
expect(css).toContain(".bx-flip-vertical { transform: scaleY(-1); }");
});
});
+
+describe("Listing icon packs", () => {
+ afterEach(() => {
+ vi.restoreAllMocks();
+ });
+
+ it("returns only the built-in pack, without searching, while becca is not loaded", () => {
+ const wasLoaded = becca.loaded;
+ const searchNotes = vi.spyOn(search, "searchNotes");
+ becca.loaded = false;
+ try {
+ const iconPacks = getIconPacks();
+ expect(iconPacks.map(p => p.prefix)).toStrictEqual([ "bx" ]);
+ expect(iconPacks[0].builtin).toBe(true);
+ expect(searchNotes).not.toHaveBeenCalled();
+ } finally {
+ becca.loaded = wasLoaded;
+ }
+ });
+});
diff --git a/packages/trilium-core/src/services/icon_packs.ts b/packages/trilium-core/src/services/icon_packs.ts
index 3f995dcc96..aeff8c1313 100644
--- a/packages/trilium-core/src/services/icon_packs.ts
+++ b/packages/trilium-core/src/services/icon_packs.ts
@@ -1,5 +1,6 @@
import { iconFontFaceOverrides, type IconFontMetrics, IconRegistry } from "@triliumnext/commons";
+import becca from "../becca/becca";
import type BAttachment from "../becca/entities/battachment";
import type BNote from "../becca/entities/bnote";
import boxiconsManifest from "./icon_pack_boxicons-v2.json" with { type: "json" };
@@ -70,6 +71,11 @@ export function getIconPacks() {
builtin: true
};
+ // Custom packs are notes, which a search cannot find before becca is loaded (e.g. during setup).
+ if (!becca.loaded) {
+ return [ defaultIconPack ];
+ }
+
const usedPrefixes = new Set<string>([defaultIconPack.prefix]);
const customIconPacks = search.searchNotes("#iconPack")
.filter(note => !note.isProtected)
diff --git a/packages/trilium-core/src/services/task_states.ts b/packages/trilium-core/src/services/task_states.ts
index 2a992d9968..a0eedc867c 100644
--- a/packages/trilium-core/src/services/task_states.ts
+++ b/packages/trilium-core/src/services/task_states.ts
@@ -5,7 +5,7 @@ import { t } from "i18next";
import becca from "../becca/becca.js";
import BAttribute from "../becca/entities/battribute.js";
import type BNote from "../becca/entities/bnote.js";
-import { getIconPacks } from "./icon_packs.js";
+import { getIconPacks, type ProcessedIconPack } from "./icon_packs.js";
import noteService from "./notes.js";
import { decodeCssEscapes, escapeCssString } from "./utils/index.js";
@@ -129,13 +129,13 @@ const UNSAFE_CSS_VALUE_PATTERN = /["'<>;{}\\]|[\u0000-\u001F\u007F]/;
* using the icon-pack manifests — the same data that powers the icon picker.
* Works for any installed pack without a browser or font-CSS parsing.
*/
-function resolveIconGlyph(iconClass: string): {glyph: string; fontFamily: string} | null {
+function resolveIconGlyph(iconClass: string, iconPacks: ProcessedIconPack[]): {glyph: string; fontFamily: string} | null {
const parts = iconClass.trim().split(/\s+/);
if (parts.length < 2) {
return null;
}
const [prefix, name] = parts;
- for (const pack of getIconPacks()) {
+ for (const pack of iconPacks) {
if (pack.prefix !== prefix) {
continue;
}
@@ -169,15 +169,16 @@ function computeHue(color: string): number | undefined {
/**
* Generates the CSS that renders each task state's icon on its `data-trilium-task-state`
* checkbox. Resolution is a plain manifest lookup, so this works server-side and
- * the same stylesheet can be served to both the app and shared notes.
+ * the same stylesheet can be served to both the app and shared notes. A caller that has
+ * already loaded the packs passes them as `iconPacks`.
*/
-export function generateTaskStateCss(): string {
+export function generateTaskStateCss(iconPacks: ProcessedIconPack[] = getIconPacks()): string {
const rules: string[] = [];
for (const state of getTaskStates()) {
if (isAnchorState(state.name) || !state.icon) {
continue;
}
- const resolved = resolveIconGlyph(state.icon);
+ const resolved = resolveIconGlyph(state.icon, iconPacks);
if (!resolved) {
continue;
}