From 743bb6f8456795f500c7f5c8933a4096531178d0 Mon Sep 17 00:00:00 2001
From: Stefano Ricci <1219739+SteRiccio@users.noreply.github.com>
Date: Mon, 13 Nov 2023 10:42:59 +0100
Subject: [PATCH] fixed labels export: do not default to node def name (#3137)

Co-authored-by: Stefano Ricci <SteRiccio@users.noreply.github.com>
---
 core/survey/nodeDef.js                              | 8 ++++----
 server/modules/survey/service/surveyLabelsExport.js | 7 ++++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/core/survey/nodeDef.js b/core/survey/nodeDef.js
index 78bb5689d9..ef8759e526 100644
--- a/core/survey/nodeDef.js
+++ b/core/survey/nodeDef.js
@@ -255,8 +255,8 @@ export const getMeta = R.propOr({}, keys.meta)
 export const getMetaHierarchy = R.pathOr([], [keys.meta, metaKeys.h])
 
 // Utils
-export const getLabel = (nodeDef, lang, type = NodeDefLabelTypes.label) => {
-  let firstPart = null
+export const getLabel = (nodeDef, lang, type = NodeDefLabelTypes.label, defaultToName = true) => {
+  let firstPart = ''
   const name = getName(nodeDef)
 
   if (type === NodeDefLabelTypes.name) {
@@ -267,13 +267,13 @@ export const getLabel = (nodeDef, lang, type = NodeDefLabelTypes.label) => {
     if (!StringUtils.isBlank(label)) {
       if (type === NodeDefLabelTypes.label) {
         firstPart = label
-      } else if (type === NodeDefLabelTypes.labelAndName && !StringUtils.isBlank(label)) {
+      } else if (type === NodeDefLabelTypes.labelAndName) {
         firstPart = `${label} [${name}]`
       }
     }
   }
   // default to name
-  if (StringUtils.isBlank(firstPart)) {
+  if (StringUtils.isBlank(firstPart) && defaultToName) {
     firstPart = name
   }
 
diff --git a/server/modules/survey/service/surveyLabelsExport.js b/server/modules/survey/service/surveyLabelsExport.js
index f62dbad9ff..af11f47938 100644
--- a/server/modules/survey/service/surveyLabelsExport.js
+++ b/server/modules/survey/service/surveyLabelsExport.js
@@ -21,7 +21,12 @@ const exportLabels = async ({ surveyId, outputStream }) => {
         ...languages.reduce(
           (labelsAcc, lang) => ({
             ...labelsAcc,
-            [SurveyLabelsExportModel.getLabelColumn(lang)]: NodeDef.getLabel(nodeDef, lang),
+            [SurveyLabelsExportModel.getLabelColumn(lang)]: NodeDef.getLabel(
+              nodeDef,
+              lang,
+              NodeDef.NodeDefLabelTypes.label,
+              false
+            ),
           }),
           {}
         ),