From af4e639cfe28e7de51556de194e9a2763873163e Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Thu, 21 Sep 2023 12:05:49 +0200
Subject: [PATCH] Copy the collection contents by default when copying a
 collection

That got left out when creating the new multi history view.
Fixes https://github.com/galaxyproject/galaxy/issues/16716 and
https://github.com/galaxyproject/galaxy/issues/16619.
---
 client/src/schema/schema.ts                            | 4 ++--
 lib/galaxy/schema/schema.py                            | 2 +-
 lib/galaxy/webapps/galaxy/services/history_contents.py | 5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/client/src/schema/schema.ts b/client/src/schema/schema.ts
index 891b4bd83eb0..2e3ab870bf65 100644
--- a/client/src/schema/schema.ts
+++ b/client/src/schema/schema.ts
@@ -2446,7 +2446,7 @@ export interface components {
             /**
              * Copy Elements
              * @description If the source is a collection, whether to copy child HDAs into the target history as well, defaults to False but this is less than ideal and may be changed in future releases.
-             * @default false
+             * @default true
              */
             copy_elements?: boolean;
             /**
@@ -2616,7 +2616,7 @@ export interface components {
             /**
              * Copy Elements
              * @description Whether to create a copy of the source HDAs for the new collection.
-             * @default false
+             * @default true
              */
             copy_elements?: boolean;
             /**
diff --git a/lib/galaxy/schema/schema.py b/lib/galaxy/schema/schema.py
index ca0d2b03210a..3ecfb60e3043 100644
--- a/lib/galaxy/schema/schema.py
+++ b/lib/galaxy/schema/schema.py
@@ -1366,7 +1366,7 @@ class CreateNewCollectionPayload(Model):
         description="Whether to mark the original HDAs as hidden.",
     )
     copy_elements: Optional[bool] = Field(
-        default=False,
+        default=True,
         title="Copy Elements",
         description="Whether to create a copy of the source HDAs for the new collection.",
     )
diff --git a/lib/galaxy/webapps/galaxy/services/history_contents.py b/lib/galaxy/webapps/galaxy/services/history_contents.py
index 0254f92001f7..65313e1af02b 100644
--- a/lib/galaxy/webapps/galaxy/services/history_contents.py
+++ b/lib/galaxy/webapps/galaxy/services/history_contents.py
@@ -239,12 +239,11 @@ class CreateHistoryContentPayloadFromCollection(CreateHistoryContentPayloadFromC
         description="TODO",
     )
     copy_elements: Optional[bool] = Field(
-        default=False,
+        default=True,
         title="Copy Elements",
         description=(
             "If the source is a collection, whether to copy child HDAs into the target "
-            "history as well, defaults to False but this is less than ideal and may "
-            "be changed in future releases."
+            "history as well. Prior to the galaxy release 23.1 this defaulted to false."
         ),
     )