Merge branch 'release_22.01' into release_22.05

doc/source/releases/22.01_announce_user.rst

@@ -14,9 +14,7 @@ Do you use tools which require colour inputs, like Circos? Previously we had a r
 
 .. raw:: html
 
-   <video controls autoplay loop muted width="100%" alt="Gif of the colour selector in action, a mouse clicks on the colour selector and gone is the restricted 20 colour palette, now there is a colour field and you can select any possible RGB colour.">
-       <source src="../_static/22.01-colour.mp4" type="video/mp4">
-   </video>
+   <iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/DSnFa5012RE" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen alt="Gif of the colour selector in action, a mouse clicks on the colour selector and gone is the restricted 20 colour palette, now there is a colour field and you can select any possible RGB colour."></iframe>
 
 
 **Improved File Export**
@@ -25,9 +23,7 @@ If you've been exporting files from Galaxy lately, you've probably seen the amaz
 
 .. raw:: html
 
-   <video controls autoplay loop muted width="100%" alt="Video of a user exporting a file using the new file export, selecting a folder, creating some subdirectories, before changing their mind and choosing another location to export their file to.">
-       <source src="../_static/22.01-export.mp4" type="video/mp4">
-   </video>
+   <iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/KBFrgWGlPus" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen alt="Video of a user exporting a file using the new file export, selecting a folder, creating some subdirectories, before changing their mind and choosing another location to export their file to."></iframe>
 
 **Improved File Uploads**
 
@@ -142,7 +138,7 @@ A special thanks to the release testing team for testing many of the new feature
 - `Natalie Kucher <https://github.com/nakucher>`_
 - `Alex Ostrovsky <https://github.com/astrovsky01>`_
 - `Enis Afgan <https://github.com/afgane>`_
- 
+
 Release Notes
 ===========================================================
 

lib/galaxy/managers/histories.py

@@ -480,9 +480,11 @@ class HistorySerializer(sharable.SharableModelSerializer, deletable.PurgableSeri
             "size": lambda item, key, **context: int(item.disk_size),
             "nice_size": lambda item, key, **context: item.disk_nice_size,
             "state": self.serialize_history_state,
-            "url": lambda item, key, **context: self.url_for("history", id=self.app.security.encode_id(item.id)),
+            "url": lambda item, key, **context: self.url_for(
+                "history", id=self.app.security.encode_id(item.id), context=context
+            ),
             "contents_url": lambda item, key, **context: self.url_for(
-                "history_contents", history_id=self.app.security.encode_id(item.id)
+                "history_contents", history_id=self.app.security.encode_id(item.id), context=context
             ),
             "empty": lambda item, key, **context: (len(item.datasets) + len(item.dataset_collections)) <= 0,
             "count": lambda item, key, **context: len(item.datasets),

lib/galaxy/webapps/galaxy/api/histories.py

@@ -180,6 +180,7 @@ class FastAPIHistories:
 
     @router.get(
         "/api/histories/{id}",
+        name="history",
         summary="Returns the history with the given ID.",
     )
     def show(

lib/galaxy_test/api/test_histories.py

@@ -93,6 +93,15 @@ class HistoriesApiTestCase(ApiTestCase, BaseHistories):
         self._assert_has_keys(state_details, *states)
         self._assert_has_keys(state_ids, *states)
 
+    def test_show_history_returns_expected_urls(self):
+        # This test can be dropped when the URL attributes become deprecated
+        history_id = self._create_history("TestHistoryForUrls")["id"]
+        show_response = self._show(history_id)
+        self._assert_has_key(show_response, "id", "url", "contents_url")
+
+        assert show_response["url"] == f"/api/histories/{history_id}"
+        assert show_response["contents_url"] == f"/api/histories/{history_id}/contents"
+
     def test_show_most_recently_used(self):
         history_id = self._create_history("TestHistoryRecent")["id"]
         show_response = self._get("histories/most_recently_used").json()