Skip to content

Build your personal knowledge base with Trilium Notes

fix some issues

Adorian Doran276dc5c72b4a
diff --git a/apps/client/src/layouts/desktop_layout.tsx b/apps/client/src/layouts/desktop_layout.tsx
index d2fe3b6719..2ef6d95282 100644
--- a/apps/client/src/layouts/desktop_layout.tsx
+++ b/apps/client/src/layouts/desktop_layout.tsx
@@ -3,11 +3,10 @@ import type { WidgetsByParent } from "../services/bundle.js";
import options from "../services/options.js";
import utils from "../services/utils.js";
import GlobalMenu from "../widgets/buttons/global_menu.jsx";
-import LeaveFullScreenButton from "../widgets/buttons/leave_full_screen_button.jsx";
import LeftPaneToggle, { LeftPanePeekButton } from "../widgets/buttons/left_pane_toggle.js";
import RightPaneToggle from "../widgets/buttons/right_pane_toggle.jsx";
import ShowAllNotesButton from "../widgets/buttons/show_all_notes_button.jsx";
-import CloseZenModeButton from "../widgets/close_zen_button.jsx";
+import CloseZenModeButton, { LeaveFullScreenButton } from "../widgets/close_zen_button.jsx";
import NoteList from "../widgets/collections/NoteList.jsx";
import FlexContainer from "../widgets/containers/flex_container.js";
import LeftPaneContainer from "../widgets/containers/left_pane_container.js";
diff --git a/apps/client/src/widgets/buttons/leave_full_screen_button.css b/apps/client/src/widgets/buttons/leave_full_screen_button.css
deleted file mode 100644
index 08008393f3..0000000000
--- a/apps/client/src/widgets/buttons/leave_full_screen_button.css
+++ /dev/null
@@ -1,3 +0,0 @@
-body:not(.full-screen) .leave-full-screen-button {
- display: none;
-}
diff --git a/apps/client/src/widgets/buttons/leave_full_screen_button.tsx b/apps/client/src/widgets/buttons/leave_full_screen_button.tsx
deleted file mode 100644
index 14ebbb930d..0000000000
--- a/apps/client/src/widgets/buttons/leave_full_screen_button.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import "./leave_full_screen_button.css";
-
-import { t } from "../../services/i18n";
-import ActionButton from "../react/ActionButton";
-
-/** Leaves full screen. Shown in the tab bar only while `body.full-screen` is set. */
-export default function LeaveFullScreenButton() {
- return (
- <ActionButton
- className="toggle-button leave-full-screen-button"
- text={t("tab_row.leave_full_screen")}
- icon="bx bx-exit-fullscreen"
- triggerCommand="toggleFullscreen"
- />
- );
-}
diff --git a/apps/client/src/widgets/close_zen_button.css b/apps/client/src/widgets/close_zen_button.css
index 52bbbc086c..47ac35f665 100644
--- a/apps/client/src/widgets/close_zen_button.css
+++ b/apps/client/src/widgets/close_zen_button.css
@@ -23,4 +23,8 @@ body.zen.mobile .close-zen-container {
body.zen.electron:not(.platform-darwin):not(.native-titlebar) .close-zen-container {
inset-inline-start: calc(env(titlebar-area-width) - var(--zen-button-size) - 2px);
inset-inline-end: unset;
+}
+
+body:not(.full-screen) .leave-full-screen-button {
+ display: none;
}
\ No newline at end of file
diff --git a/apps/client/src/widgets/buttons/leave_full_screen_button.spec.tsx b/apps/client/src/widgets/close_zen_button.spec.tsx
similarity index 80%
rename from apps/client/src/widgets/buttons/leave_full_screen_button.spec.tsx
rename to apps/client/src/widgets/close_zen_button.spec.tsx
index 23375b86e1..5a08fda65a 100644
--- a/apps/client/src/widgets/buttons/leave_full_screen_button.spec.tsx
+++ b/apps/client/src/widgets/close_zen_button.spec.tsx
@@ -1,9 +1,9 @@
import { describe, expect, it, vi } from "vitest";
-import Component from "../../components/component";
-import { renderInto } from "../../test/render";
-import { ParentComponent } from "../react/react_utils";
-import LeaveFullScreenButton from "./leave_full_screen_button";
+import Component from "../components/component";
+import { renderInto } from "../test/render";
+import { LeaveFullScreenButton } from "./close_zen_button";
+import { ParentComponent } from "./react/react_utils";
describe("LeaveFullScreenButton", () => {
it("renders a tab bar button that toggles full screen", () => {
diff --git a/apps/client/src/widgets/close_zen_button.tsx b/apps/client/src/widgets/close_zen_button.tsx
index 21b364da40..e46fb47fcb 100644
--- a/apps/client/src/widgets/close_zen_button.tsx
+++ b/apps/client/src/widgets/close_zen_button.tsx
@@ -23,3 +23,15 @@ export default function CloseZenModeButton() {
</div>
)
}
+
+/** Leaves full screen. Shown in the tab bar only while `body.full-screen` is set. */
+export function LeaveFullScreenButton() {
+ return (
+ <ActionButton
+ className="toggle-button leave-full-screen-button"
+ text={t("tab_row.leave_full_screen")}
+ icon="bx bx-exit-fullscreen"
+ triggerCommand="toggleFullscreen"
+ />
+ );
+}
diff --git a/apps/standalone/src/lightweight/browser_routes.spec.ts b/apps/standalone/src/lightweight/browser_routes.spec.ts
index 26c8a3cfd3..29ad0e234c 100644
--- a/apps/standalone/src/lightweight/browser_routes.spec.ts
+++ b/apps/standalone/src/lightweight/browser_routes.spec.ts
@@ -82,6 +82,13 @@ describe("registerRoutes (real wiring)", () => {
expect(parseJson(res.body)).toBeTypeOf("object");
});
+ // `search()` writes `res.locals` for the server's request log, as any handler can on Express.
+ it("passes a response to an apiRoute handler", async () => {
+ const res = await router.dispatch("GET", "http://localhost/api/search?searchString=root");
+ expect(res.status).toBe(200);
+ expect(parseJson(res.body)).toBeInstanceOf(Array);
+ });
+
it("returns the full bootstrap payload when the database is initialized", async () => {
const data = parseJson((await router.dispatch("GET", "http://localhost/bootstrap")).body) as Record<string, unknown>;
expect(data.isStandalone).toBe(true);
diff --git a/apps/standalone/src/lightweight/browser_routes.ts b/apps/standalone/src/lightweight/browser_routes.ts
index 49d1bb6712..f3b4deea4b 100644
--- a/apps/standalone/src/lightweight/browser_routes.ts
+++ b/apps/standalone/src/lightweight/browser_routes.ts
@@ -65,19 +65,21 @@ function setContextFromHeaders(req: BrowserRequest) {
/**
* Wraps a core route handler to work with the BrowserRouter.
- * Core handlers expect an Express-like request object with params, query, and body.
+ * Core handlers expect an Express-like request object with params, query, and body, and a
+ * response, as on the server.
* Each request is wrapped in an execution context (like cls.init() on the server)
* to ensure entity change tracking works correctly.
*/
-function wrapHandler(handler: (req: Request) => unknown, transactional: boolean) {
+function wrapHandler(handler: (req: Request, res: Response) => unknown, transactional: boolean) {
return (req: BrowserRequest) => {
return dbLock.runShared(() => getContext().init(() => {
setContextFromHeaders(req);
const coreReq = toCoreRequest(req);
+ const mockRes = createMockResponse();
if (transactional) {
- return getSql().transactional(() => handler(coreReq));
+ return getSql().transactional(() => handler(coreReq, mockRes));
}
- return handler(coreReq);
+ return handler(coreReq, mockRes);
}));
};
}
@@ -87,7 +89,7 @@ function wrapHandler(handler: (req: Request) => unknown, transactional: boolean)
* This bridges the core's route registration to the BrowserRouter.
*/
function createApiRoute(router: BrowserRouter, transactional: boolean) {
- return (method: HttpMethod, path: string, handler: (req: Request) => unknown) => {
+ return (method: HttpMethod, path: string, handler: (req: Request, res: Response) => unknown) => {
router.register(method, path, wrapHandler(handler, transactional));
};
}
diff --git a/packages/commons/package.json b/packages/commons/package.json
index b08aacb401..8ea8403c22 100644
--- a/packages/commons/package.json
+++ b/packages/commons/package.json
@@ -20,7 +20,7 @@
"jszip": "3.10.2",
"marked": "18.1.1",
"marked-footnote": "1.4.0",
- "numfmt": "4.0.1"
+ "numfmt": "4.1.1"
},
"devDependencies": {
"happy-dom": "21.0.3",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b90f52eada..695cbd3e9e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1332,8 +1332,8 @@ importers:
specifier: 1.4.0
version: 1.4.0([email protected])
numfmt:
- specifier: 4.0.1
- version: 4.0.1
+ specifier: 4.1.1
+ version: 4.1.1
devDependencies:
happy-dom:
specifier: 21.0.3
@@ -9448,8 +9448,8 @@ packages:
resolution: {integrity: sha512-GX0gsdbGVCgnRgbeGaubfjpBXyYRWOOCVeYh08bSQvDZqxz5ndXs1OTfAt/h36G1xvI94YIspsI0sVFqAV9+RQ==}
engines: {node: '>=20.19.0'}
- resolution: {integrity: sha512-P+C1JTxlTO0thySpEGxUR72Z7mnpIH73Dw2Xdw9QGhtlZdB4k1u0owNUTpNiT1dsw9jQCgpQa3gjRaXo8lhdXw==}
+ resolution: {integrity: sha512-12MJtolvN20WANpEm1LjEZrUgnjnBxg9Rp5FpXZZO06NInd7zc5cu8DOjVkrYfeWswNBOmDeD0MuJEYkVf5kzQ==}
resolution: {integrity: sha512-W72Hrj1petq+b3Hk2aAC+9zswetlIFTnDW4s5djseZh2nYqBbyQLOtj472HwcbcWykPBUW1WpWpjOd4nK6gMRw==}
@@ -21884,7 +21884,7 @@ snapshots:
dependencies:
boolbase: 2.0.0
dependencies: