Issue 52355: Assure we always have non-blank rows for dat provided fo…

…r cross-type import (#6364)
LabKey · Feb 24, 2025 · e665a39 · e665a39
1 parent 520f04b
commit e665a39
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/experiment/src/org/labkey/experiment/ExpDataIterators.java b/experiment/src/org/labkey/experiment/ExpDataIterators.java
@@ -3019,7 +3019,12 @@ private TypeData createSampleHeaderRow(ExpSampleTypeImpl sampleType, Container c
                 ColumnInfo colInfo = getColumnInfo(i);
                 String name = colInfo.getName();
                 String lcName = name.toLowerCase();
-                if (validFields.contains(name))
+                if (_typeColIndex != null && _typeColIndex == i) // Issue 52355: assure we have some data in the row by including the type
+                {
+                    fieldIndexes.add(i);
+                    header.add(_typeColName);
+                }
+                else if (validFields.contains(name))
                 {
                     fieldIndexes.add(i);
                     header.add(_tsvWriter.quoteValue(name));