Merge pull request #174 from ltb-project/169-error-warning-dn_list-editor

Manage error and warning messages in dn_list editor

Author: coudot

htdocs/api/search_dn.php

@@ -20,8 +20,16 @@
 
     if ($nb_entries) {
         foreach($entries as $entry) {
-            $data[] = array( "dn" => $entry["dn"], "display" => $entry["cn"][0]);
+            $data["entries"][] = array( "dn" => $entry["dn"], "display" => $entry["cn"][0]);
         }
     }
+
+    if ($result) {
+        $data["error"] = $messages[$result];
+    }
+
+    if ($size_limit_reached) {
+        $data["warning"] = $messages["sizelimit"];
+    }
 }
 ?>

htdocs/js/update.js

@@ -2,32 +2,42 @@ $(document).ready(function(){
   let timer;
 
   $(".dn_link_container input[type=text]").on("keyup", function (event) {
-    // Remove value if field is emptied
-    if ($(this).val().length == 0) {
+    // Remove value if field is emptied or less than minimal characters
+    if ($(this).val().length <= 2) {
         $(this).siblings('input[type=hidden]').val('') ;
+        $(this).siblings('div.dn_link_suggestions').empty();
     }
     // Minimal search characters
     if ($(this).val().length > 2) {
       if (timer) {
         clearTimeout(timer);
-        // clear any existing list
         $(this).siblings('div.dn_link_suggestions').empty();
       }
 
       timer = setTimeout(() => {
         $.post("index.php", { 'apiendpoint': 'search_dn', 'search': $(this).val() }, (data) => {
           // clear existing list
           $(this).siblings('div.dn_link_suggestions').empty();
-          // add entries to list
-          data.forEach( (entry) => {
-            const $elem = $(`<button type="button" class="list-group-item list-group-item-action">${entry.display}</button>`);
-            $elem.on('click', () => {
-              $(this).val(entry.display);
-              $(this).siblings('input[type=hidden]').val(entry.dn);
-              $(this).siblings('div.dn_link_suggestions').empty();
-            })
+          if (data.entries) {
+            // add entries to list
+            data.entries.forEach( (entry) => {
+              const $elem = $(`<button type="button" class="list-group-item list-group-item-action">${entry.display}</button>`);
+              $elem.on('click', () => {
+                $(this).val(entry.display);
+                $(this).siblings('input[type=hidden]').val(entry.dn);
+                $(this).siblings('div.dn_link_suggestions').empty();
+              })
+              $(this).siblings('div.dn_link_suggestions').append($elem);
+            });
+            if (data.warning) {
+              const $elem = $(`<span class="list-group-item list-group-item-warning">${data.warning}</span>`);
+              $(this).siblings('div.dn_link_suggestions').append($elem);
+            }
+          }
+          if (data.error) {
+            const $elem = $(`<span class="list-group-item list-group-item-danger">${data.error}</span>`);
             $(this).siblings('div.dn_link_suggestions').append($elem);
-          });
+          }
         }, 'json');
       }, 500);
     }

templates/value_editor.tpl

@@ -27,7 +27,7 @@
     <div class="dn_link_container">
     <input type="text" class="form-control" value="{get_attribute dn="{$value}" attribute="cn" ldap_url="{$ldap_params.ldap_url}" ldap_starttls="{$ldap_params.ldap_starttls}" ldap_binddn="{$ldap_params.ldap_binddn}" ldap_bindpw="{$ldap_params.ldap_bindpw}" ldap_filter="{$ldap_params.ldap_user_filter}" ldap_network_timeout="{$ldap_params.ldap_network_timeout}"}" data-role="display"/>
     <input type="hidden" name="{$item}{$itemindex}" value="{$value}" data-role="value" />
-    <div class="z-3 list-group dn_link_suggestions"></div>
+    <div class="z-3 position-absolute list-group dn_link_suggestions"></div>
     </div>
 {else}
     <input type="text" name={$item} class="form-control" value="{$value}" data-role="value" />