From ab3890b3bc8af708cc906537f4aac5bfc39d0edf Mon Sep 17 00:00:00 2001
From: davelopez <46503462+davelopez@users.noreply.github.com>
Date: Tue, 14 Sep 2021 14:56:23 +0200
Subject: [PATCH 1/2] Add failing API test for update in batch with collections

---
 lib/galaxy_test/api/test_history_contents.py | 32 +++++++++++++++-----
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/lib/galaxy_test/api/test_history_contents.py b/lib/galaxy_test/api/test_history_contents.py
index c6a48ab9111..0f14a881afc 100644
--- a/lib/galaxy_test/api/test_history_contents.py
+++ b/lib/galaxy_test/api/test_history_contents.py
@@ -429,13 +429,7 @@ class HistoryContentsApiTestCase(ApiTestCase):
         assert not datasets[1]["visible"]
 
     def test_update_dataset_collection(self):
-        payload = self.dataset_collection_populator.create_pair_payload(
-            self.history_id,
-            type="dataset_collection"
-        )
-        dataset_collection_response = self._post(f"histories/{self.history_id}/contents", payload)
-        self._assert_status_code_is(dataset_collection_response, 200)
-        hdca = dataset_collection_response.json()
+        hdca = self._create_pair_collection()
         update_url = self._api_url(f"histories/{self.history_id}/contents/dataset_collections/{hdca['id']}", use_key=True)
         # Awkward json.dumps required here because of https://trello.com/c/CQwmCeG6
         body = json.dumps(dict(name="newnameforpair"))
@@ -444,6 +438,30 @@ class HistoryContentsApiTestCase(ApiTestCase):
         show_response = self.__show(hdca)
         assert str(show_response.json()["name"]) == "newnameforpair"
 
+    def test_update_batch_dataset_collection(self):
+        hdca = self._create_pair_collection()
+        body = {
+            "items": [{
+                "history_content_type": "dataset_collection",
+                "id": hdca["id"]
+            }],
+            "name": "newnameforpair"
+        }
+        update_response = self._put(f"histories/{self.history_id}/contents", data=body, json=True)
+        self._assert_status_code_is(update_response, 200)
+        show_response = self.__show(hdca)
+        assert str(show_response.json()["name"]) == "newnameforpair"
+
+    def _create_pair_collection(self):
+        payload = self.dataset_collection_populator.create_pair_payload(
+            self.history_id,
+            type="dataset_collection"
+        )
+        dataset_collection_response = self._post(f"histories/{self.history_id}/contents", payload)
+        self._assert_status_code_is(dataset_collection_response, 200)
+        hdca = dataset_collection_response.json()
+        return hdca
+
     def test_hdca_copy(self):
         hdca = self.dataset_collection_populator.create_pair_in_history(self.history_id).json()
         hdca_id = hdca["id"]

From 2c7fedee223a51875c34dc70167a4f9400ed5c76 Mon Sep 17 00:00:00 2001
From: davelopez <46503462+davelopez@users.noreply.github.com>
Date: Tue, 14 Sep 2021 15:05:51 +0200
Subject: [PATCH 2/2] Fix history contents update in batch with collections

There was a missing dictionary conversion from the last refactoring and the model config needed to allow extra fields.
---
 lib/galaxy/schema/schema.py                       | 7 ++++++-
 lib/galaxy/webapps/galaxy/api/history_contents.py | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/galaxy/schema/schema.py b/lib/galaxy/schema/schema.py
index 2e846bfc1ac..78d2e9e6149 100644
--- a/lib/galaxy/schema/schema.py
+++ b/lib/galaxy/schema/schema.py
@@ -634,7 +634,12 @@ class UpdateHDCAPayload(HDCADetailed):
     pass
 
 
-class UpdateHistoryContentsBatchPayload(Model):
+class UpdateHistoryContentsBatchPayload(BaseModel):
+    class Config:
+        use_enum_values = True  # when using .dict()
+        allow_population_by_field_name = True
+        extra = Extra.allow  # Allow any additional field
+
     items: List[Union[UpdateHDAPayload, UpdateHDCAPayload]] = Field(
         ...,
         title="Items",
diff --git a/lib/galaxy/webapps/galaxy/api/history_contents.py b/lib/galaxy/webapps/galaxy/api/history_contents.py
index 5f6c37c9580..b7c4370d376 100644
--- a/lib/galaxy/webapps/galaxy/api/history_contents.py
+++ b/lib/galaxy/webapps/galaxy/api/history_contents.py
@@ -583,7 +583,7 @@ class HistoriesContentsService(ServiceBase):
                 hda, user=trans.user, trans=trans, **serialization_params
             ))
         for hdca_id in hdca_ids:
-            self.__update_dataset_collection(trans, hdca_id, payload)
+            self.__update_dataset_collection(trans, hdca_id, payload.dict(exclude_defaults=True))
             dataset_collection_instance = self.__get_accessible_collection(trans, hdca_id)
             rval.append(self.__collection_dict(trans, dataset_collection_instance, view="summary"))
         return rval