MID-9316: fix for duplicate options of licecycle state panel in safar…

…i browser
Evolveum · Jan 19, 2024 · dda8c88 · dda8c88
1 parent 107b1fc
commit dda8c88
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 44 deletions.
diff --git a/gui/admin-gui/src/frontend/js/midpoint-theme.js b/gui/admin-gui/src/frontend/js/midpoint-theme.js
@@ -598,17 +598,6 @@ breakLongerTextInTableCell(cellId) {
         });
     }
 
-    /**
-    * used in SimulationModePanel.java
-    *
-    * @param compId
-    */
-    initDropdownResize(panelId) {
-        var panel = $('#' + panelId);
-        panel.find("option.width-tmp-option").html(panel.find("select.resizing-select option:selected").text());
-        panel.find("select.resizing-select").width(panel.find("select.width-tmp-select").width());
-    }
-
     initScaleResize(containerId) {
         let div = document.querySelector(containerId);
         let scale = 0.5;

diff --git a/...gui/src/main/java/com/evolveum/midpoint/gui/impl/component/input/LifecycleStatePanel.html b/...gui/src/main/java/com/evolveum/midpoint/gui/impl/component/input/LifecycleStatePanel.html
@@ -8,9 +8,6 @@
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
-    <select class="resizing-select form-control form-control-sm" wicket:id="panel"/>
-    <select class="width-tmp-select form-control form-control-sm w-auto" style="display:none;visibility:hidden;">
-        <option class="width-tmp-option"/>
-    </select>
+    <select class="form-control form-control-sm" wicket:id="panel"/>
 </wicket:panel>
 </html>
diff --git a/...gui/src/main/java/com/evolveum/midpoint/gui/impl/component/input/LifecycleStatePanel.java b/...gui/src/main/java/com/evolveum/midpoint/gui/impl/component/input/LifecycleStatePanel.java
@@ -7,7 +7,6 @@
 
 package com.evolveum.midpoint.gui.impl.component.input;
 
-import com.evolveum.midpoint.gui.api.component.Badge;
 import com.evolveum.midpoint.gui.api.util.DisplayForLifecycleState;
 import com.evolveum.midpoint.gui.api.util.DisplayableChoiceRenderer;
 import com.evolveum.midpoint.gui.api.util.LocalizationUtil;
@@ -26,8 +25,6 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
 import org.apache.wicket.markup.html.form.DropDownChoice;
 import org.apache.wicket.markup.html.form.FormComponent;
 import org.apache.wicket.markup.html.form.IChoiceRenderer;
@@ -65,20 +62,6 @@ protected void onInitialize() {
         initLayout();
     }
 
-    @Override
-    public void renderHead(IHeaderResponse response) {
-        super.renderHead(response);
-
-        callScript(response);
-    }
-
-    private void callScript(IHeaderResponse response) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("MidPointTheme.initDropdownResize('").append(getMarkupId()).append("');");
-
-        response.render(OnDomReadyHeaderItem.forScript(sb.toString()));
-    }
-
     private <T> void initLayout() {
         setOutputMarkupId(true);
 
@@ -149,25 +132,20 @@ protected void appendOptionHtml(AppendingStringBuffer buffer, T choice, int inde
                 DisplayableValue<String> displayValue = (DisplayableValue<String>) choice;
                 DisplayForLifecycleState display = DisplayForLifecycleState.valueOfOrDefault(displayValue.getValue());
                 String label = new DisplayableValueChoiceRenderer<>(null).getDisplayValue(displayValue);
+                buffer.append("\n<option ");
+                setOptionAttributes(buffer, choice, index, selected);
+                buffer.append(">");
                 if (display.getLabel() == null) {
-                    buffer.append("\n<option ");
-                    setOptionAttributes(buffer, choice, index, selected);
-                    buffer.append(">");
                     buffer.append(label);
-                    buffer.append("</option>");
                 } else {
-                    buffer.append("\n<option ");
-                    setOptionAttributes(buffer, choice, index, selected);
-                    buffer.append("style=\"display:none;\">");
-
                     String advancedLabel = LocalizationUtil.translate(display.getLabel());
                     if (label.equals(advancedLabel)) {
                         buffer.append(label);
                     } else {
                         buffer.append(advancedLabel);
                     }
-                    buffer.append("</option>");
                 }
+                buffer.append("</option>");
             }
         };
         input.setNullValid(false);
@@ -176,15 +154,13 @@ protected void appendOptionHtml(AppendingStringBuffer buffer, T choice, int inde
         input.add(new EmptyOnChangeAjaxFormUpdatingBehavior() {
             @Override
             protected void onUpdate(AjaxRequestTarget target) {
-                callScript(target.getHeaderResponse());
                 target.add(input);
             }
         });
 
         input.add(new EmptyOnBlurAjaxFormUpdatingBehaviour() {
             @Override
             protected void onUpdate(AjaxRequestTarget target) {
-                callScript(target.getHeaderResponse());
                 target.add(input);
             }
         });
@@ -198,7 +174,7 @@ protected void onUpdate(AjaxRequestTarget target) {
                 name = value.getValue();
             }
             DisplayForLifecycleState display = DisplayForLifecycleState.valueOfOrDefault(name);
-            return display.getCssClass() + " form-control form-control-sm resizing-select " + customCssClassForInputField();
+            return display.getCssClass() + " form-control form-control-sm " + customCssClassForInputField();
         }));
 
         add(input);