Merge remote-tracking branch 'origin/master' into feature/boot

Evolveum · Sep 2, 2017 · 7eb4217 · 7eb4217
2 parents 2a717dd + 8639398
commit 7eb4217
Show file tree

Hide file tree

Showing 74 changed files with 3,671 additions and 438 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OpResult.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OpResult.java
@@ -23,6 +23,7 @@
 import com.evolveum.midpoint.schema.result.OperationResultStatus;
 import com.evolveum.midpoint.security.api.AuthorizationConstants;
 import com.evolveum.midpoint.task.api.Task;
+import com.evolveum.midpoint.util.LocalizableMessage;
 import com.evolveum.midpoint.util.exception.*;
 import com.evolveum.midpoint.util.logging.LoggingUtils;
 import com.evolveum.midpoint.util.logging.Trace;
@@ -33,6 +34,8 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskType;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.Validate;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.model.StringResourceModel;
 
 import java.io.PrintWriter;
 import java.io.Serializable;
@@ -80,13 +83,25 @@ public boolean isAlreadyShown() {
     public void setAlreadyShown(boolean alreadyShown) {
 		this.alreadyShown = alreadyShown;
 	}
-
-    public static OpResult getOpResult(PageBase page, OperationResult result){
+    
+        public static OpResult getOpResult(PageBase page, OperationResult result){
         OpResult opResult = new OpResult();
         Validate.notNull(result, "Operation result must not be null.");
         Validate.notNull(result.getStatus(), "Operation result status must not be null.");
 
-        opResult.message = result.getMessage();
+        if (result.getCause() != null && result.getCause() instanceof CommonException){
+        	LocalizableMessage localizableMessage = ((CommonException) result.getCause()).getUserFriendlyMessage();
+        	if (localizableMessage != null) {
+        		String key = localizableMessage.getKey() != null ? localizableMessage.getKey() : localizableMessage.getFallbackMessage();
+        		StringResourceModel stringResourceModel = new StringResourceModel(key, page).setModel(new Model<String>()).setDefaultValue(localizableMessage.getFallbackMessage())
+				.setParameters(localizableMessage.getArgs());
+        		opResult.message = stringResourceModel.getString();
+        	}
+        } 
+
+        if (opResult.message == null) {
+        	opResult.message = result.getMessage();
+        }
         opResult.operation = result.getOperation();
         opResult.status = result.getStatus();
         opResult.count = result.getCount();

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
@@ -98,6 +98,7 @@
 import com.evolveum.midpoint.task.api.TaskCategory;
 import com.evolveum.midpoint.task.api.TaskManager;
 import com.evolveum.midpoint.util.Holder;
+import com.evolveum.midpoint.util.LocalizableMessage;
 import com.evolveum.midpoint.util.Producer;
 import com.evolveum.midpoint.util.logging.LoggingUtils;
 import com.evolveum.midpoint.util.logging.Trace;
@@ -940,7 +941,7 @@ public StringResourceModel createStringResource(String resourceKey, Object... ob
 		return new StringResourceModel(resourceKey, this).setModel(new Model<String>()).setDefaultValue(resourceKey)
 				.setParameters(objects);
 	}
-
+	
 	public StringResourceModel createStringResource(Enum e) {
 		String resourceKey = e.getDeclaringClass().getSimpleName() + "." + e.name();
 		return createStringResource(resourceKey);
@@ -968,7 +969,7 @@ public OpResult showResult(OperationResult result) {
     public OpResult showResult(OperationResult result, String errorMessageKey, boolean showSuccess) {
         Validate.notNull(result, "Operation result must not be null.");
         Validate.notNull(result.getStatus(), "Operation result status must not be null.");
-
+        
         OpResult opResult = OpResult.getOpResult((PageBase) getPage(), result);
 		opResult.determineBackgroundTaskVisibility(this);
         switch (opResult.getStatus()) {

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -37,6 +37,7 @@
 import com.evolveum.midpoint.model.api.ModelExecuteOptions;
 import com.evolveum.midpoint.schema.GetOperationOptions;
 import com.evolveum.midpoint.schema.SelectorOptions;
+import com.evolveum.midpoint.web.component.prism.InputPanel;
 import com.evolveum.midpoint.web.util.ObjectTypeGuiDescriptor;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 
@@ -52,6 +53,7 @@
 import org.apache.wicket.PageReference;
 import org.apache.wicket.Session;
 import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
 import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
 import org.apache.wicket.authroles.authentication.AuthenticatedWebApplication;
 import org.apache.wicket.authroles.authorization.strategies.role.Roles;
@@ -63,10 +65,7 @@
 import org.apache.wicket.feedback.IFeedback;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.CheckBox;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.IChoiceRenderer;
-import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.form.*;
 import org.apache.wicket.model.AbstractReadOnlyModel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.StringResourceModel;
@@ -262,6 +261,29 @@ public static String getReferencedObjectDisplayNamesAndNames(List<ObjectReferenc
 				.collect(Collectors.joining(", "));
 	}
 
+	public static void addAjaxOnUpdateBehavior(WebMarkupContainer container) {
+        container.visitChildren(new IVisitor<Component, Object>() {
+            @Override
+            public void component(Component component, IVisit<Object> objectIVisit) {
+                if (component instanceof InputPanel) {
+                    addAjaxOnBlurUpdateBehaviorToComponent(((InputPanel) component).getBaseFormComponent());
+                } else if (component instanceof FormComponent) {
+                    addAjaxOnBlurUpdateBehaviorToComponent(component);
+                }
+            }
+        });
+    }
+
+	private static void addAjaxOnBlurUpdateBehaviorToComponent(final Component component) {
+        component.setOutputMarkupId(true);
+        component.add(new AjaxFormComponentUpdatingBehavior("blur") {
+
+            @Override
+            protected void onUpdate(AjaxRequestTarget target) {
+            }
+        });
+    }
+
 	public enum Channel {
 		// TODO: move this to schema component
 		LIVE_SYNC(SchemaConstants.CHANGE_CHANNEL_LIVE_SYNC_URI),

diff --git a/...va/com/evolveum/midpoint/web/component/assignment/AssignmentActivationPopupablePanel.java b/...va/com/evolveum/midpoint/web/component/assignment/AssignmentActivationPopupablePanel.java
@@ -17,16 +17,13 @@
 
 import com.evolveum.midpoint.gui.api.component.BasePanel;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
-import com.evolveum.midpoint.prism.path.ItemPath;
 import com.evolveum.midpoint.web.component.AjaxButton;
 import com.evolveum.midpoint.web.component.DateInput;
 import com.evolveum.midpoint.web.component.dialog.Popupable;
 import com.evolveum.midpoint.web.component.input.DropDownChoicePanel;
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivationStatusType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivationType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.AssignmentType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.FocusType;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -141,7 +138,7 @@ public void onClick(AjaxRequestTarget ajaxRequestTarget) {
         };
         buttonsPanel.add(cancelButton);
 
-        AssignmentsUtil.addAjaxOnUpdateBehavior((WebMarkupContainer)get(ID_ACTIVATION_BLOCK));
+        WebComponentUtil.addAjaxOnUpdateBehavior((WebMarkupContainer)get(ID_ACTIVATION_BLOCK));
 
     }
 

diff --git a/...i/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java b/...i/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
@@ -37,7 +37,6 @@
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.security.api.ItemSecurityDecisions;
 import com.evolveum.midpoint.task.api.Task;
-import com.evolveum.midpoint.util.MiscUtil;
 import com.evolveum.midpoint.util.exception.CommunicationException;
 import com.evolveum.midpoint.util.exception.ConfigurationException;
 import com.evolveum.midpoint.util.exception.ExpressionEvaluationException;
@@ -49,10 +48,8 @@
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.web.component.DateInput;
 import com.evolveum.midpoint.web.component.input.DropDownChoicePanel;
-import com.evolveum.midpoint.web.component.prism.InputPanel;
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
 import com.evolveum.midpoint.web.page.admin.PageAdminFocus;
-import com.evolveum.midpoint.web.page.admin.PageAdminObjectDetails;
 import com.evolveum.midpoint.web.page.admin.configuration.component.ChooseTypePanel;
 import com.evolveum.midpoint.web.page.admin.dto.ObjectViewDto;
 import com.evolveum.midpoint.web.page.admin.users.component.AssignmentsPreviewDto;
@@ -65,14 +62,12 @@
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
 import org.apache.wicket.markup.head.CssHeaderItem;
 import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.FormComponent;
 import org.apache.wicket.markup.html.form.TextArea;
 import org.apache.wicket.markup.html.list.ListItem;
 import org.apache.wicket.markup.html.list.ListView;
@@ -81,10 +76,7 @@
 import org.apache.wicket.model.Model;
 import org.apache.wicket.model.PropertyModel;
 import org.apache.wicket.request.resource.PackageResourceReference;
-import org.apache.wicket.util.visit.IVisit;
-import org.apache.wicket.util.visit.IVisitor;
 
-import javax.xml.datatype.XMLGregorianCalendar;
 import javax.xml.namespace.QName;
 
 import java.util.*;
@@ -635,7 +627,7 @@ public boolean isVisible(){
 		});
 		body.add(metadataPanel);
 
-		AssignmentsUtil.addAjaxOnUpdateBehavior(body);
+		WebComponentUtil.addAjaxOnUpdateBehavior(body);
 	}
 
 	private void updateAssignmentName(AjaxRequestTarget target, Boolean isManager){

diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentsUtil.java b/...min-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentsUtil.java
@@ -145,20 +145,7 @@ public void setObject(Date object) {
         };
     }
 
-    public static void addAjaxOnUpdateBehavior(WebMarkupContainer container) {
-        container.visitChildren(new IVisitor<Component, Object>() {
-            @Override
-            public void component(Component component, IVisit<Object> objectIVisit) {
-                if (component instanceof InputPanel) {
-                    addAjaxOnBlurUpdateBehaviorToComponent(((InputPanel) component).getBaseFormComponent());
-                } else if (component instanceof FormComponent) {
-                    addAjaxOnBlurUpdateBehaviorToComponent(component);
-                }
-            }
-        });
-    }
-
-//    public static IModel<String> createAssignmentStatusClassModel(final IModel<AssignmentEditorDto> model) {
+    //    public static IModel<String> createAssignmentStatusClassModel(final IModel<AssignmentEditorDto> model) {
 //        return new AbstractReadOnlyModel<String>() {
 //            private static final long serialVersionUID = 1L;
 //
@@ -193,16 +180,6 @@ public String getObject() {
         };
     }
 
-    private static void addAjaxOnBlurUpdateBehaviorToComponent(final Component component) {
-        component.setOutputMarkupId(true);
-        component.add(new AjaxFormComponentUpdatingBehavior("blur") {
-
-            @Override
-            protected void onUpdate(AjaxRequestTarget target) {
-            }
-        });
-    }
-
     public static VisibleEnableBehaviour getEnableBehavior(IModel<AssignmentEditorDto> dtoModel){
         return new VisibleEnableBehaviour(){
             private static final long serialVersionUID = 1L;

diff --git a/...i/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.java b/...i/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.java
@@ -51,7 +51,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.evolveum.midpoint.web.component.assignment.AssignmentsUtil.addAjaxOnUpdateBehavior;
+import static com.evolveum.midpoint.gui.api.util.WebComponentUtil.addAjaxOnUpdateBehavior;
 
 /**
  * Created by honchar.

diff --git a/...c/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulePropertiesPanel.html b/...c/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulePropertiesPanel.html
@@ -20,7 +20,31 @@
     <div class="prism-properties">
     <div class="row prism-property">
         <div class="col-md-2"><wicket:message key="PolicyRule.constraintsLabel"/></div>
-        <div class="col-md-10" wicket:id="constraintsValue" />
+        <div class="col-md-10" wicket:id="constraintsContainer">
+            <div wicket:id="exclusionConstraints" />
+            <div wicket:id="minAssigneesConstraints" />
+            <div wicket:id="maxAssigneesConstraints" />
+            <div wicket:id="modificationConstraints" />
+            <div wicket:id="assignmentConstraints" />
+            <div wicket:id="timeValidityConstraints" />
+            <div wicket:id="situationConstraints" />
+            <div class="pull-right">
+                <div class="btn-group">
+                        <button wicket:id="addExclusionConstraints" type="button" class="btn btn-default"><wicket:message key="PolicyRulePropertiesPanel.exclusionConstraints"/></button>
+                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+                            <span class="caret"></span>
+                        </button>
+                        <ul class="dropdown-menu" role="menu">
+                            <li><a wicket:id="addMinAssigneesConstraints"><wicket:message key="PolicyRulePropertiesPanel.minAssigneesConstraints"/></a></li>
+                            <li><a wicket:id="addMaxAssigneesConstraints"><wicket:message key="PolicyRulePropertiesPanel.maxAssigneesConstraints"/></a></li>
+                            <li><a wicket:id="addModificationConstraints"><wicket:message key="PolicyRulePropertiesPanel.modification"/></a></li>
+                            <li><a wicket:id="addAssignmentConstraints"><wicket:message key="PolicyRulePropertiesPanel.assignmentConstraints"/></a></li>
+                            <li><a wicket:id="addTimeValidityConstraints"><wicket:message key="PolicyRulePropertiesPanel.timeValidityConstraints"/></a></li>
+                            <li><a wicket:id="addSituationConstraints"><wicket:message key="PolicyRulePropertiesPanel.situationConstraints"/></a></li>
+                        </ul>
+                </div>
+            </div>
+        </div>
     </div>
     <div class="row">
         <div class="col-md-2"><wicket:message key="PolicyRule.situationLabel"/></div>