From d5d623b982cdb69b197d84f5f0dcda0dce7e2e31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C5=BEe=20Fortun?= <joze.fortun@gmail.com>
Date: Mon, 29 Jul 2024 08:31:22 +0200
Subject: [PATCH] Show label instead of name for fields selectors in metric,
 progress, geometry and calendar block configurators

---
 .../CalendarConfigurator/FeedSource/configs/Record.vue          | 2 +-
 .../GeometryConfigurator/FeedSource/configs/Record.vue          | 2 +-
 .../src/components/PageBlocks/MetricConfigurator/index.vue      | 2 +-
 .../compose/src/components/PageBlocks/ProgressConfigurator.vue  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/web/compose/src/components/PageBlocks/CalendarConfigurator/FeedSource/configs/Record.vue b/client/web/compose/src/components/PageBlocks/CalendarConfigurator/FeedSource/configs/Record.vue
index 1f9dd9994..45c537a08 100644
--- a/client/web/compose/src/components/PageBlocks/CalendarConfigurator/FeedSource/configs/Record.vue
+++ b/client/web/compose/src/components/PageBlocks/CalendarConfigurator/FeedSource/configs/Record.vue
@@ -227,7 +227,7 @@ export default {
     },
 
     getOptionEventFieldLabel ({ name, label }) {
-      return name || label
+      return label || name
     },
   },
 }
diff --git a/client/web/compose/src/components/PageBlocks/GeometryConfigurator/FeedSource/configs/Record.vue b/client/web/compose/src/components/PageBlocks/GeometryConfigurator/FeedSource/configs/Record.vue
index 3395e743e..350a447af 100644
--- a/client/web/compose/src/components/PageBlocks/GeometryConfigurator/FeedSource/configs/Record.vue
+++ b/client/web/compose/src/components/PageBlocks/GeometryConfigurator/FeedSource/configs/Record.vue
@@ -239,7 +239,7 @@ export default {
     },
 
     getOptionGeometryAndTitleFieldLabel ({ name, label }) {
-      return name || label
+      return label || name
     },
   },
 }
diff --git a/client/web/compose/src/components/PageBlocks/MetricConfigurator/index.vue b/client/web/compose/src/components/PageBlocks/MetricConfigurator/index.vue
index 53e34f707..31ad12dc3 100644
--- a/client/web/compose/src/components/PageBlocks/MetricConfigurator/index.vue
+++ b/client/web/compose/src/components/PageBlocks/MetricConfigurator/index.vue
@@ -456,7 +456,7 @@ export default {
     },
 
     getOptionMetricFieldLabel ({ name, label }) {
-      return name || label
+      return label || name
     },
 
     getOptionAggregationOperationKey ({ operation }) {
diff --git a/client/web/compose/src/components/PageBlocks/ProgressConfigurator.vue b/client/web/compose/src/components/PageBlocks/ProgressConfigurator.vue
index 49a7ffc80..0ea4d517b 100644
--- a/client/web/compose/src/components/PageBlocks/ProgressConfigurator.vue
+++ b/client/web/compose/src/components/PageBlocks/ProgressConfigurator.vue
@@ -673,7 +673,7 @@ export default {
     },
 
     getOptionModuleFieldLabel ({ name, label }) {
-      return name || label
+      return label || name
     },
 
     getOptionAggregationOperationKey ({ operation }) {