From commits-return-14996-archive-asf-public=cust-asf.ponee.io@syncope.apache.org Tue Mar 24 11:43:27 2020 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 348A718065C for ; Tue, 24 Mar 2020 12:43:27 +0100 (CET) Received: (qmail 26415 invoked by uid 500); 24 Mar 2020 11:43:26 -0000 Mailing-List: contact commits-help@syncope.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@syncope.apache.org Delivered-To: mailing list commits@syncope.apache.org Received: (qmail 26406 invoked by uid 99); 24 Mar 2020 11:43:26 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Mar 2020 11:43:26 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 422F6819F7; Tue, 24 Mar 2020 11:43:26 +0000 (UTC) Date: Tue, 24 Mar 2020 11:43:26 +0000 To: "commits@syncope.apache.org" Subject: [syncope] branch 2_1_X updated: Applying enhanced SearchConditionBuilder MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <158505020618.23865.14473870249037579535@gitbox.apache.org> From: ilgrosso@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: syncope X-Git-Refname: refs/heads/2_1_X X-Git-Reftype: branch X-Git-Oldrev: c688458d2d3b99dd3432cc9e6750e3d83ffceb59 X-Git-Newrev: 5fc9a49b05e408a3cc92cf8a65b2e15d6c19e559 X-Git-Rev: 5fc9a49b05e408a3cc92cf8a65b2e15d6c19e559 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a commit to branch 2_1_X in repository https://gitbox.apache.org/repos/asf/syncope.git The following commit(s) were added to refs/heads/2_1_X by this push: new 5fc9a49 Applying enhanced SearchConditionBuilder 5fc9a49 is described below commit 5fc9a49b05e408a3cc92cf8a65b2e15d6c19e559 Author: Francesco Chicchiriccò AuthorDate: Tue Mar 24 12:43:12 2020 +0100 Applying enhanced SearchConditionBuilder --- .../syncope/client/console/panels/AnyPanel.java | 1 - .../client/console/panels/GroupDirectoryPanel.java | 29 ++++++++++------------ .../client/console/panels/RoleDirectoryPanel.java | 7 +++--- .../client/console/wizards/WizardMgtPanel.java | 12 +++++++++ .../syncope/client/console/wizards/any/Groups.java | 2 +- 5 files changed, 29 insertions(+), 22 deletions(-) diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyPanel.java index c3fd912..bb62175 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyPanel.java @@ -82,7 +82,6 @@ public class AnyPanel extends Panel implements ModalPanel { protected static DirectoryPanelSupplier DEFAULT_DIRECTORYPANEL_SUPPLIER = (id, anyTypeTO, realmTO, anyLayout, pageRef) -> { - AnyTypeClassRestClient anyTypeClassRestClient = new AnyTypeClassRestClient(); final Panel panel; diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/GroupDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/GroupDirectoryPanel.java index 33734ae..be99f89 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/GroupDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/GroupDirectoryPanel.java @@ -109,38 +109,35 @@ public class GroupDirectoryPanel extends AnyDirectoryPanel { final Panel panel; if (AnyTypeKind.USER.name().equals(type)) { - String query = SyncopeClient.getUserSearchConditionBuilder().and( - SyncopeClient.getUserSearchConditionBuilder().inGroups(groupTO.getKey()), - SyncopeClient.getUserSearchConditionBuilder(). - is(Constants.KEY_FIELD_NAME).notNullValue()).query(); + String fiql = SyncopeClient.getUserSearchConditionBuilder(). + inGroups(groupTO.getKey()). + and(Constants.KEY_FIELD_NAME).notNullValue().query(); panel = new UserDirectoryPanel.Builder( classRestClient.list(anyTypeTO.getClasses()), anyTypeTO.getKey(), pageRef). setRealm(SyncopeConstants.ROOT_REALM). setFiltered(true). - setFiql(query). + setFiql(fiql). disableCheckBoxes(). - addNewItemPanelBuilder( - AnyLayoutUtils.newLayoutInfo( - new UserTO(), - anyTypeTO.getClasses(), - anyLayout.getUser(), - pageRef), false). + addNewItemPanelBuilder(AnyLayoutUtils.newLayoutInfo( + new UserTO(), + anyTypeTO.getClasses(), + anyLayout.getUser(), + pageRef), false). setWizardInModal(false).build(id); MetaDataRoleAuthorizationStrategy.authorize( panel, WebPage.RENDER, StandardEntitlement.USER_SEARCH); } else { - String query = SyncopeClient.getAnyObjectSearchConditionBuilder(type).and( - SyncopeClient.getUserSearchConditionBuilder().inGroups(groupTO.getKey()), - SyncopeClient.getUserSearchConditionBuilder(). - is(Constants.KEY_FIELD_NAME).notNullValue()).query(); + String fiql = SyncopeClient.getAnyObjectSearchConditionBuilder(type). + inGroups(groupTO.getKey()). + and(Constants.KEY_FIELD_NAME).notNullValue().query(); panel = new AnyObjectDirectoryPanel.Builder( classRestClient.list(anyTypeTO.getClasses()), anyTypeTO.getKey(), pageRef). setRealm(SyncopeConstants.ROOT_REALM). setFiltered(true). - setFiql(query). + setFiql(fiql). disableCheckBoxes(). addNewItemPanelBuilder(AnyLayoutUtils.newLayoutInfo( new AnyObjectTO(), diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/RoleDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/RoleDirectoryPanel.java index 222a200..3899f63 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/RoleDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/RoleDirectoryPanel.java @@ -169,10 +169,9 @@ public class RoleDirectoryPanel extends DirectoryPanel { - String query = SyncopeClient.getUserSearchConditionBuilder().and( - SyncopeClient.getUserSearchConditionBuilder().inRoles(model.getObject().getKey()), - SyncopeClient.getUserSearchConditionBuilder(). - is(Constants.KEY_FIELD_NAME).notNullValue()). + String query = SyncopeClient.getUserSearchConditionBuilder(). + inRoles(model.getObject().getKey()). + and(Constants.KEY_FIELD_NAME).notNullValue(). query(); Panel panel = new UserDirectoryPanel.Builder( diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/WizardMgtPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/WizardMgtPanel.java index 6924d8a..3d221dd 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/WizardMgtPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/WizardMgtPanel.java @@ -164,6 +164,18 @@ public abstract class WizardMgtPanel extends Panel imple return actualId; } + public boolean isWizardInModal() { + return wizardInModal; + } + + public ModalPanelBuilder getNewItemPanelBuilder() { + return newItemPanelBuilder; + } + + public boolean isNewItemDefaultButtonEnabled() { + return addAjaxLink.isVisible() && addAjaxLink.isEnabled(); + } + @Override @SuppressWarnings("unchecked") public void onEvent(final IEvent event) { diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Groups.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Groups.java index 7dd86c4..bdc2730 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Groups.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Groups.java @@ -135,7 +135,7 @@ public class Groups extends AbstractGroups { : groupRestClient.search( anyTO.getRealm(), SyncopeClient.getGroupSearchConditionBuilder(). - isAssignable().and().is("name").equalToIgnoreCase(filter).query(), + isAssignable().and("name").equalToIgnoreCase(filter).query(), 1, Constants.MAX_GROUP_LIST_SIZE, new SortParam<>("name", true), null)).stream().map(input -> {