Skip to content

An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作

:bug: Apply icon-only default database entry templates https://github.com/siyuan-note/siyuan/issues/19953

Danielc88eeac660b1
diff --git a/app/src/protyle/render/av/render.ts b/app/src/protyle/render/av/render.ts
index 91b16469d7..7618e0251a 100644
--- a/app/src/protyle/render/av/render.ts
+++ b/app/src/protyle/render/av/render.ts
@@ -136,7 +136,8 @@ export const genTabHeaderHTML = (data: IAV, showSearch: boolean, editable: boole
});
const defaultTemplate = data.newItemTemplates?.find(item => item.id === data.defaultTemplateID);
const defaultTemplateID = defaultTemplate && (defaultTemplate.targetType !== "detached" ||
- defaultTemplate.primaryKeyTemplate || Object.keys(defaultTemplate.fieldValues || {}).length) ? defaultTemplate.id : "";
+ defaultTemplate.icon || defaultTemplate.primaryKeyTemplate ||
+ Object.keys(defaultTemplate.fieldValues || {}).length) ? defaultTemplate.id : "";
const editingState = getAVHeaderEditingState(editable, includeEditingControls);
return `<div class="av__header" data-default-template-id="${defaultTemplateID}" data-current-view-id="${escapeAttr(data.viewID)}" data-view-count="${data.views.length}" data-view-ids="${data.views.map((view) => view.id).join(",")}" data-view-pages="${escapeAttr(serializeAVViewPageSizes(data.views))}">
<div class="fn__flex av__views${isMobile() ? " av__views--mobile" : ""}${showSearch ? " av__views--show av__views--search" : ""}">
diff --git a/app/src/protyle/render/av/renderHeader.test.ts b/app/src/protyle/render/av/renderHeader.test.ts
index c60c368e4f..2836abd5d9 100644
--- a/app/src/protyle/render/av/renderHeader.test.ts
+++ b/app/src/protyle/render/av/renderHeader.test.ts
@@ -1,5 +1,10 @@
import {before, describe, it} from "node:test";
import * as assert from "node:assert/strict";
+import {readFileSync} from "node:fs";
+import {join} from "node:path";
+import {runInNewContext} from "node:vm";
+import * as ts from "typescript";
+import * as escape from "../../../util/escape";
import {getAVHeaderEditingState} from "./headerEditing";
before(() => {
@@ -33,3 +38,57 @@ describe("database header editing controls", () => {
assert.equal(state.selectionHTML, "");
});
});
+
+describe("database default item templates", () => {
+ const compiled = ts.transpileModule(readFileSync(join(__dirname, "render.ts"), "utf8"), {
+ compilerOptions: {module: ts.ModuleKind.CommonJS, target: ts.ScriptTarget.ES2022},
+ }).outputText;
+ const renderHeader = (mobile: boolean, layout: TAVView, itemTemplate?: IAVNewItemTemplate,
+ defaultTemplateID = itemTemplate?.id || "") => {
+ const module = {exports: {}};
+ const mocks: Record<string, unknown> = {
+ "../../../util/escape": escape,
+ "../../../util/functions": {isMobile: () => mobile},
+ "./view": {getFieldsByData: (): IAVColumn[] => [], getViewIcon: () => "iconTable"},
+ "./viewVisibility": {
+ getAVVisibleViewIDs: () => ["view"], serializeAVViewPageSizes: () => "{}",
+ },
+ "./headerEditing": {getAVHeaderEditingState},
+ "./contextFilterState": {getContextFilterKeyID: () => ""},
+ };
+ runInNewContext(compiled, {
+ module, exports: module.exports, require: (id: string) => mocks[id] || {},
+ window: {siyuan: {languages: {_kernel: {}}, config: {editor: {spellcheck: false}}}},
+ });
+ const data = {
+ viewID: "view", views: [{id: "view", type: layout, name: "View"}],
+ view: {filters: [], sorts: []}, newItemTemplates: itemTemplate ? [itemTemplate] : [],
+ defaultTemplateID,
+ } as IAV;
+ const block = {classList: {contains: () => true}} as unknown as Element;
+ return (module.exports as typeof import("./render")).genTabHeaderHTML(data, false, true, block);
+ };
+
+ it("keeps icon-only default templates available to creation buttons on desktop and mobile", () => {
+ for (const mobile of [false, true]) {
+ for (const layout of ["table", "list", "gallery", "kanban", "calendar"] as TAVView[]) {
+ for (const icon of ["1f600", "/emojis/custom.svg"]) {
+ const html = renderHeader(mobile, layout, {
+ id: "icon-template", name: "Icon", targetType: "detached", icon,
+ });
+ assert.match(html, /data-default-template-id="icon-template"/);
+ assert.match(html, /data-type="av-add-more"/);
+ }
+ }
+ }
+ });
+
+ it("keeps blank creation available for empty, missing or unselected templates", () => {
+ const empty: IAVNewItemTemplate = {id: "empty", name: "Empty", targetType: "detached", icon: ""};
+ for (const mobile of [false, true]) {
+ assert.match(renderHeader(mobile, "table", empty), /data-default-template-id=""/);
+ assert.match(renderHeader(mobile, "table", undefined, "missing"), /data-default-template-id=""/);
+ assert.match(renderHeader(mobile, "table", {...empty, icon: "1f600"}, ""), /data-default-template-id=""/);
+ }
+ });
+});