Support not yet created aliquot parents

Author: labkey-nicka

experiment/src/org/labkey/experiment/ExpDataIterators.java

@@ -3263,6 +3263,11 @@ else if (aliquotedFromObj instanceof Number)
                                 _row[_aliquotNameCol] = List.of(aliquotParent.getName());
                                 _row[_aliquotRowIdCol] = aliquotParent.getRowId();
                             }
+                            else
+                            {
+                                // The referenced sample may not exist yet (e.g. it may be created in the same import)
+                                _row[_aliquotNameCol] = aliquotedFromObj.toString();
+                            }
                         }
                         catch (ValidationException e)
                         {

experiment/src/org/labkey/experiment/api/SampleTypeUpdateServiceDI.java

@@ -1997,6 +1997,8 @@ public String nextName(Map<String, Object> map,
                 Object name = map.get(ALIQUOT_FROM_RESOLVED_NAME);
                 if (name instanceof String aliquotParentName)
                     map.put(ExpMaterial.ALIQUOTED_FROM_INPUT, aliquotParentName);
+                else if (name instanceof List<?> nameList)
+                    map.put(ExpMaterial.ALIQUOTED_FROM_INPUT, nameList.get(0));
             }
 
             String generatedName = null;