Skip to content

Commit

Permalink
adding panel for generate expression evaluator
Browse files Browse the repository at this point in the history
  • Loading branch information
@skublik
skublik committed Jul 20, 2023
1 parent b7fc72e commit da46c03
Show file tree
Hide file tree
Showing 11 changed files with 603 additions and 208 deletions.
14 changes: 1 addition & 13 deletions ...a/com/evolveum/midpoint/gui/impl/component/input/expression/EvaluatorExpressionPanel.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,7 @@
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
<div wicket:id="valueContainer">
<div class="prism-property-label p-0">
<span wicket:id="valueContainerLabel" />
<button wicket:id="add" class="btn btn-tool text-primary" trigger="hover">
<i class="fa fa-plus-circle pr-1"></i>
<wicket:message key="VerticalFormItemHeaderPanel.addValue"/>
</button>

<button wicket:id="remove" class="btn btn-tool text-danger" trigger="hover">
<i class="fa fa-eraser pr-1"></i>
<wicket:message key="VerticalFormItemHeaderPanel.removeAll"/>
</button>
</div>
<div class="prism-property-value" wicket:id="valueInput"/>
<wicket:child/>
<span wicket:id="feedback"/>
</div>
</wicket:panel>
Expand Down
131 changes: 13 additions & 118 deletions ...a/com/evolveum/midpoint/gui/impl/component/input/expression/EvaluatorExpressionPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,35 +7,23 @@
package com.evolveum.midpoint.gui.impl.component.input.expression;

import com.evolveum.midpoint.gui.api.component.BasePanel;
import com.evolveum.midpoint.gui.api.model.NonEmptyLoadableModel;
import com.evolveum.midpoint.gui.api.model.NonEmptyModel;
import com.evolveum.midpoint.gui.impl.component.message.FeedbackLabels;
import com.evolveum.midpoint.web.component.form.multivalue.MultiValueTextPanel;
import com.evolveum.midpoint.web.component.input.TextPanel;
import com.evolveum.midpoint.web.component.prism.InputPanel;
import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ExpressionType;

import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.feedback.ContainerFeedbackMessageFilter;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
import org.jetbrains.annotations.NotNull;

import java.util.List;
import java.io.Serializable;

public abstract class EvaluatorExpressionPanel extends BasePanel<ExpressionType> {

private static final long serialVersionUID = 1L;

private static final String ID_VALUE_INPUT = "valueInput";
private static final String ID_VALUE_CONTAINER = "valueContainer";
private static final String ID_VALUE_CONTAINER_LABEL = "valueContainerLabel";
private static final String ID_ADD_BUTTON = "add";
private static final String ID_REMOVE_BUTTON = "remove";
private static final String ID_FEEDBACK = "feedback";

public EvaluatorExpressionPanel(String id, IModel<ExpressionType> model) {
Expand All @@ -45,123 +33,30 @@ public EvaluatorExpressionPanel(String id, IModel<ExpressionType> model) {
@Override
protected void onInitialize() {
super.onInitialize();
initLayout();
}

private void initLayout() {
setOutputMarkupId(true);

WebMarkupContainer valueContainer = new WebMarkupContainer(ID_VALUE_CONTAINER);
valueContainer.setOutputMarkupId(true);
add(valueContainer);

valueContainer.add(new Label(ID_VALUE_CONTAINER_LABEL, getValueContainerLabelModel()));
WebMarkupContainer parent = new WebMarkupContainer(ID_VALUE_CONTAINER);
parent.setOutputMarkupId(true);
add(parent);

FeedbackLabels feedback = new FeedbackLabels(ID_FEEDBACK);
feedback.setFilter(new ContainerFeedbackMessageFilter(valueContainer));
feedback.setFilter(new ContainerFeedbackMessageFilter(parent));
feedback.setOutputMarkupPlaceholderTag(true);
valueContainer.add(feedback);

AjaxLink<Void> addButton = new AjaxLink<>(ID_ADD_BUTTON) {
private static final long serialVersionUID = 1L;

@Override
public void onClick(AjaxRequestTarget target) {
addValue(target);
}
};
valueContainer.add(addButton);
parent.add(feedback);

AjaxLink<Void> removeButton = new AjaxLink<>(ID_REMOVE_BUTTON) {
private static final long serialVersionUID = 1L;

@Override
public void onClick(AjaxRequestTarget target) {
removeItem(target);
}
};
valueContainer.add(removeButton);

valueContainer.add(createDefaultInputPanel());
initLayout(parent);
}

public abstract IModel<String> getValueContainerLabelModel();
protected abstract void initLayout(MarkupContainer valueContainer);

protected WebMarkupContainer createDefaultInputPanel() {

IModel<List<String>> model = new IModel<>() {
@Override
public List<String> getObject() {
return getEvaluatorValues();
}

@Override
public void setObject(List<String> strings) {
updateEvaluatorValue(getModelObject(), strings);
}

@Override
public void detach() {
}
};

NonEmptyModel<Boolean> readOnlyModel = new NonEmptyLoadableModel<>(false) {
@NotNull
@Override
protected Boolean load() {
return false;
}
};
MultiValueTextPanel<String> valueInput = new MultiValueTextPanel<>(EvaluatorExpressionPanel.ID_VALUE_INPUT, model, readOnlyModel, false) {

@Override
protected Behavior getAddButtonVisibleBehavior(NonEmptyModel<Boolean> readOnlyModel) {
return VisibleBehaviour.ALWAYS_INVISIBLE;
}

@Override
protected IModel<String> createEmptyItemPlaceholder() {
return () -> "";
}

@Override
protected InputPanel createTextPanel(String id, IModel<String> model) {
return EvaluatorExpressionPanel.this.createTextPanel(id, model);
}

@Override
protected void modelObjectUpdatePerformed(AjaxRequestTarget target, List<String> strings) {
updateEvaluatorValue(EvaluatorExpressionPanel.this.getModelObject(), strings);
target.add(getFeedback());
}
};
valueInput.setOutputMarkupId(true);
return valueInput;
}

protected InputPanel createTextPanel(String id, IModel<String> model) {
return new TextPanel<>(id, model);
}

private void removeItem(AjaxRequestTarget target) {
getModelObject().getExpressionEvaluator().clear();
target.add(get(ID_VALUE_CONTAINER));
target.add(getFeedback());
}
public abstract IModel<String> getValueContainerLabelModel();

private void addValue(AjaxRequestTarget target) {
List<String> values = getEvaluatorValues();
values.add("");
updateEvaluatorValue(EvaluatorExpressionPanel.this.getModelObject(), values);
target.add(get(ID_VALUE_CONTAINER));
target.add(getFeedback());
protected final Component getValueContainer() {
return get(ID_VALUE_CONTAINER);
}

protected FeedbackLabels getFeedback() {
return (FeedbackLabels) get(createComponentPath(ID_VALUE_CONTAINER, ID_FEEDBACK));
}

protected abstract void updateEvaluatorValue(ExpressionType expression, List<String> values);

protected abstract List<String> getEvaluatorValues();
}
69 changes: 54 additions & 15 deletions .../main/java/com/evolveum/midpoint/gui/impl/component/input/expression/ExpressionPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@

import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;

import com.evolveum.midpoint.gui.api.model.LoadableModel;
import com.evolveum.midpoint.gui.api.page.PageBase;
import com.evolveum.midpoint.gui.impl.component.dialog.OnePanelPopupPanel;
import com.evolveum.midpoint.gui.impl.prism.wrapper.ExpressionWrapper;
import com.evolveum.midpoint.prism.PrismContext;
Expand Down Expand Up @@ -60,7 +62,7 @@ public class ExpressionPanel extends BasePanel<ExpressionType> {

private final IModel<ExpressionWrapper> parent;
private LoadableModel<RecognizedEvaluator> typeModel;
private IModel<String> helpModel;
private LoadableModel<String> helpModel;
private boolean isEvaluatorPanelExpanded = false;
private boolean isInColumn = false;

Expand All @@ -74,14 +76,17 @@ private enum RecognizedEvaluator {
"ExpressionEvaluatorType.LITERAL.show.button"),
SCRIPT(ExpressionEvaluatorType.SCRIPT,
ScriptExpressionPanel.class,
"ExpressionEvaluatorType.SCRIPT.show.button");
"ExpressionEvaluatorType.SCRIPT.show.button"),
GENERATE(ExpressionEvaluatorType.GENERATE,
GenerateExpressionPanel.class,
"ExpressionEvaluatorType.GENERATE.show.button");

private final ExpressionEvaluatorType type;
private final Class<? extends BasePanel> evaluatorPanel;
private final Class<? extends EvaluatorExpressionPanel> evaluatorPanel;
private final String buttonLabelKeyPrefix;

RecognizedEvaluator(
ExpressionEvaluatorType type, Class<? extends BasePanel> evaluatorPanel, String buttonLabelKeyPrefix) {
ExpressionEvaluatorType type, Class<? extends EvaluatorExpressionPanel> evaluatorPanel, String buttonLabelKeyPrefix) {
this.type = type;
this.evaluatorPanel = evaluatorPanel;
this.buttonLabelKeyPrefix = buttonLabelKeyPrefix;
Expand Down Expand Up @@ -136,13 +141,32 @@ public void setObject(RecognizedEvaluator object) {
}

if (helpModel == null) {
if (StringUtils.isNotEmpty(getModelObject().getDescription())) {
helpModel = getPageBase().createStringResource(getModelObject().getDescription());
} else {
helpModel = () -> StringEscapeUtils.escapeHtml4(
ExpressionUtil.loadExpression(getModelObject(), PrismContext.get(), LOGGER));
helpModel = new LoadableModel<>(false) {
@Override
protected String load() {
if (StringUtils.isNotEmpty(getModelObject().getDescription())) {
return getPageBase().createStringResource(getModelObject().getDescription()).getString();
}

}
Class<? extends EvaluatorExpressionPanel> evaluatorPanel = null;
if (typeModel != null && typeModel.getObject() != null) {
evaluatorPanel = typeModel.getObject().evaluatorPanel;
}

if (evaluatorPanel != null) {
try {
Method m = evaluatorPanel.getMethod("getInfoDescription", ExpressionType.class, PageBase.class);
return (String) m.invoke(null, getModelObject(), getPageBase());
} catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
LOGGER.debug("Couldn't find method getInfoDescription in class " + evaluatorPanel.getSimpleName());
}

}

return StringEscapeUtils.escapeHtml4(
ExpressionUtil.loadExpression(getModelObject(), PrismContext.get(), LOGGER));
}
};
}
}

Expand All @@ -166,14 +190,15 @@ private void initLayout() {
Label infoIcon = new Label(ID_INFO_ICON);
infoIcon.add(AttributeModifier.replace("title", helpModel));
infoIcon.add(new InfoTooltipBehavior());
infoIcon.add(new VisibleBehaviour(() -> !isExpressionEmpty() && isInfoLabelNotEmpty()));
infoIcon.add(new VisibleBehaviour(() -> !isExpressionEmpty() && isInfoLabelNotEmpty() && isHelpDescriptionNotEmpty()));
infoContainer.add(infoIcon);

AjaxButton resetButton = new AjaxButton(ID_RESET_BUTTON) {
@Override
public void onClick(AjaxRequestTarget target) {
ExpressionPanel.this.getModelObject().getExpressionEvaluator().clear();
typeModel.reset();
helpModel.reset();
infoLabelModel.setObject("");

updateLabelForExistingEvaluator();
Expand All @@ -182,7 +207,7 @@ public void onClick(AjaxRequestTarget target) {
ExpressionPanel.this.addOrReplace(createEvaluatorPanel());
ExpressionPanel.this.addOrReplace(createTypeButton());

target.add(ExpressionPanel.this.get(ID_EVALUATOR_PANEL));
target.add(getEvaluatorPanel());
target.add(ExpressionPanel.this.get(ID_TYPE_CHOICE));
target.add(ExpressionPanel.this.get(ID_TYPE_BUTTON));
target.add(ExpressionPanel.this.get(ID_INFO_CONTAINER));
Expand All @@ -195,7 +220,6 @@ public void onClick(AjaxRequestTarget target) {

if (isExpressionEmpty() || typeModel.getObject() != null) {


updateLabelForExistingEvaluator();

add(createTypeChoice());
Expand All @@ -214,6 +238,14 @@ public void onClick(AjaxRequestTarget target) {
}
}

private boolean isHelpDescriptionNotEmpty() {
return helpModel != null && StringUtils.isNotEmpty(helpModel.getObject());
}

private Component getEvaluatorPanel() {
return get(ID_EVALUATOR_PANEL);
}

private boolean isInfoLabelNotEmpty() {
return StringUtils.isNotEmpty(infoLabelModel.getObject());
}
Expand Down Expand Up @@ -271,10 +303,12 @@ protected void onUpdate(AjaxRequestTarget target) {
addOrReplace(createEvaluatorPanel());
addOrReplace(createTypeButton());

target.add(get(ID_EVALUATOR_PANEL));
target.add(getEvaluatorPanel());
target.add(get(ID_TYPE_BUTTON));
target.add(get(ID_TYPE_CHOICE));
target.add(ExpressionPanel.this);

helpModel.reset();
}
});

Expand Down Expand Up @@ -320,6 +354,8 @@ protected void processHide(AjaxRequestTarget target) {
updateLabelForExistingEvaluator();
target.add(ExpressionPanel.this.get(ID_INFO_CONTAINER));
target.add(ExpressionPanel.this);

helpModel.reset();
}
};
getPageBase().showMainPopup(popupPanel, target);
Expand All @@ -331,10 +367,12 @@ protected void processHide(AjaxRequestTarget target) {
updateLabelForExistingEvaluator();
}

target.add(ExpressionPanel.this.get(ID_EVALUATOR_PANEL));
target.add(getEvaluatorPanel());
target.add(ExpressionPanel.this.get(ID_INFO_CONTAINER));
target.add(ExpressionPanel.this.get(ID_TYPE_BUTTON));
target.add(ExpressionPanel.this);

helpModel.reset();
}
}

Expand All @@ -355,6 +393,7 @@ public IModel<?> getBody() {
private WebMarkupContainer createEvaluatorPanel() {
return createEvaluatorPanel(ExpressionPanel.ID_EVALUATOR_PANEL, false);
}

private WebMarkupContainer createEvaluatorPanel(String id, boolean isInPopup) {
RecognizedEvaluator type = typeModel.getObject();
if (type != null && type.evaluatorPanel != null) {
Expand Down
20 changes: 20 additions & 0 deletions ...va/com/evolveum/midpoint/gui/impl/component/input/expression/GenerateExpressionPanel.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<!--
~ Copyright (c) 2023 Evolveum
~
~ This work is dual-licensed under the Apache License 2.0
~ and European Union Public License. See LICENSE file for details.
-->

<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
<div class="prism-property-label p-0">
<span><wicket:message key="GenerateExpressionPanel.mode"/></span>
</div>
<div class="prism-property-value" wicket:id="mode"/>
<div class="prism-property-label pt-1 p-0">
<span><wicket:message key="GenerateExpressionPanel.valuePolicy"/></span>
</div>
<div class="prism-property-value" wicket:id="valuePolicy"/>
</wicket:extend>
</html>

0 comments on commit da46c03

Please sign in to comment.