Fixes #26075: Trying to save a group with empty criteria removes all …

…entries
Normation · Dec 19, 2024 · 742be8e · 742be8e
1 parent 36eacd2
commit 742be8e
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/...r/rudder-web/src/main/scala/com/normation/rudder/web/components/SearchNodeComponent.scala b/...r/rudder-web/src/main/scala/com/normation/rudder/web/components/SearchNodeComponent.scala
@@ -173,7 +173,7 @@ class SearchNodeComponent(
       }
       query = Some(Query(rType, composition, transform, lines.toList))
       initUpdate = false
-      ajaxCriteriaRefresh(isGroupsPage)
+      ajaxCriteriaRefresh(isGroupsPage, preventSave = true)
     }
 
     def removeLine(i: Int): JsCmd = {
@@ -190,7 +190,7 @@ class SearchNodeComponent(
         query = Some(Query(rType, composition, transform, lines.toList))
       }
       initUpdate = false
-      ajaxCriteriaRefresh(isGroupsPage)
+      ajaxCriteriaRefresh(isGroupsPage, preventSave = true)
     }
 
     def processForm(isGroupPage: Boolean): JsCmd = {
@@ -220,16 +220,16 @@ class SearchNodeComponent(
         srvList = Empty
         searchFormHasError = true
       }
-      ajaxCriteriaRefresh(isGroupsPage) & ajaxGridRefresh(isGroupsPage)
+      ajaxCriteriaRefresh(isGroupsPage, preventSave = false) & gridResult(isGroupPage)
       // ajaxGroupCriteriaRefresh & ajaxNodesTableRefresh()
     }
 
     /**
      * Refresh the query parameter part
      */
-    def ajaxCriteriaRefresh(isGroupPage: Boolean):                           JsCmd   = {
+    def ajaxCriteriaRefresh(isGroupPage: Boolean, preventSave: Boolean):     JsCmd   = {
       lines.clear()
-      SetHtml("SearchForm", displayQuery(content, isGroupPage)) & activateButtonOnChange()
+      SetHtml("SearchForm", displayQuery(content, isGroupPage)) & activateButtonOnChange(preventSave)
     }
     def displayQueryLine(cl: CriterionLine, index: Int, addRemove: Boolean): NodeSeq = {
 
@@ -386,7 +386,7 @@ class SearchNodeComponent(
    * @return
    */
   def ajaxGridRefresh(isGroupPage: Boolean): JsCmd = {
-    activateButtonOnChange() &
+    activateButtonOnChange(preventSave = false) &
     gridResult(isGroupPage)
   }
 
@@ -418,7 +418,7 @@ class SearchNodeComponent(
    * When we change the form, we can update the query
    * @return
    */
-  def activateButtonOnChange(): JsCmd = {
+  def activateButtonOnChange(preventSave: Boolean): JsCmd = {
     // If saved button id is not defined do not disable save button
     val disableGridOnChange: JsCmd = if (saveButtonId != "") {
       JE.JsRaw(
@@ -428,7 +428,8 @@ class SearchNodeComponent(
     } else {
       Noop
     }
-    onSearchCallback(searchFormHasError, query) & disableGridOnChange
+    val disableSave = searchFormHasError || preventSave
+    onSearchCallback(disableSave, query) & disableGridOnChange
   }
 
   /**