From 6e40202e31a219e46d9ae76a115cff90e38e2b35 Mon Sep 17 00:00:00 2001 From: cnathe Date: Fri, 18 Sep 2026 15:02:45 -0500 Subject: [PATCH 1/2] TsvDataExchangeHandler to include reRunId in transform script properties file --- api/src/org/labkey/api/qc/TsvDataExchangeHandler.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/api/src/org/labkey/api/qc/TsvDataExchangeHandler.java b/api/src/org/labkey/api/qc/TsvDataExchangeHandler.java index 8060e132f95..ced6e0ae6af 100644 --- a/api/src/org/labkey/api/qc/TsvDataExchangeHandler.java +++ b/api/src/org/labkey/api/qc/TsvDataExchangeHandler.java @@ -118,6 +118,7 @@ public enum Props { protocolId, // protocol row id protocolLsid, protocolDescription, + reRunId, // row id of the run being replaced, only present for a re-import runDataFile, runDataUploadedFile, @@ -491,6 +492,11 @@ private Map getContextProperties(DataTransformService.TransformO FileLike originalFileLocation = context.getOriginalFileLocation(); if (originalFileLocation != null) map.put(Props.originalFileLocation.name(), originalFileLocation.toNioPathForRead().toFile().getPath()); + + // Note: the replaced run isn't marked as replaced until after the transform, this is the RowId of the run that is being re-imported + Long reRunId = context.getReRunId(); + if (reRunId != null) + map.put(Props.reRunId.name(), String.valueOf(reRunId)); } map.put(Props.baseUrl.name(), AppProps.getInstance().getBaseServerUrl() + AppProps.getInstance().getContextPath()); From 8c4e1a27e052bfc0f9221f7e881540c621d74bb3 Mon Sep 17 00:00:00 2001 From: cnathe Date: Fri, 18 Sep 2026 15:47:28 -0500 Subject: [PATCH 2/2] TsvDataExchangeHandler to guard against SampleRunUploadContext --- api/src/org/labkey/api/qc/TsvDataExchangeHandler.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/api/src/org/labkey/api/qc/TsvDataExchangeHandler.java b/api/src/org/labkey/api/qc/TsvDataExchangeHandler.java index ced6e0ae6af..924b731bb8d 100644 --- a/api/src/org/labkey/api/qc/TsvDataExchangeHandler.java +++ b/api/src/org/labkey/api/qc/TsvDataExchangeHandler.java @@ -494,9 +494,12 @@ private Map getContextProperties(DataTransformService.TransformO map.put(Props.originalFileLocation.name(), originalFileLocation.toNioPathForRead().toFile().getPath()); // Note: the replaced run isn't marked as replaced until after the transform, this is the RowId of the run that is being re-imported - Long reRunId = context.getReRunId(); - if (reRunId != null) - map.put(Props.reRunId.name(), String.valueOf(reRunId)); + if (!(context instanceof SampleRunUploadContext)) + { + Long reRunId = context.getReRunId(); + if (reRunId != null) + map.put(Props.reRunId.name(), String.valueOf(reRunId)); + } } map.put(Props.baseUrl.name(), AppProps.getInstance().getBaseServerUrl() + AppProps.getInstance().getContextPath());