Skip to content

Commit

Permalink
adding title to popup panels (MID-7285)
Browse files Browse the repository at this point in the history
  • Loading branch information
skublik committed Oct 18, 2021
1 parent 4fe42f7 commit 1ff0176
Show file tree
Hide file tree
Showing 51 changed files with 296 additions and 36 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.StringResourceModel;

import javax.xml.namespace.QName;
import java.util.ArrayList;
Expand Down Expand Up @@ -523,4 +524,8 @@ public Component getComponent(){
protected QName getDefaultTargetType() {
return RoleType.COMPLEX_TYPE;
}

public StringResourceModel getTitle(){
return createStringResource("TypedAssignablePanel.selectObjects");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
import com.evolveum.midpoint.web.component.MultiCompositedButtonPanel;
import com.evolveum.midpoint.web.component.dialog.Popupable;

import org.apache.wicket.model.StringResourceModel;

public abstract class NewObjectCreationPopup extends BasePanel<List<CompositedIconButtonDto>> implements Popupable {

private static final String ID_BUTTON_CANCEL = "cancelButton";
Expand Down Expand Up @@ -91,4 +93,8 @@ public Component getComponent() {
return NewObjectCreationPopup.this;
}

@Override
public StringResourceModel getTitle() {
return new StringResourceModel("");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -292,4 +292,9 @@ public String getHeightUnit(){
public Component getComponent() {
return this;
}

@Override
public StringResourceModel getTitle() {
return parentPage.createStringResource("ObjectBrowserPanel.chooseObject");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -547,4 +547,9 @@ private int getSelectedResourceCount() {
protected List<ObjectTypes> getObjectTypesList() {
return WebComponentUtil.createAssignableTypesList();
}

@Override
public StringResourceModel getTitle() {
return PageBase.createStringResourceStatic(TypedAssignablePanel.this, "TypedAssignablePanel.selectObjects");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -710,4 +710,9 @@ public Component getComponent() {
return this;
}

@Override
public StringResourceModel getTitle() {
return new StringResourceModel("OperationResultPanel.result");
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -104,5 +104,9 @@ public Component getComponent() {
return this;
}

@Override
public StringResourceModel getTitle() {
return new StringResourceModel("OperationResultPopupPanel.title");
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -1047,6 +1047,7 @@ public void showMainPopup(Popupable popupable, AjaxRequestTarget target) {
popupable.getWidthUnit(),
"" + (popupable.getHeight() > 0 ? popupable.getHeight() : ""), popupable.getHeightUnit())));
dialog.setContent(popupable.getComponent());
dialog.setTitle(popupable.getTitle());
dialog.open(target);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
import com.evolveum.midpoint.web.page.admin.configuration.component.HeaderMenuAction;
import com.evolveum.midpoint.web.page.admin.roles.AbstractRoleCompositedSearchItem;
import com.evolveum.midpoint.web.page.admin.roles.SearchBoxConfigurationHelper;
import com.evolveum.midpoint.web.page.admin.users.component.TreeTablePanel;
import com.evolveum.midpoint.web.security.GuiAuthorizationConstants;
import com.evolveum.midpoint.web.session.MemberPanelStorage;
import com.evolveum.midpoint.web.session.PageStorage;
Expand Down Expand Up @@ -776,7 +775,7 @@ protected List<QName> getSupportedRelations() {
protected List<QName> getSupportedMembersTabRelations() {
List<QName> relations = WebComponentUtil.getCategoryRelationChoices(AreaCategoryType.ADMINISTRATION, getPageBase());
List<QName> governance = WebComponentUtil.getCategoryRelationChoices(AreaCategoryType.GOVERNANCE, getPageBase());
governance.forEach(r -> relations.remove(r));
governance.forEach(relations::remove);
return relations;
// return new AvailableRelationDto(relations, defaultRelationConfiguration);
}
Expand Down Expand Up @@ -1151,6 +1150,11 @@ protected PrismObject<TaskType> getTask(AjaxRequestTarget target) {
return recomputeTask;
}

@Override
public StringResourceModel getTitle() {
return createStringResource("pageUsers.message.confirmActionPopupTitle");
}

@Override
public void yesPerformed(AjaxRequestTarget target) {
MemberOperationsHelper.recomputeMembersPerformed(getModelObject(), getPageBase(), getQueryScope(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

import com.evolveum.midpoint.gui.api.util.WebComponentUtil;

import com.evolveum.midpoint.web.component.dialog.DeleteConfirmationPanel;

import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
Expand Down Expand Up @@ -208,7 +210,7 @@ public void yesPerformed(AjaxRequestTarget target) {
}

private void deletePerformed(AjaxRequestTarget target) {
ConfirmationPanel confirmationPanel = new ConfirmationPanel(getPageBase().getMainPopupBodyId(),
ConfirmationPanel confirmationPanel = new DeleteConfirmationPanel(getPageBase().getMainPopupBodyId(),
createStringResource("OperationalButtonsPanel.deletePerformed", WebComponentUtil.getDisplayNameOrName(getPrismObject()))) {
private static final long serialVersionUID = 1L;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
import java.util.stream.Collectors;
import javax.xml.namespace.QName;

import com.evolveum.midpoint.web.component.dialog.DeleteConfirmationPanel;

import org.apache.commons.lang3.BooleanUtils;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
Expand Down Expand Up @@ -121,7 +123,7 @@ private PrismObjectDefinition<ShadowType> getShadowDefinition() {

protected void initLayout() {

IModel<Integer> deadShadows = new ReadOnlyModel<>(() -> countDeadShadows());
IModel<Integer> deadShadows = new ReadOnlyModel<>(this::countDeadShadows);
Label label = new Label(ID_DEAD_SHADOWS, deadShadows);
label.add(new VisibleBehaviour(() -> deadShadows.getObject() > 0));
add(label);
Expand Down Expand Up @@ -863,7 +865,7 @@ private void unlinkProjectionPerformed(AjaxRequestTarget target,
}

private Popupable getDeleteProjectionPopupContent(List<PrismContainerValueWrapper<ShadowType>> selected) {
ConfirmationPanel dialog = new ConfirmationPanel(getPageBase().getMainPopupBodyId(),
ConfirmationPanel dialog = new DeleteConfirmationPanel(getPageBase().getMainPopupBodyId(),
new IModel<String>() {
private static final long serialVersionUID = 1L;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.StringResourceModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;

import com.evolveum.midpoint.prism.PrismContainer;
Expand Down Expand Up @@ -157,6 +158,11 @@ public void saveAndRunPerformed(AjaxRequestTarget target) {

private static final long serialVersionUID = 1L;

@Override
public StringResourceModel getTitle() {
return createStringResource("PageReport.reportPreview");
}

protected void runConfirmPerformed(AjaxRequestTarget target, PrismObject<ReportType> report, PrismContainer<ReportParameterType> reportParam) {
runReport(report, reportParam);
hideMainPopup(target);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,12 @@ public void onClick(AjaxRequestTarget target) {

@Override
public void onClick(AjaxRequestTarget target) {
RunReportPopupPanel reportPopup = new RunReportPopupPanel(getPageBase().getMainPopupBodyId(), getReport(), false);
RunReportPopupPanel reportPopup = new RunReportPopupPanel(getPageBase().getMainPopupBodyId(), getReport(), false){
@Override
public StringResourceModel getTitle() {
return createStringResource("PageReport.reportPreview");
}
};
getPageBase().showMainPopup(reportPopup, target);
target.add(ReportOperationalButtonsPanel.this);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.model.StringResourceModel;

import java.util.ArrayList;
import java.util.List;
Expand Down Expand Up @@ -239,4 +240,9 @@ public Component getComponent() {
return this;
}

@Override
public StringResourceModel getTitle() {
return getPageBase().createStringResource("ResourceTasksPanel.definedTasks");
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -134,4 +134,8 @@ public Component getComponent() {
return this;
}

@Override
public StringResourceModel getTitle() {
return new StringResourceModel("ExpressionTypeSelectPopup.title");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -174,5 +174,10 @@ public Component getComponent() {
return this;
}

@Override
public StringResourceModel getTitle() {
return new StringResourceModel("ListContainersPopup.availableContainers");
}

}

Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
import java.util.List;
import javax.xml.namespace.QName;

import com.evolveum.midpoint.web.component.dialog.DeleteConfirmationPanel;

import org.apache.commons.collections4.CollectionUtils;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.model.IModel;
Expand Down Expand Up @@ -54,7 +56,7 @@ protected void deleteAssignmentPerformed(AjaxRequestTarget target, AssignmentEdi
}

public Popupable getDeleteAssignmentPopupContent(AssignmentEditorDto dto) {
return new ConfirmationPanel(getPageBase().getMainPopupBodyId(), new IModel<String>() {
return new DeleteConfirmationPanel(getPageBase().getMainPopupBodyId(), new IModel<String>() {

private static final long serialVersionUID = 1L;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,11 @@ protected void addPerformed(AjaxRequestTarget target, QName type, List<UserType>
multipleUsersSelectionPerformed(target, selected);
}

@Override
public StringResourceModel getTitle() {
return titleModel;
}

};
pageBase.showMainPopup(focusBrowser, target);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -224,5 +224,9 @@ public Component getComponent() {
return this;
}

@Override
public StringResourceModel getTitle() {
return new StringResourceModel("ChooseFocusTypeDialogPanel.chooseType");
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,13 @@

import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.StringResourceModel;

import java.io.Serializable;

/**
* Created by Honchar.
*
Expand Down Expand Up @@ -52,10 +49,6 @@ public ConfirmationPanel(String id, IModel<String> message) {
initLayout(message);
}

// public boolean getLabelEscapeModelStrings() {
// return true;
// }

public void setMessage(IModel<String> message) {
Label label = (Label) get(ID_PANEL).get(ID_CONFIRM_TEXT);
label.setDefaultModel(message);
Expand Down Expand Up @@ -145,6 +138,11 @@ public String getHeightUnit(){
return "px";
}

@Override
public StringResourceModel getTitle() {
return ((PageBase)getPage()).createStringResource("pageUsers.message.confirmActionPopupTitle");
}

@Override
public Component getComponent() {
return this;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -364,5 +364,9 @@ public Component getComponent() {
return this;
}

@Override
public StringResourceModel getTitle() {
return createStringResource("pageDebugList.dialog.title.deleteAll");
}
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/*
* Copyright (c) 2010-2021 Evolveum and contributors
*
* This work is dual-licensed under the Apache License 2.0
* and European Union Public License. See LICENSE file for details.
*/

package com.evolveum.midpoint.web.component.dialog;

import org.apache.wicket.model.IModel;
import org.apache.wicket.model.StringResourceModel;

import com.evolveum.midpoint.gui.api.page.PageBase;

public class DeleteConfirmationPanel extends ConfirmationPanel {

public DeleteConfirmationPanel(String id) {
super(id);
}

public DeleteConfirmationPanel(String id, IModel<String> message) {
super(id, message);
}

@Override
public StringResourceModel getTitle() {
return ((PageBase)getPage()).createStringResource("AssignmentTablePanel.modal.title.confirmDeletion");
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -263,4 +263,9 @@ public String getHeightUnit() {
public Component getComponent() {
return this;
}

@Override
public StringResourceModel getTitle() {
return new StringResourceModel("ExportingPopupPanel.title");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,8 @@ public Component getComponent() {
return this;
}

@Override
public StringResourceModel getTitle() {
return new StringResourceModel("ChangePasswordPanel.helpPopupTitle");
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<!--
~ Copyright (c) 2010-2017 Evolveum
~
~ This work is dual-licensed under the Apache License 2.0
~ and European Union Public License. See LICENSE file for details.
-->
<wicket:panel xmlns:wicket="http://wicket.apache.org">
<div wicket:id="overlay" class="modal-dialog-overlay">
<div wicket:id="dialog" class="modal-dialog">
<div wicket:id="title" class="modal-dialog-title"/>
<div wicket:id="content" class="modal-dialog-content"/>
</div>
</div>
</wicket:panel>

0 comments on commit 1ff0176

Please sign in to comment.