Merge pull request #14168 from mvdbeek/fix_folder_import_22_01 (216378ab) · Commits · NDIP / Galaxy

lib/galaxy/webapps/galaxy/api/history_contents.py

+2 −1

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@ from typing import (
		List,
		Optional,
		Set,
		Union,
		)

		import dateutil.parser
		@@ -494,7 +495,7 @@ class FastAPIHistoryContents:
		),
		serialization_params: SerializationParams = Depends(query_serialization_params),
		payload: CreateHistoryContentPayload = Body(...),
		) -> AnyHistoryContentItem:
		) -> Union[AnyHistoryContentItem, List[AnyHistoryContentItem]]:
		"""Create a new `HDA` or `HDCA` in the given History."""
		payload.type = type or payload.type
		return self.service.create(trans, history_id, payload, serialization_params)

lib/galaxy/webapps/galaxy/services/history_contents.py

+3 −4

Original line number	Diff line number	Diff line
		@@ -343,7 +343,7 @@ class HistoriesContentsService(ServiceBase):
		history_id: EncodedDatabaseIdField,
		payload: CreateHistoryContentPayload,
		serialization_params: SerializationParams,
		) -> AnyHistoryContentItem:
		) -> Union[AnyHistoryContentItem, List[AnyHistoryContentItem]]:
		"""
		Create a new HDA or HDCA.

		@@ -354,6 +354,7 @@ class HistoriesContentsService(ServiceBase):
		self.decode_id(history_id), trans.user, current_history=trans.history
		)

		serialization_params.default_view = "detailed"
		history_content_type = payload.type
		if history_content_type == HistoryContentType.dataset:
		source = payload.source
		@@ -1053,7 +1054,7 @@ class HistoriesContentsService(ServiceBase):
		for ld in traverse(folder):
		hda = ld.library_dataset_dataset_association.to_history_dataset_association(history, add_to_history=True)
		hda_dict = self.hda_serializer.serialize_to_view(
		hda, user=trans.user, trans=trans, default_view='detailed', **serialization_params.dict()
		hda, user=trans.user, trans=trans, **serialization_params.dict()
		)
		rval.append(hda_dict)
		else:
		@@ -1087,7 +1088,6 @@ class HistoriesContentsService(ServiceBase):
		return None

		trans.sa_session.flush()
		serialization_params.default_view = 'detailed'
		return self.hda_serializer.serialize_to_view(
		hda, user=trans.user, trans=trans, **serialization_params.dict()
		)
		@@ -1187,7 +1187,6 @@ class HistoriesContentsService(ServiceBase):

		# if the consumer specified keys or view, use the secondary serializer
		if serialization_params.view or serialization_params.keys:
		serialization_params.default_view = 'detailed'
		return self.hdca_serializer.serialize_to_view(
		dataset_collection_instance, user=trans.user, trans=trans, **serialization_params.dict()
		)