Skip to content

Commit

Permalink
more refactoring: ConfirmationDialog is replaced with main popup from…
Browse files Browse the repository at this point in the history 
… PageBase with ConfirmationPanel as a body
  • Loading branch information
@KaterynaHonchar
KaterynaHonchar committed Mar 15, 2016
1 parent 01694da commit df11ac1
Show file tree
Hide file tree
Showing 6 changed files with 58 additions and 54 deletions.
2 changes: 0 additions & 2 deletions ...src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinitions.html
View file
Expand Up @@ -18,8 +18,6 @@
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<body>
<wicket:extend>
<div wicket:id="confirmDeletePopup"/>

<form wicket:id="mainForm" class="form-inline">
<div wicket:id="definitionsTable"/>
</form>
Expand Down
29 changes: 17 additions & 12 deletions ...src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinitions.java
View file
Expand Up @@ -35,6 +35,7 @@
import com.evolveum.midpoint.web.component.data.column.LinkColumn;
import com.evolveum.midpoint.web.component.data.column.MultiButtonColumn;
import com.evolveum.midpoint.web.component.dialog.ConfirmationDialog;
import com.evolveum.midpoint.web.component.dialog.ConfirmationPanel;
import com.evolveum.midpoint.web.component.util.SelectableBean;
import com.evolveum.midpoint.web.page.admin.configuration.PageDebugView;
import com.evolveum.midpoint.web.page.admin.workflow.PageAdminWorkItems;
Expand Down Expand Up @@ -77,7 +78,6 @@ public class PageCertDefinitions extends PageAdminWorkItems {
private static final String DOT_CLASS = PageCertDefinitions.class.getName() + ".";
private static final String OPERATION_CREATE_CAMPAIGN = DOT_CLASS + "createCampaign";
private static final String OPERATION_DELETE_DEFINITION = DOT_CLASS + "deleteDefinition";
private static final String DIALOG_CONFIRM_DELETE = "confirmDeletePopup";

private static final String ID_MAIN_FORM = "mainForm";
private static final String ID_DEFINITIONS_TABLE = "definitionsTable";
Expand Down Expand Up @@ -114,15 +114,6 @@ private void initLayout() {

ObjectDataProvider provider = createProvider();

add(new ConfirmationDialog(DIALOG_CONFIRM_DELETE,
createStringResource("PageCertDefinitions.title.confirmDelete"), createDeleteConfirmString()) {

@Override
public void yesPerformed(AjaxRequestTarget target) {
close(target);
deleteDefinitionPerformed(target, singleDelete);
}
});
int itemsPerPage = (int) getItemsPerPage(UserProfileStorage.TableId.PAGE_CERT_DEFINITIONS_PANEL);
BoxedTablePanel table = new BoxedTablePanel<>(ID_DEFINITIONS_TABLE, provider, initColumns(),
UserProfileStorage.TableId.PAGE_CERT_DEFINITIONS_PANEL, itemsPerPage);
Expand Down Expand Up @@ -244,8 +235,8 @@ private void createCampaignPerformed(AjaxRequestTarget target, AccessCertificati
private void deleteConfirmation(AjaxRequestTarget target, AccessCertificationDefinitionType definition) {

this.singleDelete = definition;
ModalWindow dialog = (ModalWindow) get(DIALOG_CONFIRM_DELETE);
dialog.show(target);
showMainPopup(getDeleteDefinitionConfirmationPanel(), createStringResource("PageCertDefinitions.title.confirmDelete"),
target);
}

private void deleteDefinitionPerformed(AjaxRequestTarget target, AccessCertificationDefinitionType definition) {
Expand Down Expand Up @@ -288,4 +279,18 @@ private void definitionDetailsPerformed(AjaxRequestTarget target, String oid) {
}

//endregion

private Component getDeleteDefinitionConfirmationPanel() {
return new ConfirmationPanel(getMainPopupBodyId(),
createDeleteConfirmString()) {
@Override
public void yesPerformed(AjaxRequestTarget target) {
ModalWindow modalWindow = findParent(ModalWindow.class);
if (modalWindow != null) {
modalWindow.close(target);
deleteDefinitionPerformed(target, singleDelete);
}
}
};
}
}
1 change: 0 additions & 1 deletion ...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.html
View file
Expand Up @@ -18,7 +18,6 @@
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<body>
<wicket:extend>
<div wicket:id="confirmDeletePopup" />
<div wicket:id="confirmDeleteAll" />

<form wicket:id="mainForm" class="form-inline">
Expand Down
76 changes: 39 additions & 37 deletions ...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
View file
Expand Up @@ -23,6 +23,7 @@

import javax.xml.namespace.QName;

import com.evolveum.midpoint.web.component.dialog.ConfirmationPanel;
import org.apache.commons.lang.StringUtils;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
Expand Down Expand Up @@ -173,7 +174,6 @@ public class PageDebugList extends PageAdminConfiguration {
private static final String OPERATION_LOAD_RESOURCES = DOT_CLASS + "loadResources";
private static final String OPERATION_DELETE_SHADOWS = DOT_CLASS + "deleteShadows";

private static final String ID_CONFIRM_DELETE_POPUP = "confirmDeletePopup";
private static final String ID_MAIN_FORM = "mainForm";
private static final String ID_ZIP_CHECK = "zipCheck";
private static final String ID_TABLE = "table";
Expand Down Expand Up @@ -268,35 +268,6 @@ public void yesPerformed(AjaxRequestTarget target) {
};
add(deleteAllDialog);

ConfirmationDialog deleteConfirm = new ConfirmationDialog(ID_CONFIRM_DELETE_POPUP,
createStringResource("pageDebugList.dialog.title.confirmDelete"),
createDeleteConfirmString()) {

@Override
public void yesPerformed(AjaxRequestTarget target) {
close(target);

DebugConfDialogDto dto = confDialogModel.getObject();
switch (dto.getOperation()) {
case DELETE_ALL_TYPE:
deleteAllTypeConfirmed(target);
break;
case DELETE_SELECTED:
deleteSelectedConfirmed(target, dto.getObjects());
break;
case DELETE_RESOURCE_SHADOWS:
deleteAllShadowsOnResourceConfirmed(target);
break;
}
}

@Override
public boolean getLabelEscapeModelStrings() {
return false;
}
};
add(deleteConfirm);

Form main = new Form(ID_MAIN_FORM);
add(main);

Expand Down Expand Up @@ -715,8 +686,8 @@ private void deleteAllType(AjaxRequestTarget target) {
searchDto.getType().getClassDefinition());
confDialogModel.setObject(dto);

ModalWindow dialog = (ModalWindow) get(ID_CONFIRM_DELETE_POPUP);
dialog.show(target);
showMainPopup(getDeleteConfirmationPanel(), createStringResource("pageDebugList.dialog.title.confirmDelete"),
target);
}

private List<DebugObjectItem> getSelectedData(AjaxRequestTarget target, DebugObjectItem item) {
Expand Down Expand Up @@ -747,8 +718,8 @@ private void deleteSelected(AjaxRequestTarget target, DebugObjectItem item) {
selected, searchDto.getType().getClassDefinition());
confDialogModel.setObject(dto);

ModalWindow dialog = (ModalWindow) get(ID_CONFIRM_DELETE_POPUP);
dialog.show(target);
showMainPopup(getDeleteConfirmationPanel(), createStringResource("pageDebugList.dialog.title.confirmDelete"),
target);
}

private void deleteAllIdentities(AjaxRequestTarget target) {
Expand Down Expand Up @@ -824,11 +795,42 @@ private void deleteAllShadowsOnResource(AjaxRequestTarget target) {
DebugConfDialogDto.Operation.DELETE_RESOURCE_SHADOWS, null, null);
confDialogModel.setObject(dialogDto);

ModalWindow dialog = (ModalWindow) get(ID_CONFIRM_DELETE_POPUP);
dialog.show(target);
showMainPopup(getDeleteConfirmationPanel(), createStringResource("pageDebugList.dialog.title.confirmDelete"),
target);
}

private void deleteAllShadowsOnResourceConfirmed(AjaxRequestTarget target) {

private Component getDeleteConfirmationPanel() {
return new ConfirmationPanel(getMainPopupBodyId(),
createDeleteConfirmString()) {
@Override
public void yesPerformed(AjaxRequestTarget target) {
ModalWindow modalWindow = findParent(ModalWindow.class);
if (modalWindow != null) {
modalWindow.close(target);
DebugConfDialogDto dto = confDialogModel.getObject();
switch (dto.getOperation()) {
case DELETE_ALL_TYPE:
deleteAllTypeConfirmed(target);
break;
case DELETE_SELECTED:
deleteSelectedConfirmed(target, dto.getObjects());
break;
case DELETE_RESOURCE_SHADOWS:
deleteAllShadowsOnResourceConfirmed(target);
break;
}
}
}

@Override
public boolean getLabelEscapeModelStrings() {
return false;
}
};
}

private void deleteAllShadowsOnResourceConfirmed(AjaxRequestTarget target) {
DebugSearchDto dto = searchModel.getObject();
String resourceOid = dto.getResource().getOid();

Expand Down
2 changes: 1 addition & 1 deletion gui/admin-gui/src/main/resources/localization/Midpoint.properties
View file
Expand Up @@ -1535,7 +1535,7 @@ pageDebugList.message.singleOrgDeleteProblem=Couldn't delete org. unit
pageDebugList.message.singleShadowDeleteProblem=Couldn't delete shadow
pageDebugList.message.singleUserDeleteProblem=Couldn't delete user
pageDebugList.messsage.deleteAllOfType=Deleting objects of type {0}.
pageDebugList.messsage.deleteAllResourceShadows=Do your really want to delete all shadows on resource {0}?
pageDebugList.messsage.deleteAllResourceShadows=Do you really want to delete all shadows on resource {0}?
pageDebugList.messsage.deleteAllShadowsStarted=Task which deletes all shadows on resource {0} was started.
pageDebugList.name=Name
pageDebugList.oid=Oid
Expand Down
2 changes: 1 addition & 1 deletion gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties
View file
Expand Up @@ -1505,7 +1505,7 @@ pageDebugList.message.singleOrgDeleteProblem=Couldn't delete org. unit
pageDebugList.message.singleShadowDeleteProblem=Couldn't delete shadow
pageDebugList.message.singleUserDeleteProblem=Couldn't delete user
pageDebugList.messsage.deleteAllOfType=Deleting objects of type {0}.
pageDebugList.messsage.deleteAllResourceShadows=Do your really want to delete all shadows on resource {0}?
pageDebugList.messsage.deleteAllResourceShadows=Do you really want to delete all shadows on resource {0}?
pageDebugList.messsage.deleteAllShadowsStarted=Task which deletes all shadows on resource {0} was started.
pageDebugList.name=Name
pageDebugList.oid=Oid
Expand Down

0 comments on commit df11ac1

Please sign in to comment.