This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a commit to branch 3_0_X in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/3_0_X by this push: new e4317e38f4 Restoring group members provisioning from Console, incorrectly removed by 0308336e3c936d8f5396f15763a2e8af3f46d13e e4317e38f4 is described below commit e4317e38f47b7871aaf7db182b31dcdfff542724 Author: Francesco Chicchiriccò <ilgro...@apache.org> AuthorDate: Wed Apr 12 12:26:03 2023 +0200 Restoring group members provisioning from Console, incorrectly removed by 0308336e3c936d8f5396f15763a2e8af3f46d13e --- .../console/topology/TopologyTogglePanel.java | 4 ++-- .../client/console/panels/GroupDirectoryPanel.java | 23 ++++++++++++++-------- .../console/wicket/markup/html/form/Action.java | 1 - .../wicket/markup/html/form/ActionPanel.java | 2 +- .../html/form/IndicatingOnConfirmAjaxLink.java | 4 ---- .../console/SyncopeWebApplication.properties | 4 +++- .../console/SyncopeWebApplication_fr_CA.properties | 2 ++ .../console/SyncopeWebApplication_it.properties | 4 +++- .../console/SyncopeWebApplication_ja.properties | 2 ++ .../console/SyncopeWebApplication_pt_BR.properties | 4 +++- .../console/SyncopeWebApplication_ru.properties | 2 ++ .../src/test/resources/console-debug.properties | 4 ++-- .../enduser/SyncopeEnduserApplication.properties | 2 +- .../SyncopeEnduserApplication_it.properties | 4 ++-- .../SyncopeEnduserApplication_pt_BR.properties | 4 ++-- 15 files changed, 40 insertions(+), 26 deletions(-) diff --git a/client/idm/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java b/client/idm/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java index 33b0bf25c1..511807310c 100644 --- a/client/idm/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java +++ b/client/idm/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java @@ -227,7 +227,7 @@ public class TopologyTogglePanel extends TogglePanel<Serializable> { private Fragment getConnectorFragment(final TopologyNode node, final PageReference pageRef) { Fragment fragment = new Fragment("actions", "connectorActions", this); - AjaxLink<String> delete = new IndicatingOnConfirmAjaxLink<>("delete", true) { + AjaxLink<String> delete = new IndicatingOnConfirmAjaxLink<>("delete", Constants.CONFIRM_DELETE, true) { private static final long serialVersionUID = 3776750333491622263L; @@ -361,7 +361,7 @@ public class TopologyTogglePanel extends TogglePanel<Serializable> { private Fragment getResourceFragment(final TopologyNode node, final PageReference pageRef) { Fragment fragment = new Fragment("actions", "resourceActions", this); - AjaxLink<String> delete = new IndicatingOnConfirmAjaxLink<>("delete", true) { + AjaxLink<String> delete = new IndicatingOnConfirmAjaxLink<>("delete", Constants.CONFIRM_DELETE, true) { private static final long serialVersionUID = 3776750333491622263L; diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/GroupDirectoryPanel.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/GroupDirectoryPanel.java index a9fd3d357f..f60df4c5b0 100644 --- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/GroupDirectoryPanel.java +++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/GroupDirectoryPanel.java @@ -258,13 +258,14 @@ public class GroupDirectoryPanel extends AnyDirectoryPanel<GroupTO, GroupRestCli String.format("%s,%s", IdRepoEntitlement.GROUP_READ, IdRepoEntitlement.GROUP_UPDATE)). setRealms(realm, model.getObject().getDynRealms()); - panel.add(new ActionLink<>() { + ActionLink<GroupTO> provisionMembers = new ActionLink<GroupTO>() { private static final long serialVersionUID = -7978723352517770644L; @Override public void onClick(final AjaxRequestTarget target, final GroupTO ignore) { try { + GroupRestClient.provisionMembers(model.getObject().getKey(), ProvisionAction.PROVISION); SyncopeConsoleSession.get().success(getString(Constants.OPERATION_SUCCEEDED)); target.add(container); } catch (SyncopeClientException e) { @@ -273,11 +274,14 @@ public class GroupDirectoryPanel extends AnyDirectoryPanel<GroupTO, GroupRestCli } ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target); } - }, ActionType.PROVISION_MEMBERS, - String.format("%s,%s", IdRepoEntitlement.TASK_CREATE, IdRepoEntitlement.TASK_EXECUTE)). - setRealm(realm); + }.confirmMessage("confirmProvisionMembers"); + panel.add( + provisionMembers, + ActionType.PROVISION_MEMBERS, + String.format("%s,%s", IdRepoEntitlement.TASK_CREATE, IdRepoEntitlement.TASK_EXECUTE), + true).setRealm(realm); - panel.add(new ActionLink<>() { + ActionLink<GroupTO> deprovisionMembers = new ActionLink<GroupTO>() { private static final long serialVersionUID = -7978723352517770644L; @@ -293,9 +297,12 @@ public class GroupDirectoryPanel extends AnyDirectoryPanel<GroupTO, GroupRestCli } ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target); } - }, ActionType.DEPROVISION_MEMBERS, - String.format("%s,%s", IdRepoEntitlement.TASK_CREATE, IdRepoEntitlement.TASK_EXECUTE)). - setRealm(realm); + }.confirmMessage("confirmDeprovisionMembers"); + panel.add( + deprovisionMembers, + ActionType.DEPROVISION_MEMBERS, + String.format("%s,%s", IdRepoEntitlement.TASK_CREATE, IdRepoEntitlement.TASK_EXECUTE), + true).setRealm(realm); SyncopeWebApplication.get().getAnyDirectoryPanelAdditionalActionLinksProvider().get( model.getObject(), diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/Action.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/Action.java index a3979b3fa7..97e850025f 100644 --- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/Action.java +++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/Action.java @@ -201,5 +201,4 @@ public final class Action<T extends Serializable> implements Serializable { public boolean hasIndicator() { return indicator; } - } diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel.java index 4591590dda..5cce59c6ab 100644 --- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel.java +++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel.java @@ -97,7 +97,7 @@ public final class ActionPanel<T extends Serializable> extends Panel { actionLink = action.isOnConfirm() ? new IndicatingOnConfirmAjaxLink<Void>( - Constants.ACTION, + Constants.ACTION, StringUtils.isNotBlank(action.getLink().getConfirmMessage()) ? action.getLink().getConfirmMessage() : Constants.CONFIRM_DELETE, enabled) { diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/IndicatingOnConfirmAjaxLink.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/IndicatingOnConfirmAjaxLink.java index d9377e99c4..d3ae2a383f 100644 --- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/IndicatingOnConfirmAjaxLink.java +++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/IndicatingOnConfirmAjaxLink.java @@ -30,10 +30,6 @@ public abstract class IndicatingOnConfirmAjaxLink<T> extends IndicatingAjaxLink< private final boolean enabled; - public IndicatingOnConfirmAjaxLink(final String id, final boolean enabled) { - this(id, "confirmDelete", enabled); - } - public IndicatingOnConfirmAjaxLink(final String id, final String msg, final boolean enabled) { super(id); diff --git a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/SyncopeWebApplication.properties b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/SyncopeWebApplication.properties index e013427500..068b1632be 100644 --- a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/SyncopeWebApplication.properties +++ b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/SyncopeWebApplication.properties @@ -29,7 +29,7 @@ alert=Alert: confirmDelete=Do you really want to delete the selected item(s)? confirmUnlink=Do you really want to remove the link between the selected item(s) and the resource? confirmUnassign=Do you really want to remove the assignment between the selected item(s) and the resource? -confirmDeprovision=Do you really want to de-provision the selected item(s)? +confirmDeprovision=Do you really want to deprovision the selected item(s)? confirmProvision=Do you really want to provision the selected item(s)? confirmClone=Do you really want to clone the selected item(s)? @@ -82,3 +82,5 @@ tooLargeFile=File is too large, max upload file size is ${maxUploadSizeB} bytes confirmDelegation=Do you really want to switch user? topology=Topology engagements=Engagements +confirmProvisionMembers=Do you really want to provision all group members? +confirmDeprovisionMembers=Do you really want to deprovision all group members? diff --git a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/SyncopeWebApplication_fr_CA.properties b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/SyncopeWebApplication_fr_CA.properties index 90301999a4..3f345a7f53 100644 --- a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/SyncopeWebApplication_fr_CA.properties +++ b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/SyncopeWebApplication_fr_CA.properties @@ -80,3 +80,5 @@ nomatch=Aucune correspondance trouv\u00e9e tooLargeFile=Fichier trop volumineux, la taille maximale autoris\u00e9e est de $ {maxUploadSizeB} octets ($ {maxUploadSizeMB} Mo). confirmDelegation=Do you really want to switch user? engagements=Engagements +confirmProvisionMembers=Do you really want to provision all group's members? +confirmDeprovisionMembers=Do you really want to deprovision all group members? diff --git a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/SyncopeWebApplication_it.properties b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/SyncopeWebApplication_it.properties index 3200a9be9d..446476f3c4 100644 --- a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/SyncopeWebApplication_it.properties +++ b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/SyncopeWebApplication_it.properties @@ -29,7 +29,7 @@ alert=Attenzione: confirmDelete=Vuoi davvero procedere con la cancellazione? confirmUnlink=Vuoi davvero procedere rimuovendo il link con la risorsa? confirmUnassign=Vuoi davvero procedere rimuovendo l'assegnamento sulla risorsa? -confirmDeprovision=Vuoi davvero procedere con il de-provisioning? +confirmDeprovision=Vuoi davvero procedere con il deprovisioning? confirmProvision=Vuoi davvero procedere con il provisioning? confirmClone=Vuoi davvero procedere con la duplicazione? @@ -82,3 +82,5 @@ tooLargeFile=File troppo grande, la dimensione massima ammessa \u00e8 ${maxUploa confirmDelegation=Vuoi davvero cambiare utenza? topology=Topologia engagements=Impegni +confirmProvisionMembers=Vuoi davvero procedere con il provisioning di tutti i membri del gruppo? +confirmDeprovisionMembers=Vuoi davvero procedere con il deprovisioning di tutti i membri del gruppo? diff --git a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/SyncopeWebApplication_ja.properties b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/SyncopeWebApplication_ja.properties index a4ed95c701..c5574aed48 100644 --- a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/SyncopeWebApplication_ja.properties +++ b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/SyncopeWebApplication_ja.properties @@ -80,3 +80,5 @@ tooLargeFile=File is too large, max upload file size is ${maxUploadSizeB} bytes confirmDelegation=Do you really want to switch user? topology=Topology engagements=Engagements +confirmProvisionMembers=Do you really want to provision all group members? +confirmDeprovisionMembers=Do you really want to deprovision all group members? diff --git a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/SyncopeWebApplication_pt_BR.properties b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/SyncopeWebApplication_pt_BR.properties index cd5fe7769e..b989d75ca9 100644 --- a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/SyncopeWebApplication_pt_BR.properties +++ b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/SyncopeWebApplication_pt_BR.properties @@ -29,7 +29,7 @@ alert=Alerta: confirmDelete=Voc\u00ea realmente deseja apagar este item(s) selecionado? confirmUnlink=Voc\u00ea realmente deseja apagar o v\u00ednculo entre o item e de recursos? confirmUnassign=Voc\u00ea realmente deseja apagar a atribui\u00e7\u00e3o entre o item e de recursos? -confirmDeprovision=Voc\u00ea realmente de-provision item? +confirmDeprovision=Voc\u00ea realmente deprovision item? confirmProvision=Voc\u00ea realmente provision item? confirmClone=Voc\u00ea realmente deseja clonar este item(s) selecionado? @@ -82,3 +82,5 @@ tooLargeFile=File is too large, max upload file size is ${maxUploadSizeB} bytes confirmDelegation=Do you really want to switch user? topology=Topology engagements=Engagements +confirmProvisionMembers=Do you really want to provision all group's members? +confirmDeprovisionMembers=Do you really want to deprovision all group members? diff --git a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/SyncopeWebApplication_ru.properties b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/SyncopeWebApplication_ru.properties index dd5cd0fbc2..8a234c38d6 100644 --- a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/SyncopeWebApplication_ru.properties +++ b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/SyncopeWebApplication_ru.properties @@ -81,3 +81,5 @@ tooLargeFile=File is too large, max upload file size is ${maxUploadSizeB} bytes confirmDelegation=Do you really want to switch user? topology=Topology engagements=Engagements +confirmProvisionMembers=Do you really want to provision all group members? +confirmDeprovisionMembers=Do you really want to deprovision all group members? diff --git a/client/idrepo/console/src/test/resources/console-debug.properties b/client/idrepo/console/src/test/resources/console-debug.properties index d41b7337e0..8472125348 100644 --- a/client/idrepo/console/src/test/resources/console-debug.properties +++ b/client/idrepo/console/src/test/resources/console-debug.properties @@ -14,8 +14,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -#keymaster.address=http://localhost:9080/syncope/rest/keymaster -keymaster.address=https://localhost:9443/syncope/rest/keymaster +keymaster.address=http://localhost:9080/syncope/rest/keymaster +#keymaster.address=https://localhost:9443/syncope/rest/keymaster keymaster.username=${anonymousUser} keymaster.password=${anonymousKey} diff --git a/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/enduser/SyncopeEnduserApplication.properties b/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/enduser/SyncopeEnduserApplication.properties index 51a1bdc99e..edf98f7c84 100644 --- a/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/enduser/SyncopeEnduserApplication.properties +++ b/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/enduser/SyncopeEnduserApplication.properties @@ -29,7 +29,7 @@ alert=Alert: confirmDelete=Do you really want to delete the selected item(s)? confirmUnlink=Do you really want to remove the link between the selected item(s) and the resource? confirmUnassign=Do you really want to remove the assignment between the selected item(s) and the resource? -confirmDeprovision=Do you really want to de-provision the selected item(s)? +confirmDeprovision=Do you really want to deprovision the selected item(s)? confirmProvision=Do you really want to provision the selected item(s)? confirmClone=Do you really want to clone the selected item(s)? diff --git a/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/enduser/SyncopeEnduserApplication_it.properties b/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/enduser/SyncopeEnduserApplication_it.properties index 371ab4ba84..c36338ba6e 100644 --- a/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/enduser/SyncopeEnduserApplication_it.properties +++ b/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/enduser/SyncopeEnduserApplication_it.properties @@ -29,7 +29,7 @@ alert=Attenzione: confirmDelete=Vuoi davvero procedere con la cancellazione? confirmUnlink=Vuoi davvero procedere rimuovendo il link con la risorsa? confirmUnassign=Vuoi davvero procedere rimuovendo l'assegnamento sulla risorsa? -confirmDeprovision=Vuoi davvero procedere con il de-provisioning? +confirmDeprovision=Vuoi davvero procedere con il deprovisioning? confirmProvision=Vuoi davvero procedere con il provisioning? confirmClone=Vuoi davvero procedere con la duplicazione? @@ -75,7 +75,7 @@ before=Prima after=Dopo captcha_error=Il Captcha inserito non \u00e8 corretto -blank_security_info=La domanda e/o la risposta di sicurezza �/sono vuote +blank_security_info=La domanda e/o la risposta di sicurezza \u00e8/sono vuote invalid.security.answer=Risposta di sicurezza non valida tooLargeFile=File troppo grande, la dimensione massima ammessa \\u00e8 ${maxUploadSizeB} bytes (${maxUploadSizeMB} MB). diff --git a/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/enduser/SyncopeEnduserApplication_pt_BR.properties b/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/enduser/SyncopeEnduserApplication_pt_BR.properties index 128d00a373..eb290d5b97 100644 --- a/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/enduser/SyncopeEnduserApplication_pt_BR.properties +++ b/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/enduser/SyncopeEnduserApplication_pt_BR.properties @@ -29,7 +29,7 @@ alert=Alerta: confirmDelete=Voc\u00ea realmente deseja apagar este item(s) selecionado? confirmUnlink=Voc\u00ea realmente deseja apagar o v\u00ednculo entre o item e de recursos? confirmUnassign=Voc\u00ea realmente deseja apagar a atribui\u00e7\u00e3o entre o item e de recursos? -confirmDeprovision=Voc\u00ea realmente de-provision item? +confirmDeprovision=Voc\u00ea realmente deprovision item? confirmProvision=Voc\u00ea realmente provision item? confirmClone=Voc\u00ea realmente deseja clonar este item(s) selecionado? @@ -75,7 +75,7 @@ before=Before after=After captcha_error=Captcha entered does not match -blank_security_info=A pergunta e/ou resposta de seguran�a est�/est�o em branco +blank_security_info=A pergunta e/ou resposta de seguran\u00e7a est\u00e1/est\u00e3o em branco invalid.security.answer=Invalid security answer tooLargeFile=File is too large, max upload file size is ${maxUploadSizeB} bytes (${maxUploadSizeMB} MB).