Skip to content

Commit

Permalink
more refactoring for object list pages
Browse files Browse the repository at this point in the history
  • Loading branch information
@KaterynaHonchar
KaterynaHonchar committed Dec 18, 2018
1 parent 9b8087f commit 24a75cd
Show file tree
Hide file tree
Showing 9 changed files with 40 additions and 141 deletions.
10 changes: 4 additions & 6 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectList.java
View file
Expand Up @@ -26,10 +26,9 @@
import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem;
import com.evolveum.midpoint.web.component.util.SelectableBean;
import com.evolveum.midpoint.web.page.admin.roles.PageRoles;
import com.evolveum.midpoint.web.session.UserProfileStorage;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ReportOutputType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.extensions.markup.html.repeater.data.table.ColGroup;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
Expand All @@ -38,9 +37,7 @@
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;

import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.*;

/**
* Created by honchar
Expand Down Expand Up @@ -78,6 +75,7 @@ protected void initLayout() {
}

private void initTable(Form mainForm) {
//TODO fix tableId
MainObjectListPanel<O> userListPanel = new MainObjectListPanel<O>(ID_TABLE,
getType(), UserProfileStorage.TableId.TABLE_USERS, getQueryOptions(), this) {
private static final long serialVersionUID = 1L;
Expand Down
40 changes: 0 additions & 40 deletions ...dmin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAdminReports.java
View file

This file was deleted.

3 changes: 2 additions & 1 deletion gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageNewReport.java
View file
Expand Up @@ -26,6 +26,7 @@
import com.evolveum.midpoint.web.component.AceEditor;
import com.evolveum.midpoint.web.component.AjaxSubmitButton;
import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
import com.evolveum.midpoint.web.page.admin.PageAdmin;
import com.evolveum.midpoint.web.page.admin.configuration.PageAdminConfiguration;
import com.evolveum.midpoint.web.page.admin.reports.dto.ReportDto;
import com.evolveum.midpoint.web.security.MidPointApplication;
Expand Down Expand Up @@ -63,7 +64,7 @@
@AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_REPORTS_REPORT_CREATE_URL,
label = "PageNewReport.auth.reports.label",
description = "PageNewReport.auth.reports.description")})
public class PageNewReport extends PageAdminReports {
public class PageNewReport extends PageAdmin {

private static final Trace LOGGER = TraceManager.getTrace(PageNewReport.class);

Expand Down
3 changes: 2 additions & 1 deletion gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java
View file
Expand Up @@ -19,6 +19,7 @@
import java.util.List;

import com.evolveum.midpoint.prism.delta.DeltaFactory;
import com.evolveum.midpoint.web.page.admin.PageAdmin;
import org.apache.wicket.RestartResponseException;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.extensions.markup.html.tabs.AbstractTab;
Expand Down Expand Up @@ -62,7 +63,7 @@
@AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_REPORT_URL,
label = "PageReport.auth.report.label",
description = "PageReport.auth.report.description")})
public class PageReport extends PageAdminReports {
public class PageReport extends PageAdmin {

private static Trace LOGGER = TraceManager.getTrace(PageReport.class);

Expand Down
3 changes: 2 additions & 1 deletion gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReports.java
View file
Expand Up @@ -34,6 +34,7 @@
import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem;
import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItemAction;
import com.evolveum.midpoint.web.component.util.SelectableBean;
import com.evolveum.midpoint.web.page.admin.PageAdmin;
import com.evolveum.midpoint.web.page.admin.configuration.PageAdminConfiguration;
import com.evolveum.midpoint.web.page.admin.reports.component.RunReportPopupPanel;
import com.evolveum.midpoint.web.session.UserProfileStorage;
Expand Down Expand Up @@ -65,7 +66,7 @@
@AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_REPORTS_URL,
label = "PageReports.auth.reports.label",
description = "PageReports.auth.reports.description")})
public class PageReports extends PageAdminReports {
public class PageReports extends PageAdmin {

private static final Trace LOGGER = TraceManager.getTrace(PageReports.class);

Expand Down
29 changes: 0 additions & 29 deletions ...rc/main/java/com/evolveum/midpoint/web/page/admin/valuePolicy/PageAdminValuePolicies.java
View file

This file was deleted.

27 changes: 0 additions & 27 deletions ...gui/src/main/java/com/evolveum/midpoint/web/page/admin/valuePolicy/PageValuePolicies.html
View file

This file was deleted.

57 changes: 25 additions & 32 deletions ...gui/src/main/java/com/evolveum/midpoint/web/page/admin/valuePolicy/PageValuePolicies.java
View file
Expand Up @@ -28,6 +28,7 @@
import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem;
import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItemAction;
import com.evolveum.midpoint.web.component.util.SelectableBean;
import com.evolveum.midpoint.web.page.admin.PageAdminObjectList;
import com.evolveum.midpoint.web.session.UserProfileStorage;
import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ValuePolicyType;
Expand All @@ -48,15 +49,15 @@
@Url(mountUrl = "/admin/valuepolicies", matchUrlForSecurity = "/admin/valuepolicies" )
},
action = {
@AuthorizationAction(actionUri = PageAdminValuePolicies.AUTH_VALUE_POLICIES_ALL,
label = PageAdminValuePolicies.AUTH_VALUE_POLICIES_ALL_LABEL,
description = PageAdminValuePolicies.AUTH_VALUE_POLICIES_ALL_DESCRIPTION),
@AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_VALUE_POLICIES_ALL_URL,
label = "PageAdminValuePolicies.auth.valuePoliciesAll.label",
description = "PageAdminValuePolicies.auth.valuePoliciesAll.description"),
@AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_VALUE_POLICIES_URL,
label = "PageValuePolicies.auth.valuePolicies.label",
description = "PageValuePolicies.auth.valuePolicies.description")
})

public class PageValuePolicies extends PageAdminValuePolicies {
public class PageValuePolicies extends PageAdminObjectList<ValuePolicyType> {

private static final long serialVersionUID = 1L;

Expand All @@ -67,38 +68,30 @@ public PageValuePolicies() {
initLayout();
}

protected void initLayout() {
Form mainForm = new Form(ID_MAIN_FORM);
add(mainForm);

MainObjectListPanel<ValuePolicyType> valuePolicyPanel = new MainObjectListPanel<ValuePolicyType>(ID_VALUE_POLICIES_TABLE, ValuePolicyType.class,
UserProfileStorage.TableId.TABLE_VALUE_POLICIES, null, this) {
private static final long serialVersionUID = 1L;

@Override
protected void objectDetailsPerformed(AjaxRequestTarget target, ValuePolicyType valuePolicy) {
PageValuePolicies.this.valuePolicyDetailsPerformed(target, valuePolicy);
}
@Override
protected void objectDetailsPerformed(AjaxRequestTarget target, ValuePolicyType valuePolicy) {
PageValuePolicies.this.valuePolicyDetailsPerformed(target, valuePolicy);
}

@Override
protected void newObjectPerformed(AjaxRequestTarget target) {
navigateToNext(PageValuePolicy.class);
}
@Override
protected void newObjectActionPerformed(AjaxRequestTarget target) {
navigateToNext(PageValuePolicy.class);
}

@Override
protected List<IColumn<SelectableBean<ValuePolicyType>, String>> createColumns() {
return PageValuePolicies.this.initColumns();
}
@Override
protected List<IColumn<SelectableBean<ValuePolicyType>, String>> initColumns() {
return PageValuePolicies.this.initValuePoliciesColumns();
}

@Override
protected List<InlineMenuItem> createInlineMenu() {
return PageValuePolicies.this.createInlineMenu();
}
@Override
protected List<InlineMenuItem> createRowActions() {
return PageValuePolicies.this.createInlineMenu();
}

};
valuePolicyPanel.setOutputMarkupId(true);
mainForm.add(valuePolicyPanel);

@Override
protected Class<ValuePolicyType> getType() {
return ValuePolicyType.class;
}

private void valuePolicyDetailsPerformed(AjaxRequestTarget target, ValuePolicyType valuePolicy) {
Expand All @@ -107,7 +100,7 @@ private void valuePolicyDetailsPerformed(AjaxRequestTarget target, ValuePolicyTy
navigateToNext(PageValuePolicy.class, pageParameters);
}

private List<IColumn<SelectableBean<ValuePolicyType>, String>> initColumns() {
private List<IColumn<SelectableBean<ValuePolicyType>, String>> initValuePoliciesColumns() {
List<IColumn<SelectableBean<ValuePolicyType>, String>> columns = new ArrayList<>();

IColumn column = new PropertyColumn(createStringResource("pageValuePolicies.table.description"), "value.description");
Expand Down
9 changes: 5 additions & 4 deletions ...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/valuePolicy/PageValuePolicy.java
View file
Expand Up @@ -40,6 +40,7 @@
import com.evolveum.midpoint.web.component.prism.ContainerStatus;
import com.evolveum.midpoint.web.component.prism.ObjectWrapper;
import com.evolveum.midpoint.web.component.util.ObjectWrapperUtil;
import com.evolveum.midpoint.web.page.admin.PageAdmin;
import com.evolveum.midpoint.web.page.admin.valuePolicy.component.ValuePolicyBasicPanel;
import com.evolveum.midpoint.web.page.admin.valuePolicy.component.ValuePolicySummaryPanel;
import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
Expand All @@ -66,15 +67,15 @@
matchUrlForSecurity = "/admin/valuepolicy")
},
action = {
@AuthorizationAction(actionUri = PageAdminValuePolicies.AUTH_VALUE_POLICIES_ALL,
label = PageAdminValuePolicies.AUTH_VALUE_POLICIES_ALL_LABEL,
description = PageAdminValuePolicies.AUTH_VALUE_POLICIES_ALL_DESCRIPTION),
@AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_VALUE_POLICIES_ALL_URL,
label = "PageAdminValuePolicies.auth.valuePoliciesAll.label",
description = "PageAdminValuePolicies.auth.valuePoliciesAll.description"),
@AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_VALUE_POLICY_URL,
label = "PageValuePolicy.auth.valuePolcy.label",
description = "PageValuePolicy.auth.valuePolicy.description")
})

public class PageValuePolicy extends PageAdminValuePolicies {
public class PageValuePolicy extends PageAdmin {

private static final long serialVersionUID = 1L;

Expand Down

0 comments on commit 24a75cd

Please sign in to comment.