Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix issue with generating slug for sharing #18986

Open
wants to merge 12 commits into
base: dev
Choose a base branch
from
Open

Fix issue with generating slug for sharing #18986

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c6aa6c8
Fix issue with generating slug for sharing history
arash77 Oct 14, 2024
7f4d594
Add test for sharing non-alphanumeric history
arash77 Oct 14, 2024
b40873b
Fix python lint
arash77 Oct 14, 2024
d61b5fc
Refactor valid slug to just exclude `/:?#` characters
arash77 Oct 14, 2024
705a5c4
No escape needed for '/' in slug input
arash77 Oct 14, 2024
1984746
Refactor slug generation to use slugify library
arash77 Oct 15, 2024
990ea5a
remove unused import
arash77 Oct 15, 2024
b56fd9b
Add types-python-slugify library for mypy type check
arash77 Oct 15, 2024
3aaa4cf
Add python-slugify and types-python-slugify to pyproject.toml
arash77 Oct 15, 2024
f319fa8
order alphabetically
arash77 Oct 15, 2024
9e8cfab
Add python-slugify library to app/setup.cfg
arash77 Oct 15, 2024
42b34a2
Assert slug in response
arash77 Oct 17, 2024
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
2 changes: 2 additions & 0 deletions lib/galaxy/managers/sharable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,8 @@ def _slugify(self, start_with):
# Remove trailing '-'.
if slug_base.endswith("-"):
slug_base = slug_base[:-1]
if not slug_base:
slug_base = "unnamed"
return slug_base

def _default_slug_base(self, item):
Expand Down
6 changes: 6 additions & 0 deletions lib/galaxy_test/api/test_histories.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,12 @@ def test_anonymous_can_import_published(self):
}
self.dataset_populator.import_history(import_data)

def test_publish_non_alphanumeric(self):
history_name = f"تاریخچه"
arash77 marked this conversation as resolved.
Show resolved Hide resolved
history_id = self.dataset_populator.new_history(name=history_name)
response = self.dataset_populator.make_public(history_id)
assert response["username_and_slug"]
Copy link
Member

@mvdbeek mvdbeek Oct 17, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you assert the actual slug?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The SharingStatus model doesn't have the slug itself.
Should I split it from this one?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

like this:

Suggested change
assert response["username_and_slug"]
assert response["username_and_slug"].split("h/")[1] == history_name

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can also assert that the history_name is in response["username_and_slug"], whatever you prefer


def test_immutable_history_update_fails(self):
history_id = self._create_history("TestHistoryForImmutability")["id"]

Expand Down
Loading