From 2fb07698d55cf4da231fe5d6646b88d17b8fc692 Mon Sep 17 00:00:00 2001 From: dswbx Date: Sun, 3 Aug 2025 13:10:49 +0200 Subject: [PATCH] fixing AppReduced.spec.ts --- app/__test__/ui/client/utils/AppReduced.spec.ts | 3 ++- app/src/ui/client/utils/AppReduced.ts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/__test__/ui/client/utils/AppReduced.spec.ts b/app/__test__/ui/client/utils/AppReduced.spec.ts index ca80c2e..459272b 100644 --- a/app/__test__/ui/client/utils/AppReduced.spec.ts +++ b/app/__test__/ui/client/utils/AppReduced.spec.ts @@ -133,6 +133,7 @@ describe("AppReduced", () => { const options = appReduced.options; expect(options).toEqual({ + basepath: "/", logo_return_path: "/custom-home", admin_basepath: "/custom-admin", }); @@ -187,7 +188,7 @@ describe("AppReduced", () => { appReduced = new AppReduced(mockAppJson, options); const result = appReduced.getAbsolutePath("entity/"); - expect(result).toBe("~/admin/entity/"); + expect(result).toBe("~/admin/entity"); }); it("should remove trailing slashes from non-entity paths", () => { diff --git a/app/src/ui/client/utils/AppReduced.ts b/app/src/ui/client/utils/AppReduced.ts index dd8fb20..e34a0c6 100644 --- a/app/src/ui/client/utils/AppReduced.ts +++ b/app/src/ui/client/utils/AppReduced.ts @@ -86,7 +86,8 @@ export class AppReduced { return [absolute ? "~" : null, this.options.basepath, this.options.admin_basepath, ...paths] .filter(Boolean) .join("/") - .replace(/\/+/g, "/"); + .replace(/\/+/g, "/") + .replace(/\/$/, ""); } getSettingsPath(path: string[] = []): string {