diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/password/PasswordPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/password/PasswordPanel.html index d944f340fd2..24e5aabdd66 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/password/PasswordPanel.html +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/password/PasswordPanel.html @@ -19,8 +19,8 @@
- - + +
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.html index c25d512e3d0..6660d18792f 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.html +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.html @@ -37,16 +37,16 @@
-
-
-
- -
-
-
-
+
+
+
+ +
+
+
+
+
-
\ No newline at end of file diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentsUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentsUtil.java index 70192faf357..e4b05ae82ab 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentsUtil.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentsUtil.java @@ -374,11 +374,11 @@ public static QName getTargetType(AssignmentType assignment) { } - public static IModel getShoppingCartAssignmentsLimitReachedTitleModel(OperationResult result, PageBase pageBase){ + public static IModel getShoppingCartAssignmentsLimitReachedTitleModel(PageBase pageBase){ return new LoadableModel(true) { @Override protected String load() { - int assignmentsLimit = loadAssignmentsLimit(result, pageBase); + int assignmentsLimit = pageBase.getSessionStorage().getRoleCatalog().getAssignmentRequestLimit(); return isShoppingCartAssignmentsLimitReached(assignmentsLimit, pageBase) ? pageBase.createStringResource("RoleCatalogItemButton.assignmentsLimitReachedTitle", assignmentsLimit) .getString() : ""; @@ -394,11 +394,12 @@ public static boolean isShoppingCartAssignmentsLimitReached(int assignmentsLimit public static int loadAssignmentsLimit(OperationResult result, PageBase pageBase){ int assignmentsLimit = -1; try { - SystemConfigurationType sysConfig = pageBase.getModelInteractionService().getSystemConfiguration(result); - if (sysConfig != null && sysConfig.getAdminGuiConfiguration() != null && sysConfig.getAdminGuiConfiguration().getRoleManagement() != null){ - assignmentsLimit = sysConfig.getAdminGuiConfiguration().getRoleManagement().getAssignmentApprovalRequestLimit(); + AdminGuiConfigurationType adminGuiConfig = pageBase.getModelInteractionService().getAdminGuiConfiguration( + pageBase.createSimpleTask(result.getOperation()), result); + if (adminGuiConfig != null && adminGuiConfig.getRoleManagement() != null) { + assignmentsLimit = adminGuiConfig.getRoleManagement().getAssignmentApprovalRequestLimit(); } - } catch (ObjectNotFoundException | SchemaException ex){ + } catch (ObjectNotFoundException | SchemaException ex) { LOGGER.error("Error getting system configuration: {}", ex.getMessage(), ex); } return assignmentsLimit; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/RoleCatalogItemButton.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/RoleCatalogItemButton.html index 52e0860d862..94070806c87 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/RoleCatalogItemButton.html +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/RoleCatalogItemButton.html @@ -33,11 +33,11 @@ style="position: absolute; top: 3px; right: 3px; font-size: 20px;">
- + - + diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/RoleCatalogItemButton.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/RoleCatalogItemButton.java index 6c3493a8a9c..502bfa798ce 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/RoleCatalogItemButton.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/RoleCatalogItemButton.java @@ -69,7 +69,6 @@ public class RoleCatalogItemButton extends BasePanel{ private static final String DOT_CLASS = RoleCatalogItemButton.class.getName() + "."; private static final String OPERATION_LOAD_OBJECT = DOT_CLASS + "loadObject"; - private static final String OPERATION_LOAD_ASSIGNMENTS_LIMIT = DOT_CLASS + "loadAssignmentsLimit"; private static final Trace LOGGER = TraceManager.getTrace(RoleCatalogItemButton.class); public RoleCatalogItemButton(String id, IModel model){ @@ -127,7 +126,13 @@ public void onClick(AjaxRequestTarget ajaxRequestTarget) { }; detailsLink.add(getFooterLinksEnableBehaviour()); detailsLink.add(AttributeAppender.append("title", - AssignmentsUtil.getShoppingCartAssignmentsLimitReachedTitleModel(new OperationResult(OPERATION_LOAD_ASSIGNMENTS_LIMIT), getPageBase()))); + AssignmentsUtil.getShoppingCartAssignmentsLimitReachedTitleModel(getPageBase()))); + detailsLink.add(AttributeAppender.append("class", new LoadableModel() { + @Override + protected String load() { + return detailsLink.isEnabled() ? "shopping-cart-item-button-details" : "shopping-cart-item-button-details-disabled"; + } + })); itemButtonContainer.add(detailsLink); Label detailsLinkLabel = new Label(ID_DETAILS_LINK_LABEL, createStringResource("MultiButtonPanel.detailsLink")); @@ -155,7 +160,13 @@ public void onClick(AjaxRequestTarget ajaxRequestTarget) { }; addToCartLink.add(getFooterLinksEnableBehaviour()); addToCartLink.add(AttributeAppender.append("title", - AssignmentsUtil.getShoppingCartAssignmentsLimitReachedTitleModel(new OperationResult(OPERATION_LOAD_ASSIGNMENTS_LIMIT), getPageBase()))); + AssignmentsUtil.getShoppingCartAssignmentsLimitReachedTitleModel(getPageBase()))); + addToCartLink.add(AttributeAppender.append("class", new LoadableModel() { + @Override + protected String load() { + return addToCartLink.isEnabled() ? "shopping-cart-item-button-add" : "shopping-cart-item-button-add-disabled"; + } + })); itemButtonContainer.add(addToCartLink); AjaxLink addToCartLinkIcon = new AjaxLink(ID_ADD_TO_CART_LINK_ICON) { @@ -232,8 +243,7 @@ private VisibleEnableBehaviour getFooterLinksEnableBehaviour(){ @Override public boolean isEnabled(){ - int assignmentsLimit = AssignmentsUtil.loadAssignmentsLimit(new OperationResult(OPERATION_LOAD_ASSIGNMENTS_LIMIT), - RoleCatalogItemButton.this.getPageBase()); + int assignmentsLimit = getRoleCatalogStorage().getAssignmentRequestLimit(); return !AssignmentsUtil.isShoppingCartAssignmentsLimitReached(assignmentsLimit, RoleCatalogItemButton.this.getPageBase()) && (isMultiUserRequest() || canAssign(getModelObject())); } @@ -280,7 +290,11 @@ private void targetObjectDetailsPerformed(AssignmentEditorDto assignment, AjaxRe } private boolean isMultiUserRequest(){ - return getPageBase().getSessionStorage().getRoleCatalog().isMultiUserRequest(); + return getRoleCatalogStorage().isMultiUserRequest(); + } + + private RoleCatalogStorage getRoleCatalogStorage(){ + return getPageBase().getSessionStorage().getRoleCatalog(); } private boolean canAssign(AssignmentEditorDto assignment) { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.html index cd63a869b34..bcb405f1033 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.html +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.html @@ -32,7 +32,7 @@ - + diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.java index 59e79c19e20..0ab4de2bc57 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.java @@ -120,6 +120,12 @@ public void onClick(AjaxRequestTarget target) { target.add(shoppingCartButtonsPanel); } }; + addToCartButton.add(AttributeAppender.append("class", new LoadableModel() { + @Override + protected String load() { + return addToCartButton.isEnabled() ? "btn btn-success" : "btn btn-success disabled"; + } + })); addToCartButton.setOutputMarkupId(true); addToCartButton.add(new VisibleEnableBehaviour(){ private static final long serialVersionUID = 1L; @@ -135,7 +141,7 @@ public boolean isEnabled(){ } }); addToCartButton.add(AttributeAppender.append("title", - AssignmentsUtil.getShoppingCartAssignmentsLimitReachedTitleModel(new OperationResult(OPERATION_LOAD_ASSIGNMENTS_LIMIT), parentPage))); + AssignmentsUtil.getShoppingCartAssignmentsLimitReachedTitleModel(parentPage))); shoppingCartButtonsPanel.add(addToCartButton); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PagePreviewChanges.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PagePreviewChanges.html index 864f37a7ddf..29ea4919e2b 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PagePreviewChanges.html +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PagePreviewChanges.html @@ -19,39 +19,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-

-
-
-
-
-
-
-
-
-
-
-
-

-
-
-
-
-
-
-
- +
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PagePreviewChanges.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PagePreviewChanges.java index d093513dfd8..50ea6957511 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PagePreviewChanges.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PagePreviewChanges.java @@ -15,11 +15,14 @@ */ package com.evolveum.midpoint.web.component.prism.show; +import com.evolveum.midpoint.gui.api.component.tabs.PanelTab; import com.evolveum.midpoint.gui.api.util.WebComponentUtil; +import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils; import com.evolveum.midpoint.model.api.ModelInteractionService; import com.evolveum.midpoint.model.api.context.ModelContext; import com.evolveum.midpoint.model.api.context.ModelProjectionContext; import com.evolveum.midpoint.model.api.visualizer.Scene; +import com.evolveum.midpoint.prism.PrismObject; import com.evolveum.midpoint.prism.delta.ObjectDelta; import com.evolveum.midpoint.schema.result.OperationResult; import com.evolveum.midpoint.schema.util.ObjectResolver; @@ -35,6 +38,7 @@ import com.evolveum.midpoint.web.application.AuthorizationAction; import com.evolveum.midpoint.web.application.PageDescriptor; import com.evolveum.midpoint.web.component.AjaxButton; +import com.evolveum.midpoint.web.component.TabbedPanel; import com.evolveum.midpoint.web.component.breadcrumbs.Breadcrumb; import com.evolveum.midpoint.web.component.breadcrumbs.BreadcrumbPageInstance; import com.evolveum.midpoint.web.component.util.VisibleBehaviour; @@ -48,10 +52,12 @@ import com.evolveum.midpoint.web.page.admin.workflow.dto.ApprovalProcessExecutionInformationDto; import com.evolveum.midpoint.web.page.admin.workflow.dto.EvaluatedTriggerGroupDto; import com.evolveum.midpoint.web.util.OnePageParameterEncoder; +import com.evolveum.midpoint.xml.ns._public.common.common_3.AbstractRoleType; import com.evolveum.midpoint.xml.ns._public.common.common_3.ApprovalSchemaExecutionInformationType; import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType; import com.evolveum.midpoint.xml.ns._public.common.common_3.PolicyRuleEnforcerHookPreviewOutputType; import org.apache.wicket.ajax.AjaxRequestTarget; +import org.apache.wicket.extensions.markup.html.tabs.ITab; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.form.Form; @@ -62,6 +68,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Map; import static org.apache.commons.collections.CollectionUtils.addIgnoreNull; @@ -82,145 +89,39 @@ @AuthorizationAction(actionUri = PageAdminServices.AUTH_SERVICES_ALL, label = PageAdminServices.AUTH_SERVICES_ALL_LABEL, description = PageAdminServices.AUTH_SERVICES_ALL_DESCRIPTION), @AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_SERVICE_URL, label = "PageService.auth.role.label", description = "PageService.auth.role.description") }) -public class PagePreviewChanges extends PageAdmin { +public class PagePreviewChanges extends PageAdmin { private static final long serialVersionUID = 1L; - - private static final String ID_PRIMARY_DELTAS_SCENE = "primaryDeltas"; - private static final String ID_SECONDARY_DELTAS_SCENE = "secondaryDeltas"; - private static final String ID_APPROVALS_CONTAINER = "approvalsContainer"; - private static final String ID_APPROVALS = "approvals"; - private static final String ID_POLICY_VIOLATIONS_CONTAINER = "policyViolationsContainer"; - private static final String ID_POLICY_VIOLATIONS = "policyViolations"; + + private static final String ID_TABBED_PANEL = "tabbedPanel"; private static final String ID_CONTINUE_EDITING = "continueEditing"; private static final String ID_SAVE = "save"; private static final Trace LOGGER = TraceManager.getTrace(PagePreviewChanges.class); - private IModel primaryDeltasModel; - private IModel secondaryDeltasModel; - private IModel> policyViolationsModel; - private IModel> approvalsModel; - - public PagePreviewChanges(ModelContext modelContext, ModelInteractionService modelInteractionService) { - final List> primaryDeltas = new ArrayList<>(); - final List> secondaryDeltas = new ArrayList<>(); - final List primaryScenes; - final List secondaryScenes; - try { - if (modelContext != null) { - if (modelContext.getFocusContext() != null) { - addIgnoreNull(primaryDeltas, modelContext.getFocusContext().getPrimaryDelta()); - addIgnoreNull(secondaryDeltas, modelContext.getFocusContext().getSecondaryDelta()); - } - for (ModelProjectionContext projCtx : modelContext.getProjectionContexts()) { - addIgnoreNull(primaryDeltas, projCtx.getPrimaryDelta()); - addIgnoreNull(secondaryDeltas, projCtx.getExecutableDelta()); - } - } - if (LOGGER.isTraceEnabled()) { - LOGGER.trace("Primary deltas:\n{}", DebugUtil.debugDump(primaryDeltas)); - LOGGER.trace("Secondary deltas:\n{}", DebugUtil.debugDump(secondaryDeltas)); - } - - Task task = createSimpleTask("visualize"); - primaryScenes = modelInteractionService.visualizeDeltas(primaryDeltas, task, task.getResult()); - secondaryScenes = modelInteractionService.visualizeDeltas(secondaryDeltas, task, task.getResult()); - } catch (SchemaException | ExpressionEvaluationException e) { - throw new SystemException(e); // TODO - } - if (LOGGER.isTraceEnabled()) { - LOGGER.trace("Creating context DTO for primary deltas:\n{}", DebugUtil.debugDump(primaryScenes)); - LOGGER.trace("Creating context DTO for secondary deltas:\n{}", DebugUtil.debugDump(secondaryScenes)); - } - - final WrapperScene primaryScene = new WrapperScene(primaryScenes, - primaryScenes.size() != 1 ? "PagePreviewChanges.primaryChangesMore" : "PagePreviewChanges.primaryChangesOne", primaryScenes.size()); - final WrapperScene secondaryScene = new WrapperScene(secondaryScenes, - secondaryScenes.size() != 1 ? "PagePreviewChanges.secondaryChangesMore" : "PagePreviewChanges.secondaryChangesOne", secondaryScenes.size()); - final SceneDto primarySceneDto = new SceneDto(primaryScene); - final SceneDto secondarySceneDto = new SceneDto(secondaryScene); - primaryDeltasModel = new AbstractReadOnlyModel() { - @Override - public SceneDto getObject() { - return primarySceneDto; - } - }; - secondaryDeltasModel = new AbstractReadOnlyModel() { - @Override - public SceneDto getObject() { - return secondarySceneDto; - } - }; - - PolicyRuleEnforcerHookPreviewOutputType enforcements = modelContext != null - ? modelContext.getHookPreviewResult(PolicyRuleEnforcerHookPreviewOutputType.class) - : null; - List triggerGroups = enforcements != null - ? Collections.singletonList(EvaluatedTriggerGroupDto.initializeFromRules(enforcements.getRule(), false, null)) - : Collections.emptyList(); - policyViolationsModel = Model.ofList(triggerGroups); + private Map, ModelContext> modelContextMap; + private ModelInteractionService modelInteractionService; - List approvalsExecutionList = modelContext != null - ? modelContext.getHookPreviewResults(ApprovalSchemaExecutionInformationType.class) - : Collections.emptyList(); - List approvals = new ArrayList<>(); - if (!approvalsExecutionList.isEmpty()) { - Task opTask = createSimpleTask(PagePreviewChanges.class + ".createApprovals"); // TODO - OperationResult result = opTask.getResult(); - ObjectResolver modelObjectResolver = getModelObjectResolver(); - try { - for (ApprovalSchemaExecutionInformationType execution : approvalsExecutionList) { - approvals.add(ApprovalProcessExecutionInformationDto - .createFrom(execution, modelObjectResolver, true, opTask, result)); // TODO reuse session - } - result.computeStatus(); - } catch (Throwable t) { - LoggingUtils.logUnexpectedException(LOGGER, "Couldn't prepare approval information", t); - result.recordFatalError("Couldn't prepare approval information: " + t.getMessage(), t); - } - if (WebComponentUtil.showResultInPage(result)) { - showResult(result); - } - } - approvalsModel = Model.ofList(approvals); + public PagePreviewChanges(Map, ModelContext> modelContextMap, ModelInteractionService modelInteractionService) { + this.modelContextMap = modelContextMap; + this.modelInteractionService = modelInteractionService; initLayout(); } - @Override - protected void createBreadcrumb() { - createInstanceBreadcrumb(); - } private void initLayout() { Form mainForm = new com.evolveum.midpoint.web.component.form.Form("mainForm"); mainForm.setMultiPart(true); add(mainForm); - mainForm.add(new ScenePanel(ID_PRIMARY_DELTAS_SCENE, primaryDeltasModel)); - mainForm.add(new ScenePanel(ID_SECONDARY_DELTAS_SCENE, secondaryDeltasModel)); - - WebMarkupContainer policyViolationsContainer = new WebMarkupContainer(ID_POLICY_VIOLATIONS_CONTAINER); - policyViolationsContainer.add(new VisibleBehaviour(() -> !violationsEmpty())); - policyViolationsContainer.add(new EvaluatedTriggerGroupListPanel(ID_POLICY_VIOLATIONS, policyViolationsModel)); - mainForm.add(policyViolationsContainer); - - WebMarkupContainer approvalsContainer = new WebMarkupContainer(ID_APPROVALS_CONTAINER); - approvalsContainer.add(new VisibleBehaviour(() -> violationsEmpty() && !approvalsEmpty())); - approvalsContainer.add(new ApprovalProcessesPreviewPanel(ID_APPROVALS, approvalsModel)); - mainForm.add(approvalsContainer); + List tabs = createTabs(); + TabbedPanel previewChangesTabbedPanel = WebComponentUtil.createTabPanel(ID_TABBED_PANEL, this, tabs, null); + previewChangesTabbedPanel.setOutputMarkupId(true); + mainForm.add(previewChangesTabbedPanel); initButtons(mainForm); } - private boolean approvalsEmpty() { - return approvalsModel.getObject().isEmpty(); - } - - private boolean violationsEmpty() { - return EvaluatedTriggerGroupDto.isEmpty(policyViolationsModel.getObject()); - } - private void initButtons(Form mainForm) { AjaxButton cancel = new AjaxButton(ID_CONTINUE_EDITING, createStringResource("PagePreviewChanges.button.continueEditing")) { @Override @@ -237,10 +138,50 @@ public void onClick(AjaxRequestTarget target) { } }; //save.add(new EnableBehaviour(() -> violationsEmpty())); // does not work as expected (MID-4252) + save.add(new VisibleBehaviour(() -> violationsEmpty())); // so hiding the button altogether mainForm.add(save); } + //TODO relocate the logic from the loop to some util method, code repeats in PreviewChangesTabPanel + private boolean violationsEmpty() { + for (ModelContext modelContext : modelContextMap.values()) { + PolicyRuleEnforcerHookPreviewOutputType enforcements = modelContext != null + ? modelContext.getHookPreviewResult(PolicyRuleEnforcerHookPreviewOutputType.class) + : null; + List triggerGroups = enforcements != null + ? Collections.singletonList(EvaluatedTriggerGroupDto.initializeFromRules(enforcements.getRule(), false, null)) + : Collections.emptyList(); + if (!EvaluatedTriggerGroupDto.isEmpty(triggerGroups)){ + return false; + } + } + return true; + } + + private List createTabs(){ + List tabs = new ArrayList<>(); + modelContextMap.forEach((object, modelContext) -> { + + tabs.add( + new PanelTab(getTabPanelTitleModel(object)){ + + private static final long serialVersionUID = 1L; + + @Override + public WebMarkupContainer createPanel(String panelId) { + return new PreviewChangesTabPanel(panelId, Model.of(modelContext)); + } + }); + }); + return tabs; + } + + private IModel getTabPanelTitleModel(PrismObject object){ + return Model.of(WebComponentUtil.getEffectiveName(object, AbstractRoleType.F_DISPLAY_NAME)); + } + + private void cancelPerformed(AjaxRequestTarget target) { redirectBack(); } @@ -260,4 +201,8 @@ private void savePerformed(AjaxRequestTarget target) { } } + @Override + protected void createBreadcrumb() { + createInstanceBreadcrumb(); + } } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PreviewChangesTabPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PreviewChangesTabPanel.html new file mode 100644 index 00000000000..3d053b72acf --- /dev/null +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PreviewChangesTabPanel.html @@ -0,0 +1,53 @@ + + + + + +
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
+
+ + diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PreviewChangesTabPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PreviewChangesTabPanel.java new file mode 100644 index 00000000000..2ccee29f748 --- /dev/null +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PreviewChangesTabPanel.java @@ -0,0 +1,179 @@ +package com.evolveum.midpoint.web.component.prism.show; + +import com.evolveum.midpoint.gui.api.component.BasePanel; +import com.evolveum.midpoint.gui.api.util.WebComponentUtil; +import com.evolveum.midpoint.model.api.context.ModelContext; +import com.evolveum.midpoint.model.api.context.ModelProjectionContext; +import com.evolveum.midpoint.model.api.visualizer.Scene; +import com.evolveum.midpoint.prism.delta.ObjectDelta; +import com.evolveum.midpoint.schema.result.OperationResult; +import com.evolveum.midpoint.schema.util.ObjectResolver; +import com.evolveum.midpoint.task.api.Task; +import com.evolveum.midpoint.util.DebugUtil; +import com.evolveum.midpoint.util.exception.ExpressionEvaluationException; +import com.evolveum.midpoint.util.exception.SchemaException; +import com.evolveum.midpoint.util.exception.SystemException; +import com.evolveum.midpoint.util.logging.LoggingUtils; +import com.evolveum.midpoint.util.logging.Trace; +import com.evolveum.midpoint.util.logging.TraceManager; +import com.evolveum.midpoint.web.component.util.VisibleBehaviour; +import com.evolveum.midpoint.web.component.wf.ApprovalProcessesPreviewPanel; +import com.evolveum.midpoint.web.page.admin.workflow.EvaluatedTriggerGroupListPanel; +import com.evolveum.midpoint.web.page.admin.workflow.dto.ApprovalProcessExecutionInformationDto; +import com.evolveum.midpoint.web.page.admin.workflow.dto.EvaluatedTriggerGroupDto; +import com.evolveum.midpoint.xml.ns._public.common.common_3.ApprovalSchemaExecutionInformationType; +import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType; +import com.evolveum.midpoint.xml.ns._public.common.common_3.PolicyRuleEnforcerHookPreviewOutputType; +import org.apache.wicket.markup.html.WebMarkupContainer; +import org.apache.wicket.model.AbstractReadOnlyModel; +import org.apache.wicket.model.IModel; +import org.apache.wicket.model.Model; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import static org.apache.commons.collections.CollectionUtils.addIgnoreNull; + +/** + * Created by kate on 22.8.2018. + */ +public class PreviewChangesTabPanel extends BasePanel> { + private static final long serialVersionUID = 1L; + + private static final String ID_PRIMARY_DELTAS_SCENE = "primaryDeltas"; + private static final String ID_SECONDARY_DELTAS_SCENE = "secondaryDeltas"; + private static final String ID_APPROVALS_CONTAINER = "approvalsContainer"; + private static final String ID_APPROVALS = "approvals"; + private static final String ID_POLICY_VIOLATIONS_CONTAINER = "policyViolationsContainer"; + private static final String ID_POLICY_VIOLATIONS = "policyViolations"; + + private IModel primaryDeltasModel; + private IModel secondaryDeltasModel; + private IModel> policyViolationsModel; + private IModel> approvalsModel; + + private static final Trace LOGGER = TraceManager.getTrace(PreviewChangesTabPanel.class); + + public PreviewChangesTabPanel(String id, IModel> contextModel){ + super(id, contextModel); + } + + @Override + protected void onInitialize(){ + super.onInitialize(); + + initModels(); + initLayout(); + } + + private void initModels(){ + final List> primaryDeltas = new ArrayList<>(); + final List> secondaryDeltas = new ArrayList<>(); + final List primaryScenes; + final List secondaryScenes; + + ModelContext modelContext = getModelObject(); + try { + if (modelContext != null) { + if (modelContext.getFocusContext() != null) { + addIgnoreNull(primaryDeltas, modelContext.getFocusContext().getPrimaryDelta()); + addIgnoreNull(secondaryDeltas, modelContext.getFocusContext().getSecondaryDelta()); + } + for (ModelProjectionContext projCtx : modelContext.getProjectionContexts()) { + addIgnoreNull(primaryDeltas, projCtx.getPrimaryDelta()); + addIgnoreNull(secondaryDeltas, projCtx.getExecutableDelta()); + } + } + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Primary deltas:\n{}", DebugUtil.debugDump(primaryDeltas)); + LOGGER.trace("Secondary deltas:\n{}", DebugUtil.debugDump(secondaryDeltas)); + } + + Task task = getPageBase().createSimpleTask("visualize"); + primaryScenes = getPageBase().getModelInteractionService().visualizeDeltas(primaryDeltas, task, task.getResult()); + secondaryScenes = getPageBase().getModelInteractionService().visualizeDeltas(secondaryDeltas, task, task.getResult()); + } catch (SchemaException | ExpressionEvaluationException e) { + throw new SystemException(e); // TODO + } + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Creating context DTO for primary deltas:\n{}", DebugUtil.debugDump(primaryScenes)); + LOGGER.trace("Creating context DTO for secondary deltas:\n{}", DebugUtil.debugDump(secondaryScenes)); + } + + final WrapperScene primaryScene = new WrapperScene(primaryScenes, + primaryScenes.size() != 1 ? "PagePreviewChanges.primaryChangesMore" : "PagePreviewChanges.primaryChangesOne", primaryScenes.size()); + final WrapperScene secondaryScene = new WrapperScene(secondaryScenes, + secondaryScenes.size() != 1 ? "PagePreviewChanges.secondaryChangesMore" : "PagePreviewChanges.secondaryChangesOne", secondaryScenes.size()); + final SceneDto primarySceneDto = new SceneDto(primaryScene); + final SceneDto secondarySceneDto = new SceneDto(secondaryScene); + primaryDeltasModel = new AbstractReadOnlyModel() { + @Override + public SceneDto getObject() { + return primarySceneDto; + } + }; + secondaryDeltasModel = new AbstractReadOnlyModel() { + @Override + public SceneDto getObject() { + return secondarySceneDto; + } + }; + + PolicyRuleEnforcerHookPreviewOutputType enforcements = modelContext != null + ? modelContext.getHookPreviewResult(PolicyRuleEnforcerHookPreviewOutputType.class) + : null; + List triggerGroups = enforcements != null + ? Collections.singletonList(EvaluatedTriggerGroupDto.initializeFromRules(enforcements.getRule(), false, null)) + : Collections.emptyList(); + policyViolationsModel = Model.ofList(triggerGroups); + + List approvalsExecutionList = modelContext != null + ? modelContext.getHookPreviewResults(ApprovalSchemaExecutionInformationType.class) + : Collections.emptyList(); + List approvals = new ArrayList<>(); + if (!approvalsExecutionList.isEmpty()) { + Task opTask = getPageBase().createSimpleTask(PagePreviewChanges.class + ".createApprovals"); // TODO + OperationResult result = opTask.getResult(); + ObjectResolver modelObjectResolver = getPageBase().getModelObjectResolver(); + try { + for (ApprovalSchemaExecutionInformationType execution : approvalsExecutionList) { + approvals.add(ApprovalProcessExecutionInformationDto + .createFrom(execution, modelObjectResolver, true, opTask, result)); // TODO reuse session + } + result.computeStatus(); + } catch (Throwable t) { + LoggingUtils.logUnexpectedException(LOGGER, "Couldn't prepare approval information", t); + result.recordFatalError("Couldn't prepare approval information: " + t.getMessage(), t); + } + if (WebComponentUtil.showResultInPage(result)) { + getPageBase().showResult(result); + } + } + approvalsModel = Model.ofList(approvals); + } + + private void initLayout(){ + add(new ScenePanel(ID_PRIMARY_DELTAS_SCENE, primaryDeltasModel)); + add(new ScenePanel(ID_SECONDARY_DELTAS_SCENE, secondaryDeltasModel)); + + WebMarkupContainer policyViolationsContainer = new WebMarkupContainer(ID_POLICY_VIOLATIONS_CONTAINER); + policyViolationsContainer.add(new VisibleBehaviour(() -> !violationsEmpty())); + policyViolationsContainer.add(new EvaluatedTriggerGroupListPanel(ID_POLICY_VIOLATIONS, policyViolationsModel)); + add(policyViolationsContainer); + + WebMarkupContainer approvalsContainer = new WebMarkupContainer(ID_APPROVALS_CONTAINER); + approvalsContainer.add(new VisibleBehaviour(() -> violationsEmpty() && !approvalsEmpty())); + approvalsContainer.add(new ApprovalProcessesPreviewPanel(ID_APPROVALS, approvalsModel)); + add(approvalsContainer); + + } + + private boolean approvalsEmpty() { + return approvalsModel.getObject().isEmpty(); + } + + private boolean violationsEmpty() { + return EvaluatedTriggerGroupDto.isEmpty(policyViolationsModel.getObject()); + } +} diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressPanel.java index 35e6cfb3110..e3312f6b98e 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressPanel.java @@ -601,7 +601,7 @@ public Void callWithContextPrepared() throws Exception { ModelContext previewResult = modelInteraction .previewChanges(deltas, options, task, Collections.singleton(reporter), result); reporter.setPreviewResult(previewResult); - } else { + } else if (deltas != null && deltas.size() > 0){ model.executeChanges(deltas, options, task, Collections.singleton(reporter), result); } } catch (CommonException | RuntimeException e) { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java index 5777261ae8d..9e9aeffcc2e 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java @@ -185,7 +185,16 @@ private void finishPreviewProcessing(AjaxRequestTarget target, OperationResult r showResult(result); target.add(getFeedbackPanel()); - navigateToNext(new PagePreviewChanges(getProgressPanel().getPreviewResult(), getModelInteractionService())); + + Map, ModelContext> modelContextMap = new LinkedHashMap<>(); + modelContextMap.put(getObjectWrapper().getObject(), getProgressPanel().getPreviewResult()); + + processAdditionalFocalObjectsForPreview(modelContextMap); + + navigateToNext(new PagePreviewChanges(modelContextMap, getModelInteractionService())); + } + + protected void processAdditionalFocalObjectsForPreview(Map, ModelContext> modelContextMap){ } @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java index 19acf39b19e..b6d7f31beef 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java @@ -71,196 +71,196 @@ * @author semancik */ public abstract class PageAdminObjectDetails extends PageAdmin - implements ProgressReportingAwarePage { - private static final long serialVersionUID = 1L; - - private static final String DOT_CLASS = PageAdminObjectDetails.class.getName() + "."; - - public static final String PARAM_RETURN_PAGE = "returnPage"; - - private static final String OPERATION_LOAD_OBJECT = DOT_CLASS + "loadObject"; - private static final String OPERATION_LOAD_PARENT_ORGS = DOT_CLASS + "loadParentOrgs"; - private static final String OPERATION_LOAD_GUI_CONFIGURATION = DOT_CLASS + "loadGuiConfiguration"; - protected static final String OPERATION_SAVE = DOT_CLASS + "save"; - protected static final String OPERATION_PREVIEW_CHANGES = DOT_CLASS + "previewChanges"; - protected static final String OPERATION_SEND_TO_SUBMIT = DOT_CLASS + "sendToSubmit"; - - protected static final String ID_SUMMARY_PANEL = "summaryPanel"; - protected static final String ID_MAIN_PANEL = "mainPanel"; - private static final String ID_PROGRESS_PANEL = "progressPanel"; - - private static final Trace LOGGER = TraceManager.getTrace(PageAdminObjectDetails.class); - - private LoadableModel> objectModel; - private LoadableModel>> parentOrgModel; - - private ProgressPanel progressPanel; - - // used to determine whether to leave this page or stay on it (after - // operation finishing) - private ObjectDelta delta; - - private AbstractObjectMainPanel mainPanel; - private boolean saveOnConfigure; // ugly hack - whether to invoke 'Save' when returning to this page - - private boolean editingFocus = false; //before we got isOidParameterExists status depending only on oid parameter existence - //we should set editingFocus=true not only when oid parameter exists but also - //when object is given as a constructor parameter - - public boolean isEditingFocus() { - return editingFocus; - } - - @Override - protected void createBreadcrumb() { - createInstanceBreadcrumb(); - } - - @Override - protected void onConfigure() { - super.onConfigure(); - if (saveOnConfigure) { - saveOnConfigure = false; - add(new AbstractAjaxTimerBehavior(Duration.milliseconds(100)) { - @Override - protected void onTimer(AjaxRequestTarget target) { - stop(target); - savePerformed(target); - } - }); - } - } - - @Override - protected IModel createPageTitleModel() { - return new LoadableModel() { - private static final long serialVersionUID = 1L; - - @Override - protected String load() { - if (!isOidParameterExists() && !editingFocus) { - String key = "PageAdminObjectDetails.title.new" + getCompileTimeClass().getSimpleName(); - return createStringResource(key).getObject(); - } - - String name = null; - if (getObjectWrapper() != null && getObjectWrapper().getObject() != null) { - name = WebComponentUtil.getName(getObjectWrapper().getObject()); - } - - String key = "PageAdminObjectDetails.title.edit" + getCompileTimeClass().getSimpleName(); - return createStringResource(key, name).getObject(); - } - }; - } - - public LoadableModel> getObjectModel() { - return objectModel; - } + implements ProgressReportingAwarePage { + private static final long serialVersionUID = 1L; - public LoadableModel>> getParentOrgModel() { - return parentOrgModel; - } + private static final String DOT_CLASS = PageAdminObjectDetails.class.getName() + "."; - protected AbstractObjectMainPanel getMainPanel() { - return mainPanel; - } + public static final String PARAM_RETURN_PAGE = "returnPage"; - public ObjectWrapper getObjectWrapper() { - return objectModel.getObject(); - } + private static final String OPERATION_LOAD_OBJECT = DOT_CLASS + "loadObject"; + private static final String OPERATION_LOAD_PARENT_ORGS = DOT_CLASS + "loadParentOrgs"; + private static final String OPERATION_LOAD_GUI_CONFIGURATION = DOT_CLASS + "loadGuiConfiguration"; + protected static final String OPERATION_SAVE = DOT_CLASS + "save"; + protected static final String OPERATION_PREVIEW_CHANGES = DOT_CLASS + "previewChanges"; + protected static final String OPERATION_SEND_TO_SUBMIT = DOT_CLASS + "sendToSubmit"; - public List> getParentOrgs() { - return parentOrgModel.getObject(); - } + protected static final String ID_SUMMARY_PANEL = "summaryPanel"; + protected static final String ID_MAIN_PANEL = "mainPanel"; + private static final String ID_PROGRESS_PANEL = "progressPanel"; - public ObjectDelta getDelta() { - return delta; - } - - public void setDelta(ObjectDelta delta) { - this.delta = delta; - } - - public ProgressPanel getProgressPanel() { - return progressPanel; - } - - protected void reviveModels() throws SchemaException { - WebComponentUtil.revive(objectModel, getPrismContext()); - WebComponentUtil.revive(parentOrgModel, getPrismContext()); - } - - public abstract Class getCompileTimeClass(); - - - public void initialize(final PrismObject objectToEdit) { - boolean isNewObject = objectToEdit == null; - - initialize(objectToEdit, isNewObject, false); - } - - public void initialize(final PrismObject objectToEdit, boolean isNewObject) { - initialize(objectToEdit, isNewObject, false); - } - - public void initialize(final PrismObject objectToEdit, boolean isNewObject, boolean isReadonly) { - initializeModel(objectToEdit, isNewObject, isReadonly); - initLayout(); - } - - protected void initializeModel(final PrismObject objectToEdit, boolean isNewObject, boolean isReadonly) { - editingFocus = !isNewObject; - - objectModel = new LoadableModel>(false) { - private static final long serialVersionUID = 1L; - - @Override - protected ObjectWrapper load() { - ObjectWrapper wrapper = loadObjectWrapper(objectToEdit, isReadonly); - wrapper.sort(); - return wrapper; - } - }; - - parentOrgModel = new LoadableModel>>(false) { - private static final long serialVersionUID = 1L; + private static final Trace LOGGER = TraceManager.getTrace(PageAdminObjectDetails.class); - @Override - protected List> load() { - return loadOrgWrappers(); - } - }; - } + private LoadableModel> objectModel; + private LoadableModel>> parentOrgModel; - protected List> loadOrgWrappers() { - // WRONG!! TODO: fix - return null; - } + private ProgressPanel progressPanel; - protected abstract O createNewObject(); + // used to determine whether to leave this page or stay on it (after + // operation finishing) + private ObjectDelta delta; - protected void initLayout() { - initLayoutSummaryPanel(); + private AbstractObjectMainPanel mainPanel; + private boolean saveOnConfigure; // ugly hack - whether to invoke 'Save' when returning to this page - mainPanel = createMainPanel(ID_MAIN_PANEL); - mainPanel.setOutputMarkupId(true); - add(mainPanel); + private boolean editingFocus = false; //before we got isOidParameterExists status depending only on oid parameter existence + //we should set editingFocus=true not only when oid parameter exists but also + //when object is given as a constructor parameter - progressPanel = new ProgressPanel(ID_PROGRESS_PANEL); - add(progressPanel); - } + public boolean isEditingFocus() { + return editingFocus; + } + + @Override + protected void createBreadcrumb() { + createInstanceBreadcrumb(); + } + + @Override + protected void onConfigure() { + super.onConfigure(); + if (saveOnConfigure) { + saveOnConfigure = false; + add(new AbstractAjaxTimerBehavior(Duration.milliseconds(100)) { + @Override + protected void onTimer(AjaxRequestTarget target) { + stop(target); + savePerformed(target); + } + }); + } + } + + @Override + protected IModel createPageTitleModel() { + return new LoadableModel() { + private static final long serialVersionUID = 1L; + + @Override + protected String load() { + if (!isOidParameterExists() && !editingFocus) { + String key = "PageAdminObjectDetails.title.new" + getCompileTimeClass().getSimpleName(); + return createStringResource(key).getObject(); + } + + String name = null; + if (getObjectWrapper() != null && getObjectWrapper().getObject() != null) { + name = WebComponentUtil.getName(getObjectWrapper().getObject()); + } + + String key = "PageAdminObjectDetails.title.edit" + getCompileTimeClass().getSimpleName(); + return createStringResource(key, name).getObject(); + } + }; + } + + public LoadableModel> getObjectModel() { + return objectModel; + } + + public LoadableModel>> getParentOrgModel() { + return parentOrgModel; + } + + protected AbstractObjectMainPanel getMainPanel() { + return mainPanel; + } + + public ObjectWrapper getObjectWrapper() { + return objectModel.getObject(); + } - protected abstract FocusSummaryPanel createSummaryPanel(); + public List> getParentOrgs() { + return parentOrgModel.getObject(); + } + + public ObjectDelta getDelta() { + return delta; + } + + public void setDelta(ObjectDelta delta) { + this.delta = delta; + } - protected void initLayoutSummaryPanel() { + public ProgressPanel getProgressPanel() { + return progressPanel; + } + + protected void reviveModels() throws SchemaException { + WebComponentUtil.revive(objectModel, getPrismContext()); + WebComponentUtil.revive(parentOrgModel, getPrismContext()); + } - FocusSummaryPanel summaryPanel = createSummaryPanel(); - summaryPanel.setOutputMarkupId(true); + public abstract Class getCompileTimeClass(); - setSummaryPanelVisibility(summaryPanel); - add(summaryPanel); - } + + public void initialize(final PrismObject objectToEdit) { + boolean isNewObject = objectToEdit == null; + + initialize(objectToEdit, isNewObject, false); + } + + public void initialize(final PrismObject objectToEdit, boolean isNewObject) { + initialize(objectToEdit, isNewObject, false); + } + + public void initialize(final PrismObject objectToEdit, boolean isNewObject, boolean isReadonly) { + initializeModel(objectToEdit, isNewObject, isReadonly); + initLayout(); + } + + protected void initializeModel(final PrismObject objectToEdit, boolean isNewObject, boolean isReadonly) { + editingFocus = !isNewObject; + + objectModel = new LoadableModel>(false) { + private static final long serialVersionUID = 1L; + + @Override + protected ObjectWrapper load() { + ObjectWrapper wrapper = loadObjectWrapper(objectToEdit, isReadonly); + wrapper.sort(); + return wrapper; + } + }; + + parentOrgModel = new LoadableModel>>(false) { + private static final long serialVersionUID = 1L; + + @Override + protected List> load() { + return loadOrgWrappers(); + } + }; + } + + protected List> loadOrgWrappers() { + // WRONG!! TODO: fix + return null; + } + + protected abstract O createNewObject(); + + protected void initLayout() { + initLayoutSummaryPanel(); + + mainPanel = createMainPanel(ID_MAIN_PANEL); + mainPanel.setOutputMarkupId(true); + add(mainPanel); + + progressPanel = new ProgressPanel(ID_PROGRESS_PANEL); + add(progressPanel); + } + + protected abstract FocusSummaryPanel createSummaryPanel(); + + protected void initLayoutSummaryPanel() { + + FocusSummaryPanel summaryPanel = createSummaryPanel(); + summaryPanel.setOutputMarkupId(true); + + setSummaryPanelVisibility(summaryPanel); + add(summaryPanel); + } protected void setSummaryPanelVisibility(FocusSummaryPanel summaryPanel){ summaryPanel.add(new VisibleEnableBehaviour() { @@ -273,317 +273,319 @@ public boolean isVisible() { }); } - protected abstract AbstractObjectMainPanel createMainPanel(String id); - - protected String getObjectOidParameter() { - PageParameters parameters = getPageParameters(); - LOGGER.trace("Page parameters: {}", parameters); - StringValue oidValue = parameters.get(OnePageParameterEncoder.PARAMETER); - LOGGER.trace("OID parameter: {}", oidValue); - if (oidValue == null) { - return null; - } - String oid = oidValue.toString(); - if (StringUtils.isBlank(oid)) { - return null; - } - return oid; - } - - public boolean isOidParameterExists() { - return getObjectOidParameter() != null; - } - - protected ObjectWrapper loadObjectWrapper(PrismObject objectToEdit, boolean isReadonly) { - Task task = createSimpleTask(OPERATION_LOAD_OBJECT); - OperationResult result = task.getResult(); - PrismObject object = null; - Collection> loadOptions = null; - try { - if (!isOidParameterExists()) { - if (objectToEdit == null) { - LOGGER.trace("Loading object: New object (creating)"); - O focusType = createNewObject(); - getMidpointApplication().getPrismContext().adopt(focusType); - object = (PrismObject) focusType.asPrismObject(); - } else { - LOGGER.trace("Loading object: New object (supplied): {}", objectToEdit); - object = objectToEdit; - } - } else { - - loadOptions = SelectorOptions.createCollection(UserType.F_JPEG_PHOTO, - GetOperationOptions.createRetrieve(RetrieveOption.INCLUDE)); - - String focusOid = getObjectOidParameter(); - object = WebModelServiceUtils.loadObject(getCompileTimeClass(), focusOid, loadOptions, this, task, - result); - - LOGGER.trace("Loading object: Existing object (loadled): {} -> {}", focusOid, object); - } - - result.recordSuccess(); - } catch (Exception ex) { - result.recordFatalError("Couldn't get object.", ex); - LoggingUtils.logUnexpectedException(LOGGER, "Couldn't load object", ex); - } - - showResult(result, false); - - if (LOGGER.isTraceEnabled()) { - LOGGER.trace("Loaded object:\n{}", object.debugDump()); - } - - if (object == null) { - if (isOidParameterExists()) { - getSession().error(getString("pageAdminFocus.message.cantEditFocus")); - } else { - getSession().error(getString("pageAdminFocus.message.cantNewFocus")); - } - throw new RestartResponseException(getRestartResponsePage()); - } - - ContainerStatus status = isOidParameterExists() || editingFocus ? ContainerStatus.MODIFYING : ContainerStatus.ADDING; - ObjectWrapper wrapper; - ObjectWrapperFactory owf = new ObjectWrapperFactory(this); - try { - wrapper = owf.createObjectWrapper("pageAdminFocus.focusDetails", null, object, status, task); - } catch (Exception ex) { - result.recordFatalError("Couldn't get user.", ex); - LoggingUtils.logUnexpectedException(LOGGER, "Couldn't load user", ex); - try { - wrapper = owf.createObjectWrapper("pageAdminFocus.focusDetails", null, object, null, null, status, task); - } catch (SchemaException e) { - throw new SystemException(e.getMessage(), e); - } - } - wrapper.setLoadOptions(loadOptions); - - showResult(wrapper.getResult(), false); - - loadParentOrgs(wrapper, task, result); - - wrapper.setShowEmpty(!isOidParameterExists() && !editingFocus); - wrapper.setReadonly(isReadonly); - - if (LOGGER.isTraceEnabled()) { - LOGGER.trace("Loaded focus wrapper:\n{}", wrapper.debugDump()); - } - - return wrapper; - } - - private void loadParentOrgs(ObjectWrapper wrapper, Task task, OperationResult result) { - OperationResult subResult = result.createMinorSubresult(OPERATION_LOAD_PARENT_ORGS); - PrismObject focus = wrapper.getObject(); - // Load parent organizations (full objects). There are used in the - // summary panel and also in the main form. - // Do it here explicitly instead of using resolve option to have ability - // to better handle (ignore) errors. - for (ObjectReferenceType parentOrgRef : focus.asObjectable().getParentOrgRef()) { - - PrismObject parentOrg = null; - try { - - parentOrg = getModelService().getObject(OrgType.class, parentOrgRef.getOid(), null, task, - subResult); - LOGGER.trace("Loaded parent org with result {}", - new Object[] { subResult.getLastSubresult() }); - } catch (AuthorizationException e) { - // This can happen if the user has permission to read parentOrgRef but it does not have - // the permission to read target org - // It is OK to just ignore it. - subResult.muteLastSubresultError(); - LOGGER.debug("User {} does not have permission to read parent org unit {} (ignoring error)", task.getOwner().getName(), parentOrgRef.getOid()); - } catch (Exception ex) { - subResult.recordWarning("Cannot load parent org " + parentOrgRef.getOid(), ex); - LOGGER.warn("Cannot load parent org {}: {}", parentOrgRef.getOid(), ex.getMessage(), ex); - } - - if (parentOrg != null) { - wrapper.getParentOrgs().add(parentOrg); - } - } - subResult.computeStatus(); - } - - protected abstract Class getRestartResponsePage(); - - public Object findParam(String param, String oid, OperationResult result) { - - Object object = null; - - for (OperationResult subResult : result.getSubresults()) { - if (subResult != null && subResult.getParams() != null) { - if (subResult.getParams().get(param) != null - && subResult.getParams().get(OperationResult.PARAM_OID) != null - && subResult.getParams().get(OperationResult.PARAM_OID).equals(oid)) { - return subResult.getParams().get(param); - } - object = findParam(param, oid, subResult); - - } - } - return object; - } - - // TODO put this into correct place - protected boolean previewRequested; - - /** - * This will be called from the main form when save button is pressed. - */ - public void savePerformed(AjaxRequestTarget target) { - progressPanel.onBeforeSave(); - OperationResult result = new OperationResult(OPERATION_SAVE); - previewRequested = false; - saveOrPreviewPerformed(target, result, false); - } - - public void previewPerformed(AjaxRequestTarget target) { - progressPanel.onBeforeSave(); - OperationResult result = new OperationResult(OPERATION_PREVIEW_CHANGES); - previewRequested = true; - saveOrPreviewPerformed(target, result, true); - } - - public void saveOrPreviewPerformed(AjaxRequestTarget target, OperationResult result, boolean previewOnly) { - boolean isAnythingChanged = processDeputyAssignments(previewOnly); - - ObjectWrapper objectWrapper = getObjectWrapper(); - LOGGER.debug("Saving object {}", objectWrapper); - - // todo: improve, delta variable is quickfix for MID-1006 - // redirecting to user list page everytime user is created in repository - // during user add in gui, - // and we're not taking care about account/assignment create errors - // (error message is still displayed) - delta = null; - - Task task = createSimpleTask(OPERATION_SEND_TO_SUBMIT); - - ModelExecuteOptions options = getExecuteChangesOptions(); - if (previewOnly) { - options.getOrCreatePartialProcessing().setApprovals(PartialProcessingTypeType.PROCESS); - } - LOGGER.debug("Using execute options {}.", options); - - try { - reviveModels(); - - delta = objectWrapper.getObjectDelta(); - if (objectWrapper.getOldDelta() != null) { - delta = ObjectDelta.summarize(objectWrapper.getOldDelta(), delta); - } - if (LOGGER.isTraceEnabled()) { - LOGGER.trace("User delta computed from form:\n{}", new Object[] { delta.debugDump(3) }); - } - } catch (Exception ex) { - result.recordFatalError(getString("pageUser.message.cantCreateUser"), ex); - LoggingUtils.logUnexpectedException(LOGGER, "Create user failed", ex); - showResult(result); - return; - } - - switch (objectWrapper.getStatus()) { - case ADDING: - try { - PrismObject objectToAdd = delta.getObjectToAdd(); - WebComponentUtil.encryptCredentials(objectToAdd, true, getMidpointApplication()); - prepareObjectForAdd(objectToAdd); - getPrismContext().adopt(objectToAdd, getCompileTimeClass()); - if (LOGGER.isTraceEnabled()) { - LOGGER.trace("Delta before add user:\n{}", new Object[] { delta.debugDump(3) }); - } - - if (!delta.isEmpty()) { - delta.revive(getPrismContext()); - - final Collection> deltas = WebComponentUtil.createDeltaCollection(delta); - final Collection validationErrors = performCustomValidation(objectToAdd, deltas); - if (checkValidationErrors(target, validationErrors)) { - return; - } - progressPanel.executeChanges(deltas, previewOnly, options, task, result, target); - } else { - result.recordSuccess(); - } - } catch (Exception ex) { - result.recordFatalError(getString("pageFocus.message.cantCreateFocus"), ex); - LoggingUtils.logUnexpectedException(LOGGER, "Create user failed", ex); - showResult(result); - } - break; - - case MODIFYING: - try { - WebComponentUtil.encryptCredentials(delta, true, getMidpointApplication()); - prepareObjectDeltaForModify(delta); - - if (LOGGER.isTraceEnabled()) { - LOGGER.trace("Delta before modify user:\n{}", new Object[] { delta.debugDump(3) }); - } - - Collection> deltas = new ArrayList<>(); - if (!delta.isEmpty()) { - delta.revive(getPrismContext()); - deltas.add(delta); - } - - List> additionalDeltas = getAdditionalModifyDeltas(result); - if (additionalDeltas != null) { - for (ObjectDelta additionalDelta : additionalDeltas) { - if (!additionalDelta.isEmpty()) { - additionalDelta.revive(getPrismContext()); - deltas.add(additionalDelta); - } - } - } - - if (delta.isEmpty() && ModelExecuteOptions.isReconcile(options)) { - ObjectDelta emptyDelta = ObjectDelta.createEmptyModifyDelta(getCompileTimeClass(), - objectWrapper.getObject().getOid(), getPrismContext()); - deltas.add(emptyDelta); - - Collection validationErrors = performCustomValidation(null, deltas); - if (checkValidationErrors(target, validationErrors)) { - return; - } - progressPanel.executeChanges(deltas, previewOnly, options, task, result, target); - } else if (!deltas.isEmpty()) { - Collection validationErrors = performCustomValidation(null, deltas); - if (checkValidationErrors(target, validationErrors)) { - return; - } - progressPanel.executeChanges(deltas, previewOnly, options, task, result, target); - } else { - progressPanel.clearProgressPanel(); // from previous attempts (useful only if we would call finishProcessing at the end, but that's not the case now) - if (!previewOnly) { - if (!isAnythingChanged) { - result.recordWarning(getString("PageAdminObjectDetails.noChangesSave")); - showResult(result); - } - redirectBack(); - } else { - warn(getString("PageAdminObjectDetails.noChangesPreview")); - target.add(getFeedbackPanel()); - } - } - - } catch (Exception ex) { - if (!executeForceDelete(objectWrapper, task, options, result)) { - result.recordFatalError(getString("pageUser.message.cantUpdateUser"), ex); - LoggingUtils.logUnexpectedException(LOGGER, getString("pageUser.message.cantUpdateUser"), ex); - } else { - result.recomputeStatus(); - } - showResult(result); - } - break; - // support for add/delete containers (e.g. delete credentials) - default: - error(getString("pageAdminFocus.message.unsupportedState", objectWrapper.getStatus())); - } + protected abstract AbstractObjectMainPanel createMainPanel(String id); + + protected String getObjectOidParameter() { + PageParameters parameters = getPageParameters(); + LOGGER.trace("Page parameters: {}", parameters); + StringValue oidValue = parameters.get(OnePageParameterEncoder.PARAMETER); + LOGGER.trace("OID parameter: {}", oidValue); + if (oidValue == null) { + return null; + } + String oid = oidValue.toString(); + if (StringUtils.isBlank(oid)) { + return null; + } + return oid; + } + + public boolean isOidParameterExists() { + return getObjectOidParameter() != null; + } + + protected ObjectWrapper loadObjectWrapper(PrismObject objectToEdit, boolean isReadonly) { + Task task = createSimpleTask(OPERATION_LOAD_OBJECT); + OperationResult result = task.getResult(); + PrismObject object = null; + Collection> loadOptions = null; + try { + if (!isOidParameterExists()) { + if (objectToEdit == null) { + LOGGER.trace("Loading object: New object (creating)"); + O focusType = createNewObject(); + getMidpointApplication().getPrismContext().adopt(focusType); + object = (PrismObject) focusType.asPrismObject(); + } else { + LOGGER.trace("Loading object: New object (supplied): {}", objectToEdit); + object = objectToEdit; + } + } else { + + loadOptions = SelectorOptions.createCollection(UserType.F_JPEG_PHOTO, + GetOperationOptions.createRetrieve(RetrieveOption.INCLUDE)); + + String focusOid = getObjectOidParameter(); + object = WebModelServiceUtils.loadObject(getCompileTimeClass(), focusOid, loadOptions, this, task, + result); + + LOGGER.trace("Loading object: Existing object (loadled): {} -> {}", focusOid, object); + } + + result.recordSuccess(); + } catch (Exception ex) { + result.recordFatalError("Couldn't get object.", ex); + LoggingUtils.logUnexpectedException(LOGGER, "Couldn't load object", ex); + } + + showResult(result, false); + + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Loaded object:\n{}", object.debugDump()); + } + + if (object == null) { + if (isOidParameterExists()) { + getSession().error(getString("pageAdminFocus.message.cantEditFocus")); + } else { + getSession().error(getString("pageAdminFocus.message.cantNewFocus")); + } + throw new RestartResponseException(getRestartResponsePage()); + } + + ContainerStatus status = isOidParameterExists() || editingFocus ? ContainerStatus.MODIFYING : ContainerStatus.ADDING; + ObjectWrapper wrapper; + ObjectWrapperFactory owf = new ObjectWrapperFactory(this); + try { + wrapper = owf.createObjectWrapper("pageAdminFocus.focusDetails", null, object, status, task); + } catch (Exception ex) { + result.recordFatalError("Couldn't get user.", ex); + LoggingUtils.logUnexpectedException(LOGGER, "Couldn't load user", ex); + try { + wrapper = owf.createObjectWrapper("pageAdminFocus.focusDetails", null, object, null, null, status, task); + } catch (SchemaException e) { + throw new SystemException(e.getMessage(), e); + } + } + wrapper.setLoadOptions(loadOptions); + + showResult(wrapper.getResult(), false); + + loadParentOrgs(wrapper, task, result); + + wrapper.setShowEmpty(!isOidParameterExists() && !editingFocus); + wrapper.setReadonly(isReadonly); + + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Loaded focus wrapper:\n{}", wrapper.debugDump()); + } + + return wrapper; + } + + private void loadParentOrgs(ObjectWrapper wrapper, Task task, OperationResult result) { + OperationResult subResult = result.createMinorSubresult(OPERATION_LOAD_PARENT_ORGS); + PrismObject focus = wrapper.getObject(); + // Load parent organizations (full objects). There are used in the + // summary panel and also in the main form. + // Do it here explicitly instead of using resolve option to have ability + // to better handle (ignore) errors. + for (ObjectReferenceType parentOrgRef : focus.asObjectable().getParentOrgRef()) { + + PrismObject parentOrg = null; + try { + + parentOrg = getModelService().getObject(OrgType.class, parentOrgRef.getOid(), null, task, + subResult); + LOGGER.trace("Loaded parent org with result {}", + new Object[] { subResult.getLastSubresult() }); + } catch (AuthorizationException e) { + // This can happen if the user has permission to read parentOrgRef but it does not have + // the permission to read target org + // It is OK to just ignore it. + subResult.muteLastSubresultError(); + LOGGER.debug("User {} does not have permission to read parent org unit {} (ignoring error)", task.getOwner().getName(), parentOrgRef.getOid()); + } catch (Exception ex) { + subResult.recordWarning("Cannot load parent org " + parentOrgRef.getOid(), ex); + LOGGER.warn("Cannot load parent org {}: {}", parentOrgRef.getOid(), ex.getMessage(), ex); + } + + if (parentOrg != null) { + wrapper.getParentOrgs().add(parentOrg); + } + } + subResult.computeStatus(); + } + + protected abstract Class getRestartResponsePage(); + + public Object findParam(String param, String oid, OperationResult result) { + + Object object = null; + + for (OperationResult subResult : result.getSubresults()) { + if (subResult != null && subResult.getParams() != null) { + if (subResult.getParams().get(param) != null + && subResult.getParams().get(OperationResult.PARAM_OID) != null + && subResult.getParams().get(OperationResult.PARAM_OID).equals(oid)) { + return subResult.getParams().get(param); + } + object = findParam(param, oid, subResult); + + } + } + return object; + } + + // TODO put this into correct place + protected boolean previewRequested; + + /** + * This will be called from the main form when save button is pressed. + */ + public void savePerformed(AjaxRequestTarget target) { + progressPanel.onBeforeSave(); + OperationResult result = new OperationResult(OPERATION_SAVE); + previewRequested = false; + saveOrPreviewPerformed(target, result, false); + } + + public void previewPerformed(AjaxRequestTarget target) { + progressPanel.onBeforeSave(); + OperationResult result = new OperationResult(OPERATION_PREVIEW_CHANGES); + previewRequested = true; + saveOrPreviewPerformed(target, result, true); + } + + public void saveOrPreviewPerformed(AjaxRequestTarget target, OperationResult result, boolean previewOnly) { + boolean delegationChangesExist = processDeputyAssignments(previewOnly); + + ObjectWrapper objectWrapper = getObjectWrapper(); + LOGGER.debug("Saving object {}", objectWrapper); + + // todo: improve, delta variable is quickfix for MID-1006 + // redirecting to user list page everytime user is created in repository + // during user add in gui, + // and we're not taking care about account/assignment create errors + // (error message is still displayed) + delta = null; + + Task task = createSimpleTask(OPERATION_SEND_TO_SUBMIT); + + ModelExecuteOptions options = getOptions(previewOnly); + + LOGGER.debug("Using execute options {}.", options); + + try { + reviveModels(); + + delta = objectWrapper.getObjectDelta(); + if (objectWrapper.getOldDelta() != null) { + delta = ObjectDelta.summarize(objectWrapper.getOldDelta(), delta); + } + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("User delta computed from form:\n{}", new Object[] { delta.debugDump(3) }); + } + } catch (Exception ex) { + result.recordFatalError(getString("pageUser.message.cantCreateUser"), ex); + LoggingUtils.logUnexpectedException(LOGGER, "Create user failed", ex); + showResult(result); + return; + } + + switch (objectWrapper.getStatus()) { + case ADDING: + try { + PrismObject objectToAdd = delta.getObjectToAdd(); + WebComponentUtil.encryptCredentials(objectToAdd, true, getMidpointApplication()); + prepareObjectForAdd(objectToAdd); + getPrismContext().adopt(objectToAdd, getCompileTimeClass()); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Delta before add user:\n{}", new Object[] { delta.debugDump(3) }); + } + + if (!delta.isEmpty()) { + delta.revive(getPrismContext()); + + final Collection> deltas = WebComponentUtil.createDeltaCollection(delta); + final Collection validationErrors = performCustomValidation(objectToAdd, deltas); + if (checkValidationErrors(target, validationErrors)) { + return; + } + progressPanel.executeChanges(deltas, previewOnly, options, task, result, target); + } else { + result.recordSuccess(); + } + } catch (Exception ex) { + result.recordFatalError(getString("pageFocus.message.cantCreateFocus"), ex); + LoggingUtils.logUnexpectedException(LOGGER, "Create user failed", ex); + showResult(result); + } + break; + + case MODIFYING: + try { + WebComponentUtil.encryptCredentials(delta, true, getMidpointApplication()); + prepareObjectDeltaForModify(delta); + + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Delta before modify user:\n{}", new Object[] { delta.debugDump(3) }); + } + + Collection> deltas = new ArrayList<>(); + if (!delta.isEmpty()) { + delta.revive(getPrismContext()); + deltas.add(delta); + } + + List> additionalDeltas = getAdditionalModifyDeltas(result); + if (additionalDeltas != null) { + for (ObjectDelta additionalDelta : additionalDeltas) { + if (!additionalDelta.isEmpty()) { + additionalDelta.revive(getPrismContext()); + deltas.add(additionalDelta); + } + } + } + + if (delta.isEmpty() && ModelExecuteOptions.isReconcile(options)) { + ObjectDelta emptyDelta = ObjectDelta.createEmptyModifyDelta(getCompileTimeClass(), + objectWrapper.getObject().getOid(), getPrismContext()); + deltas.add(emptyDelta); + + Collection validationErrors = performCustomValidation(null, deltas); + if (checkValidationErrors(target, validationErrors)) { + return; + } + progressPanel.executeChanges(deltas, previewOnly, options, task, result, target); + } else if (!deltas.isEmpty()) { + Collection validationErrors = performCustomValidation(null, deltas); + if (checkValidationErrors(target, validationErrors)) { + return; + } + progressPanel.executeChanges(deltas, previewOnly, options, task, result, target); + } else if (previewOnly && delta.isEmpty() && delegationChangesExist){ + progressPanel.executeChanges(deltas, previewOnly, options, task, result, target); + } else { + progressPanel.clearProgressPanel(); // from previous attempts (useful only if we would call finishProcessing at the end, but that's not the case now) + if (!previewOnly) { + if (!delegationChangesExist) { + result.recordWarning(getString("PageAdminObjectDetails.noChangesSave")); + showResult(result); + } + redirectBack(); + } else { + if (!delegationChangesExist) { + warn(getString("PageAdminObjectDetails.noChangesPreview")); + target.add(getFeedbackPanel()); + } + } + } + + } catch (Exception ex) { + if (!executeForceDelete(objectWrapper, task, options, result)) { + result.recordFatalError(getString("pageUser.message.cantUpdateUser"), ex); + LoggingUtils.logUnexpectedException(LOGGER, getString("pageUser.message.cantUpdateUser"), ex); + } else { + result.recomputeStatus(); + } + showResult(result); + } + break; + // support for add/delete containers (e.g. delete credentials) + default: + error(getString("pageAdminFocus.message.unsupportedState", objectWrapper.getStatus())); + } // result.recomputeStatus(); // @@ -592,144 +594,148 @@ public void saveOrPreviewPerformed(AjaxRequestTarget target, OperationResult res // finishProcessing(target, result, false); // } - LOGGER.trace("returning from saveOrPreviewPerformed"); - } - - protected boolean processDeputyAssignments(boolean previewOnly){ - return false; - } - - protected boolean checkValidationErrors(AjaxRequestTarget target, Collection validationErrors) { - if (validationErrors != null && !validationErrors.isEmpty()) { - for (SimpleValidationError error : validationErrors) { - LOGGER.error("Validation error, attribute: '" + error.printAttribute() - + "', message: '" + error.getMessage() + "'."); - error("Validation error, attribute: '" + error.printAttribute() - + "', message: '" + error.getMessage() + "'."); - } - - target.add(getFeedbackPanel()); - return true; - } - return false; - } - - @Override - public void startProcessing(AjaxRequestTarget target, OperationResult result) { - LOGGER.trace("startProcessing called, making main panel invisible"); - mainPanel.setVisible(false); - target.add(mainPanel); - } - - @NotNull - protected ModelExecuteOptions getExecuteChangesOptions() { - return mainPanel.getExecuteChangeOptionsDto().createOptions(); - } - - protected void prepareObjectForAdd(PrismObject object) throws SchemaException { - - } - - protected void prepareObjectDeltaForModify(ObjectDelta objectDelta) throws SchemaException { - - } - - protected List> getAdditionalModifyDeltas(OperationResult result) { - return null; - } - - protected boolean executeForceDelete(ObjectWrapper userWrapper, Task task, ModelExecuteOptions options, - OperationResult parentResult) { - return isForce(); - } - - protected boolean isForce() { - return getMainPanel().getExecuteChangeOptionsDto().isForce(); - } - - protected boolean isKeepDisplayingResults() { - return getMainPanel().getExecuteChangeOptionsDto().isKeepDisplayingResults(); - } - - - protected Collection performCustomValidation(PrismObject object, - Collection> deltas) throws SchemaException { - Collection errors = null; - - if (object == null) { - if (getObjectWrapper() != null && getObjectWrapper().getObject() != null) { - object = getObjectWrapper().getObject().clone(); // otherwise original object could get corrupted e.g. by applying the delta below - - for (ObjectDelta delta : deltas) { - // because among deltas there can be also ShadowType deltas - if (UserType.class.isAssignableFrom(delta.getObjectTypeClass())) { - delta.applyTo(object); - } - } - } - } else { - object = object.clone(); - } - - performAdditionalValidation(object, deltas, errors); - - for (MidpointFormValidator validator : getFormValidatorRegistry().getValidators()) { - if (errors == null) { - errors = validator.validateObject(object, deltas); - } else { - errors.addAll(validator.validateObject(object, deltas)); - } - } - - return errors; - } - - protected void performAdditionalValidation(PrismObject object, - Collection> deltas, Collection errors) throws SchemaException { - - } - - public List getObjectFormTypes() { - Task task = createSimpleTask(OPERATION_LOAD_GUI_CONFIGURATION); - OperationResult result = task.getResult(); - AdminGuiConfigurationType adminGuiConfiguration; - try { - adminGuiConfiguration = getModelInteractionService().getAdminGuiConfiguration(task, result); - } catch (ObjectNotFoundException | SchemaException e) { - throw new SystemException("Cannot load GUI configuration: "+e.getMessage(), e); - } - ObjectFormsType objectFormsType = adminGuiConfiguration.getObjectForms(); - if (objectFormsType == null) { - return null; - } - List objectForms = objectFormsType.getObjectForm(); - if (objectForms == null || objectForms.isEmpty()) { - return objectForms; - } - List validObjectForms = new ArrayList<>(); - for (ObjectFormType objectForm: objectForms) { - if (isSupportedObjectType(objectForm.getType())) { - validObjectForms.add(objectForm); - } - } - return validObjectForms; - } - - protected boolean isSupportedObjectType(QName type) { - ObjectTypes objectType = ObjectTypes.getObjectType(getCompileTimeClass()); - return QNameUtil.match(objectType.getTypeQName(),type); - } - - public void setSaveOnConfigure(boolean saveOnConfigure) { - this.saveOnConfigure = saveOnConfigure; - } - - public boolean isSaveOnConfigure() { - return saveOnConfigure; - } - - public boolean isForcedPreview(){ - GuiObjectDetailsPageType objectDetails = AdminGuiConfigTypeUtil.findObjectConfiguration(getCompileTimeClass(), getAdminGuiConfiguration()); - return objectDetails != null && DetailsPageSaveMethodType.FORCED_PREVIEW.equals(objectDetails.getSaveMethod()); - } + LOGGER.trace("returning from saveOrPreviewPerformed"); + } + + protected boolean processDeputyAssignments(boolean previewOnly){ + return false; + } + + protected boolean checkValidationErrors(AjaxRequestTarget target, Collection validationErrors) { + if (validationErrors != null && !validationErrors.isEmpty()) { + for (SimpleValidationError error : validationErrors) { + LOGGER.error("Validation error, attribute: '" + error.printAttribute() + + "', message: '" + error.getMessage() + "'."); + error("Validation error, attribute: '" + error.printAttribute() + + "', message: '" + error.getMessage() + "'."); + } + + target.add(getFeedbackPanel()); + return true; + } + return false; + } + + @Override + public void startProcessing(AjaxRequestTarget target, OperationResult result) { + LOGGER.trace("startProcessing called, making main panel invisible"); + mainPanel.setVisible(false); + target.add(mainPanel); + } + + @NotNull + protected ModelExecuteOptions getOptions(boolean previewOnly) { + ModelExecuteOptions options = mainPanel.getExecuteChangeOptionsDto().createOptions(); + if (previewOnly) { + options.getOrCreatePartialProcessing().setApprovals(PartialProcessingTypeType.PROCESS); + } + return options; + } + + protected void prepareObjectForAdd(PrismObject object) throws SchemaException { + + } + + protected void prepareObjectDeltaForModify(ObjectDelta objectDelta) throws SchemaException { + + } + + protected List> getAdditionalModifyDeltas(OperationResult result) { + return null; + } + + protected boolean executeForceDelete(ObjectWrapper userWrapper, Task task, ModelExecuteOptions options, + OperationResult parentResult) { + return isForce(); + } + + protected boolean isForce() { + return getMainPanel().getExecuteChangeOptionsDto().isForce(); + } + + protected boolean isKeepDisplayingResults() { + return getMainPanel().getExecuteChangeOptionsDto().isKeepDisplayingResults(); + } + + + protected Collection performCustomValidation(PrismObject object, + Collection> deltas) throws SchemaException { + Collection errors = null; + + if (object == null) { + if (getObjectWrapper() != null && getObjectWrapper().getObject() != null) { + object = getObjectWrapper().getObject().clone(); // otherwise original object could get corrupted e.g. by applying the delta below + + for (ObjectDelta delta : deltas) { + // because among deltas there can be also ShadowType deltas + if (UserType.class.isAssignableFrom(delta.getObjectTypeClass())) { + delta.applyTo(object); + } + } + } + } else { + object = object.clone(); + } + + performAdditionalValidation(object, deltas, errors); + + for (MidpointFormValidator validator : getFormValidatorRegistry().getValidators()) { + if (errors == null) { + errors = validator.validateObject(object, deltas); + } else { + errors.addAll(validator.validateObject(object, deltas)); + } + } + + return errors; + } + + protected void performAdditionalValidation(PrismObject object, + Collection> deltas, Collection errors) throws SchemaException { + + } + + public List getObjectFormTypes() { + Task task = createSimpleTask(OPERATION_LOAD_GUI_CONFIGURATION); + OperationResult result = task.getResult(); + AdminGuiConfigurationType adminGuiConfiguration; + try { + adminGuiConfiguration = getModelInteractionService().getAdminGuiConfiguration(task, result); + } catch (ObjectNotFoundException | SchemaException e) { + throw new SystemException("Cannot load GUI configuration: "+e.getMessage(), e); + } + ObjectFormsType objectFormsType = adminGuiConfiguration.getObjectForms(); + if (objectFormsType == null) { + return null; + } + List objectForms = objectFormsType.getObjectForm(); + if (objectForms == null || objectForms.isEmpty()) { + return objectForms; + } + List validObjectForms = new ArrayList<>(); + for (ObjectFormType objectForm: objectForms) { + if (isSupportedObjectType(objectForm.getType())) { + validObjectForms.add(objectForm); + } + } + return validObjectForms; + } + + protected boolean isSupportedObjectType(QName type) { + ObjectTypes objectType = ObjectTypes.getObjectType(getCompileTimeClass()); + return QNameUtil.match(objectType.getTypeQName(),type); + } + + public void setSaveOnConfigure(boolean saveOnConfigure) { + this.saveOnConfigure = saveOnConfigure; + } + + public boolean isSaveOnConfigure() { + return saveOnConfigure; + } + + public boolean isForcedPreview(){ + GuiObjectDetailsPageType objectDetails = AdminGuiConfigTypeUtil.findObjectConfiguration(getCompileTimeClass(), getAdminGuiConfiguration()); + return objectDetails != null && DetailsPageSaveMethodType.FORCED_PREVIEW.equals(objectDetails.getSaveMethod()); + } } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java index e1cf89124cc..8700752c737 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java @@ -23,6 +23,8 @@ import com.evolveum.midpoint.gui.api.util.WebComponentUtil; import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils; import com.evolveum.midpoint.model.api.ModelAuthorizationAction; +import com.evolveum.midpoint.model.api.ModelInteractionService; +import com.evolveum.midpoint.model.api.context.ModelContext; import com.evolveum.midpoint.prism.PrismContainerDefinition; import com.evolveum.midpoint.prism.PrismObject; import com.evolveum.midpoint.prism.PrismReferenceValue; @@ -35,6 +37,7 @@ import com.evolveum.midpoint.security.api.AuthorizationConstants; import com.evolveum.midpoint.task.api.Task; import com.evolveum.midpoint.util.QNameUtil; +import com.evolveum.midpoint.util.exception.SchemaException; import com.evolveum.midpoint.util.logging.LoggingUtils; import com.evolveum.midpoint.util.logging.Trace; import com.evolveum.midpoint.util.logging.TraceManager; @@ -67,10 +70,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.Collections; -import java.util.List; +import java.util.*; import static org.apache.commons.collections4.CollectionUtils.addIgnoreNull; @@ -378,34 +378,54 @@ private List getUserPrivilegesList(){ @Override protected boolean processDeputyAssignments(boolean previewOnly) { boolean isAnythingChanged = false; - if (!previewOnly) { - for (AssignmentEditorDto dto : delegationsModel.getObject()) { - if (!UserDtoStatus.MODIFY.equals(dto.getStatus())) { - UserType user = dto.getDelegationOwner(); - List userAssignmentsDtos = new ArrayList<>(); - userAssignmentsDtos.add(dto); - saveDelegationToUser(user, userAssignmentsDtos); - isAnythingChanged = true; + for (AssignmentEditorDto dto : delegationsModel.getObject()) { + if (!UserDtoStatus.MODIFY.equals(dto.getStatus())) { + UserType user = dto.getDelegationOwner(); + if (!previewOnly) { + saveDelegationToUser(user.asPrismObject(), dto); } + isAnythingChanged = true; } } return isAnythingChanged; } - private void saveDelegationToUser(UserType user, List assignmentEditorDtos) { + /** + * for now used only for delegation changes + * @param modelContextMap + */ + @Override + protected void processAdditionalFocalObjectsForPreview(Map, ModelContext> modelContextMap){ + for (AssignmentEditorDto dto : delegationsModel.getObject()) { + if (!UserDtoStatus.MODIFY.equals(dto.getStatus())) { + UserType user = dto.getDelegationOwner(); + + OperationResult result = new OperationResult(OPERATION_PREVIEW_CHANGES); + Task task = createSimpleTask(OPERATION_PREVIEW_CHANGES); + try { + + Collection> deltas = prepareDelegationDelta(user.asPrismObject(), dto); + + ModelContext modelContext = getModelInteractionService().previewChanges(deltas, getOptions(true), task, result); + modelContextMap.put(user.asPrismObject(), modelContext); + } catch (Exception e) { + LoggingUtils.logUnexpectedException(LOGGER, "Could not save delegation ", e); + error("Could not save delegation. Reason: " + e); + } finally { + result.recomputeStatus(); + } + } + } + } + + + private void saveDelegationToUser(PrismObject user, AssignmentEditorDto assignmentDto) { OperationResult result = new OperationResult(OPERATION_SAVE); - ObjectDelta delta; - Collection> deltas = new ArrayList<>(); try { - delta = user.asPrismObject().createModifyDelta(); - deltas.add(delta); - PrismContainerDefinition def = user.asPrismObject().getDefinition().findContainerDefinition(UserType.F_ASSIGNMENT); - handleAssignmentDeltas(delta, assignmentEditorDtos, def, true); - getModelService().executeChanges(deltas, null, createSimpleTask(OPERATION_SAVE), result); + Collection> deltas = prepareDelegationDelta(user, assignmentDto); + getModelService().executeChanges(deltas, getOptions(false), createSimpleTask(OPERATION_SAVE), result); result.recordSuccess(); - - } catch (Exception e) { LoggingUtils.logUnexpectedException(LOGGER, "Could not save assignments ", e); error("Could not save assignments. Reason: " + e); @@ -416,6 +436,19 @@ private void saveDelegationToUser(UserType user, List assig showResult(result); } + private Collection> prepareDelegationDelta(PrismObject user, AssignmentEditorDto dto) + throws SchemaException { + Collection> deltas = new ArrayList<>(); + ObjectDelta delta = user.createModifyDelta(); + List userAssignmentsDtos = new ArrayList<>(); + userAssignmentsDtos.add(dto); + + deltas.add(delta); + PrismContainerDefinition def = user.getDefinition().findContainerDefinition(UserType.F_ASSIGNMENT); + handleAssignmentDeltas(delta, userAssignmentsDtos, def, true); + return deltas; + } + public boolean isLoggedInUserPage(){ return getObjectWrapper() != null && getObjectWrapper().getObject() != null && StringUtils.isNotEmpty(getObjectWrapper().getObject().asObjectable().getOid()) && diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.java index d5547e9519d..9fa4c41123c 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.java @@ -98,6 +98,7 @@ public class PageAssignmentShoppingKart extends PageSelf { private static final String OPERATION_LOAD_ASSIGNABLE_ROLES = DOT_CLASS + "loadAssignableRoles"; private static final String OPERATION_GET_ASSIGNMENT_VIEW_LIST = DOT_CLASS + "getRoleCatalogViewsList"; + private static final String OPERATION_LOAD_ASSIGNMENTS_LIMIT = DOT_CLASS + "loadAssignmentsLimit"; private static final Trace LOGGER = TraceManager.getTrace(PageAssignmentShoppingKart.class); private ShoppingCartConfigurationDto shoppingCartConfigurationDto; @@ -116,6 +117,8 @@ protected void onInitialize() { initShoppingCartConfigurationDto(); getRoleCatalogStorage().setShoppingCartConfigurationDto(shoppingCartConfigurationDto); } + getRoleCatalogStorage().setAssignmentRequestLimit( + AssignmentsUtil.loadAssignmentsLimit(new OperationResult(OPERATION_LOAD_ASSIGNMENTS_LIMIT), this)); if (StringUtils.isEmpty(getRoleCatalogStorage().getSelectedOid()) && shoppingCartConfigurationDto != null) { getRoleCatalogStorage().setSelectedOid(shoppingCartConfigurationDto.getRoleCatalogOid()); } @@ -288,7 +291,10 @@ protected void populateItem(Item item) { @Override protected void assignmentAddedToShoppingCartPerformed(AjaxRequestTarget target){ - target.add(getCatalogItemsPanelContainer()); + int assignmentsLimit = getRoleCatalogStorage().getAssignmentRequestLimit(); + if (AssignmentsUtil.isShoppingCartAssignmentsLimitReached(assignmentsLimit, PageAssignmentShoppingKart.this)){ + target.add(getCatalogItemsPanelContainer()); + } PageAssignmentShoppingKart.this.reloadCartButton(target); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java index 90fd36d6723..d5fabf247f2 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java @@ -55,6 +55,7 @@ public class RoleCatalogStorage implements PageStorage, OrgTreeStateStorage { private List conflictsList; private String requestDescription = ""; private ObjectPaging roleCatalogPaging; + private int assignmentRequestLimit = -1; private ShoppingCartConfigurationDto shoppingCartConfigurationDto = null; @@ -205,4 +206,12 @@ public ShoppingCartConfigurationDto getShoppingCartConfigurationDto() { public void setShoppingCartConfigurationDto(ShoppingCartConfigurationDto shoppingCartConfigurationDto) { this.shoppingCartConfigurationDto = shoppingCartConfigurationDto; } + + public int getAssignmentRequestLimit() { + return assignmentRequestLimit; + } + + public void setAssignmentRequestLimit(int assignmentRequestLimit) { + this.assignmentRequestLimit = assignmentRequestLimit; + } } diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties index 36812e1f735..c5cc277aac4 100755 --- a/gui/admin-gui/src/main/resources/localization/Midpoint.properties +++ b/gui/admin-gui/src/main/resources/localization/Midpoint.properties @@ -2467,6 +2467,8 @@ passwordPanel.passwordChange=Change passwordPanel.passwordRemove=Remove passwordPanel.passwordSet=password is set passwordPanel.passwordRemoveLabel=password will be removed +PasswordPanel.passwordPlaceholder=Password +PasswordPanel.repeatPasswordPlaceholder=Repeat password past.ChangeType.ADD=Added past.ChangeType.DELETE=Deleted past.ChangeType.MODIFY=Modified diff --git a/gui/admin-gui/src/main/resources/static/less/midpoint-theme.less b/gui/admin-gui/src/main/resources/static/less/midpoint-theme.less index a2d2d38701e..2ed180e882c 100644 --- a/gui/admin-gui/src/main/resources/static/less/midpoint-theme.less +++ b/gui/admin-gui/src/main/resources/static/less/midpoint-theme.less @@ -1212,11 +1212,22 @@ dd.stacktrace::before { .shopping-cart-item-button-details { cursor: pointer; } - + + .shopping-cart-item-button-details-disabled { + cursor: default; + color: darkgrey; + } + .shopping-cart-item-button-add { cursor: pointer; float: right; } + + .shopping-cart-item-button-add-disabled { + cursor: default; + float: right; + color: darkgrey; + } } // Object merge dialog diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinitionImpl.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinitionImpl.java index cf43d504541..265fb46304b 100644 --- a/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinitionImpl.java +++ b/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinitionImpl.java @@ -83,10 +83,10 @@ public PrismContainerDefinitionImpl(@NotNull QName name, ComplexTypeDefinition c this.complexTypeDefinition = complexTypeDefinition; if (complexTypeDefinition == null) { isRuntimeSchema = true; - super.setDynamic(true); + super.setDynamic(true); // todo is this really ok? } else { isRuntimeSchema = complexTypeDefinition.isXsdAnyMarker(); - super.setDynamic(isRuntimeSchema); + super.setDynamic(isRuntimeSchema); // todo is this really ok? } this.compileTimeClass = compileTimeClass; } diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java index db05c6212a2..1bb0898aeaa 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java @@ -279,7 +279,7 @@ public ModelContext previewChanges( } OperationResult result = parentResult.createSubresult(PREVIEW_CHANGES); - LensContext context; + LensContext context = null; try { RepositoryCache.enter(); @@ -315,6 +315,8 @@ public ModelContext previewChanges( throw new SystemException(e); } finally { + LensUtil.reclaimSequences(context, cacheRepositoryService, task, result); + RepositoryCache.exit(); } diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java index 74fa531e191..847c7a1e34f 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java @@ -343,7 +343,7 @@ private void evaluateFromSegment(AssignmentPathSegmentImpl segment, PlusMinusZer ctx.evalAssignment.setVirtual(isVirtual); } - LOGGER.info("evalAssignment isVirtual {} ", ctx.evalAssignment.isVirtual()); + LOGGER.trace("evalAssignment isVirtual {} ", ctx.evalAssignment.isVirtual()); } private boolean isForcedAssignment(AssignmentPathSegmentImpl segment, EvaluationContext ctx) { diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java index dc5956dde84..b9c5330ab6e 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java @@ -1042,7 +1042,7 @@ private void processClockworkException(LensContext con result.recordFatalError(e); auditEvent(context, AuditEventStage.EXECUTION, null, true, task, result); recordOperationExecution(context, e, task, result); - reclaimSequences(context, task, result); + LensUtil.reclaimSequences(context, repositoryService, task, result); } private void auditEvent(LensContext context, AuditEventStage stage, @@ -1591,21 +1591,4 @@ private Collection> d } return processedChangedAssignmentValues; } - - private void reclaimSequences(LensContext context, Task task, OperationResult result) throws SchemaException { - Map sequenceMap = context.getSequences(); - LOGGER.trace("Context sequence map: {}", sequenceMap); - for (Entry sequenceMapEntry: sequenceMap.entrySet()) { - Collection unusedValues = new ArrayList<>(1); - unusedValues.add(sequenceMapEntry.getValue()); - try { - LOGGER.trace("Returning value {} to sequence {}", sequenceMapEntry.getValue(), sequenceMapEntry.getKey()); - repositoryService.returnUnusedValuesToSequence(sequenceMapEntry.getKey(), unusedValues, result); - } catch (ObjectNotFoundException e) { - LOGGER.error("Cannot return unused value to sequence {}: it does not exist", sequenceMapEntry.getKey(), e); - // ... but otherwise ignore it and go on - } - } - } - } diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java index e00a5547a7b..ab73b14aa4c 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java @@ -15,13 +15,7 @@ */ package com.evolveum.midpoint.model.impl.lens; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; +import java.util.*; import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.Collectors; @@ -42,6 +36,7 @@ import com.evolveum.midpoint.prism.query.RefFilter; import com.evolveum.midpoint.prism.query.builder.QueryBuilder; import com.evolveum.midpoint.prism.polystring.AlphanumericPolyStringNormalizer; +import com.evolveum.midpoint.repo.api.RepositoryService; import com.evolveum.midpoint.schema.SchemaConstantsGenerated; import com.evolveum.midpoint.schema.util.*; import com.evolveum.midpoint.util.DebugUtil; @@ -1088,4 +1083,24 @@ public static SingleLocalizableMessageType interpretLocalizableMessageTemplate(L } return rv; } + + public static void reclaimSequences(LensContext context, RepositoryService repositoryService, Task task, OperationResult result) throws SchemaException { + if (context == null) { + return; + } + + Map sequenceMap = context.getSequences(); + LOGGER.trace("Context sequence map: {}", sequenceMap); + for (Map.Entry sequenceMapEntry: sequenceMap.entrySet()) { + Collection unusedValues = new ArrayList<>(1); + unusedValues.add(sequenceMapEntry.getValue()); + try { + LOGGER.trace("Returning value {} to sequence {}", sequenceMapEntry.getValue(), sequenceMapEntry.getKey()); + repositoryService.returnUnusedValuesToSequence(sequenceMapEntry.getKey(), unusedValues, result); + } catch (ObjectNotFoundException e) { + LOGGER.error("Cannot return unused value to sequence {}: it does not exist", sequenceMapEntry.getKey(), e); + // ... but otherwise ignore it and go on + } + } + } } diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestSynchronization.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestSynchronization.java index 462a14d6de0..7d073e5dccc 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestSynchronization.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestSynchronization.java @@ -18,9 +18,14 @@ import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertNotNull; +import static org.testng.AssertJUnit.assertTrue; import java.io.File; +import com.evolveum.midpoint.schema.RepositoryQueryDiagRequest; +import com.evolveum.midpoint.schema.RepositoryQueryDiagResponse; +import com.evolveum.midpoint.schema.constants.SchemaConstants; +import com.evolveum.midpoint.util.QNameUtil; import org.opends.server.core.AddOperation; import org.opends.server.types.Entry; import org.opends.server.types.LDIFImportConfig; @@ -181,6 +186,19 @@ public void test100SyncAddWill() throws Exception { assertSyncToken(SYNC_TASK_OID, 1, result); + // TODO fix this brittle code (depends on internal data representation within repository service) + RepositoryQueryDiagRequest valueRequest = new RepositoryQueryDiagRequest(); + valueRequest.setImplementationLevelQuery("select l.value from ROExtLong l join RExtItem i on l.itemId = i.id where i.name='" + QNameUtil + .qNameToUri(SchemaConstants.SYNC_TOKEN) + "'"); + RepositoryQueryDiagResponse valueResponse = repositoryService.executeQueryDiagnostics(valueRequest, result); + System.out.println(valueResponse.getQueryResult()); + assertTrue("Unexpected repo query result on sync token: "+ valueResponse.getQueryResult(), valueResponse.getQueryResult().isEmpty()); + + RepositoryQueryDiagRequest dictionaryRequest = new RepositoryQueryDiagRequest(); + dictionaryRequest.setImplementationLevelQuery("select RExtItem i where i.name='" + QNameUtil.qNameToUri(SchemaConstants.SYNC_TOKEN) + "'"); + RepositoryQueryDiagResponse dictionaryResponse = repositoryService.executeQueryDiagnostics(valueRequest, result); + System.out.println(dictionaryResponse.getQueryResult()); + assertTrue("Unexpected repo query result on sync token definition: "+ dictionaryResponse.getQueryResult(), dictionaryResponse.getQueryResult().isEmpty()); } @Test diff --git a/provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java b/provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java index 1320290aeff..fb4bbb639a4 100644 --- a/provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java +++ b/provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java @@ -2867,6 +2867,7 @@ private PrismProperty createTokenProperty(T object) { type, prismContext); propDef.setDynamic(true); propDef.setMaxOccurs(1); + propDef.setIndexed(false); // redundant, as dynamic extension items are not indexed by default PrismProperty property = propDef.instantiate(); property.addValues(syncTokenValues); return property; diff --git a/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/RAnyConverterStaticTest.java b/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/RAnyConverterStaticTest.java index 34115439c59..193cff38930 100644 --- a/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/RAnyConverterStaticTest.java +++ b/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/RAnyConverterStaticTest.java @@ -24,6 +24,7 @@ import com.evolveum.midpoint.prism.schema.SchemaRegistry; import com.evolveum.midpoint.repo.sql.data.common.any.RAnyConverter; import com.evolveum.midpoint.repo.sql.data.common.any.RAnyValue; +import com.evolveum.midpoint.repo.sql.data.common.type.RObjectExtensionType; import com.evolveum.midpoint.repo.sql.util.DtoTranslationException; import com.evolveum.midpoint.schema.DeltaConvertor; import com.evolveum.midpoint.schema.SchemaConstantsGenerated; @@ -199,13 +200,13 @@ public void testExtensionEnum() throws Exception { RAnyConverter converter = new RAnyConverter(prismContext, extItemDictionary); Set> values; try { - values = converter.convertToRValue(item, false); + values = converter.convertToRValue(item, false, RObjectExtensionType.EXTENSION); AssertJUnit.fail("Should have throw serialization related exception after creating ext item"); } catch (DtoTranslationException ex) { AssertJUnit.assertTrue(SerializationRelatedException.class.equals(ex.getCause().getClass())); } - values = converter.convertToRValue(item, false); + values = converter.convertToRValue(item, false, RObjectExtensionType.EXTENSION); AssertJUnit.assertEquals("Expected only one enum value, but was " + values.size(), 1, values.size()); diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java index a98ac3530a6..ce251589b45 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java @@ -749,7 +749,7 @@ public static void copyFromJAXB(PrismContainerValue containerValue, RObject item : items) { - Set> converted = converter.convertToRValue(item, false); + Set> converted = converter.convertToRValue(item, false, ownerType); if (generatorResult.isGeneratedOid()) { converted.stream().forEach(v -> v.setTransient(true)); } diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java index 84dd3c354d2..a1455b48a6c 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java @@ -21,6 +21,7 @@ import com.evolveum.midpoint.prism.polystring.PolyString; import com.evolveum.midpoint.prism.xml.XmlTypeConverter; import com.evolveum.midpoint.repo.sql.data.common.dictionary.ExtItemDictionary; +import com.evolveum.midpoint.repo.sql.data.common.type.RObjectExtensionType; import com.evolveum.midpoint.repo.sql.query.QueryException; import com.evolveum.midpoint.repo.sql.type.XMLGregorianCalendarType; import com.evolveum.midpoint.repo.sql.util.DtoTranslationException; @@ -31,10 +32,9 @@ import com.evolveum.midpoint.util.logging.TraceManager; import com.evolveum.prism.xml.ns._public.types_3.PolyStringType; import com.evolveum.prism.xml.ns._public.types_3.RawType; +import org.apache.commons.lang.BooleanUtils; import org.apache.commons.lang.Validate; -import org.hibernate.Session; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import org.w3c.dom.Element; import javax.xml.datatype.XMLGregorianCalendar; @@ -131,12 +131,12 @@ private RAnyValue extractAndCreateValue(ItemDefinition def, PrismPropertyValue p return assignment ? type.createNewAExtValue(extractedValue) : type.createNewOExtValue(extractedValue); } - public RAnyValue convertToRValue(PrismValue value, boolean assignment) throws SchemaException { + public RAnyValue convertToRValue(PrismValue value, boolean assignment, RObjectExtensionType ownerType) throws SchemaException { RAnyValue rValue; ItemDefinition definition = value.getParent().getDefinition(); - if (!isIndexed(definition, value.getParent().getElementName(), prismContext)) { + if (!isIndexed(definition, value.getParent().getElementName(), areDynamicsOfThisKindIndexed(ownerType), prismContext)) { return null; } @@ -163,13 +163,14 @@ public RAnyValue convertToRValue(PrismValue value, boolean assignment) throws Sc } //todo assignment parameter really messed up this method, proper interfaces must be introduced later [lazyman] - public Set> convertToRValue(Item item, boolean assignment) throws SchemaException, DtoTranslationException { + public Set> convertToRValue(Item item, boolean assignment, + RObjectExtensionType ownerType) throws SchemaException, DtoTranslationException { Validate.notNull(item, "Object for converting must not be null."); Validate.notNull(item.getDefinition(), "Item '" + item.getElementName() + "' without definition can't be saved."); ItemDefinition definition = item.getDefinition(); Set> rValues = new HashSet<>(); - if (!isIndexed(definition, item.getElementName(), prismContext)) { + if (!isIndexed(definition, item.getElementName(), areDynamicsOfThisKindIndexed(ownerType), prismContext)) { return rValues; } @@ -181,7 +182,7 @@ public Set> convertToRValue(Item item, boolean assignment) throws S RAnyValue rValue; List values = item.getValues(); for (PrismValue value : values) { - rValue = convertToRValue(value, assignment); + rValue = convertToRValue(value, assignment, ownerType); rValues.add(rValue); } } catch (Exception ex) { @@ -195,7 +196,8 @@ private static String getEnumStringValue(Enum realValue) { return PrismBeanInspector.findEnumFieldValueUncached(realValue.getClass(), realValue.toString()); } - private static boolean isIndexed(ItemDefinition definition, QName elementName, PrismContext prismContext) + private static boolean isIndexed(ItemDefinition definition, QName elementName, + boolean indexAlsoDynamics, PrismContext prismContext) throws SchemaException { if (definition instanceof PrismContainerDefinition) { return false; @@ -210,6 +212,11 @@ private static boolean isIndexed(ItemDefinition definition, QName elementName, P PrismPropertyDefinition pDefinition = (PrismPropertyDefinition) definition; Boolean isIndexed = pDefinition.isIndexed(); + + if (definition.isDynamic() && !indexAlsoDynamics && BooleanUtils.isNotTrue(isIndexed)) { + return false; + } + if (isIndexed != null) { if (isIndexed && !isIndexedByDefault(definition, prismContext)) { throw new SchemaException("Item is marked as indexed (definition " + definition.debugDump() @@ -222,6 +229,14 @@ private static boolean isIndexed(ItemDefinition definition, QName elementName, P return isIndexedByDefault(definition, prismContext); } + private static boolean areDynamicsOfThisKindIndexed(RObjectExtensionType extensionType) { + // We assume that if an object/assignment extension item is not configured in XSD, we won't be searching for it. + // This is to fix MID-4878 with a reasonable effort (as the sync token is currently not defined in any XSD). + // + // For shadow attributes we - of course - treat them as indexed. + return extensionType != RObjectExtensionType.EXTENSION; + } + //todo should be renamed to canBeIndexed private static boolean isIndexedByDefault(ItemDefinition definition, PrismContext prismContext) { QName type = definition.getTypeName(); @@ -299,7 +314,7 @@ private static ValueType getValueType(QName qname) { */ public static String getAnySetType(ItemDefinition definition, PrismContext prismContext) throws SchemaException, QueryException { - if (!isIndexed(definition, definition.getName(), prismContext)) { + if (!isIndexed(definition, definition.getName(), true, prismContext)) { throw new QueryException("Can't query non-indexed value for '" + definition.getName() + "', definition " + definition); } diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAssignmentExtension.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAssignmentExtension.java index e8d66123d04..ee3c754fbe8 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAssignmentExtension.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAssignmentExtension.java @@ -22,6 +22,7 @@ import com.evolveum.midpoint.repo.sql.data.common.container.RAssignment; import com.evolveum.midpoint.repo.sql.data.common.id.RAssignmentExtensionId; import com.evolveum.midpoint.repo.sql.data.common.type.RAssignmentExtensionType; +import com.evolveum.midpoint.repo.sql.data.common.type.RObjectExtensionType; import com.evolveum.midpoint.repo.sql.helpers.modify.DeltaUpdaterUtils; import com.evolveum.midpoint.repo.sql.helpers.modify.Ignore; import com.evolveum.midpoint.repo.sql.query2.definition.NotQueryable; @@ -298,7 +299,7 @@ private static void copyFromJAXB(PrismContainerValue containerValue, RAssignment try { List> items = containerValue.getItems(); for (Item item : items) { - values.addAll(converter.convertToRValue(item, true)); + values.addAll(converter.convertToRValue(item, true, RObjectExtensionType.EXTENSION)); } } catch (Exception ex) { throw new DtoTranslationException(ex.getMessage(), ex); diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectDeltaUpdater.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectDeltaUpdater.java index 8de6060ea1e..40049eb9860 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectDeltaUpdater.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectDeltaUpdater.java @@ -456,7 +456,7 @@ private void processAnyExtensionDeltaValues(Collection values, try { Collection> extValues = new ArrayList<>(); for (PrismValue value : values) { - RAnyValue extValue = converter.convertToRValue(value, object == null); + RAnyValue extValue = converter.convertToRValue(value, object == null, objectOwnerType); if (extValue == null) { continue; }