Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · Oct 7, 2022 · 065203a · 065203a
2 parents b125a41 + e8dd8d8
commit 065203a
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 25 deletions.
diff --git a/config/initial-objects/042-role-reviewer.xml b/config/initial-objects/042-role-reviewer.xml
@@ -69,7 +69,7 @@
         </description>
         <action>http://midpoint.evolveum.com/xml/ns/public/security/authorization-model-3#read</action>
         <object>
-            <type>RoleType</type>
+            <type>OrgType</type>
         </object>
         <item>name</item>
         <item>displayName</item>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/LabelWithHelpPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/LabelWithHelpPanel.html
@@ -9,6 +9,8 @@
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
     <div wicket:id="name" style="float: left;"/>
-    <i wicket:id="help" style="float: left; margin-top: 4px;" class="fa fa-fw fa-info-circle text-info"/>
+    <span class="btn btn-tool">
+        <i wicket:id="help" data-toggle="tooltip" data-placement="right" class="fa fa-fw fa-info-circle text-info"/>
+    </span>
 </wicket:panel>
 </html>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/LabelWithHelpPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/LabelWithHelpPanel.java
@@ -41,7 +41,7 @@ private void initLayout() {
 
         Label help = new Label(ID_HELP);
         IModel<String> helpModel = getHelpModel();
-        help.add(AttributeModifier.replace("title",createStringResource(helpModel.getObject() != null ? helpModel.getObject() : "")));
+        help.add(AttributeModifier.replace("data-original-title",createStringResource(helpModel.getObject() != null ? helpModel.getObject() : "")));
         help.add(new VisibleBehaviour(() -> StringUtils.isNotEmpty(helpModel.getObject())));
         help.setOutputMarkupId(true);
         add(help);

diff --git a/...int/gui/impl/page/admin/resource/component/wizard/basic/SelectObjectClassesStepPanel.java b/...int/gui/impl/page/admin/resource/component/wizard/basic/SelectObjectClassesStepPanel.java
@@ -257,7 +257,7 @@ protected void onUpdateHeader(AjaxRequestTarget target, boolean selected, DataTa
             protected IModel<Boolean> getEnabled(IModel<SelectableBean<ObjectClassWrapper>> rowModel) {
                 if (rowModel == null) {
                     if (selectedItems.getObject().size() == getResourceModel().getObjectClassesModel().getObject().size()) {
-                       return Model.of(selectedItems.getObject().values().stream().allMatch(enabled -> !enabled));
+                       return Model.of(!selectedItems.getObject().values().stream().allMatch(enabled -> !enabled));
                     }
                     return super.getEnabled(rowModel);
                 }

diff --git a/...page/admin/resource/component/wizard/objectType/correlation/CorrelationItemRefsTable.java b/...page/admin/resource/component/wizard/objectType/correlation/CorrelationItemRefsTable.java
@@ -7,6 +7,7 @@
 package com.evolveum.midpoint.gui.impl.page.admin.resource.component.wizard.objectType.correlation;
 
 import com.evolveum.midpoint.gui.api.GuiStyleConstants;
+import com.evolveum.midpoint.gui.api.component.LabelWithHelpPanel;
 import com.evolveum.midpoint.gui.api.model.LoadableModel;
 import com.evolveum.midpoint.gui.api.prism.wrapper.ItemWrapper;
 import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerValueWrapper;
@@ -19,9 +20,12 @@
 import com.evolveum.midpoint.gui.impl.component.data.column.PrismPropertyWrapperColumnPanel;
 import com.evolveum.midpoint.gui.impl.component.icon.CompositedIconBuilder;
 import com.evolveum.midpoint.gui.impl.component.input.ContainersDropDownPanel;
+import com.evolveum.midpoint.gui.impl.prism.panel.ItemHeaderPanel;
+import com.evolveum.midpoint.gui.impl.prism.panel.PrismPropertyHeaderPanel;
 import com.evolveum.midpoint.model.api.AssignmentObjectRelation;
 import com.evolveum.midpoint.prism.PrismContainerDefinition;
 import com.evolveum.midpoint.prism.PrismContainerValue;
+import com.evolveum.midpoint.prism.PrismValue;
 import com.evolveum.midpoint.prism.path.ItemName;
 import com.evolveum.midpoint.prism.path.ItemPath;
 import com.evolveum.midpoint.util.exception.SchemaException;
@@ -42,6 +46,7 @@
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
 import org.apache.wicket.markup.html.form.FormComponent;
 import org.apache.wicket.markup.html.panel.Panel;
@@ -169,6 +174,11 @@ protected <IW extends ItemWrapper> Component createColumnPanel(String componentI
                     protected void onUpdate(AjaxRequestTarget target) {
                         target.add(findParent(SelectableDataTable.SelectableRowItem.class));
                     }
+
+                    @Override
+                    protected String getNullValidDisplayValue() {
+                        return getString("CorrelationItemRefsTable.column.fuzzy.nullValue");
+                    }
                 };
                 panel.setOutputMarkupId(true);
                 return panel;
@@ -181,32 +191,32 @@ public String getCssClass() {
         });
 
         columns.add(createColumnForPropertyOfFuzzyContainer(
-                correlationDef,
                 LevenshteinDistanceSearchDefinitionType.F_THRESHOLD,
+                "CorrelationItemRefsTable.column.threshold.label",
+                "CorrelationItemRefsTable.column.threshold.help",
                 "col-3"));
         columns.add(createColumnForPropertyOfFuzzyContainer(
-                correlationDef,
                 LevenshteinDistanceSearchDefinitionType.F_INCLUSIVE,
+                "CorrelationItemRefsTable.column.inclusive.label",
+                "CorrelationItemRefsTable.column.inclusive.help",
                 "col-2"));
 
         return columns;
     }
 
     private IColumn<PrismContainerValueWrapper<CorrelationItemType>, String> createColumnForPropertyOfFuzzyContainer(
-            IModel<PrismContainerDefinition<CorrelationItemType>> correlationDef, ItemName propertyName, String cssClass) {
-        return new PrismPropertyWrapperColumn<CorrelationItemType, String>(
-                correlationDef,
-                ItemPath.create(
-                        CorrelationItemType.F_SEARCH,
-                        ItemSearchDefinitionType.F_FUZZY,
-                        FuzzySearchDefinitionType.F_LEVENSHTEIN,
-                        propertyName),
-                AbstractItemWrapperColumn.ColumnType.VALUE,
-                getPageBase()) {
+            ItemName propertyName, String labelKey, String helpKey, String cssClass) {
+        return new AbstractColumn<>(
+                getPageBase().createStringResource(labelKey)) {
 
             @Override
-            protected boolean isHelpTextVisible(boolean originalHelpTextVisible) {
-                return false;
+            public Component getHeader(String componentId) {
+                return new LabelWithHelpPanel(componentId, getDisplayModel()) {
+                    @Override
+                    protected IModel<String> getHelpModel() {
+                        return getPageBase().createStringResource(helpKey);
+                    }
+                };
             }
 
             @Override
@@ -237,7 +247,8 @@ public void populateItem(
                     return null;
                 };
 
-                Component panel = createColumnPanel(componentId, model);
+                Component panel = new PrismPropertyWrapperColumnPanel<>(
+                        componentId, model, AbstractItemWrapperColumn.ColumnType.VALUE);
                 panel.add(new VisibleBehaviour(() -> model.getObject() != null));
                 cellItem.add(panel);
             }
@@ -277,6 +288,6 @@ protected UserProfileStorage.TableId getTableId() {
 
     @Override
     protected String getKeyOfTitleForNewObjectButton() {
-        return "CorrelationItemRefTable.newObject";
+        return "CorrelationItemRefsTable.newObject";
     }
 }
diff --git a/...resource/component/wizard/objectType/correlation/CorrelationItemRefsTableWizardPanel.java b/...resource/component/wizard/objectType/correlation/CorrelationItemRefsTableWizardPanel.java
@@ -54,7 +54,7 @@ protected void addCustomButtons(RepeatingView buttons) {
         AjaxIconButton saveButton = new AjaxIconButton(
                 buttons.newChildId(),
                 Model.of("fa fa-check"),
-                getPageBase().createStringResource("CorrelationItemRefTableWizardPanel.confirmSettings")) {
+                getPageBase().createStringResource("CorrelationItemRefsTableWizardPanel.confirmSettings")) {
             @Override
             public void onClick(AjaxRequestTarget target) {
                 onExitPerformed(target);
@@ -76,17 +76,17 @@ protected IModel<String> getBreadcrumbLabel() {
         if (StringUtils.isNotBlank(name)) {
             return Model.of(name);
         }
-        return getPageBase().createStringResource("CorrelationItemRefTableWizardPanel.breadcrumb");
+        return getPageBase().createStringResource("CorrelationItemRefsTableWizardPanel.breadcrumb");
     }
 
     @Override
     protected IModel<String> getTextModel() {
-        return getPageBase().createStringResource("CorrelationItemRefTableWizardPanel.text");
+        return getPageBase().createStringResource("CorrelationItemRefsTableWizardPanel.text");
     }
 
     @Override
     protected IModel<String> getSubTextModel() {
-        return getPageBase().createStringResource("CorrelationItemRefTableWizardPanel.subText");
+        return getPageBase().createStringResource("CorrelationItemRefsTableWizardPanel.subText");
     }
 
     protected CorrelationItemRefsTable getTable() {

diff --git a/gui/admin-gui/src/main/resources/initial-objects/042-role-reviewer.xml b/gui/admin-gui/src/main/resources/initial-objects/042-role-reviewer.xml
@@ -69,7 +69,7 @@
         </description>
         <action>http://midpoint.evolveum.com/xml/ns/public/security/authorization-model-3#read</action>
         <object>
-            <type>RoleType</type>
+            <type>OrgType</type>
         </object>
         <item>name</item>
         <item>displayName</item>

diff --git a/...va/com/evolveum/midpoint/model/impl/controller/AdminGuiConfigurationMergeManagerImpl.java b/...va/com/evolveum/midpoint/model/impl/controller/AdminGuiConfigurationMergeManagerImpl.java
@@ -266,6 +266,9 @@ private PreviewContainerPanelConfigurationType mergePreviewPanels(PreviewContain
         PreviewContainerPanelConfigurationType afterMerge = mergePanels(mergedPanel, configuredPanel);
         afterMerge.getAction().clear();
         afterMerge.getAction().addAll(mergedActions);
+        if (configuredPanel.getPreviewSize() != null) {
+            mergedPanel.setPreviewSize(configuredPanel.getPreviewSize());
+        }
         return afterMerge;
     }