Skip to content

Fixes #27784: There is no way to know that the OS is a dropdown list when creating a group #6721

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
clarktsiory merged 1 commit into from
Nov 18, 2025
Merged

Fixes #27784: There is no way to know that the OS is a dropdown list when creating a group #6721

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 28 additions & 10 deletions ...r/rudder-web/src/main/scala/com/normation/rudder/web/components/SearchNodeComponent.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,12 +242,17 @@ class SearchNodeComponent(

lines.append(cl)

val form = asForm(cl.attribute.cType)
val initJs = form.initForm("v_" + index)
val inputAttributes = ("id", "v_" + index) :: ("class", "queryInputValue form-control input-sm") :: {
val form = asForm(cl.attribute.cType)
val initJs = form.initForm("v_" + index)

val inputAttributes = ("id", "v_" + index) :: {
if (cl.comparator.hasValue) Nil else ("disabled", "disabled") :: Nil
}
val input = form.toForm(cl.value, (x => lines(index) = lines(index).copy(value = x)), inputAttributes*)
val inputNoClass = form.toForm(cl.value, (x => lines(index) = lines(index).copy(value = x)), inputAttributes*)
val inputClass = classFromInputLabel(inputNoClass)
val input =
inputNoClass % inputNoClass.attributes.append(Attribute.apply(pre = null, key = "class", value = inputClass, next = Null))

(".removeLine *" #> {
if (addRemove)
SHtml.ajaxSubmit("-", () => removeLine(index), ("class", "btn btn-danger btn-sm fw-bold"))
Expand Down Expand Up @@ -526,6 +531,14 @@ object SearchNodeComponent {
}
}

def classFromInputLabel(elem: Elem) = {
// bootstrap 5 class attributes that correspond to the elem's label
elem.label match {
case "select" => "queryInputValue form-select form-select-sm"
case _ => "queryInputValue form-control form-control-sm" // text input field by default
}
}

def updateCompAndValue(
func: String => Any,
ot: String,
Expand All @@ -536,26 +549,31 @@ object SearchNodeComponent {
v_old: String
): JsCmd = {
// change input display
val comp = ditQueryData.criteriaMap.get(ot) match {
val comp = ditQueryData.criteriaMap.get(ot) match {
case None => StringComparator
case Some(o) =>
o.criterionForName(a) match {
case None => StringComparator
case Some(comp) => comp.cType
}
}
val comparators = optionComparatorsFor(ot, a)
val compNames = comparators.map(_._1)
val selectedComp = compNames match {
val comparators = optionComparatorsFor(ot, a)
val compNames = comparators.map(_._1)
val selectedComp = compNames match {
case b :: _ =>
compNames.filter(_ == c_oldVal) match {
case x :: _ => x
case Nil => b
}
case Nil => ""
}
val form = asForm(comp)
val newForm = form.toForm(v_old, func, ("id" -> v_eltid), ("class" -> "queryInputValue form-control input-sm"))
val form = asForm(comp)
val newFormNoClass = form.toForm(v_old, func, ("id" -> v_eltid))
val inputClass = classFromInputLabel(newFormNoClass)
val newForm = newFormNoClass % newFormNoClass.attributes.append(
Attribute.apply(pre = null, key = "class", value = inputClass, next = Null)
)

form.destroyForm(v_eltid) &
JsCmds.Replace(v_eltid, newForm) &
form.initForm(v_eltid) &
Expand Down