Skip to content

Commit

Permalink
systemName usage
Browse files Browse the repository at this point in the history
  • Loading branch information
@KaterynaHonchar
KaterynaHonchar committed Apr 15, 2019
1 parent 09b6355 commit 6c93f52
Show file tree
Hide file tree
Showing 12 changed files with 94 additions and 65 deletions.
14 changes: 4 additions & 10 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/HelpInfoPanel.java
View file
Expand Up @@ -21,22 +21,16 @@ public HelpInfoPanel(String id){
this(id, null);
}

public HelpInfoPanel(String id, String messageKey){
public HelpInfoPanel(String id, IModel<String> messageModel){
super (id);
initLayout(messageKey);
initLayout(messageModel);
}

public void initLayout(final String messageKey){
public void initLayout(final IModel<String> messageModel){
WebMarkupContainer content = new WebMarkupContainer(ID_CONTENT);
add(content);

Label helpLabel = new Label(ID_HELP, new IModel<String>() {

@Override
public String getObject() {
return getString(messageKey);
}
});
Label helpLabel = new Label(ID_HELP, messageModel);
helpLabel.setEscapeModelStrings(false);
content.add(helpLabel);

Expand Down
24 changes: 8 additions & 16 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DropDownFormGroup.java
View file
Expand Up @@ -54,27 +54,27 @@ public class DropDownFormGroup<T> extends BasePanel<T> {

public DropDownFormGroup(String id, IModel<T> value, IModel<List<T>> choices, IChoiceRenderer<T> renderer,
IModel<String> label, String labelCssClass, String textCssClass, boolean required, boolean isSimilarAsPropertyPanel) {
this(id, value, choices, renderer, label, null, false, labelCssClass, textCssClass, required, isSimilarAsPropertyPanel);
this(id, value, choices, renderer, label, Model.of(), false, labelCssClass, textCssClass, required, isSimilarAsPropertyPanel);
}

public DropDownFormGroup(String id, IModel<T> value, IModel<List<T>> choices, IChoiceRenderer<T> renderer,
IModel<String> label, String labelCssClass, String textCssClass, boolean required) {
this(id, value, choices, renderer, label, null, false, labelCssClass, textCssClass, required, false);
this(id, value, choices, renderer, label, Model.of(), false, labelCssClass, textCssClass, required, false);
}

public DropDownFormGroup(String id, IModel<T> value, IModel<List<T>> choices, IChoiceRenderer<T> renderer,
IModel<String> label, String tooltipKey, boolean isTooltipInModal, String labelCssClass, String textCssClass, boolean required) {
this(id, value, choices, renderer, label, tooltipKey, isTooltipInModal, labelCssClass, textCssClass, required, false);
this(id, value, choices, renderer, label, Model.of(tooltipKey), isTooltipInModal, labelCssClass, textCssClass, required, false);
}

public DropDownFormGroup(String id, IModel<T> value, IModel<List<T>> choices, IChoiceRenderer<T> renderer, IModel<String> label, String tooltipKey,
public DropDownFormGroup(String id, IModel<T> value, IModel<List<T>> choices, IChoiceRenderer<T> renderer, IModel<String> label, IModel<String> tooltipModel,
boolean isTooltipInModal, String labelCssClass, String textCssClass, boolean required, boolean isSimilarAsPropertyPanel) {
super(id, value);

initLayout(choices, renderer, label, tooltipKey, isTooltipInModal, labelCssClass, textCssClass, required, isSimilarAsPropertyPanel);
initLayout(choices, renderer, label, tooltipModel, isTooltipInModal, labelCssClass, textCssClass, required, isSimilarAsPropertyPanel);
}

private void initLayout(IModel<List<T>> choices, IChoiceRenderer<T> renderer, IModel<String> label, final String tooltipKey,
private void initLayout(IModel<List<T>> choices, IChoiceRenderer<T> renderer, IModel<String> label, final IModel<String> tooltipModel,
boolean isTooltipInModal, String labelCssClass, String textCssClass, final boolean required,
boolean isSimilarAsPropertyPanel) {
WebMarkupContainer labelContainer = new WebMarkupContainer(ID_LABEL_CONTAINER);
Expand All @@ -93,23 +93,15 @@ private void initLayout(IModel<List<T>> choices, IChoiceRenderer<T> renderer, IM
labelContainer.add(l);

Label tooltipLabel = new Label(ID_TOOLTIP, new Model<>());
tooltipLabel.add(new AttributeAppender("data-original-title", new IModel<String>() {

private static final long serialVersionUID = 1L;

@Override
public String getObject() {
return getString(tooltipKey);
}
}));
tooltipLabel.add(new AttributeAppender("data-original-title", tooltipModel));
tooltipLabel.add(new InfoTooltipBehavior(isTooltipInModal));
tooltipLabel.add(new VisibleEnableBehaviour() {

private static final long serialVersionUID = 1L;

@Override
public boolean isVisible() {
return tooltipKey != null;
return tooltipModel != null && StringUtils.isNotEmpty(tooltipModel.getObject());
}
});
tooltipLabel.setOutputMarkupId(true);
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.html
View file
Expand Up @@ -181,7 +181,7 @@ <h3 class="box-title"><span wicket:id="editorName"></span></h3>
<dl class="dl-horizontal">
<dt>
<label><wicket:message key="SchemaHandlingStep.label.iteration" /></label>
<i wicket:id="iterationTooltip" wicket:message="title:SchemaHandlingStep.tooltip.iteration"/>
<i wicket:id="iterationTooltip"/>
</dt>
<dd>
<a wicket:id="editorIterationButton" class="btn btn-sm btn-primary" title="Edit">
Expand Down
2 changes: 2 additions & 0 deletions ...src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
View file
Expand Up @@ -575,6 +575,8 @@ protected void onSubmit(AjaxRequestTarget target) {
editor.add(assignmentPolicyRefTooltip);

Label iterationTooltip = new Label(ID_T_ITERATION);
iterationTooltip.add(AttributeAppender.append("title", createStringResource("SchemaHandlingStep.tooltip.iteration",
WebComponentUtil.getMidpointCustomSystemName(getPageBase(), "midpoint.default.system.name"))));
iterationTooltip.add(new InfoTooltipBehavior());
editor.add(iterationTooltip);

Expand Down
16 changes: 8 additions & 8 deletions ...oint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.html
View file
Expand Up @@ -49,7 +49,7 @@ <h4 class="panel-title">
<dl class="dl-horizontal">
<dt>
<label><wicket:message key="ResourceActivationEditor.label.outbound" /></label>
<i wicket:id="existenceOutboundTooltip" wicket:message="title:SchemaHandlingStep.activation.tooltip.outbound"/>
<i wicket:id="existenceOutboundTooltip" />
</dt>
<div wicket:id="existenceOutbound" />
</dl>
Expand All @@ -58,7 +58,7 @@ <h4 class="panel-title">
<dl class="dl-horizontal">
<dt>
<label><wicket:message key="ResourceActivationEditor.label.inbound" /></label>
<i wicket:id="existenceInboundTooltip" wicket:message="title:SchemaHandlingStep.activation.tooltip.inbound"/>
<i wicket:id="existenceInboundTooltip"/>
</dt>
<div wicket:id="existenceInbound" />
</dl>
Expand Down Expand Up @@ -93,7 +93,7 @@ <h4 class="panel-title">
<dl class="dl-horizontal">
<dt>
<label><wicket:message key="ResourceActivationEditor.label.outbound" /></label>
<i wicket:id="admStatusOutboundTooltip" wicket:message="title:SchemaHandlingStep.activation.tooltip.outbound"/>
<i wicket:id="admStatusOutboundTooltip" />
</dt>
<div wicket:id="admStatusOutbound" />
</dl>
Expand All @@ -102,7 +102,7 @@ <h4 class="panel-title">
<dl class="dl-horizontal">
<dt>
<label><wicket:message key="ResourceActivationEditor.label.inbound" /></label>
<i wicket:id="admStatusInboundTooltip" wicket:message="title:SchemaHandlingStep.activation.tooltip.inbound"/>
<i wicket:id="admStatusInboundTooltip"/>
</dt>
<div wicket:id="admStatusInbound" />
</dl>
Expand Down Expand Up @@ -138,7 +138,7 @@ <h4 class="panel-title">
<dl class="dl-horizontal">
<dt>
<label><wicket:message key="ResourceActivationEditor.label.outbound" /></label>
<i wicket:id="validFromOutboundTooltip" wicket:message="title:SchemaHandlingStep.activation.tooltip.outbound"/>
<i wicket:id="validFromOutboundTooltip" />
</dt>
<div wicket:id="validFromOutbound" />
</dl>
Expand All @@ -147,7 +147,7 @@ <h4 class="panel-title">
<dl class="dl-horizontal">
<dt>
<label><wicket:message key="ResourceActivationEditor.label.inbound" /></label>
<i wicket:id="validFromInboundTooltip" wicket:message="title:SchemaHandlingStep.activation.tooltip.inbound"/>
<i wicket:id="validFromInboundTooltip" />
</dt>
<div wicket:id="validFromInbound" />
</dl>
Expand Down Expand Up @@ -183,7 +183,7 @@ <h4 class="panel-title">
<dl class="dl-horizontal">
<dt>
<label><wicket:message key="ResourceActivationEditor.label.outbound" /></label>
<i wicket:id="validToOutboundTooltip" wicket:message="title:SchemaHandlingStep.activation.tooltip.outbound"/>
<i wicket:id="validToOutboundTooltip" />
</dt>
<div wicket:id="validToOutbound" />
</dl>
Expand All @@ -192,7 +192,7 @@ <h4 class="panel-title">
<dl class="dl-horizontal">
<dt>
<label><wicket:message key="ResourceActivationEditor.label.inbound" /></label>
<i wicket:id="validToInboundTooltip" wicket:message="title:SchemaHandlingStep.activation.tooltip.inbound"/>
<i wicket:id="validToInboundTooltip"/>
</dt>
<div wicket:id="validToInbound" />
</dl>
Expand Down
30 changes: 25 additions & 5 deletions ...oint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.java
View file
Expand Up @@ -28,17 +28,16 @@
import com.evolveum.midpoint.web.component.wizard.resource.dto.MappingTypeDto;
import com.evolveum.midpoint.web.util.InfoTooltipBehavior;
import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
import com.evolveum.prism.xml.ns._public.types_3.ItemPathType;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.EnumChoiceRenderer;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;

import java.util.List;
import org.apache.wicket.model.StringResourceModel;

/**
* @author shood
Expand Down Expand Up @@ -89,10 +88,17 @@ public class ResourceActivationEditor extends BasePanel<ResourceActivationDefini
public static final String VALID_FROM_IN_TARGET_DEFAULT = "&" + ExpressionConstants.VAR_FOCUS + "/activation/validFrom";

private boolean isInitialized = false;
private NonEmptyModel<Boolean> readOnlyModel;

public ResourceActivationEditor(String id, IModel<ResourceActivationDefinitionType> model, NonEmptyModel<Boolean> readOnlyModel) {
super(id, model);
initLayout(readOnlyModel);
this.readOnlyModel = readOnlyModel;
}

@Override
protected void onInitialize(){
super.onInitialize();
initLayout();
}

@Override
Expand Down Expand Up @@ -209,7 +215,7 @@ private void prepareActivationObject(ResourceActivationDefinitionType activation
}
}

protected void initLayout(NonEmptyModel<Boolean> readOnlyModel) {
protected void initLayout() {
prepareActivationPanelBody(ResourceActivationDefinitionType.F_EXISTENCE.getLocalPart(), ID_EXISTENCE_FS,
ID_EXISTENCE_OUT, ID_EXISTENCE_IN, readOnlyModel);

Expand All @@ -227,34 +233,40 @@ protected void initLayout(NonEmptyModel<Boolean> readOnlyModel) {
add(exFetchTooltip);

Label exOutTooltip = new Label(ID_T_EX_OUT);
exOutTooltip.add(AttributeAppender.append("title", getSystemNameDependentTooltipModel("SchemaHandlingStep.activation.tooltip.outbound")));
exOutTooltip.add(new InfoTooltipBehavior());
add(exOutTooltip);

Label exInTooltip = new Label(ID_T_EX_IN);
exInTooltip.add(new InfoTooltipBehavior());
exInTooltip.add(AttributeAppender.append("title", getSystemNameDependentTooltipModel("SchemaHandlingStep.activation.tooltip.inbound")));
add(exInTooltip);

Label admFetchTooltip = new Label(ID_T_ADM_FETCH);
admFetchTooltip.add(new InfoTooltipBehavior());
add(admFetchTooltip);

Label admOutTooltip = new Label(ID_T_ADM_OUT);
admOutTooltip.add(AttributeAppender.append("title", getSystemNameDependentTooltipModel("SchemaHandlingStep.activation.tooltip.outbound")));
admOutTooltip.add(new InfoTooltipBehavior());
add(admOutTooltip);

Label admInTooltip = new Label(ID_T_ADM_IN);
admInTooltip.add(new InfoTooltipBehavior());
admInTooltip.add(AttributeAppender.append("title", getSystemNameDependentTooltipModel("SchemaHandlingStep.activation.tooltip.inbound")));
add(admInTooltip);

Label validFromFetchTooltip = new Label(ID_T_VALID_F_FETCH);
validFromFetchTooltip.add(new InfoTooltipBehavior());
add(validFromFetchTooltip);

Label validFromOutTooltip = new Label(ID_T_VALID_F_OUT);
validFromOutTooltip.add(AttributeAppender.append("title", getSystemNameDependentTooltipModel("SchemaHandlingStep.activation.tooltip.outbound")));
validFromOutTooltip.add(new InfoTooltipBehavior());
add(validFromOutTooltip);

Label validFromInTooltip = new Label(ID_T_VALID_F_IN);
validFromInTooltip.add(AttributeAppender.append("title", getSystemNameDependentTooltipModel("SchemaHandlingStep.activation.tooltip.inbound")));
validFromInTooltip.add(new InfoTooltipBehavior());
add(validFromInTooltip);

Expand All @@ -263,10 +275,12 @@ protected void initLayout(NonEmptyModel<Boolean> readOnlyModel) {
add(validToFetchTooltip);

Label validToOutTooltip = new Label(ID_T_VALID_T_OUT);
validToOutTooltip.add(AttributeAppender.append("title", getSystemNameDependentTooltipModel("SchemaHandlingStep.activation.tooltip.outbound")));
validToOutTooltip.add(new InfoTooltipBehavior());
add(validToOutTooltip);

Label validToInTooltip = new Label(ID_T_VALID_T_IN);
validToInTooltip.add(AttributeAppender.append("title", getSystemNameDependentTooltipModel("SchemaHandlingStep.activation.tooltip.inbound")));
validToInTooltip.add(new InfoTooltipBehavior());
add(validToInTooltip);

Expand Down Expand Up @@ -356,4 +370,10 @@ private void mappingEditPerformed(AjaxRequestTarget target, MappingType mapping,
window.updateModel(target, mapping, isInbound);
window.show(target);
}

private StringResourceModel getSystemNameDependentTooltipModel(String key){
return createStringResource(key,
WebComponentUtil.getMidpointCustomSystemName(getPageBase(),
createStringResource("midpoint.default.system.name").getString()));
}
}
9 changes: 7 additions & 2 deletions ...omponent/wizard/resource/component/synchronization/SynchronizationActionEditorDialog.java
View file
Expand Up @@ -133,7 +133,9 @@ private void initLayout(WebMarkupContainer content){
new PropertyModel<>(model, SynchronizationActionTypeDto.F_HANDLER_URI),
WebComponentUtil.createReadonlyModelFromEnum(SynchronizationActionTypeDto.HandlerUriActions.class),
new EnumChoiceRenderer<>(this), createStringResource("SynchronizationActionEditorDialog.label.handlerUri"),
"SynchronizationStep.action.tooltip.handlerUri", true, ID_LABEL_SIZE, ID_INPUT_SIZE, false){
createStringResource("SynchronizationStep.action.tooltip.handlerUri",
WebComponentUtil.getMidpointCustomSystemName((PageResourceWizard)getPage(), "midpoint.default.system.name")),
true, ID_LABEL_SIZE, ID_INPUT_SIZE, false, false){

@Override
protected DropDownChoice createDropDown(String id, IModel<List<SynchronizationActionTypeDto.HandlerUriActions>> choices,
Expand All @@ -148,7 +150,10 @@ protected DropDownChoice createDropDown(String id, IModel<List<SynchronizationAc

DropDownFormGroup<BeforeAfterType> order = new DropDownFormGroup<BeforeAfterType>(ID_ORDER, new PropertyModel<>(model, SynchronizationActionTypeDto.F_ACTION_OBJECT + ".order"),
WebComponentUtil.createReadonlyModelFromEnum(BeforeAfterType.class), new EnumChoiceRenderer<>(this),
createStringResource("SynchronizationActionEditorDialog.label.order"), "SynchronizationStep.action.tooltip.order", true, ID_LABEL_SIZE, ID_INPUT_SIZE, false){
createStringResource("SynchronizationActionEditorDialog.label.order"),
createStringResource("SynchronizationStep.action.tooltip.order",
WebComponentUtil.getMidpointCustomSystemName((PageResourceWizard)getPage(), "midpoint.default.system.name")),
true, ID_LABEL_SIZE, ID_INPUT_SIZE, false, false){

@Override
protected DropDownChoice createDropDown(String id, IModel<List<BeforeAfterType>> choices, IChoiceRenderer<BeforeAfterType> renderer, boolean required){
Expand Down
4 changes: 2 additions & 2 deletions ...src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageRepositoryQuery.html
View file
Expand Up @@ -35,7 +35,7 @@ <h3><div wicket:id="repositoryQueryLabel"/></h3>
<label for="querySample" class="small"><wicket:message key="PageRepositoryQuery.chooseSample"/></label>
<div id="querySample" wicket:id="querySample"/>
</div>
<p class="small" style="margin-top: 5px"><wicket:message key="PageRepositoryQuery.queryVsFilterNote"/></p>
<p class="small" style="margin-top: 5px"><div wicket:id="queryVsFilterNote"/></p>
<div class="main-button-bar" wicket:id="midPointQueryButtonBar">
<a class="btn btn-primary" wicket:id="executeMidPoint"/>
<a class="btn btn-default" wicket:id="compileMidPoint"/>
Expand All @@ -46,7 +46,7 @@ <h3><div wicket:id="repositoryQueryLabel"/></h3>
<h3><wicket:message key="PageRepositoryQuery.hibernateQuery"/></h3>
<textarea wicket:id="editorHibernate"></textarea>
<h4><wicket:message key="PageRepositoryQuery.hibernateParameters"/></h4>
<p class="small" wicket:id="hibernateParametersNote"><wicket:message key="PageRepositoryQuery.hibernateParametersNote"/></p>
<p class="small" wicket:id="hibernateParametersNote" />
<textarea wicket:id="hibernateParameters"></textarea>
<div class="form-group" style="margin-top: 15px">
<a class="btn btn-primary" wicket:id="executeHibernate"/>
Expand Down

0 comments on commit 6c93f52

Please sign in to comment.