diff --git a/docs/release-notes/version-3.0.md b/docs/release-notes/version-3.0.md index fffb247b2..86d958969 100644 --- a/docs/release-notes/version-3.0.md +++ b/docs/release-notes/version-3.0.md @@ -5,6 +5,7 @@ * [#7131](https://github.com/netbox-community/netbox/issues/7131) - Fix issue where Site fields were hidden when editing a VLAN group * [#7148](https://github.com/netbox-community/netbox/issues/7148) - Fix issue where static query parameters with multiple values were not queried properly * [#7153](https://github.com/netbox-community/netbox/issues/7153) - Allow clearing of assigned device type images +* [#7162](https://github.com/netbox-community/netbox/issues/7162) - Fix API-populated form fields when `BASE_PATH` is defined * [#7164](https://github.com/netbox-community/netbox/issues/7164) - Fix styling of "decommissioned" label for circuits * [#7169](https://github.com/netbox-community/netbox/issues/7169) - Fix CSV import file upload diff --git a/netbox/project-static/dist/config.js b/netbox/project-static/dist/config.js index 0e701fc85..990415437 100644 Binary files a/netbox/project-static/dist/config.js and b/netbox/project-static/dist/config.js differ diff --git a/netbox/project-static/dist/config.js.map b/netbox/project-static/dist/config.js.map index 63379ab42..61b68949c 100644 Binary files a/netbox/project-static/dist/config.js.map and b/netbox/project-static/dist/config.js.map differ diff --git a/netbox/project-static/dist/jobs.js b/netbox/project-static/dist/jobs.js index a2d9ead62..b1b73ae01 100644 Binary files a/netbox/project-static/dist/jobs.js and b/netbox/project-static/dist/jobs.js differ diff --git a/netbox/project-static/dist/jobs.js.map b/netbox/project-static/dist/jobs.js.map index c1e2ac34b..99183a748 100644 Binary files a/netbox/project-static/dist/jobs.js.map and b/netbox/project-static/dist/jobs.js.map differ diff --git a/netbox/project-static/dist/lldp.js b/netbox/project-static/dist/lldp.js index a704b158d..b51ba092c 100644 Binary files a/netbox/project-static/dist/lldp.js and b/netbox/project-static/dist/lldp.js differ diff --git a/netbox/project-static/dist/lldp.js.map b/netbox/project-static/dist/lldp.js.map index ab5d4295a..ff03c92e7 100644 Binary files a/netbox/project-static/dist/lldp.js.map and b/netbox/project-static/dist/lldp.js.map differ diff --git a/netbox/project-static/dist/netbox.js b/netbox/project-static/dist/netbox.js index 92ffda9de..8ec3af3b3 100644 Binary files a/netbox/project-static/dist/netbox.js and b/netbox/project-static/dist/netbox.js differ diff --git a/netbox/project-static/dist/netbox.js.map b/netbox/project-static/dist/netbox.js.map index 678ca7255..c541288ef 100644 Binary files a/netbox/project-static/dist/netbox.js.map and b/netbox/project-static/dist/netbox.js.map differ diff --git a/netbox/project-static/dist/status.js b/netbox/project-static/dist/status.js index f4e64b5ef..02276c286 100644 Binary files a/netbox/project-static/dist/status.js and b/netbox/project-static/dist/status.js differ diff --git a/netbox/project-static/dist/status.js.map b/netbox/project-static/dist/status.js.map index d2c1a9c49..a0959bba1 100644 Binary files a/netbox/project-static/dist/status.js.map and b/netbox/project-static/dist/status.js.map differ diff --git a/netbox/project-static/src/tableConfig.ts b/netbox/project-static/src/tableConfig.ts index ff12e8d68..eb850d628 100644 --- a/netbox/project-static/src/tableConfig.ts +++ b/netbox/project-static/src/tableConfig.ts @@ -1,5 +1,5 @@ import { createToast } from './bs'; -import { getElements, apiPatch, hasError, getSelectedOptions } from './util'; +import { getElements, apiPatch, buildUrl, hasError, getSelectedOptions } from './util'; /** * Mark each option element in the selected columns element as 'selected' so they are submitted to @@ -54,7 +54,8 @@ function removeColumns(event: Event): void { * Submit form configuration to the NetBox API. */ async function submitFormConfig(formConfig: Dict): Promise> { - return await apiPatch('/api/users/config/', formConfig); + const url = buildUrl('/api/users/config/'); + return await apiPatch(url, formConfig); } /** diff --git a/netbox/project-static/src/util.ts b/netbox/project-static/src/util.ts index 278ccc3e5..c27cb2823 100644 --- a/netbox/project-static/src/util.ts +++ b/netbox/project-static/src/util.ts @@ -111,7 +111,8 @@ function getCsrfToken(): string { * Get the NetBox `settings.BASE_PATH` from the `` element's data attributes. * * @returns If there is no `BASE_PATH` specified, the return value will be `''`. - */ function getBasePath(): string { + */ +function getBasePath(): string { const value = document.documentElement.getAttribute('data-netbox-base-path'); if (value === null) { return ''; @@ -156,7 +157,7 @@ function queryParamsToObject(params: string): Record { * * @param path Relative path _after_ (excluding) the `BASE_PATH`. */ -function buildUrl(destination: string): string { +export function buildUrl(destination: string): string { // Separate the path from any URL search params. const [pathname, search] = destination.split(/(?=\?)/g); @@ -184,7 +185,7 @@ function buildUrl(destination: string): string { } export async function apiRequest( - path: string, + url: string, method: Method, data?: D, ): Promise> { @@ -196,7 +197,6 @@ export async function apiRequest( body = JSON.stringify(data); headers.set('content-type', 'application/json'); } - const url = buildUrl(path); const res = await fetch(url, { method, body, headers, credentials: 'same-origin' }); const contentType = res.headers.get('Content-Type');