expression editor panel

Evolveum · Nov 11, 2017 · 736172f · 736172f
1 parent c3be7c6
commit 736172f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 21 deletions.
diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionEditorPanel.java b/...in-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionEditorPanel.java
@@ -18,6 +18,7 @@
 
 import com.evolveum.midpoint.gui.api.component.BasePanel;
 import com.evolveum.midpoint.gui.api.model.LoadableModel;
+import com.evolveum.midpoint.gui.api.page.PageBase;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
 import com.evolveum.midpoint.util.logging.LoggingUtils;
@@ -78,7 +79,7 @@ public class ExpressionEditorPanel extends BasePanel<ExpressionType> {
     private IModel<ExpressionTypeDto> dtoModel;
     private Map<String, String> policyMap = new HashMap<>();
 
-    public ExpressionEditorPanel(String id, IModel<ExpressionType> model, PageResourceWizard parentPage) {
+    public ExpressionEditorPanel(String id, IModel<ExpressionType> model, PageBase parentPage) {
         super(id, model);
 		initLayout(parentPage);
     }
@@ -98,9 +99,7 @@ protected ExpressionTypeDto load() {
         }
     }
 
-    protected void initLayout(PageResourceWizard parentPage) {
-		parentPage.addEditingEnabledBehavior(this);
-
+    protected void initLayout(PageBase parentPage) {
 		setOutputMarkupId(true);
 
         loadDtoModel();
@@ -216,7 +215,10 @@ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
 		Label updateLabel = new Label(ID_LABEL_UPDATE, createStringResource(getUpdateLabelKey()));
 		updateLabel.setRenderBodyOnly(true);
 		update.add(updateLabel);
-		parentPage.addEditingVisibleBehavior(update);
+        if (parentPage instanceof PageResourceWizard) {
+            ((PageResourceWizard)parentPage).addEditingEnabledBehavior(this);
+            ((PageResourceWizard)parentPage).addEditingVisibleBehavior(update);
+        }
 		add(update);
 
         add(WebComponentUtil.createHelp(ID_T_TYPE));

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
@@ -26,6 +26,8 @@
 import javax.xml.datatype.XMLGregorianCalendar;
 import javax.xml.namespace.QName;
 
+import com.evolveum.midpoint.web.component.input.*;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 import org.apache.commons.lang.ClassUtils;
 import org.apache.commons.lang.Validate;
 import org.apache.wicket.AttributeModifier;
@@ -82,27 +84,11 @@
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.web.component.LockoutStatusPanel;
 import com.evolveum.midpoint.web.component.form.ValueChoosePanel;
-import com.evolveum.midpoint.web.component.input.DatePanel;
-import com.evolveum.midpoint.web.component.input.TextAreaPanel;
-import com.evolveum.midpoint.web.component.input.TextPanel;
-import com.evolveum.midpoint.web.component.input.TriStateComboPanel;
-import com.evolveum.midpoint.web.component.input.UploadDownloadPanel;
 import com.evolveum.midpoint.web.component.model.delta.DeltaDto;
 import com.evolveum.midpoint.web.component.model.delta.ModificationsPanel;
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
 import com.evolveum.midpoint.web.model.LookupPropertyModel;
 import com.evolveum.midpoint.web.util.DateValidator;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.AbstractRoleType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivationType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.CleanupPoliciesType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.FocusType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.LockoutStatusType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.LookupTableRowType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.LookupTableType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.OrgType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
 import com.evolveum.prism.xml.ns._public.query_3.QueryType;
 import com.evolveum.prism.xml.ns._public.types_3.ObjectDeltaType;
 import com.evolveum.prism.xml.ns._public.types_3.ProtectedStringType;
@@ -446,6 +432,9 @@ private Panel createTypedInputComponent(String id) {
 				return new LockoutStatusPanel(id, valueWrapperModel.getObject(),
 						new PropertyModel<LockoutStatusType>(valueWrapperModel, baseExpression));
 			}
+			if (ExpressionType.COMPLEX_TYPE.equals(valueType)) {
+				return new ExpressionEditorPanel(id, new PropertyModel<ExpressionType>(valueWrapperModel, baseExpression), pageBase);
+			}
 
 			if (DOMUtil.XSD_DATETIME.equals(valueType)) {
 				panel = new DatePanel(id, new PropertyModel<XMLGregorianCalendar>(valueWrapperModel, baseExpression));

diff --git a/...i/src/main/java/com/evolveum/midpoint/web/page/self/dto/ShoppingCartConfigurationDto.java b/...i/src/main/java/com/evolveum/midpoint/web/page/self/dto/ShoppingCartConfigurationDto.java
@@ -42,6 +42,7 @@ public void initShoppingCartConfigurationDto(RoleManagementConfigurationType rol
             viewTypeList = new ArrayList<>(Arrays.asList(AssignmentViewType.values()));
             viewTypeList.remove(AssignmentViewType.USER_TYPE);
             defaultViewType = AssignmentViewType.ROLE_TYPE;
+            isUserAssignmentsViewAllowed = true;
             return;
         }
 

diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XsdTypeMapper.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XsdTypeMapper.java
@@ -30,7 +30,9 @@
 import javax.xml.datatype.XMLGregorianCalendar;
 import javax.xml.namespace.QName;
 
+import com.evolveum.midpoint.prism.xnode.XNode;
 import com.evolveum.prism.xml.ns._public.types_3.ItemPathType;
+import com.evolveum.prism.xml.ns._public.types_3.RawType;
 import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -94,6 +96,7 @@ private static void initTypeMap() throws IOException, ClassNotFoundException {
         addMapping(QName.class, DOMUtil.XSD_QNAME, true);
 
         addMapping(PolyString.class, PrismConstants.POLYSTRING_TYPE_QNAME, true);
+        addMapping(RawType.class,  DOMUtil.XSD_STRING, false);
         addMappingExt(ItemPathType.class, ItemPathType.COMPLEX_TYPE, true);				// TODO remove
 
         xsdToJavaTypeMap.put(DOMUtil.XSD_ANYURI, String.class);