An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作
TypeScript agentic-aiai-agentknowledge-baselocal-firstmarkdownmcpmindmapnote-takingself-hostedsiyuanworkspace
:bug: Restore map slash entry and improve location setup https://github.com/siyuan-note/siyuan/issues/20129
Danielf50eabdbc78e
diff --git a/app/appearance/langs/ar.json b/app/appearance/langs/ar.jsonindex 5cca57dbb0..733b3c5271 100644--- a/app/appearance/langs/ar.json+++ b/app/appearance/langs/ar.json@@ -1,4 +1,5 @@{+ "databaseMapView": "عرض الخريطة لقاعدة البيانات","exportBlockRefMode": "مراجع الكتل وروابط الكتل","configGroupOCREngine": "محرّك التعرّف","configGroupSignInTokens": "تسجيل الدخول والرموز",diff --git a/app/appearance/langs/de.json b/app/appearance/langs/de.jsonindex 4936e3ab32..cdb1469e08 100644--- a/app/appearance/langs/de.json+++ b/app/appearance/langs/de.json@@ -1,4 +1,5 @@{+ "databaseMapView": "Datenbank-Kartenansicht","exportBlockRefMode": "Blockreferenzen und Blocklinks","configGroupOCREngine": "Erkennungs-Engine","configGroupSignInTokens": "Anmeldung und Token",diff --git a/app/appearance/langs/en.json b/app/appearance/langs/en.jsonindex 4b7a2e2dd6..11c77c525a 100644--- a/app/appearance/langs/en.json+++ b/app/appearance/langs/en.json@@ -1,4 +1,5 @@{+ "databaseMapView": "Database map view","exportBlockRefMode": "Block refs and block links","configGroupOCREngine": "Recognition engine","configGroupSignInTokens": "Login and tokens",diff --git a/app/appearance/langs/es.json b/app/appearance/langs/es.jsonindex 97ae865492..45b139b878 100644--- a/app/appearance/langs/es.json+++ b/app/appearance/langs/es.json@@ -1,4 +1,5 @@{+ "databaseMapView": "Vista de mapa de la base de datos","exportBlockRefMode": "Referencias y enlaces de bloque","configGroupOCREngine": "Motor de reconocimiento","configGroupSignInTokens": "Inicio de sesión y tokens",diff --git a/app/appearance/langs/fr.json b/app/appearance/langs/fr.jsonindex a6487cdf85..d483aaa29e 100644--- a/app/appearance/langs/fr.json+++ b/app/appearance/langs/fr.json@@ -1,4 +1,5 @@{+ "databaseMapView": "Vue carte de la base de données","exportBlockRefMode": "Références et liens de blocs","configGroupOCREngine": "Moteur de reconnaissance","configGroupSignInTokens": "Connexion et jetons",diff --git a/app/appearance/langs/he.json b/app/appearance/langs/he.jsonindex 8a9ab722b1..5a04979901 100644--- a/app/appearance/langs/he.json+++ b/app/appearance/langs/he.json@@ -1,4 +1,5 @@{+ "databaseMapView": "תצוגת מפה של מסד הנתונים","exportBlockRefMode": "הפניות לבלוקים וקישורי בלוקים","configGroupOCREngine": "מנוע זיהוי","configGroupSignInTokens": "כניסה ואסימונים",diff --git a/app/appearance/langs/hi.json b/app/appearance/langs/hi.jsonindex 7de217054f..71b3e6d331 100644--- a/app/appearance/langs/hi.json+++ b/app/appearance/langs/hi.json@@ -1,4 +1,5 @@{+ "databaseMapView": "डेटाबेस मानचित्र दृश्य","exportBlockRefMode": "ब्लॉक रेफ़ और ब्लॉक लिंक","configGroupOCREngine": "पहचान इंजन","configGroupSignInTokens": "लॉगिन और टोकन",diff --git a/app/appearance/langs/id.json b/app/appearance/langs/id.jsonindex e13673ea95..4106b19df6 100644--- a/app/appearance/langs/id.json+++ b/app/appearance/langs/id.json@@ -1,4 +1,5 @@{+ "databaseMapView": "Tampilan peta basis data","exportBlockRefMode": "Referensi blok dan tautan blok","configGroupOCREngine": "Mesin pengenalan","configGroupSignInTokens": "Login dan token",diff --git a/app/appearance/langs/it.json b/app/appearance/langs/it.jsonindex a31741a2fc..9fb990ad4a 100644--- a/app/appearance/langs/it.json+++ b/app/appearance/langs/it.json@@ -1,4 +1,5 @@{+ "databaseMapView": "Vista mappa del database","exportBlockRefMode": "Riferimenti e link ai blocchi","configGroupOCREngine": "Motore di riconoscimento","configGroupSignInTokens": "Accesso e token",diff --git a/app/appearance/langs/ja.json b/app/appearance/langs/ja.jsonindex 4741cc96db..6a2d4a4453 100644--- a/app/appearance/langs/ja.json+++ b/app/appearance/langs/ja.json@@ -1,4 +1,5 @@{+ "databaseMapView": "データベースの地図ビュー","exportBlockRefMode": "ブロック参照とブロックリンク","configGroupOCREngine": "認識エンジン","configGroupSignInTokens": "ログインとトークン",diff --git a/app/appearance/langs/ko.json b/app/appearance/langs/ko.jsonindex 02aad377db..212fd18074 100644--- a/app/appearance/langs/ko.json+++ b/app/appearance/langs/ko.json@@ -1,4 +1,5 @@{+ "databaseMapView": "데이터베이스 지도 보기","exportBlockRefMode": "블록 참조와 블록 링크","configGroupOCREngine": "인식 엔진","configGroupSignInTokens": "로그인과 토큰",diff --git a/app/appearance/langs/nl.json b/app/appearance/langs/nl.jsonindex 413d8eb086..8d1ad72775 100644--- a/app/appearance/langs/nl.json+++ b/app/appearance/langs/nl.json@@ -1,4 +1,5 @@{+ "databaseMapView": "Kaartweergave van database","exportBlockRefMode": "Blokreferenties en bloklinks","configGroupOCREngine": "Herkenning-engine","configGroupSignInTokens": "Inloggen en tokens",diff --git a/app/appearance/langs/pl.json b/app/appearance/langs/pl.jsonindex a514677f53..3093838d96 100644--- a/app/appearance/langs/pl.json+++ b/app/appearance/langs/pl.json@@ -1,4 +1,5 @@{+ "databaseMapView": "Widok mapy bazy danych","exportBlockRefMode": "Odwołania i łącza do bloków","configGroupOCREngine": "Silnik rozpoznawania","configGroupSignInTokens": "Logowanie i tokeny",diff --git a/app/appearance/langs/pt-BR.json b/app/appearance/langs/pt-BR.jsonindex 05797cb5d4..35685c3d97 100644--- a/app/appearance/langs/pt-BR.json+++ b/app/appearance/langs/pt-BR.json@@ -1,4 +1,5 @@{+ "databaseMapView": "Visualização de mapa do banco de dados","exportBlockRefMode": "Referências e links de bloco","configGroupOCREngine": "Mecanismo de reconhecimento","configGroupSignInTokens": "Login e tokens",diff --git a/app/appearance/langs/ru.json b/app/appearance/langs/ru.jsonindex a06d27ce16..2113e3ee14 100644--- a/app/appearance/langs/ru.json+++ b/app/appearance/langs/ru.json@@ -1,4 +1,5 @@{+ "databaseMapView": "Представление базы данных на карте","exportBlockRefMode": "Ссылки на блоки и гиперссылки блоков","configGroupOCREngine": "Движок распознавания","configGroupSignInTokens": "Вход и токены",diff --git a/app/appearance/langs/sk.json b/app/appearance/langs/sk.jsonindex ec4e26548e..ce2ad449df 100644--- a/app/appearance/langs/sk.json+++ b/app/appearance/langs/sk.json@@ -1,4 +1,5 @@{+ "databaseMapView": "Mapové zobrazenie databázy","exportBlockRefMode": "Odkazy na bloky a prepojenia blokov","configGroupOCREngine": "Mechanizmus rozpoznávania","configGroupSignInTokens": "Prihlásenie a tokeny",diff --git a/app/appearance/langs/sr.json b/app/appearance/langs/sr.jsonindex 06dc723a09..e71113394c 100644--- a/app/appearance/langs/sr.json+++ b/app/appearance/langs/sr.json@@ -1,4 +1,5 @@{+ "databaseMapView": "Приказ базе података на мапи","exportBlockRefMode": "Reference blokova i veze blokova","configGroupOCREngine": "Mehanizam prepoznavanja","configGroupSignInTokens": "Prijava i tokeni",diff --git a/app/appearance/langs/th.json b/app/appearance/langs/th.jsonindex 914dfefe9b..b13d06c60e 100644--- a/app/appearance/langs/th.json+++ b/app/appearance/langs/th.json@@ -1,4 +1,5 @@{+ "databaseMapView": "มุมมองแผนที่ฐานข้อมูล","exportBlockRefMode": "การอ้างอิงบล็อกและลิงก์บล็อก","configGroupOCREngine": "กลไกการรู้จำ","configGroupSignInTokens": "เข้าสู่ระบบและโทเค็น",diff --git a/app/appearance/langs/tr.json b/app/appearance/langs/tr.jsonindex 39f34fa7e8..bedb6cd327 100644--- a/app/appearance/langs/tr.json+++ b/app/appearance/langs/tr.json@@ -1,4 +1,5 @@{+ "databaseMapView": "Veritabanı harita görünümü","exportBlockRefMode": "Blok başvuruları ve blok bağlantıları","configGroupOCREngine": "Tanıma motoru","configGroupSignInTokens": "Giriş ve tokenlar",diff --git a/app/appearance/langs/uk.json b/app/appearance/langs/uk.jsonindex 792424474b..67b79fba55 100644--- a/app/appearance/langs/uk.json+++ b/app/appearance/langs/uk.json@@ -1,4 +1,5 @@{+ "databaseMapView": "Подання бази даних на мапі","exportBlockRefMode": "Посилання на блоки та гіперпосилання блоків","configGroupOCREngine": "Рушій розпізнавання","configGroupSignInTokens": "Вхід і токени",diff --git a/app/appearance/langs/zh-CN.json b/app/appearance/langs/zh-CN.jsonindex 847f61dc11..da921a6b8b 100644--- a/app/appearance/langs/zh-CN.json+++ b/app/appearance/langs/zh-CN.json@@ -1,4 +1,5 @@{+ "databaseMapView": "数据库 地图视图","exportBlockRefMode": "块引用与块超链接","configGroupOCREngine": "识别引擎","configGroupSignInTokens": "登录与令牌",diff --git a/app/appearance/langs/zh-TW.json b/app/appearance/langs/zh-TW.jsonindex 4f6df39138..c90b5256ef 100644--- a/app/appearance/langs/zh-TW.json+++ b/app/appearance/langs/zh-TW.json@@ -1,4 +1,5 @@{+ "databaseMapView": "資料庫 地圖視圖","exportBlockRefMode": "區塊引用與區塊超鏈接","configGroupOCREngine": "辨識引擎","configGroupSignInTokens": "登入與權杖",diff --git a/app/src/assets/scss/business/_av.scss b/app/src/assets/scss/business/_av.scssindex 0e06310a30..242cb4b942 100644--- a/app/src/assets/scss/business/_av.scss+++ b/app/src/assets/scss/business/_av.scss@@ -23,6 +23,64 @@height: clamp(240px, 50vh, 480px);}+.av__map-empty {+ font-size: var(--b3-font-size);+ min-height: 240px;+ padding: 32px 16px;+ border: 1px solid var(--b3-border-color);+ border-radius: var(--b3-border-radius);+ display: flex;+ flex-direction: column;+ align-items: center;+ justify-content: center;+ color: var(--b3-theme-on-background);++ > p {+ margin: 12px 0 24px;+ text-align: center;+ }++ > svg {+ width: 32px;+ height: 32px;+ color: var(--b3-theme-on-surface);+ }+}++.av__map-setup,+.av__map-create-fields {+ width: 360px;+ max-width: 100%;+}++.av__map-setting {+ display: grid;+ grid-template-columns: minmax(0, 1fr) minmax(0, 2fr);+ align-items: center;+ gap: 16px;++ > span,+ .b3-select {+ min-width: 0;+ }++ .b3-select {+ width: 100%;+ }+}++.av__map-create-fields {+ display: flex;+ margin-top: 24px;+ padding-top: 20px;+ border-top: 1px solid var(--b3-border-color);++ .b3-button {+ flex: 1;+ white-space: normal;+ }+}+.av__lunar-editor {width: 340px;max-width: 100%;diff --git a/app/src/config/entryVisibility/catalog.test.ts b/app/src/config/entryVisibility/catalog.test.tsindex 37c5abf199..b4c35cb3ce 100644--- a/app/src/config/entryVisibility/catalog.test.ts+++ b/app/src/config/entryVisibility/catalog.test.ts@@ -154,6 +154,7 @@ const slashMenuBuiltinOrder = ["databaseGalleryView","databaseKanbanView","databaseCalendarView",+ "databaseMapView","separator_2","emoji","link",@@ -572,7 +573,7 @@ test("slash menu catalog follows the built-in hint order", () => {assert.deepEqual(section?.children.map((item) => item.key), ["menu"]);const children = getEntryCatalogChildren(SLASH_MENU_ROOT_PATH);assert.deepEqual(children.map((item) => item.key), ["frequent", ...slashMenuBuiltinOrder]);- assert.equal(children.filter((item) => item.type === "entry").length, 69);+ assert.equal(children.filter((item) => item.type === "entry").length, 70);assert.equal(children.filter((item) => item.type === "separator").length, 5);assert.equal(children.filter(item => item.key !== "frequent").every((item) => item.simple), true);});diff --git a/app/src/config/entryVisibility/catalog.ts b/app/src/config/entryVisibility/catalog.tsindex eaeee056d3..cd71ce4bb0 100644--- a/app/src/config/entryVisibility/catalog.ts+++ b/app/src/config/entryVisibility/catalog.ts@@ -581,6 +581,7 @@ const slashMenuBuiltinChildren = [node("databaseGalleryView", lang("databaseGalleryView")),node("databaseKanbanView", lang("databaseKanbanView")),node("databaseCalendarView", lang("databaseCalendarView")),+ node("databaseMapView", lang("databaseMapView")),separator("separator_2"),node("emoji", lang("emoji")),node("link", lang("link")),diff --git a/app/src/config/entryVisibility/order.test.ts b/app/src/config/entryVisibility/order.test.tsindex 74ff28ac77..a9a8380a00 100644--- a/app/src/config/entryVisibility/order.test.ts+++ b/app/src/config/entryVisibility/order.test.ts@@ -83,6 +83,19 @@ test("database calendar view merges into saved slash orders and preserves pluginassert.equal(entries.find(item => item.key === "databaseCalendarView").simple, true);});+test("database map view merges into saved slash orders without changing existing entries", () => {+ const entries = getEntryCatalogChildren("editor.slash.menu");+ const defaults = entries.map(item => item.key);+ const saved = defaults.filter(key => key !== "databaseMapView");+ saved.splice(1, 0, "plugin:example:item");+ const merged = mergeEntryOrderPreservingUnknown(defaults, saved);+ assert.deepEqual(merged.filter(key => key !== "databaseMapView"), saved);+ assert.equal(merged[merged.indexOf("databaseCalendarView") + 1], "databaseMapView");+ const separators = new Set(entries.filter(item => item.type === "separator").map(item => item.key));+ assert.deepEqual(resolveEntryOrder([...defaults, "plugin:example:item"], merged, separators), merged);+ assert.equal(entries.find(item => item.key === "databaseMapView").simple, true);+});+test("database list view merges into saved slash orders and preserves plugin slots", () => {const entries = getEntryCatalogChildren("editor.slash.menu");const defaults = entries.map(item => item.key);diff --git a/app/src/protyle/hint/extend.ts b/app/src/protyle/hint/extend.tsindex 34f18b32be..dc10f6c86b 100644--- a/app/src/protyle/hint/extend.ts+++ b/app/src/protyle/hint/extend.ts@@ -277,6 +277,11 @@ export const getBuiltinSlashMenuItems = (protyle: IProtyle): IHintData[] => {id: "databaseCalendarView",value: '<div data-type="NodeAttributeView" data-av-type="calendar"></div>',html: `<div class="b3-list-item__first"><svg class="b3-list-item__graphic"><use xlink:href="#iconCalendar"></use></svg><span class="b3-list-item__text">${window.siyuan.languages.databaseCalendarView}</span></div>`,+ }, {+ filter: [window.siyuan.languages.databaseMapView, "database map view", "地图", "数据库地图视图", "ditu", "shujukuditushitu", "sjkdts"],+ id: "databaseMapView",+ value: '<div data-type="NodeAttributeView" data-av-type="map"></div>',+ html: `<div class="b3-list-item__first"><svg class="b3-list-item__graphic"><use xlink:href="#iconGlobe"></use></svg><span class="b3-list-item__text">${window.siyuan.languages.databaseMapView}</span></div>`,}, {value: "",id: "separator_2",diff --git a/app/src/protyle/hint/mapSlashEntry.test.ts b/app/src/protyle/hint/mapSlashEntry.test.tsnew file mode 100644index 0000000000..2a4e14da0b--- /dev/null+++ b/app/src/protyle/hint/mapSlashEntry.test.ts@@ -0,0 +1,36 @@+import * as assert from "node:assert/strict";+import {readFileSync} from "node:fs";+import {join} from "node:path";+import test from "node:test";+import {runInNewContext} from "node:vm";+import * as ts from "typescript";+import {resolveSlashMenuItems, TSlashMenuItem} from "./slashMenu";++test("the map slash entry is searchable and creates a map database block", () => {+ const source = ts.createSourceFile("extend.ts", readFileSync(join(__dirname, "extend.ts"), "utf8"),+ ts.ScriptTarget.Latest, true);+ let declaration: ts.ObjectLiteralExpression;+ const visit = (node: ts.Node) => {+ if (ts.isObjectLiteralExpression(node) && node.properties.some(property =>+ ts.isPropertyAssignment(property) && property.name.getText(source) === "id" &&+ ts.isStringLiteral(property.initializer) && property.initializer.text === "databaseMapView")) {+ declaration = node;+ }+ ts.forEachChild(node, visit);+ };+ visit(source);+ assert.ok(declaration);+ const item: TSlashMenuItem = runInNewContext(ts.transpileModule(`(${declaration.getText(source)})`, {+ compilerOptions: {target: ts.ScriptTarget.ES2020},+ }).outputText, {window: {siyuan: {languages: {databaseMapView: "Database map view"}}}});+ item.entryKey = item.id;+ const options = {enabled: true, hideConfiguredCreate: false, order: [item.id], visible: () => true};+ for (const key of ["data", "map", "地图", "ditu"]) {+ assert.equal(resolveSlashMenuItems([item], {...options, key})[0], item);+ }+ assert.equal(item.value, '<div data-type="NodeAttributeView" data-av-type="map"></div>');+ assert.match(item.html, /#iconGlobe/);+ assert.match(item.html, /Database map view/);+ assert.equal(resolveSlashMenuItems([item], {...options, key: "map", visible: () => false}).length, 0);+ assert.equal(resolveSlashMenuItems([item], {...options, key: "map", lite: true}).length, 0);+});diff --git a/app/src/protyle/hint/slashMenu.test.ts b/app/src/protyle/hint/slashMenu.test.tsindex 26acf90b5b..4591fefd51 100644--- a/app/src/protyle/hint/slashMenu.test.ts+++ b/app/src/protyle/hint/slashMenu.test.ts@@ -84,7 +84,7 @@ test("slash menu separator normalization removes leading, trailing, and consecut});test("lite slash menu hides document-dependent entries and keeps local editing entries", () => {- const unavailable = ["database", "databaseTableView", "databaseListView", "databaseCalendarView", "databaseKanbanView", "databaseGalleryView",+ const unavailable = ["database", "databaseTableView", "databaseListView", "databaseCalendarView", "databaseMapView", "databaseKanbanView", "databaseGalleryView","newFileRef", "newSubDocRef", "template", "blockEmbed", "aiWriting", "widget", "unknown"];const available = ["ref", "assets", "heading1", "table", "bold", "mermaid", "horizontalSuperBlock", "verticalSuperBlock"];const items = [...unavailable, ...available].map((id) => entry(id));diff --git a/app/src/protyle/render/av/map/render.test.ts b/app/src/protyle/render/av/map/render.test.tsindex 0fc32eb5f4..def6d0288f 100644--- a/app/src/protyle/render/av/map/render.test.ts+++ b/app/src/protyle/render/av/map/render.test.ts@@ -13,6 +13,8 @@ class ElementStub {innerHTML = "";textContent = "";isConnected = true;+ disabled = false;+ value = "";readonly children = new Map<string, ElementStub>();readonly events = new Map<string, () => void>();readonly classes = new Set<string>();@@ -34,7 +36,7 @@ const setup = (options: {published?: boolean; desktop?: boolean; hostSupported?:const records = new ElementStub();let root: ElementStub;let lifecycle: {root: ElementStub; destroy: () => void};- const block = {dataset: {avId: "database", nodeId: "carrier"}, querySelector: (selector: string) =>+ const block = {dataset: {avId: "database", nodeId: "carrier"}, removeAttribute() {}, querySelector: (selector: string) =>selector.endsWith(".av__map") ? root : records};Object.assign(records, {before: (element: ElementStub) => { root = element; roots.push(root); }});const languages = new Proxy<Record<string, string>>({mapPageScope: "${shown}/${total}",@@ -51,8 +53,13 @@ const setup = (options: {published?: boolean; desktop?: boolean; hostSupported?:destroyed: boolean; fitted: boolean}> = [];const opened: unknown[] = [];const calls: string[] = [];+ const transactions: Array<{perform: IOperation[]; undo: IOperation[]; callback: () => void}> = [];+ let settleTransaction: () => void;+ let transactionPromise = Promise.resolve();+ let refreshes = 0;const data = {id: "database", name: "Database", views: [], viewID: "map-view", viewType: "map", view: {- columns: [{id: "location", type: "location", hidden: true}], rowCount: 12,+ columns: [{id: "location", name: "<Location>", type: "location", hidden: true},+ {id: "text", name: "Text field", type: "text"}], rowCount: 12,map: {locationKeyID: "location"},rows: [{id: "row", cells: [{id: "location-value", value: {type: "location", keyID: "location",location: {latitude: 0, longitude: 0, name: "Private name", originalInput: "Private input"}}},@@ -71,6 +78,13 @@ const setup = (options: {published?: boolean; desktop?: boolean; hostSupported?:return () => lifecycle === next && next.root.isConnected;}},"../../../../util/escape": escape,+ "../../../wysiwyg/transaction": {transaction: (_protyle: IProtyle, perform: IOperation[], undo: IOperation[],+ options: {callback: () => void}) => {+ transactions.push({perform, undo, callback: options.callback});+ transactionPromise = new Promise(resolve => { settleTransaction = resolve; });+ }},+ "../../../util/transactionQueue": {waitForPendingTransactions: () => transactionPromise},+ "../render": {avRender: () => { refreshes++; }},"../../../../util/fetch": {fetchSyncPost: async (url: string, payload: unknown) => {assert.equal(JSON.stringify(payload), "{}");calls.push(url);@@ -101,17 +115,32 @@ const setup = (options: {published?: boolean; desktop?: boolean; hostSupported?:compilerOptions: {module: ModuleKind.CommonJS, target: ScriptTarget.ES2022},}).outputText, {exports: openRecord, require: (id: string) => modules[id] || {}, window: {siyuan: {languages}}});modules["./openRecord"] = openRecord;+ const settings = {} as typeof import("./settings");+ const context = {siyuan: {languages, isPublish: options.published === true}};+ runInNewContext(transpileModule(readFileSync("src/protyle/render/av/map/settings.ts", "utf8"), {+ compilerOptions: {module: ModuleKind.CommonJS, target: ScriptTarget.ES2022},+ }).outputText, {exports: settings, require: (id: string) => modules[id] || {}, window: context});+ modules["./settings"] = settings;runInNewContext(transpileModule(readFileSync("src/protyle/render/av/map/render.ts", "utf8"), {compilerOptions: {module: ModuleKind.CommonJS, target: ScriptTarget.ES2022},}).outputText, {exports: methods, require: (id: string) => modules[id] || {},- window: {siyuan: {languages, isPublish: options.published === true}, location: {protocol: "https:"},+ window: {...context, location: {protocol: "https:"},addEventListener: (type: string, callback: () => void) => events.set(type, callback),removeEventListener: (type: string) => events.delete(type)},navigator: {userAgent: "Mozilla/5.0", onLine: options.online !== false},document: {createElement: () => new ElementStub(), documentElement: {getAttribute: () => "light"}},- MutationObserver: Observer, ResizeObserver: Observer});- return {data, protyle, calls, hosts, roots, records, opened, events, observers, destroyMap,+ MutationObserver: Observer, ResizeObserver: Observer, Lute: {NewNodeID: () => "new-location"}});+ return {data, protyle, calls, hosts, roots, records, opened, events, observers, destroyMap, transactions, context,+ refreshes: () => refreshes,+ completeTransaction: async (success = true) => {+ if (success) transactions[transactions.length - 1].callback();+ settleTransaction();+ await transactionPromise;+ await new Promise(resolve => setImmediate(resolve));+ },render: () => methods.renderMap(block as unknown as HTMLElement, protyle, data),+ setupHTML: () => root.querySelector(".av__map-status").innerHTML,+ control: (selector: string) => root.querySelector(selector),status: () => root.querySelector(".av__map-status").textContent};};@@ -139,6 +168,146 @@ test("missing field, unavailable host, offline and unsupported projection maps nassert.equal(incompatible.status(), "mapNoMarkers");});+test("unconfigured, deleted and changed-type map fields show a repairable location setup", async () => {+ for (const locationKeyID of ["", "deleted", "text"]) {+ const scenario = setup();+ (scenario.data.view as IAVTable).map.locationKeyID = locationKeyID;+ await scenario.render();+ const html = scenario.setupHTML();+ assert.match(html, /class="av__map-empty"/);+ assert.match(html, /#iconGlobe/);+ assert.match(html, locationKeyID ? /mapMissingLocationField/ : /mapSelectLocationField/);+ assert.match(html, /<label class="av__map-setting"><span>mapLocationField<\/span>/);+ assert.match(html, /<select class="b3-select" data-map-location-field aria-label="mapLocationField">/);+ assert.match(html, /<option value="location"><Location><\/option>/);+ assert.match(html, /class="b3-button b3-button--outline" data-map-create-field/);+ assert.doesNotMatch(html, /value="text"|<Location>|provider|CRS|serviceID/);+ assert.deepEqual(scenario.calls, []);+ }+ const empty = setup();+ (empty.data.view as IAVTable).columns = [];+ await empty.render();+ assert.match(empty.setupHTML(), /data-map-create-field/);+});++test("selecting an existing location field submits one undoable transaction and refreshes after success", async () => {+ const scenario = setup();+ const view = scenario.data.view as IAVTable;+ view.map.locationKeyID = "deleted";+ const before = JSON.stringify(view);+ await scenario.render();+ const select = scenario.control("[data-map-location-field]");+ select.value = "text";+ select.events.get("change")();+ select.value = "";+ select.events.get("change")();+ assert.equal(scenario.transactions.length, 0);+ select.value = "location";+ select.events.get("change")();+ select.events.get("change")();+ scenario.control("[data-map-create-field]").events.get("click")();+ assert.equal(scenario.transactions.length, 1);+ assert.equal(select.disabled, true);+ assert.equal(scenario.control("[data-map-create-field]").disabled, true);+ const {perform, undo} = scenario.transactions[0];+ assert.equal(JSON.stringify(perform), JSON.stringify([{avID: "database", blockID: "carrier", viewID: "map-view",+ action: "setAttrViewMap", data: {locationKeyID: "location"}}]));+ assert.equal(JSON.stringify(undo[0].data), JSON.stringify({locationKeyID: "deleted"}));+ assert.equal(JSON.stringify(view), before);+ assert.equal(scenario.refreshes(), 0);+ await scenario.completeTransaction();+ assert.equal(scenario.refreshes(), 1);+ select.events.get("change")();+ assert.equal(scenario.transactions.length, 1);+});++test("adding a location field atomically creates, selects and hides it with an undo restoring the previous field", async () => {+ const scenario = setup();+ (scenario.data.view as IAVTable).map.locationKeyID = "";+ await scenario.render();+ const create = scenario.control("[data-map-create-field]");+ create.events.get("click")();+ create.events.get("click")();+ assert.equal(scenario.transactions.length, 1);+ const {perform, undo} = scenario.transactions[0];+ assert.equal(JSON.stringify(perform), JSON.stringify([+ {avID: "database", blockID: "carrier", viewID: "map-view", action: "addAttrViewCol",+ id: "new-location", type: "location", name: "location"},+ {avID: "database", blockID: "carrier", viewID: "map-view", action: "setAttrViewMap", data: {locationKeyID: "new-location"}},+ {avID: "database", blockID: "carrier", viewID: "map-view", action: "setAttrViewColHidden",+ id: "new-location", viewIDs: ["map-view"], data: true},+ ]));+ assert.equal(JSON.stringify(undo), JSON.stringify([+ {avID: "database", blockID: "carrier", viewID: "map-view", action: "setAttrViewMap", data: {locationKeyID: ""}},+ {avID: "database", blockID: "carrier", viewID: "map-view", action: "removeAttrViewCol", id: "new-location"},+ ]));+ await scenario.completeTransaction();+ assert.equal(scenario.refreshes(), 1);+});++test("map setup hides write controls for readonly, published and history modes", async () => {+ for (const mode of ["disabled", "published", "created", "snapshot"]) {+ const scenario = setup({published: mode === "published"});+ scenario.protyle.disabled = mode === "disabled";+ if (["created", "snapshot"].includes(mode)) scenario.protyle.options.history = {[mode]: "version"};+ (scenario.data.view as IAVTable).map.locationKeyID = "";+ await scenario.render();+ assert.doesNotMatch(scenario.setupHTML(), /data-map-location-field|data-map-create-field/);+ if (mode === "disabled") assert.match(scenario.setupHTML(), /av__map-empty/);+ assert.deepEqual(scenario.transactions, []);+ }+});++test("stale setup controls and permissions changed after render cannot submit a transaction", async () => {+ for (const mode of ["disabled", "published", "created", "snapshot", "destroyed", "removed", "rerendered"]) {+ const scenario = setup();+ (scenario.data.view as IAVTable).map.locationKeyID = "";+ await scenario.render();+ const select = scenario.control("[data-map-location-field]");+ const create = scenario.control("[data-map-create-field]");+ if (mode === "disabled") scenario.protyle.disabled = true;+ if (mode === "published") scenario.context.siyuan.isPublish = true;+ if (["created", "snapshot"].includes(mode)) scenario.protyle.options.history = {[mode]: "version"};+ if (mode === "destroyed") scenario.destroyMap();+ if (mode === "removed") scenario.roots[0].remove();+ if (mode === "rerendered") await scenario.render();+ select.value = "location";+ select.events.get("change")();+ create.events.get("click")();+ assert.equal(scenario.transactions.length, 0, mode);+ }+});++test("failed setup transactions reenable controls, while late completion cannot refresh a destroyed map", async () => {+ const scenario = setup();+ (scenario.data.view as IAVTable).map.locationKeyID = "";+ await scenario.render();+ const create = scenario.control("[data-map-create-field]");+ create.events.get("click")();+ assert.equal(create.disabled, true);+ await scenario.completeTransaction(false);+ assert.equal(create.disabled, false);+ assert.equal(scenario.refreshes(), 0);+ create.events.get("click")();+ assert.equal(scenario.transactions.length, 2);+ scenario.destroyMap();+ await scenario.completeTransaction();+ assert.equal(scenario.refreshes(), 0);+});++test("late setup transaction completions cannot refresh a removed or superseded view", async () => {+ for (const mode of ["removed", "rerendered"]) {+ const scenario = setup();+ (scenario.data.view as IAVTable).map.locationKeyID = "";+ await scenario.render();+ scenario.control("[data-map-create-field]").events.get("click")();+ if (mode === "removed") scenario.roots[0].remove();+ else await scenario.render();+ await scenario.completeTransaction();+ assert.equal(scenario.refreshes(), 0);+ }+});+test("map sends only IDs and coordinates and opens the existing row detail for a current marker", async () => {const scenario = setup();await scenario.render();diff --git a/app/src/protyle/render/av/map/render.ts b/app/src/protyle/render/av/map/render.tsindex f50cddff47..c74de7a810 100644--- a/app/src/protyle/render/av/map/render.ts+++ b/app/src/protyle/render/av/map/render.ts@@ -1,7 +1,11 @@import {escapeAttr, escapeHtml} from "../../../../util/escape";import {fetchSyncPost} from "../../../../util/fetch";+import {transaction} from "../../../wysiwyg/transaction";+import {waitForPendingTransactions} from "../../../util/transactionQueue";+import {avRender} from "../render";import {getAVData} from "../virtualScroll";import {openMapRecord} from "./openRecord";+import {canEditMapSettings} from "./settings";import {canLoadMapHost, destroyMap, getMapPoints, getMapSettings, registerMap} from "./state";import {createAVMapHost, isAVMapHostEnvironmentSupported} from "./host";import {createDesktopAVMapHost, isDesktopAVMapHostSupported} from "./desktopTransport";@@ -10,6 +14,68 @@ import {AV_MAP_ATTRIBUTION_LINKS, AV_MAP_MAX_POINTS} from "./protocol";const getTheme = () => document.documentElement.getAttribute("data-theme-mode") === "dark" ? "dark" : "light";+const renderMapSetup = (root: HTMLElement, blockElement: HTMLElement, protyle: IProtyle,+ data: IAV, current: () => boolean) => {+ const view = data.view as IAVTable;+ const previous = getMapSettings(view);+ const editable = canEditMapSettings(protyle);+ const message = previous.locationKeyID ? window.siyuan.languages.mapMissingLocationField :+ window.siyuan.languages.mapSelectLocationField;+ root.querySelector(".av__map-status").innerHTML = `<div class="av__map-empty">+ <svg aria-hidden="true"><use xlink:href="#iconGlobe"></use></svg><p>${escapeHtml(message)}</p>+ ${editable ? `<div class="av__map-setup"><label class="av__map-setting"><span>${escapeHtml(window.siyuan.languages.mapLocationField)}</span>+ <select class="b3-select" data-map-location-field aria-label="${escapeAttr(window.siyuan.languages.mapLocationField)}">+ <option value="">${escapeHtml(window.siyuan.languages.mapSelectLocationField)}</option>+ ${view.columns.filter(column => column.type === "location").map(column =>+ `<option value="${escapeAttr(column.id)}">${escapeHtml(column.name)}</option>`).join("")}+ </select></label></div>+ <div class="av__map-create-fields"><button class="b3-button b3-button--outline" data-map-create-field>+ ${escapeHtml(window.siyuan.languages.newCol)} ${escapeHtml(window.siyuan.languages.location)}</button></div>` : ""}+</div>`;+ if (!editable) return;+ const select = root.querySelector<HTMLSelectElement>("[data-map-location-field]");+ const create = root.querySelector<HTMLButtonElement>("[data-map-create-field]");+ const context = {avID: data.id, blockID: blockElement.dataset.nodeId, viewID: data.viewID};+ let pending = false;+ const submit = async (locationKeyID?: string) => {+ if (pending || !current() || !canEditMapSettings(protyle)) return;+ if (locationKeyID !== undefined && (!locationKeyID ||+ !view.columns.some(column => column.id === locationKeyID && column.type === "location"))) return;+ pending = true;+ select.disabled = true;+ create.disabled = true;+ let committed = false;+ try {+ const id = locationKeyID || Lute.NewNodeID();+ const update: IOperation = {...context, action: "setAttrViewMap", data: {locationKeyID: id}};+ const undo: IOperation = {...context, action: "setAttrViewMap", data: previous};+ transaction(protyle, locationKeyID ? [update] : [+ {...context, action: "addAttrViewCol", id, type: "location", name: window.siyuan.languages.location},+ update,+ {...context, action: "setAttrViewColHidden", id, viewIDs: [data.viewID], data: true},+ ], locationKeyID ? [undo] : [undo, {...context, action: "removeAttrViewCol", id}], {+ callback: () => {+ committed = true;+ if (current()) {+ blockElement.removeAttribute("data-render");+ avRender(blockElement, protyle);+ }+ },+ });+ await waitForPendingTransactions(protyle);+ } finally {+ if (!committed && current()) {+ pending = false;+ select.value = "";+ select.disabled = !canEditMapSettings(protyle);+ create.disabled = select.disabled;+ }+ }+ };+ select.addEventListener("change", () => { void submit(select.value); });+ create.addEventListener("click", () => { void submit(); });+};+export const refreshMapReadonly = (protyle: IProtyle) => {protyle.wysiwyg.element.querySelectorAll<HTMLElement>('.av[data-av-type="map"]').forEach(block => {const data = getAVData(block);@@ -77,12 +143,8 @@ export const renderMap = async (blockElement: HTMLElement, protyle: IProtyle, dareturn;}try {- if (!settings.locationKeyID) {- fallback(window.siyuan.languages.mapSelectLocationField);- return;- }if (!view.columns.some(column => column.id === settings.locationKeyID && column.type === "location")) {- fallback(window.siyuan.languages.mapMissingLocationField);+ renderMapSetup(root, blockElement, protyle, data, current);return;}const {points, skipped} = getMapPoints(view);