Cutlery/Kyoo
1
0
Fork 0
mirror of https://github.com/zoriya/Kyoo.git synced 2026-05-23 23:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix base uri handling

Browse Source
This commit is contained in:
Zoe Roux
2025-07-07 23:13:52 +02:00
parent c7103410dc
commit aa342cfbd3
7 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
front/src/query/query.tsx
+6 -6
View File
@@ -15,10 +15,9 @@ import { setServerData } from "~/utils";
const ssrApiUrl = process.env.KYOO_URL ?? "http://api:3567/api";
const cleanSlash = (str: string | null, keepFirst = false) => {
if (!str) return null;
if (keepFirst) return str.replace(/\/$/g, "");
return str.replace(/^\/|\/$/g, "");
const cleanSlash = (str: string | null) => {
if (str === null) return null;
return str.replace(/\/$/g, "");
};
export const queryFn = async <Parser extends z.ZodTypeAny>(context: {
@@ -31,6 +30,7 @@ export const queryFn = async <Parser extends z.ZodTypeAny>(context: {
parser: Parser | null;
signal?: AbortSignal;
}): Promise<z.infer<Parser>> => {
console.log(context.url);
if (
Platform.OS === "web" &&
typeof window === "undefined" &&
@@ -154,7 +154,7 @@ const toQueryKey = (query: {
};
}) => {
return [
cleanSlash(query.apiUrl, true),
cleanSlash(query.apiUrl),
...query.path,
query.params
? `?${Object.entries(query.params)
@@ -162,7 +162,7 @@ const toQueryKey = (query: {
.map(([k, v]) => `${k}=${Array.isArray(v) ? v.join(",") : v}`)
.join("&")}`
: null,
].filter((x) => x);
].filter((x) => x !== undefined);
};
export const keyToUrl = (key: ReturnType<typeof toQueryKey>) => {