Merge pull request #16718 from davelopez/fix_collection_id_encoding

[23.1] Fix collection id encoding
galaxyproject · Sep 21, 2023 · 9d79596 · 9d79596
2 parents 551fabd + 1f068f3
commit 9d79596
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/client/src/components/providers/test/json/DatasetCollection.error.json b/client/src/components/providers/test/json/DatasetCollection.error.json
@@ -11,7 +11,7 @@
     "name": "abcdef",
     "create_time": "2020-07-02T17:33:56.567412",
     "populated_state": "new",
-    "collection_id": 44,
+    "collection_id": "b887d74393f85b6d",
     "hid": 2,
     "job_source_id": "3da1fe6d8d16a505",
     "type_id": "dataset_collection-ba03619785539f8c",

diff --git a/client/src/components/providers/test/json/DatasetCollection.json b/client/src/components/providers/test/json/DatasetCollection.json
@@ -35,5 +35,5 @@
     "deleted": false,
     "populated": true,
     "update_time": "2020-06-26T14:22:58.435348",
-    "collection_id": 23
-}
+    "collection_id": "f09437b8822035f7"
+}
diff --git a/client/src/components/providers/test/json/DatasetCollection.processing.json b/client/src/components/providers/test/json/DatasetCollection.processing.json
@@ -19,7 +19,7 @@
     "tags": [],
     "hid": 2,
     "url": "/api/histories/f7bb1edd6b95db62/contents/dataset_collections/ba03619785539f8c",
-    "collection_id": 44,
+    "collection_id": "b887d74393f85b6d",
     "job_state_summary": {
         "running": 3,
         "waiting": 0,
@@ -36,4 +36,4 @@
         "new": 0
     },
     "name": "Unzip on data 1"
-}
+}
diff --git a/lib/galaxy/managers/hdcas.py b/lib/galaxy/managers/hdcas.py
@@ -314,6 +314,7 @@ def add_serializers(self):
             "contents_url": self.generate_contents_url,
             "job_state_summary": self.serialize_job_state_summary,
             "elements_datatypes": self.serialize_elements_datatypes,
+            "collection_id": self.serialize_id,
         }
         self.serializers.update(serializers)