fix(popupEditor): fix closing of popupEditor when inserting note link

apps/client/src/components/app_context.ts

@@ -535,7 +535,6 @@ export type FilteredCommandNames<T extends CommandData> = keyof Pick<CommandMapp
 
 export class AppContext extends Component {
     isMainWindow: boolean;
-    windowId: string;
     components: Component[];
     beforeUnloadListeners: (WeakRef<BeforeUploadListener> | (() => boolean))[];
     tabManager!: TabManager;
@@ -544,11 +543,10 @@ export class AppContext extends Component {
 
     lastSearchString?: string;
 
-    constructor(isMainWindow: boolean, windowId: string) {
+    constructor(isMainWindow: boolean) {
         super();
 
         this.isMainWindow = isMainWindow;
-        this.windowId = windowId;
         // non-widget/layout components needed for the application
         this.components = [];
         this.beforeUnloadListeners = [];
@@ -678,7 +676,8 @@ export class AppContext extends Component {
         this.beforeUnloadListeners = this.beforeUnloadListeners.filter(l => l !== listener);
     }
 }
-const appContext = new AppContext(window.glob.isMainWindow, window.glob.windowId);
+
+const appContext = new AppContext(window.glob.isMainWindow);
 
 // we should save all outstanding changes before the page/app is closed
 $(window).on("beforeunload", () => {

apps/client/src/components/entrypoints.ts

@@ -142,15 +142,14 @@ export default class Entrypoints extends Component {
     }
 
     async openInWindowCommand({ notePath, hoistedNoteId, viewScope }: NoteCommandData) {
-        const extraWindowId = utils.randomString(4);
         const extraWindowHash = linkService.calculateHash({ notePath, hoistedNoteId, viewScope });
 
         if (utils.isElectron()) {
             const { ipcRenderer } = utils.dynamicRequire("electron");
 
-            ipcRenderer.send("create-extra-window", { extraWindowId, extraWindowHash });
+            ipcRenderer.send("create-extra-window", { extraWindowHash });
         } else {
-            const url = `${window.location.protocol}//${window.location.host}${window.location.pathname}?extraWindow=${extraWindowId}${extraWindowHash}`;
+            const url = `${window.location.protocol}//${window.location.host}${window.location.pathname}?extraWindow=1${extraWindowHash}`;
 
             window.open(url, "", "width=1000,height=800");
         }

apps/client/src/components/tab_manager.ts

@@ -11,8 +11,6 @@ import linkService from "../services/link.js";
 import type { EventData } from "./app_context.js";
 import type FNote from "../entities/fnote.js";
 
-const MAX_SAVED_WINDOWS = 10;
-
 interface TabState {
     contexts: NoteContext[];
     position: number;
@@ -43,6 +41,9 @@ export default class TabManager extends Component {
         this.recentlyClosedTabs = [];
 
         this.tabsUpdate = new SpacedUpdate(async () => {
+            if (!appContext.isMainWindow) {
+                return;
+            }
             if (options.is("databaseReadonly")) {
                 return;
             }
@@ -51,21 +52,9 @@ export default class TabManager extends Component {
                 .map((nc) => nc.getPojoState())
                 .filter((t) => !!t);
 
-            // Update the current window’s openNoteContexts in options    
-            const savedWindows = options.getJson("openNoteContexts") || [];
-            const win = savedWindows.find(w => w.windowId === appContext.windowId);
-            if (win) {
-                win.contexts = openNoteContexts;
-            } else {
-                savedWindows.push({
-                    windowId: appContext.windowId,
-                    createdAt: Date.now(),
-                    closedAt: null,
-                    contexts: openNoteContexts
-                });
-            }
-
-            await options.save("openNoteContexts", JSON.stringify(savedWindows));
+            await server.put("options", {
+                openNoteContexts: JSON.stringify(openNoteContexts)
+            });
         });
 
         appContext.addBeforeUnloadListener(this);
@@ -80,13 +69,8 @@ export default class TabManager extends Component {
     }
 
     async loadTabs() {
-        // Get the current window’s openNoteContexts
-        const savedWindows = options.getJson("openNoteContexts") || [];
-        const currentWin = savedWindows.find(w => w.windowId === appContext.windowId);
-        const openNoteContexts = currentWin ? currentWin.contexts : undefined;
-
         try {
-            const noteContextsToOpen = openNoteContexts || [];
+            const noteContextsToOpen = (appContext.isMainWindow && options.getJson("openNoteContexts")) || [];
 
             // preload all notes at once
             await froca.getNotes([...noteContextsToOpen.flatMap((tab: NoteContextState) =>
@@ -135,32 +119,6 @@ export default class TabManager extends Component {
                 }
             });
 
-            // Save window contents
-            if (currentWin) {
-                currentWin.createdAt = Date.now();
-                currentWin.closedAt = null;
-                currentWin.contexts = filteredNoteContexts;
-            } else {
-                // Filter out the oldest entry (excluding the main window)
-                if (savedWindows?.length >= MAX_SAVED_WINDOWS) {
-                    const candidates = savedWindows.filter(w => w.windowId !== "main");
-                    if (candidates.length > 0) {
-                        const oldest = candidates.reduce((a, b) =>
-                            a.createdAt < b.createdAt ? a : b
-                        );
-                        savedWindows.splice(savedWindows.indexOf(oldest), 1);
-                    }
-                }
-                savedWindows.push({
-                    windowId: appContext.windowId,
-                    createdAt: Date.now(),
-                    closedAt: null,
-                    contexts: filteredNoteContexts
-                });
-            }
-
-            await options.save("openNoteContexts", JSON.stringify(savedWindows));
-
             // if there's a notePath in the URL, make sure it's open and active
             // (useful, for e.g., opening clipped notes from clipper or opening link in an extra window)
             if (parsedFromUrl.notePath) {

apps/client/src/services/froca_updater.ts

@@ -27,6 +27,10 @@ async function processEntityChanges(entityChanges: EntityChange[]) {
                 loadResults.addRevision(ec.entityId, ec.noteId, ec.componentId);
             } else if (ec.entityName === "options") {
                 const attributeEntity = ec.entity as FAttributeRow;
+                if (attributeEntity.name === "openNoteContexts") {
+                    continue; // only noise
+                }
+
                 options.set(attributeEntity.name as OptionNames, attributeEntity.value);
                 loadResults.addOption(attributeEntity.name as OptionNames);
             } else if (ec.entityName === "attachments") {

apps/client/src/types.d.ts

@@ -36,7 +36,6 @@ interface CustomGlobals {
     isProtectedSessionAvailable: boolean;
     isDev: boolean;
     isMainWindow: boolean;
-    windowId: string;
     maxEntityChangeIdAtLoad: number;
     maxEntityChangeSyncIdAtLoad: number;
     assetPath: string;

apps/client/src/widgets/dialogs/PopupEditor.tsx

@@ -88,6 +88,7 @@ export default function PopupEditor() {
                     onHidden={() => setShown(false)}
                     keepInDom // needed for faster loading
                     noFocus // automatic focus breaks block popup
+                    stackable
                 >
                     {!isNewLayout && <ReadOnlyNoteInfoBar />}
                     <PromotedAttributes />

apps/desktop/src/main.ts

@@ -6,8 +6,6 @@ import sqlInit from "@triliumnext/server/src/services/sql_init.js";
 import windowService from "@triliumnext/server/src/services/window.js";
 import tray from "@triliumnext/server/src/services/tray.js";
 import options from "@triliumnext/server/src/services/options.js";
-import { randomString } from "@triliumnext/server/src/services/utils.js";
-
 import electronDebug from "electron-debug";
 import electronDl from "electron-dl";
 import { PRODUCT_NAME } from "./app-info";
@@ -74,8 +72,7 @@ async function main() {
     app.on("second-instance", (event, commandLine) => {
         const lastFocusedWindow = windowService.getLastFocusedWindow();
         if (commandLine.includes("--new-window")) {
-            const extraWindowId = randomString(4);
-            windowService.createExtraWindow(extraWindowId, "");
+            windowService.createExtraWindow("");
         } else if (lastFocusedWindow) {
             if (lastFocusedWindow.isMinimized()) {
                 lastFocusedWindow.restore();

apps/server/src/assets/translations/en/server.json

@@ -382,8 +382,6 @@
     "tooltip": "Trilium Notes",
     "close": "Quit Trilium",
     "recents": "Recent notes",
-    "recently-closed-windows": "Recently closed windows",
-    "tabs-total": "total {{number}} tabs",
     "bookmarks": "Bookmarks",
     "today": "Open today's journal note",
     "new-note": "New note",

apps/server/src/assets/views/desktop.ejs

@@ -15,7 +15,7 @@
 </head>
 <body
   id="trilium-app"
-  class="desktop heading-style-<%= headingStyle %> layout-<%= layoutOrientation %> platform-<%= platform %> <%= isElectron ? 'electron' : '' %> <%= hasNativeTitleBar ? 'native-titlebar' : '' %> <%= hasBackgroundEffects ? 'background-effects' : '' %> <%= isMainWindow ? '' : 'extra-window' %>"
+  class="desktop heading-style-<%= headingStyle %> layout-<%= layoutOrientation %> platform-<%= platform %> <%= isElectron ? 'electron' : '' %> <%= hasNativeTitleBar ? 'native-titlebar' : '' %> <%= hasBackgroundEffects ? 'background-effects' : '' %>"
   lang="<%= currentLocale.id %>" dir="<%= currentLocale.rtl ? 'rtl' : 'ltr' %>"
 >
 <noscript><%= t("javascript-required") %></noscript>

apps/server/src/assets/views/partials/windowGlobal.ejs

@@ -12,7 +12,6 @@
         isDev: <%= isDev %>,
         appCssNoteIds: <%- JSON.stringify(appCssNoteIds) %>,
         isMainWindow: <%= isMainWindow %>,
-        windowId: "<%= windowId %>",
         isProtectedSessionAvailable: <%= isProtectedSessionAvailable %>,
         triliumVersion: "<%= triliumVersion %>",
         assetPath: "<%= assetPath %>",

apps/server/src/migrations/0234__migrate_open_note_contexts_format.ts

@@ -1,48 +0,0 @@
-import cls from "../services/cls.js";
-import sql from "../services/sql.js";
-
-export default () => {
-    cls.init(() => {
-        const row = sql.getRow<{ value: string }>(
-            `SELECT value FROM options WHERE name = 'openNoteContexts'`
-        );
-
-        if (!row || !row.value) {
-            return;
-        }
-
-        let parsed: any;
-        try {
-            parsed = JSON.parse(row.value);
-        } catch {
-            return;
-        }
-
-        // Already in new format (array + windowId), skip
-        if (
-            Array.isArray(parsed) &&
-            parsed.length > 0 &&
-            parsed[0] &&
-            typeof parsed[0] === "object" &&
-            parsed[0].windowId
-        ) {
-            return;
-        }
-
-        // Old format: just contexts
-        const migrated = [
-            {
-                windowId: "main",
-                createdAt: 0,
-                closedAt: null,
-                contexts: parsed
-            }
-        ];
-
-        sql.execute(
-            `UPDATE options SET value = ? WHERE name = 'openNoteContexts'`,
-            [JSON.stringify(migrated)]
-        );
-
-    });
-};

apps/server/src/migrations/migrations.ts

@@ -6,11 +6,6 @@
 
 // Migrations should be kept in descending order, so the latest migration is first.
 const MIGRATIONS: (SqlMigration | JsMigration)[] = [
-    // Migrate openNoteContexts option to the new structured format with window metadata
-    {
-        version: 234,
-        module: async () => import("./0234__migrate_open_note_contexts_format")
-    },
     // Migrate geo map to collection
     {
         version: 233,

apps/server/src/routes/index.ts

@@ -56,7 +56,6 @@ function index(req: Request, res: Response) {
         appCssNoteIds: getAppCssNoteIds(),
         isDev,
         isMainWindow: view === "mobile" ? true : !req.query.extraWindow,
-        windowId: view !== "mobile" && req.query.extraWindow ? req.query.extraWindow : "main",
         isProtectedSessionAvailable: protectedSessionService.isProtectedSessionAvailable(),
         triliumVersion: packageJson.version,
         assetPath,

apps/server/src/services/app_info.ts

@@ -4,7 +4,7 @@ import packageJson from "../../package.json" with { type: "json" };
 import dataDir from "./data_dir.js";
 import { AppInfo } from "@triliumnext/commons";
 
-const APP_DB_VERSION = 234;
+const APP_DB_VERSION = 233;
 const SYNC_VERSION = 36;
 const CLIPPER_PROTOCOL_VERSION = "1.0";
 

apps/server/src/services/options.ts

@@ -72,19 +72,6 @@ function getOptionBool(name: FilterOptionsByType<boolean>): boolean {
     return val === "true";
 }
 
-function getOptionJson(name: OptionNames) {
-    const val = getOptionOrNull(name);
-
-    if (typeof val !== "string") {
-        return null;
-    }
-    try {
-        return JSON.parse(val);
-    } catch (e) {
-        return null;
-    }
-}
-
 function setOption<T extends OptionNames>(name: T, value: string | OptionDefinitions[T]) {
     const option = becca.getOption(name);
 
@@ -150,7 +137,6 @@ export default {
     getOption,
     getOptionInt,
     getOptionBool,
-    getOptionJson,
     setOption,
     createOption,
     getOptions,

apps/server/src/services/options_init.ts

@@ -45,15 +45,8 @@ async function initNotSyncedOptions(initialized: boolean, opts: NotSyncedOpts =
         "openNoteContexts",
         JSON.stringify([
             {
-                windowId: "main",
-                createdAt: 0,
-                closedAt: null,
-                contexts: [
-                    {
-                        notePath: "root",
-                        active: true
-                    }
-                ]
+                notePath: "root",
+                active: true
             }
         ]),
         false
@@ -264,15 +257,8 @@ function initStartupOptions() {
             "openNoteContexts",
             JSON.stringify([
                 {
-                    windowId: "main",
-                    createdAt: 0,
-                    closedAt: null,
-                    contexts: [
-                        {
-                            notePath: process.env.TRILIUM_START_NOTE_ID || "root",
-                            active: true
-                        }
-                    ]
+                    notePath: process.env.TRILIUM_START_NOTE_ID || "root",
+                    active: true
                 }
             ])
         );

apps/server/src/services/sql_init.ts

@@ -147,15 +147,8 @@ async function createInitialDatabase(skipDemoDb?: boolean) {
             "openNoteContexts",
             JSON.stringify([
                 {
-                    windowId: "main",
-                    createdAt: 0,
-                    closedAt: null,
-                    contexts: [
-                        {
-                            notePath: startNoteId,
-                            active: true
-                        }
-                    ]
+                    notePath: startNoteId,
+                    active: true
                 }
             ])
         );

apps/server/src/services/tray.ts

@@ -196,44 +196,6 @@ function updateTrayMenu() {
         return menuItems;
     }
 
-    function buildClosedWindowsMenu() {
-        const savedWindows = optionService.getOptionJson("openNoteContexts") || [];
-        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;
-            });
-        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;
-            const activateNoteId = activateNotePath?.split("/").pop() ?? null;
-
-            // Get the title of the closed window
-            const rawTitle = activateNoteId ? becca_service.getNoteTitle(activateNoteId) : "";
-            let winTitle = rawTitle.length > 20 ? `${rawTitle.slice(0, 17)}...` : rawTitle;
-            const mainTabCount = win.contexts.filter(ctx => ctx.mainNtxId === null).length;
-            if (mainTabCount > 1) {
-                const tabSuffix = t("tray.tabs-total", { number: mainTabCount });
-                winTitle += ` (${tabSuffix})`;
-            }
-
-            menuItems.push({
-                label: winTitle,
-                type: "normal",
-                click: () => win.windowId !== "main" ? windowService.createExtraWindow(win.windowId, "") : windowService.createMainWindow()
-            });
-        }
-
-        return menuItems;
-    }
-
     const windowVisibilityMenuItems: Electron.MenuItemConstructorOptions[] = [];
 
     // Only call getWindowTitle if windowVisibilityMap has more than one window
@@ -296,12 +258,6 @@ function updateTrayMenu() {
             icon: getIconPath("recents"),
             submenu: buildRecentNotesMenu()
         },
-        {
-            label: t("tray.recently-closed-windows"),
-            type: "submenu",
-            icon: getIconPath("closed-windows"),
-            submenu: buildClosedWindowsMenu()
-        },
         { type: "separator" },
         {
             label: t("tray.close"),

apps/server/src/services/window.ts

@@ -16,45 +16,28 @@ import { formatDownloadTitle, isMac, isWindows } from "./utils.js";
 // Prevent the window being garbage collected
 let mainWindow: BrowserWindow | null;
 let setupWindow: BrowserWindow | null;
+let allWindows: BrowserWindow[] = []; // // Used to store all windows, sorted by the order of focus.
 
-interface WindowEntry {
-    window: BrowserWindow;
-    windowId: string; // custom window ID
-}
-let allWindowEntries: WindowEntry[] = [];
-
-function trackWindowFocus(win: BrowserWindow, windowId: string) {
+function trackWindowFocus(win: BrowserWindow) {
     // We need to get the last focused window from allWindows. If the last window is closed, we return the previous window.
     // Therefore, we need to push the window into the allWindows array every time it gets focused.
     win.on("focus", () => {
-        allWindowEntries = allWindowEntries.filter(w => !w.window.isDestroyed() && w.window !== win);
-        allWindowEntries.push({ window: win, windowId: windowId });
-
+        allWindows = allWindows.filter(w => !w.isDestroyed() && w !== win);
+        allWindows.push(win);
         if (!optionService.getOptionBool("disableTray")) {
             electron.ipcMain.emit("reload-tray");
         }
     });
 
     win.on("closed", () => {
-        cls.wrap(() => {
-            const savedWindows = optionService.getOptionJson("openNoteContexts") || [];
-
-            const win = savedWindows.find(w => w.windowId === windowId);
-            if (win) {
-                win.closedAt = Date.now();
-            }
-
-            optionService.setOption("openNoteContexts", JSON.stringify(savedWindows));
-        })();
-        
-        allWindowEntries = allWindowEntries.filter(w => !w.window.isDestroyed());
+        allWindows = allWindows.filter(w => !w.isDestroyed());
         if (!optionService.getOptionBool("disableTray")) {
             electron.ipcMain.emit("reload-tray");
         }
     });
 }
 
-async function createExtraWindow(extraWindowId: string, extraWindowHash: string) {
+async function createExtraWindow(extraWindowHash: string) {
     const spellcheckEnabled = optionService.getOptionBool("spellCheckEnabled");
 
     const { BrowserWindow } = await import("electron");
@@ -73,15 +56,15 @@ async function createExtraWindow(extraWindowId: string, extraWindowHash: string)
     });
 
     win.setMenuBarVisibility(false);
-    win.loadURL(`http://127.0.0.1:${port}/?extraWindow=${extraWindowId}${extraWindowHash}`);
+    win.loadURL(`http://127.0.0.1:${port}/?extraWindow=1${extraWindowHash}`);
 
     configureWebContents(win.webContents, spellcheckEnabled);
 
-    trackWindowFocus(win, extraWindowId);
+    trackWindowFocus(win);
 }
 
 electron.ipcMain.on("create-extra-window", (event, arg) => {
-    createExtraWindow(arg.extraWindowId, arg.extraWindowHash);
+    createExtraWindow(arg.extraWindowHash);
 });
 
 interface PrintOpts {
@@ -185,8 +168,8 @@ async function getBrowserWindowForPrinting(e: IpcMainEvent, notePath: string, ac
     return { browserWindow, printReport };
 }
 
-async function createMainWindow(app?: App) {
-    if (app && "setUserTasks" in app) {
+async function createMainWindow(app: App) {
+    if ("setUserTasks" in app) {
         app.setUserTasks([
             {
                 program: process.execPath,
@@ -236,7 +219,7 @@ async function createMainWindow(app?: App) {
     mainWindow.on("closed", () => (mainWindow = null));
 
     configureWebContents(mainWindow.webContents, spellcheckEnabled);
-    trackWindowFocus(mainWindow, "main");
+    trackWindowFocus(mainWindow);
 }
 
 function getWindowExtraOpts() {
@@ -398,15 +381,11 @@ function getMainWindow() {
 }
 
 function getLastFocusedWindow() {
-    return allWindowEntries.length > 0 ? allWindowEntries[allWindowEntries.length - 1]?.window : null;
+    return allWindows.length > 0 ? allWindows[allWindows.length - 1] : null;
 }
 
 function getAllWindows() {
-    return allWindowEntries.map(e => e.window);
-}
-
-function getAllWindowIds(): string[] {
-    return allWindowEntries.map(e => e.windowId);
+    return allWindows;
 }
 
 export default {
@@ -417,6 +396,5 @@ export default {
     registerGlobalShortcuts,
     getMainWindow,
     getLastFocusedWindow,
-    getAllWindows,
-    getAllWindowIds
+    getAllWindows
 };