This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 42c0340035dadee497b1df7c768988268f4482f0 Author: Francesco Chicchiriccò <[email protected]> AuthorDate: Wed May 25 10:55:51 2022 +0200 [SYNCOPE-1658] Allow for extensions --- .../syncope/client/console/pages/Connectors.java | 14 ++++-------- .../syncope/client/console/pages/Resources.java | 14 ++++-------- .../client/console/panels/ConnidLocations.java | 26 ++++++++++++++-------- .../console/panels/ResourceDirectoryPanel.java | 20 ++++++++--------- .../client/console/topology/TabularTopology.java | 2 +- 5 files changed, 36 insertions(+), 40 deletions(-) diff --git a/client/idm/console/src/main/java/org/apache/syncope/client/console/pages/Connectors.java b/client/idm/console/src/main/java/org/apache/syncope/client/console/pages/Connectors.java index 21441e1964..c66e17df2b 100644 --- a/client/idm/console/src/main/java/org/apache/syncope/client/console/pages/Connectors.java +++ b/client/idm/console/src/main/java/org/apache/syncope/client/console/pages/Connectors.java @@ -38,8 +38,6 @@ public class Connectors extends Panel { private static final long serialVersionUID = 305521359617401936L; - private final WizardMgtPanel<Serializable> connectorDirectoryPanel; - public Connectors(final String id, final PageReference pageRef) { super(id); @@ -68,13 +66,9 @@ public class Connectors extends Panel { form.add(search); form.setDefaultButton(search); - connectorDirectoryPanel = - new ConnectorDirectoryPanel.Builder(pageRef). - addNewItemPanelBuilder(new ConnectorWizardBuilder( - new ConnInstanceTO(), pageRef), true). - build("connectorDirectoryPanel"); - connectorDirectoryPanel.setOutputMarkupId(true); - - add(connectorDirectoryPanel); + WizardMgtPanel<Serializable> connectorDirectoryPanel = new ConnectorDirectoryPanel.Builder(pageRef). + addNewItemPanelBuilder(new ConnectorWizardBuilder(new ConnInstanceTO(), pageRef), true). + build("connectorDirectoryPanel"); + add(connectorDirectoryPanel.setOutputMarkupId(true)); } } diff --git a/client/idm/console/src/main/java/org/apache/syncope/client/console/pages/Resources.java b/client/idm/console/src/main/java/org/apache/syncope/client/console/pages/Resources.java index 37dc5d69f3..197e95b34d 100644 --- a/client/idm/console/src/main/java/org/apache/syncope/client/console/pages/Resources.java +++ b/client/idm/console/src/main/java/org/apache/syncope/client/console/pages/Resources.java @@ -38,8 +38,6 @@ public class Resources extends Panel { private static final long serialVersionUID = 7240865652350993779L; - private final WizardMgtPanel<Serializable> resourceDirectoryPanel; - public Resources(final String id, final PageReference pageRef) { super(id); @@ -68,13 +66,9 @@ public class Resources extends Panel { form.add(search); form.setDefaultButton(search); - resourceDirectoryPanel = - new ResourceDirectoryPanel.Builder(pageRef). - addNewItemPanelBuilder(new ResourceWizardBuilder( - new ResourceTO(), pageRef), true). - build("resourceDirectoryPanel"); - resourceDirectoryPanel.setOutputMarkupId(true); - - add(resourceDirectoryPanel); + WizardMgtPanel<Serializable> resourceDirectoryPanel = new ResourceDirectoryPanel.Builder(pageRef). + addNewItemPanelBuilder(new ResourceWizardBuilder(new ResourceTO(), pageRef), true). + build("resourceDirectoryPanel"); + add(resourceDirectoryPanel.setOutputMarkupId(true)); } } diff --git a/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ConnidLocations.java b/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ConnidLocations.java index 8605c1ccdb..63dce397a3 100644 --- a/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ConnidLocations.java +++ b/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ConnidLocations.java @@ -19,6 +19,13 @@ package org.apache.syncope.client.console.panels; import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal; +import java.io.Serializable; +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; import org.apache.syncope.client.console.SyncopeConsoleSession; import org.apache.syncope.client.ui.commons.Constants; import org.apache.syncope.client.console.commons.IdRepoConstants; @@ -42,17 +49,13 @@ import org.apache.wicket.model.CompoundPropertyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.ResourceModel; -import java.io.Serializable; -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; +import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator; public class ConnidLocations extends DirectoryPanel<Serializable, Serializable, ConnidLocations.ConnidLocationsDataProvider, RestClient> { - + + private static final long serialVersionUID = 1L; + public ConnidLocations(final String id, final Builder builder) { super(id, builder); @@ -79,8 +82,13 @@ public class ConnidLocations extends columns.add(new AbstractColumn<>( new ResourceModel(Constants.KEY_FIELD_NAME), Constants.KEY_FIELD_NAME) { + @Override - public void populateItem(final Item cellItem, final String componentId, final IModel rowModel) { + public void populateItem( + final Item<ICellPopulator<Serializable>> cellItem, + final String componentId, + final IModel<Serializable> rowModel) { + cellItem.add(new Label(componentId, rowModel.getObject().toString())); } }); diff --git a/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ResourceDirectoryPanel.java b/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ResourceDirectoryPanel.java index 481f1850ea..a270735b79 100644 --- a/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ResourceDirectoryPanel.java +++ b/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ResourceDirectoryPanel.java @@ -68,15 +68,15 @@ public class ResourceDirectoryPanel extends private static final long serialVersionUID = -5223129956783782225L; - private String keyword; + protected String keyword; - private final BaseModal<Serializable> propTaskModal; + protected final BaseModal<Serializable> propTaskModal; - private final BaseModal<Serializable> schedTaskModal; + protected final BaseModal<Serializable> schedTaskModal; - private final BaseModal<Serializable> provisionModal; + protected final BaseModal<Serializable> provisionModal; - private final BaseModal<Serializable> historyModal; + protected final BaseModal<Serializable> historyModal; protected ResourceDirectoryPanel(final String id, final ResourceDirectoryPanel.Builder builder) { super(id, builder); @@ -184,8 +184,8 @@ public class ResourceDirectoryPanel extends build(BaseModal.CONTENT_ID, SyncopeConsoleSession.get(). owns(IdMEntitlement.RESOURCE_UPDATE, connInstance.getAdminRealm()) - ? AjaxWizard.Mode.EDIT - : AjaxWizard.Mode.READONLY))); + ? AjaxWizard.Mode.EDIT + : AjaxWizard.Mode.READONLY))); modal.header(new Model<>(MessageFormat.format(getString("resource.edit"), model.getObject().getKey()))); modal.show(true); @@ -397,9 +397,9 @@ public class ResourceDirectoryPanel extends private static final long serialVersionUID = 213974502541311941L; - private final AjaxRequestTarget target; + protected final AjaxRequestTarget target; - private final String keyword; + protected final String keyword; public ResourceSearchEvent(final AjaxRequestTarget target, final String keyword) { this.target = target; @@ -414,7 +414,7 @@ public class ResourceDirectoryPanel extends return keyword; } } - + public static class Builder extends DirectoryPanel.Builder<Serializable, Serializable, ResourceRestClient> { private static final long serialVersionUID = -1391308721262593468L; diff --git a/client/idm/console/src/main/java/org/apache/syncope/client/console/topology/TabularTopology.java b/client/idm/console/src/main/java/org/apache/syncope/client/console/topology/TabularTopology.java index b39e047581..f979be33d9 100644 --- a/client/idm/console/src/main/java/org/apache/syncope/client/console/topology/TabularTopology.java +++ b/client/idm/console/src/main/java/org/apache/syncope/client/console/topology/TabularTopology.java @@ -53,7 +53,7 @@ public class TabularTopology extends BasePage { body.add(content); } - private List<ITab> buildTabList() { + protected List<ITab> buildTabList() { final List<ITab> tabs = new ArrayList<>(); tabs.add(new AbstractTab(new Model<>("CustomTasks")) {
