From 9bab7d8217e2339488c2d6584e0c282a9ea49ae9 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Fri, 6 Mar 2020 11:24:13 +0100
Subject: [PATCH] chg: [server:rest] Query builder gets loaded with body after
 the POST

fix #5680
---
 app/webroot/js/restClient.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/webroot/js/restClient.js b/app/webroot/js/restClient.js
index c1ef64cd9..43c51d13e 100644
--- a/app/webroot/js/restClient.js
+++ b/app/webroot/js/restClient.js
@@ -129,6 +129,7 @@ function removeRestClientHistoryItem(id) {
             }
         });
 
+        $('#TemplateSelect').val($('#ServerUrl').val()).trigger("chosen:updated").trigger("change");
         $('#ServerUrl').keyup(function() {
             $('#TemplateSelect').val($(this).val()).trigger("chosen:updated").trigger("change");
         });
@@ -142,11 +143,12 @@ function removeRestClientHistoryItem(id) {
                 $('#ServerUrl').val(allValidApis[selected_template].url);
                 $('#ServerUrl').data('urlWithoutParam', selected_template);
                 var body_value = $('#ServerBody').val();
-                if (body_value === '' || server_url_changed) {
+                var refreshBody = (body_value === '' || server_url_changed)
+                if (refreshBody) {
                     $('#ServerBody').val(allValidApis[selected_template].body);
                 }
                 setApiInfoBox(false);
-                updateQueryTool(selected_template, true);
+                updateQueryTool(selected_template, refreshBody);
             }
         });
 
@@ -294,8 +296,10 @@ function updateQueryTool(url, isEmpty) {
             });
         } else {
             var r = filtersJson[k];
-            r.value = values;
-            rules.rules[0].rules.push(r);
+            if (r !== undefined) { // rule is not defined in the description
+                r.value = values;
+                rules.rules[0].rules.push(r);
+            }
         }
     });
 
@@ -313,7 +317,6 @@ function updateQueryTool(url, isEmpty) {
             + '</div>');
         div.append(additionalInput);
     }
-
     querybuilderTool.setRules(rules, false);
 }