gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-12-29 18:54:29 +01:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

chore(icon_packs): address requested changes

Browse Source
This commit is contained in:
Elian Doran 2025-12-28 12:30:26 +02:00
parent f849c4b315
commit 13b700e0e5
No known key found for this signature in database
3 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/client/src/widgets/note_icon.tsx
View File

@ -73,10 +73,10 @@ function NoteIconList({ note, dropdownRef }: {
async function loadIcons() {
// Filter by text and/or category.
let icons: IconData["icons"] = [
...glob.iconRegistry.sources.map(s => s.icons.map((i) => ({
...glob.iconRegistry.sources.flatMap(s => s.icons.map((i) => ({
...i,
iconPack: s.name,
}))).flat()
})))
];
const processedSearch = search?.trim()?.toLowerCase();
if (processedSearch || filterByPrefix !== null) {

29
apps/server/src/services/icon_packs.spec.ts
View File

@ -82,6 +82,21 @@ describe("Mapping attachments", () => {
expect(attachment?.mime).toStrictEqual("font/ttf");
});
it("ignores when no right attachment is found", () => {
const iconPackNote = buildNote({
type: "text",
attachments: [
{
role: "file",
title: "Font",
mime: "font/otf"
}
]
});
const attachment = determineBestFontAttachment(iconPackNote);
expect(attachment).toBeNull();
});
it("prefers woff2", () => {
const iconPackNote = buildNote({
type: "text",
@ -149,7 +164,7 @@ describe("CSS generation", () => {
});
});
describe("Icon registery", () => {
describe("Icon registry", () => {
it("generates the registry", () => {
const iconPack = processIconPack(buildNote({
title: "Boxicons v2",
@ -177,7 +192,7 @@ describe("Icon registery", () => {
});
});
it("ignores incorrect manifest", () => {
it("ignores manifest with wrong icon structure", () => {
const iconPack = processIconPack(buildNote({
type: "text",
content: JSON.stringify({
@ -195,4 +210,14 @@ describe("Icon registery", () => {
const registry = generateIconRegistry([ iconPack! ]);
expect(registry.sources).toHaveLength(0);
});
it("ignores manifest with corrupt JSON", () => {
const iconPack = processIconPack(buildNote({
type: "text",
content: "{ this is not valid JSON }",
attachments: [ defaultAttachment ],
"#iconPack": "bx"
}));
expect(iconPack).toBeFalsy();
});
});

6
apps/server/src/services/icon_packs.ts
View File

@ -119,6 +119,12 @@ export function processIconPack(iconPackNote: BNote): ProcessedIconPack | undefi
return;
}
// Ensure prefix is alphanumeric only, dashes and underscores.
if (!/^[a-zA-Z0-9-_]+$/.test(prefix)) {
log.error(`Icon pack has invalid 'iconPack' prefix (only alphanumeric characters, dashes and underscores are allowed): ${iconPackNote.title} (${iconPackNote.noteId})`);
return;
}
return {
prefix,
manifest,