gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2026-01-03 13:14:24 +01:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

chore(window): initialize closed time of openNoteContents to 0

Browse Source
This commit is contained in:
SiriusXT 2026-01-01 14:30:01 +08:00
parent 9c9e123e3d
commit 1078107776
5 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/client/src/components/tab_manager.ts
View File

@ -60,7 +60,7 @@ export default class TabManager extends Component {
savedWindows.push({
windowId: appContext.windowId,
createdAt: Date.now(),
closedAt: null,
closedAt: 0,
contexts: openNoteContexts
});
}
@ -154,7 +154,7 @@ export default class TabManager extends Component {
savedWindows.push({
windowId: appContext.windowId,
createdAt: Date.now(),
closedAt: null,
closedAt: 0,
contexts: filteredNoteContexts
});
}

2
apps/server/src/migrations/0234__migrate_open_note_contexts_format.ts
View File

@ -34,7 +34,7 @@ export default () => {
{
windowId: "main",
createdAt: 0,
closedAt: null,
closedAt: 0,
contexts: parsed
}
];

4
apps/server/src/services/options_init.ts
View File

@ -47,7 +47,7 @@ async function initNotSyncedOptions(initialized: boolean, opts: NotSyncedOpts =
{
windowId: "main",
createdAt: 0,
closedAt: null,
closedAt: 0,
contexts: [
{
notePath: "root",
@ -266,7 +266,7 @@ function initStartupOptions() {
{
windowId: "main",
createdAt: 0,
closedAt: null,
closedAt: 0,
contexts: [
{
notePath: process.env.TRILIUM_START_NOTE_ID || "root",

2
apps/server/src/services/sql_init.ts
View File

@ -149,7 +149,7 @@ async function createInitialDatabase(skipDemoDb?: boolean) {
{
windowId: "main",
createdAt: 0,
closedAt: null,
closedAt: 0,
contexts: [
{
notePath: startNoteId,

10
apps/server/src/services/tray.ts
View File

@ -201,15 +201,9 @@ function updateTrayMenu() {
const openedWindowIds = windowService.getAllWindowIds();
const closedWindows = savedWindows
.filter(win => !openedWindowIds.includes(win.windowId))
.sort((a, b) => {
// If closedAt is null, it indicates an abnormal closure and should be placed at the end
if (a.closedAt === null && b.closedAt === null) return 0;
if (a.closedAt === null) return 1;
if (b.closedAt === null) return -1;
// Otherwise, sort by time in descending order
return b.closedAt - a.closedAt;
});
.sort((a, b) => { return b.closedAt - a.closedAt; }); // sort by time in descending order
const menuItems: Electron.MenuItemConstructorOptions[] = [];
for (const win of closedWindows) {
const activeCtx = win.contexts.find(c => c.active === true);
const activateNotePath = (activeCtx ?? win.contexts[0])?.notePath;