v1.0.5: user dropdown from Notion API, settingsCache pruning

This commit is contained in:
pdmarf
2026-04-10 20:42:11 +01:00
parent 2029b5187e
commit d6282d7396
6 changed files with 82 additions and 34 deletions

View File

@@ -6327,19 +6327,6 @@ var BOOK_COLOR = {
pink: "\u{1F4D4}",
purple: "\u{1F4D3}"
};
var COLOR_CIRCLE = {
green: "\u{1F7E2}",
blue: "\u{1F535}",
red: "\u{1F534}",
orange: "\u{1F7E0}",
yellow: "\u{1F7E1}",
purple: "\u{1F7E3}",
pink: "\u{1FA77}",
brown: "\u{1F7E4}",
gray: "\u26AB",
lightgray: "\u2B1C",
default: "\u2B1C"
};
var ICON_NAME = {
graduate: "\u{1F393}",
science: "\u{1F52C}",
@@ -6369,11 +6356,19 @@ function notionIconToEmoji(page) {
if (icon.type === "icon") {
const { name, color } = icon.icon ?? {};
if (name === "book") return BOOK_COLOR[color] ?? "\u{1F4DA}";
if (name === "skip-forward") return `\u23ED ${COLOR_CIRCLE[color] ?? ""}`.trimEnd();
if (name === "skip-forward") return "\u23ED";
return ICON_NAME[name] ?? "";
}
return "";
}
async function fetchUsers(token) {
const resp = await fetch(`${NOTION_BASE}/users`, {
headers: headers(token)
});
if (!resp.ok) throw new Error(`Failed to fetch users: ${resp.status}`);
const data = await resp.json();
return data.results.filter((u) => u.type === "person" && u.person?.email).map((u) => ({ id: u.id, name: u.name })).sort((a, b) => a.name.localeCompare(b.name));
}
async function fetchProjects(token, dbId) {
const resp = await fetch(`${NOTION_BASE}/databases/${dbId}/query`, {
method: "POST",
@@ -6433,7 +6428,7 @@ async function stopTimer(token, entryId) {
}
// src/plugin.ts
var CURRENT_VERSION = "1.0.4";
var CURRENT_VERSION = "1.0.5";
var GITEA_BASE = "http://100.120.125.113:3000/pdm/stream_deck_notion_timer/raw/branch/master";
var SIGNING_PUBLIC_KEY = `-----BEGIN PUBLIC KEY-----
MCowBQYDK2VwAyEAN7ko8TUpuPzPAJuKAZCRjV0c4ZSlou5d9pUAF6o12b4=
@@ -6490,6 +6485,9 @@ function buttonTitle(projectName) {
}
var TimerToggle = class extends SingletonAction {
settingsCache = /* @__PURE__ */ new Map();
async onWillDisappear(ev) {
this.settingsCache.delete(ev.action.id);
}
async onWillAppear(ev) {
this.settingsCache.set(ev.action.id, ev.payload.settings);
const { activeEntryId, projectName } = ev.payload.settings;
@@ -6507,8 +6505,11 @@ var TimerToggle = class extends SingletonAction {
await plugin_default.ui.sendToPropertyInspector({ event: "projects", data: [], error: "Configure Notion credentials in plugin settings first.", version: CURRENT_VERSION });
return;
}
const projects = await fetchProjects(global.notionToken, global.projectsDbId);
await plugin_default.ui.sendToPropertyInspector({ event: "projects", data: projects, version: CURRENT_VERSION });
const [projects, users] = await Promise.all([
fetchProjects(global.notionToken, global.projectsDbId),
fetchUsers(global.notionToken)
]);
await plugin_default.ui.sendToPropertyInspector({ event: "projects", data: projects, users, version: CURRENT_VERSION });
} catch (err) {
plugin_default.logger.error("Failed to fetch projects:", err);
await plugin_default.ui.sendToPropertyInspector({ event: "projects", data: [], error: String(err), version: CURRENT_VERSION });

View File

@@ -1 +1 @@
sRE¸ ć6TÝßţă<ćÝE]&Z¸pŚĐÝĽŤÓĐ^ßlt!°BDuÖs屟ę1)Žë€6Ç_/ř`9
╦Ъ? НО╡Л╝KV

View File

@@ -73,8 +73,8 @@
#statusText.running { color: #4caf50; }
#statusText.error { color: #e57373; }
#versionText {
font-size: 10px;
color: #444;
font-size: 12px;
color: #fff;
text-align: center;
padding-top: 8px;
}
@@ -102,10 +102,12 @@
<input type="password" id="notionToken" placeholder="ntn_…">
</div>
<div class="row">
<label>User ID</label>
<input type="text" id="userId" placeholder="Your Notion user UUID">
<label>Your Name</label>
<select id="userId">
<option value="">— Select your name —</option>
</select>
</div>
<p class="hint">Shared across all buttons. Enter once per device.</p>
<p class="hint">Shared across all buttons. Select once per device.</p>
<p id="credStatus"></p>
<hr class="divider">
</div>
@@ -166,12 +168,25 @@
function saveCredentials() {
var creds = {
notionToken: document.getElementById("notionToken").value.trim(),
userId: document.getElementById("userId").value.trim(),
userId: document.getElementById("userId").value,
};
$PI.setGlobalSettings(creds);
setCredStatus("Credentials saved.", "ok");
}
function populateUsers(users, savedUserId) {
var sel = document.getElementById("userId");
var current = savedUserId || sel.value;
sel.innerHTML = '<option value="">— Select your name —</option>';
users.forEach(function(u) {
var opt = document.createElement("option");
opt.value = u.id;
opt.textContent = u.name;
if (u.id === current) opt.selected = true;
sel.appendChild(opt);
});
}
function scheduleCredSave() {
clearTimeout(credSaveTimer);
credSaveTimer = setTimeout(saveCredentials, 600);
@@ -212,15 +227,19 @@
$PI.getGlobalSettings();
document.getElementById("projectSelect").addEventListener("change", save);
["notionToken", "userId"].forEach(function(id) {
document.getElementById(id).addEventListener("input", scheduleCredSave);
});
document.getElementById("notionToken").addEventListener("input", scheduleCredSave);
document.getElementById("userId").addEventListener("change", saveCredentials);
});
$PI.onDidReceiveGlobalSettings(function(jsn) {
var s = jsn.payload.settings || {};
document.getElementById("notionToken").value = s.notionToken || "";
document.getElementById("userId").value = s.userId || "";
if (s.userId) {
var sel = document.getElementById("userId");
if (sel.querySelector('option[value="' + s.userId + '"]')) {
sel.value = s.userId;
}
}
credConfigured = !!(s.notionToken && s.userId);
@@ -253,6 +272,10 @@
if (payload.version) {
document.getElementById("versionText").textContent = "v" + payload.version;
}
if (payload.users) {
var savedUserId = document.getElementById("userId").value;
populateUsers(payload.users, savedUserId);
}
if (payload.error) {
setStatus(payload.error, "error");
} else {