Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ downloads/
eggs/
.eggs/
lib/
!ui/src/lib/
lib64/
parts/
sdist/
Expand Down
2 changes: 1 addition & 1 deletion jhub_apps/static/css/index.css

Large diffs are not rendered by default.

202 changes: 52 additions & 150 deletions jhub_apps/static/js/index.js

Large diffs are not rendered by default.

24 changes: 20 additions & 4 deletions jhub_apps/tests/tests_e2e/test_integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,22 +148,38 @@ def create_app(

def select_share_options(page, users=None, groups=None):
logger.info("Selecting share form")
share_locator = page.locator("id=share-permissions-autocomplete")
expect(share_locator).to_be_visible()
share_trigger = page.locator("id=share-permissions-autocomplete")
expect(share_trigger).to_be_visible()

users = users or []
groups = groups or []

def open_and_search(query):
# The shadcn Combobox trigger is a button; clicking it opens a popover
# containing the search input. Re-open per entry because selecting an
# option in multi-select mode keeps the popover open, but typing again
# requires the search field to be focused.
if share_trigger.get_attribute("aria-expanded") != "true":
share_trigger.click()
search_input = page.get_by_placeholder("Search…")
expect(search_input).to_be_visible()
search_input.fill(query)

for user in users:
logger.info(f"Fill user: {user} in share")
share_locator.fill(user)
open_and_search(user)
logger.info(f"Select user: {user} in share")
page.get_by_role("option", name=user).click()

for group in groups:
logger.info(f"Fill group: {group} in share")
share_locator.fill(group)
open_and_search(group)
logger.info(f"Select group: {group} in share")
page.get_by_role("option", name=f"{group} (Group)").click()

# Close the popover before clicking Share, in case it overlays the button.
if share_trigger.get_attribute("aria-expanded") == "true":
page.keyboard.press("Escape")
page.get_by_role("button", name="Share").click()


Expand Down
301 changes: 0 additions & 301 deletions ui/SHADCN_MIGRATION.md

This file was deleted.

8 changes: 5 additions & 3 deletions ui/biome.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://biomejs.dev/schemas/2.4.15/schema.json",
"$schema": "https://biomejs.dev/schemas/2.4.16/schema.json",
"vcs": {
"enabled": true,
"clientKind": "git",
Expand All @@ -13,7 +13,8 @@
"package.json",
"tsconfig*.json",
"vite.config.ts",
"!**/*.test.tsx"
"!**/*.test.tsx",
"!src/data/logos.ts"
]
},
"formatter": {
Expand Down Expand Up @@ -47,7 +48,8 @@
"suspicious": {
"noArrayIndexKey": "off",
"noExplicitAny": "off",
"noImplicitAnyLet": "off"
"noImplicitAnyLet": "off",
"noUnknownAtRules": "off"
}
}
},
Expand Down
21 changes: 21 additions & 0 deletions ui/components.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"$schema": "https://ui.shadcn.com/schema.json",
"style": "default",
"rsc": false,
"tsx": true,
"tailwind": {
"config": "tailwind.config.js",
"css": "src/index.css",
"baseColor": "neutral",
"cssVariables": true,
"prefix": ""
},
"aliases": {
"components": "@src/components",
"utils": "@src/lib/utils",
"ui": "@src/components/ui",
"lib": "@src/lib",
"hooks": "@src/hooks"
},
"iconLibrary": "lucide"
}
Loading
Loading