094b0ec6 by Adam Heath

Don't add '/' when building the full url from base and page.

1 parent ddb16a0b
...@@ -31,8 +31,8 @@ const baseQuery = fetchBaseQuery() ...@@ -31,8 +31,8 @@ const baseQuery = fetchBaseQuery()
31 31
32 const siteBaseQuery = async (args, api, options) => { 32 const siteBaseQuery = async (args, api, options) => {
33 const { site, url } = args 33 const { site, url } = args
34 const baseUrl = getSiteBaseUrl(site) 34 const baseUrl = getSiteBaseUrl(site) || ''
35 return baseQuery({ ...args, url: `${baseUrl ? `${baseUrl}/` : ''}${url}` }, api, options) 35 return baseQuery({ ...args, url: `${baseUrl}${url}` }, api, options)
36 } 36 }
37 37
38 export const sitePageSlice = createApi({ 38 export const sitePageSlice = createApi({
...@@ -80,7 +80,7 @@ export const getUrl = async(url: string) => { ...@@ -80,7 +80,7 @@ export const getUrl = async(url: string) => {
80 for (const site of sites) { 80 for (const site of sites) {
81 const baseUrl = configSlice.selectors.getSiteBaseUrl(state, site) 81 const baseUrl = configSlice.selectors.getSiteBaseUrl(state, site)
82 if (url.startsWith(baseUrl)) { 82 if (url.startsWith(baseUrl)) {
83 return getSitePage(site, url.substring(baseUrl.length + 1)) 83 return getSitePage(site, url.substring(baseUrl.length))
84 } 84 }
85 } 85 }
86 return getSitePage('default', url) 86 return getSitePage('default', url)
......