From 5b3bb43d2a32549d1a523e54efb71f577b6389bd Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Wed, 18 Oct 2017 13:06:22 +0000
Subject: [PATCH] Bug 19482 - Add support for defining 'mandatory' mappings

To test:
1 - Apply patch
2 - ./installer/data/mysql/updatedatabase.pl
3 - Clear all ES mappings form the db: DELETE FROM search_field;
DELETE FROM search_marc_map; DELETE FROM search_marc_to_field;
4 - Reset ES mapping:
/cgi-bin/koha/admin/searchengine/elasticsearch/mappings.pl?op=reset&i_know_what_i_am_doing=1
5 - issues should now be uneditable and not removable

Signed-off-by: Nicolas Legrand <nicolas.legrand@bulac.fr>
---
 Koha/SearchEngine/Elasticsearch.pm                 |   4 +-
 admin/searchengine/elasticsearch/mappings.pl       |   1 +
 admin/searchengine/elasticsearch/mappings.yaml     |   1 +
 .../admin/searchengine/elasticsearch/mappings.tt   | 193 ++++++++++++---------
 4 files changed, 117 insertions(+), 82 deletions(-)

diff --git a/Koha/SearchEngine/Elasticsearch.pm b/Koha/SearchEngine/Elasticsearch.pm
index d859a39..0980cd9 100644
--- a/Koha/SearchEngine/Elasticsearch.pm
+++ b/Koha/SearchEngine/Elasticsearch.pm
@@ -286,8 +286,10 @@ sub reset_elasticsearch_mappings {
         while ( my ( $field_name, $data ) = each %$fields ) {
             my $field_type = $data->{type};
             my $field_label = $data->{label};
+            my $field_mandatory = $data->{mandatory};
+            warn $field_mandatory;
             my $mappings = $data->{mappings};
-            my $search_field = Koha::SearchFields->find_or_create({ name => $field_name, label => $field_label, type => $field_type }, { key => 'name' });
+            my $search_field = Koha::SearchFields->find_or_create({ name => $field_name, label => $field_label, type => $field_type, mandatory => $field_mandatory }, { key => 'name' });
             for my $mapping ( @$mappings ) {
                 my $marc_field = Koha::SearchMarcMaps->find_or_create({ index_name => $index_name, marc_type => $mapping->{marc_type}, marc_field => $mapping->{marc_field} });
                 $search_field->add_to_search_marc_maps($marc_field, { facet => $mapping->{facet} || 0, suggestible => $mapping->{suggestible} || 0, sort => $mapping->{sort} } );
diff --git a/admin/searchengine/elasticsearch/mappings.pl b/admin/searchengine/elasticsearch/mappings.pl
index 7d63002..3124a7f 100755
--- a/admin/searchengine/elasticsearch/mappings.pl
+++ b/admin/searchengine/elasticsearch/mappings.pl
@@ -123,6 +123,7 @@ for my $index_name (qw| biblios authorities |) {
           { search_field_name  => $s->name,
             search_field_label => $s->label,
             search_field_type  => $s->type,
+            search_field_mandatory  => $s->mandatory,
             marc_field         => $s->get_column('marc_field'),
             sort               => $s->get_column('sort') // 'undef', # To avoid warnings "Use of uninitialized value in lc"
             suggestible        => $s->get_column('suggestible'),
diff --git a/admin/searchengine/elasticsearch/mappings.yaml b/admin/searchengine/elasticsearch/mappings.yaml
index 25a1cc7..826d3a3 100644
--- a/admin/searchengine/elasticsearch/mappings.yaml
+++ b/admin/searchengine/elasticsearch/mappings.yaml
@@ -1602,6 +1602,7 @@ biblios:
         sort: 1
         suggestible: ''
     type: sum
+    mandatory: 1
   itemnumber:
     label: itemnumber
     mappings:
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 24327c5..c2b93dd 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
@@ -130,40 +130,49 @@ a.add, a.delete {
                 </thead>
                 <tbody>
                   [% FOREACH search_field IN all_search_fields %]
+                      [% IF search_field.mandatory %]
+                          [% SET is_readonly = "readonly" %]
+                      [% ELSE %]
+                          [% SET is_readonly = "" %]
+                      [% END %]
                     <tr>
                       <td>
-                        <input type="text" name="search_field_name" value="[% search_field.name %]" />
+                        <input type="text" name="search_field_name" value="[% search_field.name %]" [% is_readonly %]/>
                       </td>
-                      <td><input type="text" name="search_field_label" value="[% search_field.label %]" />
+                      <td><input type="text" name="search_field_label" value="[% search_field.label %]" [% is_readonly %]/>
                       <td>
-                        <select name="search_field_type">
-                          <option value=""></option>
-                          [% IF search_field.type == "string" %]
-                            <option value="string" selected="selected">String</option>
-                          [% ELSE %]
-                            <option value="string">String</option>
-                          [% END %]
-                          [% IF search_field.type == "date" %]
-                            <option value="date" selected="selected">Date</option>
-                          [% ELSE %]
-                            <option value="date">Date</option>
-                          [% END %]
-                          [% IF search_field.type == "number" %]
-                            <option value="number" selected="selected">Number</option>
-                          [% ELSE %]
-                            <option value="number">Number</option>
-                          [% END %]
-                          [% IF search_field.type == "boolean" %]
-                            <option value="boolean" selected="selected">Boolean</option>
-                          [% ELSE %]
-                            <option value="boolean">Boolean</option>
-                          [% END %]
-                          [% IF search_field.type == "sum" %]
-                            <option value="sum" selected="selected">Sum</option>
-                          [% ELSE %]
-                            <option value="sum">Sum</option>
-                          [% END %]
-                        </select>
+                        [% IF is_readonly %]
+                            <input type="text" name="search_field_type" value="[% search_field.type FILTER ucfirst%]" [% is_readonly %] />
+                        [% ELSE %]
+                            <select name="search_field_type">
+                              <option value=""></option>
+                              [% IF search_field.type == "string" %]
+                                <option value="string" selected="selected">String</option>
+                              [% ELSE %]
+                                <option value="string">String</option>
+                              [% END %]
+                              [% IF search_field.type == "date" %]
+                                <option value="date" selected="selected">Date</option>
+                              [% ELSE %]
+                                <option value="date">Date</option>
+                              [% END %]
+                              [% IF search_field.type == "number" %]
+                                <option value="number" selected="selected">Number</option>
+                              [% ELSE %]
+                                <option value="number">Number</option>
+                              [% END %]
+                              [% IF search_field.type == "boolean" %]
+                                <option value="boolean" selected="selected">Boolean</option>
+                              [% ELSE %]
+                                <option value="boolean">Boolean</option>
+                              [% END %]
+                              [% IF search_field.type == "sum" %]
+                                <option value="sum" selected="selected">Sum</option>
+                              [% ELSE %]
+                                <option value="sum">Sum</option>
+                              [% END %]
+                            </select>
+                        [% END %]
                       </td>
                     </tr>
                   [% END %]
@@ -185,59 +194,81 @@ a.add, a.delete {
                       </thead>
                       <tbody>
                         [% FOREACH mapping IN index.mappings %]
-                          <tr>
-                            <td>
-                              <input type="hidden" name="mapping_index_name" value="[% index.index_name %]" />
-                              <input type="hidden" name="mapping_search_field_name" value="[% mapping.search_field_name %]">
+                            [% IF mapping.search_field_mandatory %]
+                                <tr>
+                                    <td>
+                                        <input type="hidden" name="mapping_index_name" value="[% index.index_name %]" />
+                                        <input type="hidden" name="mapping_search_field_name" value="[% mapping.search_field_name %]">
                               [% mapping.search_field_label %]
-                            </td>
-                            <td>
-                              <select name="mapping_sort">
-                                [% IF mapping.sort == 'undef' %]
-                                  <option value="undef" selected="selected">Undef</option>
-                                [% ELSE %]
-                                  <option value="undef">Undef</option>
-                                [% END %]
-                                [% IF mapping.sort == 0 %]
-                                  <option value="0" selected="selected">0</option>
-                                [% ELSE %]
-                                  <option value="0">0</option>
-                                [% END %]
-                                [% IF  mapping.sort == 1 %]
-                                  <option value="1" selected="selected">1</option>
-                                [% ELSE %]
-                                  <option value="1">1</option>
-                                [% END %]
-                              </select>
-                            </td>
-                            <td>
-                              <select name="mapping_facet">
-                                [% IF mapping.facet %]
-                                  <option value="0">No</option>
-                                  <option value="1" selected="selected">Yes</option>
-                                [% ELSE %]
-                                  <option value="0" selected="selected">No</option>
-                                  <option value="1">Yes</option>
-                                [% END %]
-                              </select>
-                            </td>
-                            <td>
-                              <select name="mapping_suggestible">
-                                [% IF mapping.suggestible %]
-                                  <option value="0">No</option>
-                                  <option value="1" selected="selected">Yes</option>
-                                [% ELSE %]
-                                  <option value="0" selected="selected">No</option>
-                                  <option value="1">Yes</option>
+                                    </td>
+                                    <td>
+                                        <input type="hidden" name="mapping_sort" value="[% mapping.sort %]" readonly />[% IF mapping.sort == 'undef' %]Undef[% ELSE %][% mapping.sort %][% END %]
+                                    </td>
+                                    <td>
+                                        <input type="hidden" name="mapping_facet" value="[% mapping.facet %]" readonly />[% IF mapping.facet == 1 %]Yes[% ELSE %]No[% END %]
+                                    </td>
+                                    <td>
+                                        <input type="hidden" name="mapping_suggestible" value="[% mapping.suggestible %]" readonly />[% IF mapping.suggestible == 1 %]Yes[% ELSE %]No[% END %]
+                                    </td>
+                                    <td>
+                                        <input type="text" name="mapping_marc_field" value="[% mapping.marc_field %]" readonly />
+                                    </td>
+                                </tr>
+                            [% ELSE %]
+                              <tr>
+                                <td>
+                                  <input type="hidden" name="mapping_index_name" value="[% index.index_name %]" />
+                                  <input type="hidden" name="mapping_search_field_name" value="[% mapping.search_field_name %]">
+                              [% mapping.search_field_label %]
+                                </td>
+                                <td>
+                                  <select name="mapping_sort">
+                                    [% IF mapping.sort == 'undef' %]
+                                      <option value="undef" selected="selected">Undef</option>
+                                    [% ELSE %]
+                                      <option value="undef">Undef</option>
+                                    [% END %]
+                                    [% IF mapping.sort == 0 %]
+                                      <option value="0" selected="selected">0</option>
+                                    [% ELSE %]
+                                      <option value="0">0</option>
+                                    [% END %]
+                                    [% IF  mapping.sort == 1 %]
+                                      <option value="1" selected="selected">1</option>
+                                    [% ELSE %]
+                                      <option value="1">1</option>
+                                    [% END %]
+                                  </select>
+                                </td>
+                                <td>
+                                  <select name="mapping_facet">
+                                    [% IF mapping.facet %]
+                                      <option value="0">No</option>
+                                      <option value="1" selected="selected">Yes</option>
+                                    [% ELSE %]
+                                      <option value="0" selected="selected">No</option>
+                                      <option value="1">Yes</option>
+                                    [% END %]
+                                  </select>
+                                </td>
+                                <td>
+                                  <select name="mapping_suggestible">
+                                    [% IF mapping.suggestible %]
+                                      <option value="0">No</option>
+                                      <option value="1" selected="selected">Yes</option>
+                                    [% ELSE %]
+                                      <option value="0" selected="selected">No</option>
+                                      <option value="1">Yes</option>
+                                    [% END %]
+                                  </select>
+                                </td>
+                                <td>
+                                    <input name="mapping_marc_field" type="text" value="[% mapping.marc_field %]" />
+                                </td>
+                                <td><a class="btn btn-default btn-xs delete" style="cursor: pointer;"><i class="fa fa-trash"></i> Delete</a></td>
+                              </tr>
                                 [% END %]
-                              </select>
-                            </td>
-                            <td>
-                                <input name="mapping_marc_field" type="text" value="[% mapping.marc_field %]" />
-                            </td>
-                            <td><a class="btn btn-default btn-xs delete" style="cursor: pointer;"><i class="fa fa-trash"></i> Delete</a></td>
-                          </tr>
-                        [% END %]
+                            [% END %]
                       </tbody>
                       <tfoot>
                         <tr class="nodrag nodrop">
-- 
2.1.4