From 2d1680b0421a2777234cc2a04a5c34c9b7c3197d Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Tue, 13 Aug 2024 13:10:31 +0200
Subject: [PATCH 01/11] Really do change PJA in test case

---
 lib/galaxy_test/api/test_workflows.py | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/lib/galaxy_test/api/test_workflows.py b/lib/galaxy_test/api/test_workflows.py
index c42da227984e..cfb723048934 100644
--- a/lib/galaxy_test/api/test_workflows.py
+++ b/lib/galaxy_test/api/test_workflows.py
@@ -2086,14 +2086,25 @@ def test_run_workflow_pick_value_bam_pja(self):
           pick_from:
           - value:
             __class__: RuntimeValue
+  consume_index:
+    tool_id: metadata_bam
+    in:
+      input_bam: pick_value/data_param
+    tool_state:
+      ref_names:
+        - chr10_random
+        - chr11
+        - chrM
+        - chrX
+        - chr16
 outputs:
   pick_out:
     outputSource: pick_value/data_param
 """,
                 test_data="""
 some_file:
-  value: 1.bam
-  file_type: bam
+  value: 3.bam
+  file_type: unsorted.bam
   type: File
 """,
                 history_id=history_id,
@@ -2106,6 +2117,7 @@ def test_run_workflow_pick_value_bam_pja(self):
         )
         assert dataset_details["metadata_reference_names"]
         assert dataset_details["metadata_bam_index"]
+        assert dataset_details["file_ext"] == "bam"
 
     def test_run_workflow_simple_conditional_step(self):
         with self.dataset_populator.test_history() as history_id:

From 886cd1b36e191c04c1a55ff36d3cee4223ba77b7 Mon Sep 17 00:00:00 2001
From: John Davis <jdavcs@gmail.com>
Date: Tue, 13 Aug 2024 10:51:24 -0400
Subject: [PATCH 02/11] Fix bug: remove parens

---
 lib/galaxy/webapps/galaxy/controllers/admin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/galaxy/webapps/galaxy/controllers/admin.py b/lib/galaxy/webapps/galaxy/controllers/admin.py
index 7e788bb1cc0f..bd0ea3a06158 100644
--- a/lib/galaxy/webapps/galaxy/controllers/admin.py
+++ b/lib/galaxy/webapps/galaxy/controllers/admin.py
@@ -73,7 +73,7 @@ def sort(self, trans, query, ascending, column_name=None):
                 .group_by(model.GalaxySession.table.c.user_id)
                 .subquery()
             )
-            query = query.outerjoin((last_login_subquery, model.User.table.c.id == last_login_subquery.c.user_id))
+            query = query.outerjoin(last_login_subquery, model.User.table.c.id == last_login_subquery.c.user_id)
 
             if not ascending:
                 query = query.order_by((last_login_subquery.c.last_login).desc().nullslast())

From ad659adbc42f01c1aef3d24cb94b4e0e32e1acd5 Mon Sep 17 00:00:00 2001
From: davelopez <46503462+davelopez@users.noreply.github.com>
Date: Wed, 14 Aug 2024 10:57:48 +0200
Subject: [PATCH 03/11] Expose currentHistory in useUserHistories composable

---
 client/src/composables/userHistories.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/client/src/composables/userHistories.js b/client/src/composables/userHistories.js
index ae8376527e83..823e66c45bef 100644
--- a/client/src/composables/userHistories.js
+++ b/client/src/composables/userHistories.js
@@ -15,6 +15,10 @@ export function useUserHistories(user) {
     );
 
     const currentHistoryId = computed(() => historyStore.currentHistoryId);
+    const currentHistory = computed(() => historyStore.currentHistory);
 
-    return { currentHistoryId };
+    return {
+        currentHistoryId,
+        currentHistory,
+    };
 }

From 1fc96de5854286118258f7a3065c92b13837819b Mon Sep 17 00:00:00 2001
From: davelopez <46503462+davelopez@users.noreply.github.com>
Date: Wed, 14 Aug 2024 11:01:18 +0200
Subject: [PATCH 04/11] Display target history name in upload modal

---
 client/src/components/Upload/UploadModal.vue | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/client/src/components/Upload/UploadModal.vue b/client/src/components/Upload/UploadModal.vue
index 762abcc9afc0..a78b0ce0adea 100644
--- a/client/src/components/Upload/UploadModal.vue
+++ b/client/src/components/Upload/UploadModal.vue
@@ -1,17 +1,17 @@
 <script setup>
-import { setIframeEvents } from "components/Upload/utils";
-import { useConfig } from "composables/config";
-import { useUserHistories } from "composables/userHistories";
 import { storeToRefs } from "pinia";
 import { ref, watch } from "vue";
 
+import { setIframeEvents } from "@/components/Upload/utils";
+import { useConfig } from "@/composables/config";
+import { useUserHistories } from "@/composables/userHistories";
 import { useUserStore } from "@/stores/userStore";
 import { wait } from "@/utils/utils";
 
 import UploadContainer from "./UploadContainer.vue";
 
 const { currentUser } = storeToRefs(useUserStore());
-const { currentHistoryId } = useUserHistories(currentUser);
+const { currentHistoryId, currentHistory } = useUserHistories(currentUser);
 
 const { config, isConfigLoaded } = useConfig();
 
@@ -81,7 +81,12 @@ defineExpose({
         no-enforce-focus
         hide-footer>
         <template v-slot:modal-header>
-            <h2 class="title h-sm" tabindex="0">{{ options.title }}</h2>
+            <h2 class="title h-sm" tabindex="0">
+                {{ options.title }}
+                <span v-if="currentHistory">
+                    to <b>{{ currentHistory.name }}</b>
+                </span>
+            </h2>
         </template>
         <UploadContainer
             v-if="currentHistoryId"

From 80e4074819f046516a54d0ed710ce829328de22a Mon Sep 17 00:00:00 2001
From: davelopez <46503462+davelopez@users.noreply.github.com>
Date: Wed, 14 Aug 2024 12:23:08 +0200
Subject: [PATCH 05/11] Fix initialization logic for upload queue

When the current history changes we need to either "reuse" or "create" a new upload queue
---
 client/src/components/Upload/DefaultBox.vue | 34 +++++++++++++++++++--
 client/src/utils/upload-queue.js            |  8 +++++
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/client/src/components/Upload/DefaultBox.vue b/client/src/components/Upload/DefaultBox.vue
index 5182b087a306..e7e9c863c87a 100644
--- a/client/src/components/Upload/DefaultBox.vue
+++ b/client/src/components/Upload/DefaultBox.vue
@@ -4,7 +4,7 @@ import { faCopy, faEdit, faFolderOpen, faLaptop } from "@fortawesome/free-solid-
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 import { BButton } from "bootstrap-vue";
 import { filesDialog } from "utils/data";
-import Vue, { computed, ref } from "vue";
+import Vue, { computed, onMounted, ref, watch } from "vue";
 
 import { UploadQueue } from "@/utils/upload-queue.js";
 
@@ -84,6 +84,7 @@ const uploadCompleted = ref(0);
 const uploadFile = ref(null);
 const uploadItems = ref({});
 const uploadSize = ref(0);
+const queue = ref();
 
 const counterNonRunning = computed(() => counterAnnounce.value + counterSuccess.value + counterError.value);
 const enableBuild = computed(
@@ -99,7 +100,16 @@ const listExtensions = computed(() => props.effectiveExtensions.filter((ext) =>
 const showHelper = computed(() => Object.keys(uploadItems.value).length === 0);
 const uploadValues = computed(() => Object.values(uploadItems.value));
 
-const queue = computed(() => createUploadQueue());
+onMounted(() => {
+    queue.value = initUploadQueue();
+});
+
+watch(
+    () => props.historyId,
+    () => {
+        queue.value = initUploadQueue();
+    }
+);
 
 function createUploadQueue() {
     return new UploadQueue({
@@ -116,6 +126,26 @@ function createUploadQueue() {
     });
 }
 
+function initUploadQueue() {
+    if (!queue.value) {
+        return createUploadQueue();
+    }
+
+    if (queue.value.historyId !== historyId.value) {
+        // The history has changed since the queue was created
+        if (isRunning.value) {
+            // The queue is running on the old history, so we need to create a new queue
+            // that will target the new history
+            return createUploadQueue();
+        }
+        // The queue is not running, so we can just update the target historyId and reuse the queue
+        queue.value.historyId = historyId.value;
+        return queue.value;
+    }
+    // Nothing has changed, so we can just return the existing queue
+    return queue.value;
+}
+
 /** Add files to queue */
 function addFiles(files, immediate = false) {
     if (!isRunning.value) {
diff --git a/client/src/utils/upload-queue.js b/client/src/utils/upload-queue.js
index 854ae90de567..f91dc58b4ae5 100644
--- a/client/src/utils/upload-queue.js
+++ b/client/src/utils/upload-queue.js
@@ -66,6 +66,14 @@ export class UploadQueue {
         return this.queue.size;
     }
 
+    get historyId() {
+        return this.opts.historyId;
+    }
+
+    set historyId(historyId) {
+        this.opts.historyId = historyId;
+    }
+
     // Initiate upload process
     start() {
         if (!this.isRunning) {

From 640e0978afbd6cd68587ff765ff97e82729c4efa Mon Sep 17 00:00:00 2001
From: davelopez <46503462+davelopez@users.noreply.github.com>
Date: Wed, 14 Aug 2024 15:07:13 +0200
Subject: [PATCH 06/11] Use watchImmediate instead of onMounted and watch

Co-authored-by: Laila Los <44241786+ElectronicBlueberry@users.noreply.github.com>
---
 client/src/components/Upload/DefaultBox.vue | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/client/src/components/Upload/DefaultBox.vue b/client/src/components/Upload/DefaultBox.vue
index e7e9c863c87a..0ef734e1bb52 100644
--- a/client/src/components/Upload/DefaultBox.vue
+++ b/client/src/components/Upload/DefaultBox.vue
@@ -2,9 +2,10 @@
 import { library } from "@fortawesome/fontawesome-svg-core";
 import { faCopy, faEdit, faFolderOpen, faLaptop } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
+import { watchImmediate } from "@vueuse/core";
 import { BButton } from "bootstrap-vue";
 import { filesDialog } from "utils/data";
-import Vue, { computed, onMounted, ref, watch } from "vue";
+import Vue, { computed, ref } from "vue";
 
 import { UploadQueue } from "@/utils/upload-queue.js";
 
@@ -100,11 +101,7 @@ const listExtensions = computed(() => props.effectiveExtensions.filter((ext) =>
 const showHelper = computed(() => Object.keys(uploadItems.value).length === 0);
 const uploadValues = computed(() => Object.values(uploadItems.value));
 
-onMounted(() => {
-    queue.value = initUploadQueue();
-});
-
-watch(
+watchImmediate(
     () => props.historyId,
     () => {
         queue.value = initUploadQueue();

From 6ff4befbdbc3b2582f1841c978451650d0c64b30 Mon Sep 17 00:00:00 2001
From: davelopez <46503462+davelopez@users.noreply.github.com>
Date: Wed, 14 Aug 2024 16:40:11 +0200
Subject: [PATCH 07/11] Associate target history with each upload item when
 upload starts

This will ensure that when we change the current history in the middle of the upload each dataset goes where it was scheduled for the first time.
---
 client/src/components/Upload/DefaultBox.vue | 36 ++++-----------------
 client/src/utils/upload-queue.js            | 14 +++-----
 2 files changed, 11 insertions(+), 39 deletions(-)

diff --git a/client/src/components/Upload/DefaultBox.vue b/client/src/components/Upload/DefaultBox.vue
index 0ef734e1bb52..96df25751d75 100644
--- a/client/src/components/Upload/DefaultBox.vue
+++ b/client/src/components/Upload/DefaultBox.vue
@@ -2,7 +2,6 @@
 import { library } from "@fortawesome/fontawesome-svg-core";
 import { faCopy, faEdit, faFolderOpen, faLaptop } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
-import { watchImmediate } from "@vueuse/core";
 import { BButton } from "bootstrap-vue";
 import { filesDialog } from "utils/data";
 import Vue, { computed, ref } from "vue";
@@ -85,7 +84,7 @@ const uploadCompleted = ref(0);
 const uploadFile = ref(null);
 const uploadItems = ref({});
 const uploadSize = ref(0);
-const queue = ref();
+const queue = ref(createUploadQueue());
 
 const counterNonRunning = computed(() => counterAnnounce.value + counterSuccess.value + counterError.value);
 const enableBuild = computed(
@@ -101,13 +100,6 @@ const listExtensions = computed(() => props.effectiveExtensions.filter((ext) =>
 const showHelper = computed(() => Object.keys(uploadItems.value).length === 0);
 const uploadValues = computed(() => Object.values(uploadItems.value));
 
-watchImmediate(
-    () => props.historyId,
-    () => {
-        queue.value = initUploadQueue();
-    }
-);
-
 function createUploadQueue() {
     return new UploadQueue({
         announce: eventAnnounce,
@@ -115,7 +107,6 @@ function createUploadQueue() {
         complete: eventComplete,
         error: eventError,
         get: (index) => uploadItems.value[index],
-        historyId: historyId.value,
         multiple: props.multiple,
         progress: eventProgress,
         success: eventSuccess,
@@ -123,26 +114,6 @@ function createUploadQueue() {
     });
 }
 
-function initUploadQueue() {
-    if (!queue.value) {
-        return createUploadQueue();
-    }
-
-    if (queue.value.historyId !== historyId.value) {
-        // The history has changed since the queue was created
-        if (isRunning.value) {
-            // The queue is running on the old history, so we need to create a new queue
-            // that will target the new history
-            return createUploadQueue();
-        }
-        // The queue is not running, so we can just update the target historyId and reuse the queue
-        queue.value.historyId = historyId.value;
-        return queue.value;
-    }
-    // Nothing has changed, so we can just return the existing queue
-    return queue.value;
-}
-
 /** Add files to queue */
 function addFiles(files, immediate = false) {
     if (!isRunning.value) {
@@ -295,6 +266,11 @@ function eventStart() {
         uploadValues.value.forEach((model) => {
             if (model.status === "init") {
                 model.status = "queued";
+                if (!model.targetHistoryId) {
+                    // Associate with current history once upload starts
+                    // This will not change if the current history is changed during upload
+                    model.targetHistoryId = historyId.value;
+                }
                 uploadSize.value += model.fileSize;
             }
         });
diff --git a/client/src/utils/upload-queue.js b/client/src/utils/upload-queue.js
index f91dc58b4ae5..f3ccb4b26ba5 100644
--- a/client/src/utils/upload-queue.js
+++ b/client/src/utils/upload-queue.js
@@ -66,14 +66,6 @@ export class UploadQueue {
         return this.queue.size;
     }
 
-    get historyId() {
-        return this.opts.historyId;
-    }
-
-    set historyId(historyId) {
-        this.opts.historyId = historyId;
-    }
-
     // Initiate upload process
     start() {
         if (!this.isRunning) {
@@ -104,7 +96,11 @@ export class UploadQueue {
             // Remove item from queue
             this.remove(index);
             // Collect upload request data
-            const data = uploadPayload([this.opts.get(index)], this.opts.historyId);
+            const item = this.opts.get(index);
+            if (!item.targetHistoryId) {
+                throw new Error(`Missing target history for upload item [${index}] ${item.fileName}`);
+            }
+            const data = uploadPayload([item], item.targetHistoryId);
             // Initiate upload request
             this._processSubmit(index, data);
         } catch (e) {

From ada6e88d444204b2c989bbe7f3d18f85e91a474c Mon Sep 17 00:00:00 2001
From: davelopez <46503462+davelopez@users.noreply.github.com>
Date: Wed, 14 Aug 2024 16:41:12 +0200
Subject: [PATCH 08/11] Increase default lazy load value to 150 in
 DefaultBox.vue

---
 client/src/components/Upload/DefaultBox.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/Upload/DefaultBox.vue b/client/src/components/Upload/DefaultBox.vue
index 96df25751d75..4afaa63ad705 100644
--- a/client/src/components/Upload/DefaultBox.vue
+++ b/client/src/components/Upload/DefaultBox.vue
@@ -58,7 +58,7 @@ const props = defineProps({
     },
     lazyLoad: {
         type: Number,
-        default: 50,
+        default: 150,
     },
     listDbKeys: {
         type: Array,

From a4ac441f96f74d34f06d89e2ba783d09493ea0d8 Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Tue, 13 Aug 2024 13:10:01 +0200
Subject: [PATCH 09/11] Fix change datatype PJA on pick value tool

Fixes https://github.com/galaxyproject/galaxy/issues/18677
---
 lib/galaxy/celery/tasks.py   | 13 +++++++++----
 lib/galaxy/jobs/__init__.py  |  7 ++++++-
 lib/galaxy/tools/__init__.py | 22 +++++++++++++++++++++-
 3 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/lib/galaxy/celery/tasks.py b/lib/galaxy/celery/tasks.py
index e1ac7456ad41..3b2e4c6272a7 100644
--- a/lib/galaxy/celery/tasks.py
+++ b/lib/galaxy/celery/tasks.py
@@ -185,14 +185,19 @@ def set_metadata(
     dataset_id: int,
     model_class: str = "HistoryDatasetAssociation",
     overwrite: bool = True,
+    ensure_can_set_metadata: bool = True,
     task_user_id: Optional[int] = None,
 ):
+    """
+    ensure_can_set_metadata can be bypassed for new outputs.
+    """
     manager = _get_dataset_manager(hda_manager, ldda_manager, model_class)
     dataset_instance = manager.by_id(dataset_id)
-    can_set_metadata = manager.ensure_can_set_metadata(dataset_instance, raiseException=False)
-    if not can_set_metadata:
-        log.info(f"Setting metadata is not allowed for {model_class} {dataset_instance.id}")
-        return
+    if ensure_can_set_metadata:
+        can_set_metadata = manager.ensure_can_set_metadata(dataset_instance, raiseException=False)
+        if not can_set_metadata:
+            log.info(f"Setting metadata is not allowed for {model_class} {dataset_instance.id}")
+            return
     try:
         if overwrite:
             hda_manager.overwrite_metadata(dataset_instance)
diff --git a/lib/galaxy/jobs/__init__.py b/lib/galaxy/jobs/__init__.py
index d63ba30916df..c930229df5e0 100644
--- a/lib/galaxy/jobs/__init__.py
+++ b/lib/galaxy/jobs/__init__.py
@@ -2020,8 +2020,9 @@ def fail(message=job.info, exception=None):
         # Certain tools require tasks to be completed after job execution
         # ( this used to be performed in the "exec_after_process" hook, but hooks are deprecated ).
         param_dict = self.get_param_dict(job)
+        task_wrapper = None
         try:
-            self.tool.exec_after_process(
+            task_wrapper = self.tool.exec_after_process(
                 self.app, inp_data, out_data, param_dict, job=job, final_job_state=final_job_state
             )
         except Exception as e:
@@ -2063,6 +2064,10 @@ def fail(message=job.info, exception=None):
             self.sa_session.commit()
         if job.state == job.states.ERROR:
             self._report_error()
+        elif task_wrapper:
+            # Only task is setting metadata (if necessary) on expression tool output.
+            # The dataset state is SETTING_METADATA, which delays dependent jobs until the task completes.
+            task_wrapper.delay()
         cleanup_job = self.cleanup_job
         delete_files = cleanup_job == "always" or (job.state == job.states.OK and cleanup_job == "onsuccess")
         self.cleanup(delete_files=delete_files)
diff --git a/lib/galaxy/tools/__init__.py b/lib/galaxy/tools/__init__.py
index 065033fe3029..570008c7c64b 100644
--- a/lib/galaxy/tools/__init__.py
+++ b/lib/galaxy/tools/__init__.py
@@ -2876,7 +2876,27 @@ def exec_after_process(self, app, inp_data, out_data, param_dict, job=None, **kw
                         break
                 if copy_object is None:
                     raise exceptions.MessageException("Failed to find dataset output.")
-                out_data[key].copy_from(copy_object, include_metadata=True)
+                output = out_data[key]
+                # if change_datatype PJA is associated with expression tool output the new output already has
+                # the desired datatype, so we use it. If the extension is "data" there's no change_dataset PJA and
+                # we want to use the existing extension.
+                new_ext = output.extension if output.extension != "data" else copy_object.extension
+                require_metadata_regeneration = copy_object.extension != new_ext
+                output.copy_from(copy_object, include_metadata=not require_metadata_regeneration)
+                output.extension = new_ext
+                if require_metadata_regeneration:
+                    if app.config.enable_celery_tasks:
+                        from galaxy.celery.tasks import set_metadata
+
+                        output._state = model.Dataset.states.SETTING_METADATA
+                        return set_metadata.si(
+                            dataset_id=output.id, task_user_id=output.history.user_id, ensure_can_set_metadata=False
+                        )
+                    else:
+                        # TODO: move exec_after_process into metadata script so this doesn't run on the headnode ?
+                        output.init_meta()
+                        output.set_meta()
+                        output.set_metadata_success_state()
 
     def parse_environment_variables(self, tool_source):
         """Setup environment variable for inputs file."""

From caabe013227c3a0143fc2e17f2d21b187aac25fd Mon Sep 17 00:00:00 2001
From: davelopez <46503462+davelopez@users.noreply.github.com>
Date: Wed, 14 Aug 2024 19:10:05 +0200
Subject: [PATCH 10/11] Submit remote files as single batch request per target
 history

This is unlikely to happen, but it will be consistent if we switch around histories and add remote files to different ones while pausing and continuing upload progress on them.
---
 client/src/utils/upload-queue.js | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/client/src/utils/upload-queue.js b/client/src/utils/upload-queue.js
index f3ccb4b26ba5..d4d10b46e9da 100644
--- a/client/src/utils/upload-queue.js
+++ b/client/src/utils/upload-queue.js
@@ -111,19 +111,27 @@ export class UploadQueue {
         }
     }
 
-    // Submit remote files as single batch request
+    // Submit remote files as single batch request per target history
     _processUrls() {
-        const list = [];
+        const batchByHistory = {};
         for (const index of this.queue.keys()) {
             const model = this.opts.get(index);
             if (model.status === "queued" && model.fileMode === "url") {
-                list.push({ index, ...model });
+                if (!model.targetHistoryId) {
+                    throw new Error(`Missing target history for upload item [${index}] ${model.fileName}`);
+                }
+                if (!batchByHistory[model.targetHistoryId]) {
+                    batchByHistory[model.targetHistoryId] = [];
+                }
+                batchByHistory[model.targetHistoryId].push({ index, ...model });
                 this.remove(index);
             }
         }
-        if (list.length > 0) {
+
+        for (const historyId in batchByHistory) {
+            const list = batchByHistory[historyId];
             try {
-                const data = uploadPayload(list, this.opts.historyId);
+                const data = uploadPayload(list, historyId);
                 sendPayload(data, {
                     success: (message) => {
                         list.forEach((model) => {

From 5e5e6fc04de927e3606cf7bf807143372fdad166 Mon Sep 17 00:00:00 2001
From: davelopez <46503462+davelopez@users.noreply.github.com>
Date: Wed, 14 Aug 2024 19:21:35 +0200
Subject: [PATCH 11/11] Adapt upload-queue tests

---
 client/src/utils/upload-queue.test.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/utils/upload-queue.test.js b/client/src/utils/upload-queue.test.js
index 473d578dd1da..3e5a72588132 100644
--- a/client/src/utils/upload-queue.test.js
+++ b/client/src/utils/upload-queue.test.js
@@ -177,6 +177,7 @@ describe("UploadQueue", () => {
                     spaceToTab: true,
                     status: "queued",
                     toPosixLines: false,
+                    targetHistoryId: "historyId",
                 };
             },
             get: (index) => fileEntries[index],