From ff8c236273efe457bf11f01483c97147dcf25f80 Mon Sep 17 00:00:00 2001 From: philippe tcheriatinsky <philippe.tcherniatinsky@inrae.fr> Date: Thu, 23 May 2024 13:12:40 +0200 Subject: [PATCH] Correction back --- .../fr/inra/oresing/domain/data/deposit/DataImporter.java | 4 ++-- ui/src/composable/data/dataLoader.js | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/fr/inra/oresing/domain/data/deposit/DataImporter.java b/src/main/java/fr/inra/oresing/domain/data/deposit/DataImporter.java index 79cc8e8ff..f93071166 100644 --- a/src/main/java/fr/inra/oresing/domain/data/deposit/DataImporter.java +++ b/src/main/java/fr/inra/oresing/domain/data/deposit/DataImporter.java @@ -170,8 +170,8 @@ public class DataImporter { final Stream<RowWithReferenceDatum> recordStreamBeforePreloading = csvRecordsStream .flatMap(csvRecordToReferenceDatumFn) - .map(this::computeComputedColumns) - .map(dataHeaderReader::addConstantsToRow); + .map(dataHeaderReader::addConstantsToRow) + .map(this::computeComputedColumns); Stream<RowWithReferenceDatum> recordStream = recursionStrategy.firstPass(recordStreamBeforePreloading); final ImmutableSet<LineChecker> transformedLineCheckers = buildLineCheckers(); Stream<DataValue> referenceValuesStream = recordStream diff --git a/ui/src/composable/data/dataLoader.js b/ui/src/composable/data/dataLoader.js index a75577a90..6954e738d 100644 --- a/ui/src/composable/data/dataLoader.js +++ b/ui/src/composable/data/dataLoader.js @@ -27,6 +27,9 @@ export function dataLoader(services) { }; const getValueDisplay = function (referenceLocal, application) { + if(!referenceLocal?.values){ + return ''; + } if (referenceLocal.values["__display_" + services.internationalisationService.getLocale()]) { return referenceLocal.values["__display_" + services.internationalisationService.getLocale()]; } -- GitLab