fix issues for flex auth schrodinger tests after implementation of ne…

…w date time picker
Evolveum · Apr 10, 2024 · 4c8abe1 · 4c8abe1
1 parent 3593795
commit 4c8abe1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 24 deletions.
diff --git a/...gui/src/main/java/com/evolveum/midpoint/gui/impl/component/input/DateTimePickerPanel.html b/...gui/src/main/java/com/evolveum/midpoint/gui/impl/component/input/DateTimePickerPanel.html
@@ -11,7 +11,7 @@
 <body>
 <wicket:panel>
     <div class="form-group">
-        <div class='input-group date-time-picker-container flex-nowrap' data-td-target-input="nearest" data-td-target-toggle="nearest" wicket:id="container">
+        <div class='input-group flex-nowrap' data-td-target-input="nearest" data-td-target-toggle="nearest" wicket:id="container">
             <input type='text' class="form-control form-control-sm" wicket:id="input"/>
             <span wicket:id="iconContainer" class="input-group-text input-group-append btn"
                     tabindex="0" data-td-toggle="datetimepicker"

diff --git a/...a/com/evolveum/midpoint/gui/impl/page/login/module/PageAbstractAttributeVerification.java b/...a/com/evolveum/midpoint/gui/impl/page/login/module/PageAbstractAttributeVerification.java
@@ -8,15 +8,13 @@
 package com.evolveum.midpoint.gui.impl.page.login.module;
 
 import java.io.Serial;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import com.evolveum.midpoint.gui.api.factory.wrapper.WrapperContext;
 import com.evolveum.midpoint.gui.api.prism.ItemStatus;
 import com.evolveum.midpoint.gui.api.prism.wrapper.ItemWrapper;
 import com.evolveum.midpoint.gui.api.prism.wrapper.PrismPropertyWrapper;
-import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.gui.impl.prism.panel.*;
 import com.evolveum.midpoint.gui.impl.prism.wrapper.PrismPropertyValueWrapper;
 import com.evolveum.midpoint.prism.PrismObject;
@@ -33,7 +31,6 @@
 import com.evolveum.midpoint.web.component.input.TextPanel;
 import com.evolveum.prism.xml.ns._public.types_3.PolyStringType;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.ajax.AjaxEventBehavior;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
@@ -147,7 +144,7 @@ private void createTextPanelComponent(PrismPropertyWrapper<?> itemWrapper, ListI
     private void createGenericPanelComponent(PrismPropertyWrapper<?> itemWrapper, ListItem<VerificationAttributeDto> item, String headerLabel) {
         IModel<String> hiddenFieldModel = Model.of();
 
-        PropertyModel<PrismPropertyValueWrapper> valueModel = new PropertyModel<PrismPropertyValueWrapper>(itemWrapper, "value");
+        PropertyModel<PrismPropertyValueWrapper> valueModel = new PropertyModel<>(itemWrapper, "value");
         var valuePanel = new PrismPropertyValuePanel(ID_ATTRIBUTE_VALUE,
                 valueModel, createItemPanelSettings()) {
 
@@ -172,10 +169,7 @@ protected void onUpdate(AjaxRequestTarget target) {
 
             @Override
             protected Map<String, String> getAttributeValuesMap() {
-                Map<String, String> attributes = new HashMap<>();
-                attributes.put("name", AuthConstants.ATTR_VERIFICATION_PARAMETER_START + item.getModelObject().getItemPath());
-                attributes.put("aria-label", headerLabel);
-                return attributes;
+                return Map.of("aria-label", headerLabel);
             }
 
             @Override
@@ -210,19 +204,6 @@ private void addNameAttribute(FormComponent component, ListItem<VerificationAttr
                 + item.getModelObject().getItemPath()));
     }
 
-    private String resolveAttributeLabel(VerificationAttributeDto attribute) {
-        if (attribute == null) {
-            return "";
-        }
-        var path = attribute.getItemPath();
-        if (path == null) {
-            return "";
-        }
-        ItemDefinition<?> def = new UserType().asPrismObject().getDefinition().findItemDefinition(path);
-        var label = WebComponentUtil.getItemDefinitionDisplayNameOrName(def);
-        return StringUtils.isEmpty(label) ? path.toString() : label;
-    }
-
     protected PrismPropertyWrapper<?> createItemWrapper(ItemPath itemPath) {
         try {
             var itemDefinition = resolveAttributeDefinition(itemPath);
@@ -242,8 +223,7 @@ private ItemDefinition<?> resolveAttributeDefinition(ItemPath itemPath) {
 
     private WrapperContext createWrapperContext() {
         Task task = createAnonymousTask(OPERATION_CREATE_ITEM_WRAPPER);
-        WrapperContext ctx = new WrapperContext(task, task.getResult());
-        return ctx;
+        return new WrapperContext(task, task.getResult());
     }
 
     private ItemPanelSettings createItemPanelSettings() {