From 27e430325ef7734d12bdd9017259e9f0521898d8 Mon Sep 17 00:00:00 2001
From: Fridolin Somers <fridolin.somers@biblibre.com>
Date: Thu, 22 Dec 2022 20:15:09 -1000
Subject: [PATCH] Bug 32519: In Elasticsearch mappings table use of search
 field name and label

In Elasticsearch mappings table, in tabs for mappings we should add search field name in addition to label ; in order to find them when searching using DataTable search field. This is very useful when debugging.

Also the lines are sorting alphabetically by search field name.
So I propose to display name and label between parenthesis.
And also add label to the form in last line.

By default label equals name so I display label only if different from name.

Test plan :
1) Go to : Administration > Search engine configuration (Elasticsearch)
2) In first tabe edit a line to change label, for example : author => Auteur
3) Save
4) Go to second tab
5) Check you see a line with 'author (Auteur)' and lines with only name when label equals name
6) Look at last line (addition form)
7) Check you see in combobox : 'author (Auteur)' and lines with only name when label equals name

Signed-off-by: Solene Ngamga <solene.ngamga@inLibro.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 14a2cc60a404709edc97f6daed8ad8e00dd884e8)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
(cherry picked from commit c654d8b51eb8d19302d131e430ec95f7ad4586f4)
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 .../modules/admin/searchengine/elasticsearch/mappings.tt  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
index c120a76ad1..9453def0b3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
@@ -281,7 +281,8 @@ a.add, a.delete {
                                     <td>
                                     <input type="hidden" name="mapping_index_name" value="[% index.index_name | html %]" />
                                     <input type="hidden" name="mapping_search_field_name" value="[% mapping.search_field_name | html %]">
-                                    [% mapping.search_field_label | html %]
+                                    [% mapping.search_field_name | html %]
+                                    [% IF mapping.search_field_label != mapping.search_field_name %] ([% mapping.search_field_label | html %])[% END %]
                                     </td>
                                     <td>
                                     [% IF mapping.sort == 0 %]
@@ -309,7 +310,8 @@ a.add, a.delete {
                                     <td>
                                     <input type="hidden" name="mapping_index_name" value="[% index.index_name | html %]" />
                                     <input type="hidden" name="mapping_search_field_name" value="[% mapping.search_field_name | html %]">
-                                    [% mapping.search_field_label | html %]
+                                    [% mapping.search_field_name | html %]
+                                    [% IF mapping.search_field_label != mapping.search_field_name %] ([% mapping.search_field_label | html %])[% END %]
                                     </td>
                                     <td>
                                     <select name="mapping_sort">
@@ -378,7 +380,7 @@ a.add, a.delete {
                                 <input data-id="mapping_index_name" type="hidden" value="[% index.index_name | html %]" />
                                 <select data-id="mapping_search_field_name">
                                 [% FOREACH f IN all_search_fields %]
-                                <option value="[% f.name | html %]">[% f.name | html %]</option>
+                                <option value="[% f.name | html %]">[% f.name | html %][% IF f.label != f.name %] ([% f.label | html %])[% END %]</option>
                                 [% END %]
                                 </select>
                             </td>
-- 
2.39.5