From 89afee1ad58b96f36fd268c7ff3768ea183ee33a Mon Sep 17 00:00:00 2001
From: Martin Raifer <martin@raifer.tech>
Date: Mon, 12 Dec 2022 16:11:15 +0100
Subject: [PATCH] lint code

---
 modules/ui/fields/combo.js             | 16 +++++++++++-----
 modules/ui/fields/directional_combo.js |  3 +--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/modules/ui/fields/combo.js b/modules/ui/fields/combo.js
index 827a5d9f8..b343aa293 100644
--- a/modules/ui/fields/combo.js
+++ b/modules/ui/fields/combo.js
@@ -115,13 +115,20 @@ export function uiFieldCombo(field, context) {
     }
 
 
+    function getLabelId(field, v) {
+        return field.hasTextForStringId(`options.${v}.title`)
+            ? `options.${v}.title`
+            : `options.${v}`;
+    }
+
+
     // returns the display value for a tag value
     // (for multiCombo, tval should be the key suffix, not the entire key)
     function displayValue(tval) {
         tval = tval || '';
 
         var stringsField = field.resolveReference('stringsCrossReference');
-        const labelId = stringsField.hasTextForStringId(`options.${tval}.title`) ? `options.${tval}.title` : `options.${tval}`;
+        const labelId = getLabelId(stringsField, tval);
         if (stringsField.hasTextForStringId(labelId)) {
             return stringsField.t(labelId, { default: tval });
         }
@@ -140,7 +147,7 @@ export function uiFieldCombo(field, context) {
         tval = tval || '';
 
         var stringsField = field.resolveReference('stringsCrossReference');
-        const labelId = stringsField.hasTextForStringId(`options.${tval}.title`) ? `options.${tval}.title` : `options.${tval}`;
+        const labelId = getLabelId(stringsField, tval);
         if (stringsField.hasTextForStringId(labelId)) {
             return stringsField.t(labelId, { default: tval });
         }
@@ -186,8 +193,7 @@ export function uiFieldCombo(field, context) {
         if (!(field.options || stringsField.options)) return [];
 
         return (field.options || stringsField.options).map(function(v) {
-            const labelId = stringsField.hasTextForStringId(`options.${v}.title`) ? `options.${v}.title` : `options.${v}`;
-            const hasDescription = stringsField.hasTextForStringId(`options.${v}.description`);
+            const labelId = getLabelId(stringsField, v);
             return {
                 key: v,
                 value: stringsField.t(labelId, { default: v }),
@@ -272,7 +278,7 @@ export function uiFieldCombo(field, context) {
             _comboData = data.concat(additionalOptions).map(function(d) {
                 var v = d.value;
                 if (_isMulti) v = v.replace(field.key, '');
-                const labelId = stringsField.hasTextForStringId(`options.${v}.title`) ? `options.${v}.title` : `options.${v}`;
+                const labelId = getLabelId(stringsField, v);
                 var isLocalizable = stringsField.hasTextForStringId(labelId);
                 var label = stringsField.t(labelId, { default: v });
                 return {
diff --git a/modules/ui/fields/directional_combo.js b/modules/ui/fields/directional_combo.js
index c64d432d3..91a280789 100644
--- a/modules/ui/fields/directional_combo.js
+++ b/modules/ui/fields/directional_combo.js
@@ -1,8 +1,7 @@
 import { dispatch as d3_dispatch } from 'd3-dispatch';
 import { select as d3_select } from 'd3-selection';
 
-import { utilGetSetValue, utilNoAuto, utilRebind } from '../../util';
-import { t } from '../../core/localizer';
+import { utilRebind } from '../../util';
 import { uiFieldCombo } from './combo';