Commit Graph

7335 Commits

Author SHA1 Message Date
Min RK
d2a07aaf1b forward-port 4.1.0 2024-03-20 13:21:34 +01:00
Min RK
4a83cddb8e Merge pull request from GHSA-7r3h-4ph8-w38g
forward-port 4.1.0
2024-03-20 13:19:30 +01:00
Min RK
c110c25428 Merge pull request #4738 from minrk/browser-subdomain
run browser tests in subdomain
2024-03-20 13:05:58 +01:00
Min RK
1cd3bc1860 fix browser tests with subdomains 2024-03-20 12:51:44 +01:00
Min RK
71f6cfa92b fix permission check on /hub/user/ page
needed for share redirect to work
2024-03-20 12:24:56 +01:00
Min RK
66c1600f4f run browser tests in subdomain 2024-03-20 12:24:56 +01:00
Min RK
b319b58a2f default=False for allow_token_in_url for 5.0 2024-03-19 18:46:51 +01:00
Min RK
83ce6d3f6b forward-port 4.1.0 2024-03-19 18:45:58 +01:00
Min RK
970693ef46 Merge pull request #4736 from krassowski/bump-python-version-in-contributing
Bump required Python version in contributing setup to 3.8
2024-03-19 13:57:12 +01:00
krassowski
74455d6337 Bump required Python version in contributing setup 2024-03-19 12:52:59 +00:00
Min RK
1db5e5e95c Merge pull request #4733 from kreuzert/main
Catch ValueError while waiting for server to be reachable
2024-03-19 09:37:20 +01:00
Tim Kreuzer
ed5b9249fe catch all exceptions, to allow a more stable wait_up. Without removing OSError specific catch 2024-03-18 18:28:27 +01:00
Tim Kreuzer
bb702abe15 Revert "except ValueError while waiting for server to be reachable"
This reverts commit 6bc3e05c6c.
2024-03-18 18:27:31 +01:00
Tim Kreuzer
5723746e05 catch all exceptions, to allow a more stable wait_up 2024-03-18 14:47:14 +01:00
Tim Kreuzer
6bc3e05c6c except ValueError while waiting for server to be reachable 2024-03-18 11:05:08 +01:00
Simon Li
0abe517faa Merge pull request #4731 from jupyterhub/dependabot/npm_and_yarn/jsx/follow-redirects-1.15.6
Bump follow-redirects from 1.15.4 to 1.15.6 in /jsx
2024-03-17 09:07:02 +00:00
dependabot[bot]
c9c4c3cfd7 Bump follow-redirects from 1.15.4 to 1.15.6 in /jsx
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.4 to 1.15.6.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.4...v1.15.6)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-03-16 23:05:49 +00:00
Min RK
5033effffb Merge pull request #4729 from manics/manics-patch-1
services.md: idle-culler does not need admin
2024-03-15 16:32:32 +01:00
Simon Li
f83c22ea0e services.md: idle-culler does not need admin 2024-03-14 15:12:20 +00:00
Min RK
46c3548725 Merge pull request #4724 from minrk/ruff
switch to ruff for lint, format
2024-03-13 11:15:51 +01:00
Min RK
061bd7b19f remove unused linter/formatter config 2024-03-13 09:44:43 +01:00
Min RK
a587c1c91c Merge pull request #4725 from aktech/rest-api-typo
Fix typo in the `rest-api.yml`
2024-03-13 08:56:30 +01:00
Amit Kumar
d3add440ca Fix typo in the rest-api.yml 2024-03-11 16:19:34 +00:00
Min RK
52af3abedc run ruff via pre-commit 2024-03-11 09:39:10 +01:00
Min RK
25da2c2ad3 run ruff in pre-commit 2024-03-11 09:37:59 +01:00
Min RK
6d4e17c531 lint: bare exceptions
E722
2024-03-11 09:35:51 +01:00
Min RK
e15b7c2620 apply pyupgrade fixes via ruff
ruff check --fix --select UP
2024-03-11 09:16:02 +01:00
Min RK
5e166970fa easier linting in jupyterhub_config
noqa get_import satisfies most linters
2024-03-11 09:16:02 +01:00
Erik Sundell
4375c2db96 Merge pull request #4723 from minrk/admin-page-naviate
admin: update navigation for react-router v6
2024-03-08 17:28:47 +01:00
Min RK
b0235527ab fix table hierarchy in property editor
don't nest trs in trs
2024-03-08 14:34:55 +01:00
Min RK
77e625d36d update navigation for react-router v6 2024-03-08 14:29:16 +01:00
Min RK
bfe143f1ac Merge pull request #4722 from minrk/sort-order-admin-ui
server-side sorting of admin page
2024-03-08 13:10:46 +01:00
Min RK
871f747597 tst: expect count to start from 0 when no items displayed 2024-03-08 12:59:13 +01:00
Min RK
d0665a9f21 update tests for sort, state filter 2024-03-08 12:01:38 +01:00
Min RK
f47d0a1524 space all the way around action buttons
4px margin matches 8px cell padding (margin is added on both sides)

and center when buttons collapse to single column
2024-03-08 10:20:35 +01:00
Min RK
d87e2dd3ae fix GET /users?include_stopped_servers when users aren't in UserDict
server model needs high-level User object for `progress_url` (it probably shouldn't)
2024-03-08 09:50:31 +01:00
Min RK
e540963f20 admin: move active-servers filter to top
next to name filter, so it's not in the table headings

merges Running & Actions columns,
since it's really just Actions now (server actions & user actions)
2024-03-08 09:49:23 +01:00
Min RK
bc3bb47672 pagination: fix offset display when there are 0 results 2024-03-08 09:06:46 +01:00
Min RK
8cbe1eac2b use URL api to construct API url
avoids imperfect logic detecting `?`
2024-03-08 09:05:55 +01:00
Min RK
78a796cea6 server-side sorting of admin page
removes in-page sort, which removes sort by server name, sort by running

Running column switches from sort to filter, matching the `?state` query parameter in the API

needs some CSS on the column widths to avoid jumps when toggling active servers
2024-03-06 23:16:43 +01:00
Erik Sundell
943e4a7072 Merge pull request #4720 from minrk/persist-offset-limit
admin: persist page view parameters in url
2024-03-06 17:24:36 +01:00
Simon Li
af396ec8d6 Merge pull request #4700 from minrk/redocly
Use redoc for REST API
2024-03-06 16:05:16 +00:00
Erik Sundell
41379bfe8c Merge pull request #4721 from minrk/sort-order-admin
Implement sort order in GET /users
2024-03-06 14:03:52 +01:00
Min RK
eab6065a26 update rest api spec for sort
don't use enum, which is a poor fit for `-` prefix,
instead give some examples
2024-03-06 13:31:48 +01:00
Min RK
86b3d8dc79 follow jsonapi spec for sort parameter 2024-03-06 11:40:56 +01:00
Min RK
3492cebec2 fix offset display in pagination
first 50 is 1-50, not 0-50
2024-03-06 10:44:24 +01:00
Min RK
a09862cb1b restore resetting offset when name filter changes 2024-03-06 10:30:36 +01:00
Min RK
f5bfe6a773 address some eslint 2024-03-06 10:21:02 +01:00
Min RK
a6e32deeb1 refactor mock dashboard in tests
reusable mock function with overrides for props (mostly API methods), rather than duplicate invocations

makes updating to v6 way easier
2024-03-06 10:12:46 +01:00
Min RK
38dc781271 update react-router-dom to v6
don't need v5-compat
2024-03-06 10:10:04 +01:00