hazza/jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/jupyterhub.git synced 2025-10-10 11:33:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pass base_url

Browse Source
This commit is contained in:
Nathan Barber
2021-12-13 19:55:23 -05:00
parent bb20002aea
commit 3893fb6d2c
5 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jsx/src/util/jhapiUtil.js
View File

@@ -1,5 +1,7 @@
export const jhapiRequest = (endpoint, method, data) => { export const jhapiRequest = (endpoint, method, data) => {
return fetch("/hub/api" + endpoint, { let base_url = window.base_url,
api_url = `${base_url}hub/api`;
return fetch(api_url + endpoint, {
method: method, method: method,
json: true, json: true,
headers: { headers: {

7
jsx/src/util/withAPI.js
View File

@@ -7,9 +7,10 @@ const withAPI = withProps(() => ({
data.json() data.json()
), ),
updateGroups: (offset, limit) => updateGroups: (offset, limit) =>
jhapiRequest(`/groups?offset=${offset}&limit=${limit}`, "GET").then( jhapiRequest(
(data) => data.json() `/groups?offset=${offset}&limit=${limit}`,
), "GET"
).then((data) => data.json()),
shutdownHub: () => jhapiRequest("/shutdown", "POST"), shutdownHub: () => jhapiRequest("/shutdown", "POST"),
startServer: (name) => jhapiRequest("/users/" + name + "/server", "POST"), startServer: (name) => jhapiRequest("/users/" + name + "/server", "POST"),
stopServer: (name) => jhapiRequest("/users/" + name + "/server", "DELETE"), stopServer: (name) => jhapiRequest("/users/" + name + "/server", "DELETE"),

1
jupyterhub/handlers/pages.py
View File

@@ -465,6 +465,7 @@ class AdminHandler(BaseHandler):
named_server_limit_per_user=self.named_server_limit_per_user, named_server_limit_per_user=self.named_server_limit_per_user,
server_version=f'{__version__} {self.version_hash}', server_version=f'{__version__} {self.version_hash}',
api_page_limit=self.settings["api_page_default_limit"], api_page_limit=self.settings["api_page_default_limit"],
base_url=self.settings["base_url"],
) )
self.finish(html) self.finish(html)

2
share/jupyterhub/static/js/admin-react.js
View File

File diff suppressed because one or more lines are too long

1
share/jupyterhub/templates/admin.html
View File

@@ -19,6 +19,7 @@
<div id="react-admin-hook"> <div id="react-admin-hook">
<script id="jupyterhub-admin-config"> <script id="jupyterhub-admin-config">
window.api_page_limit = parseInt("{{ api_page_limit|safe }}") window.api_page_limit = parseInt("{{ api_page_limit|safe }}")
window.base_url = "{{ base_url|safe }}"
</script> </script>
<script src="static/js/admin-react.js"></script> <script src="static/js/admin-react.js"></script>
</div> </div>