Merge branch 'master' of https://github.com/Evolveum/midpoint

Evolveum · Jan 19, 2017 · 62043ea · 62043ea
2 parents 94ded2c + 45a90f3
commit 62043ea
Show file tree

Hide file tree

Showing 65 changed files with 3,982 additions and 261 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenuItem.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenuItem.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2010-2017 Evolveum
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.evolveum.midpoint.web.component.menu.cog;
 
 import com.evolveum.midpoint.web.component.data.column.DoubleButtonColumn;

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
@@ -27,6 +27,7 @@
 import com.evolveum.midpoint.util.DebugDumpable;
 import com.evolveum.midpoint.util.DebugUtil;
 import com.evolveum.midpoint.util.PrettyPrinter;
+import com.evolveum.midpoint.util.QNameUtil;
 import com.evolveum.midpoint.util.exception.SchemaException;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
@@ -150,7 +151,7 @@ public void setProperties(List<ItemWrapper> properties) {
     public <IW extends ItemWrapper> IW findPropertyWrapper(QName name) {
         Validate.notNull(name, "QName must not be null.");
         for (ItemWrapper wrapper : getItems()) {
-            if (name.equals(wrapper.getItem().getElementName())) {
+            if (QNameUtil.match(name, wrapper.getItem().getElementName())) {
                 return (IW) wrapper;
             }
         }

diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFieldGroupPanel.html b/...n-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFieldGroupPanel.html
@@ -0,0 +1,27 @@
+<!--
+  ~ Copyright (c) 2010-2017 Evolveum
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<!DOCTYPE html>
+<html xmlns:wicket="http://wicket.apache.org">
+<wicket:panel>
+	<div class="prism-header" wicket:id="header"/>
+	<div class="prism-properties">
+	    <div>
+	        <div class="row prism-property" wicket:id="property"/>
+	    </div>
+	</div>
+</wicket:panel>
+</html>
diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFieldGroupPanel.java b/...n-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFieldGroupPanel.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright (c) 2010-2017 Evolveum
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.evolveum.midpoint.web.component.prism;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.JAXBElement;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.wicket.RestartResponseException;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.repeater.RepeatingView;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+
+import com.evolveum.midpoint.gui.api.component.BasePanel;
+import com.evolveum.midpoint.gui.api.page.PageBase;
+import com.evolveum.midpoint.prism.Item;
+import com.evolveum.midpoint.prism.ItemDefinitionImpl;
+import com.evolveum.midpoint.prism.PrismContainer;
+import com.evolveum.midpoint.prism.path.ItemPath;
+import com.evolveum.midpoint.prism.xml.XsdTypeMapper;
+import com.evolveum.midpoint.util.logging.Trace;
+import com.evolveum.midpoint.util.logging.TraceManager;
+import com.evolveum.midpoint.web.component.form.Form;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.AbstractFormItemType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.FormDefinitionType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.FormFieldGroupType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.FormItemDisplayType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
+import com.evolveum.prism.xml.ns._public.types_3.ItemPathType;
+
+public class DynamicFieldGroupPanel<O extends ObjectType> extends BasePanel<ObjectWrapper<O>>{
+
+	private static final long serialVersionUID = 1L;
+
+	private static final transient Trace LOGGER = TraceManager.getTrace(DynamicFieldGroupPanel.class);
+
+	private static final String ID_PROPERTY = "property";
+	private static final String ID_HEADER = "header";
+
+	public DynamicFieldGroupPanel(String id, String groupName, IModel<ObjectWrapper<O>> objectWrapper, List<AbstractFormItemType> formItems, Form<?> mainForm, PageBase parentPage) {
+		super(id,objectWrapper);
+		setParent(parentPage);
+		initLayout(groupName, formItems, mainForm);
+	}
+
+	public DynamicFieldGroupPanel(String id, IModel<ObjectWrapper<O>> objectWrapper, FormDefinitionType formDefinition, Form<?> mainForm, PageBase parentPage) {
+		super(id, objectWrapper);
+		setParent(parentPage);
+		String groupName = "Basic";
+		if (formDefinition.getDisplay() != null) {
+			groupName = formDefinition.getDisplay().getLabel();
+		}
+		initLayout(groupName, getFormItems(formDefinition.getFormItem()), mainForm);
+	}
+
+	private void initLayout(String groupName, List<AbstractFormItemType> formItems, Form<?> mainForm) {
+
+		Label header = new Label(ID_HEADER, groupName);
+		add(header);
+
+		RepeatingView itemView = new RepeatingView(ID_PROPERTY);
+		add(itemView);
+
+		int i = 0;
+		for (AbstractFormItemType formItem : formItems) {
+
+			if (formItem instanceof FormFieldGroupType) {
+				DynamicFieldGroupPanel<O> dynamicFieldGroupPanel = new DynamicFieldGroupPanel<O>(itemView.newChildId(), formItem.getName(), getModel(), getFormItems(((FormFieldGroupType) formItem).getFormItem()), mainForm, getPageBase());
+				dynamicFieldGroupPanel.setOutputMarkupId(true);
+				itemView.add(dynamicFieldGroupPanel);
+				continue;
+			}
+
+			ItemWrapper itemWrapper = createItemWrapper(formItem, getObjectWrapper());
+
+			if (itemWrapper instanceof ContainerWrapper) {
+				PrismContainerPanel containerPanel = new PrismContainerPanel(itemView.newChildId(),
+						Model.of((ContainerWrapper) itemWrapper), true, mainForm, getPageBase());
+					containerPanel.setOutputMarkupId(true);
+					itemView.add(containerPanel);
+			} else {
+				PrismPropertyPanel propertyPanel = new PrismPropertyPanel(itemView.newChildId(),
+						Model.of(itemWrapper), mainForm, getPageBase());
+				propertyPanel.setOutputMarkupId(true);
+				itemView.add(propertyPanel);
+			}
+
+			i++;
+
+		}
+	}
+
+	private ItemWrapper createItemWrapper(AbstractFormItemType formField, ObjectWrapper objectWrapper) {
+		ItemPathType itemPathType = formField.getRef();
+
+		if (itemPathType == null) {
+			getSession().error("Bad form item definition. It has to contain reference to the real attribute");
+			LOGGER.error("Bad form item definition. It has to contain reference to the real attribute");
+			throw new RestartResponseException(getPageBase());
+		}
+
+		ItemPath path = itemPathType.getItemPath();
+
+		Item item = objectWrapper.getObject().findItem(path);
+
+		ItemWrapper itemWrapper = null;
+
+		if (item instanceof PrismContainer) {
+			itemWrapper = objectWrapper.findContainerWrapper(path);
+		} else {
+			itemWrapper = objectWrapper.findPropertyWrapper(path);
+		}
+		if (itemWrapper == null) {
+			getSession().error("Bad form item definition. No attribute with path: " + path + " was found");
+			LOGGER.error("Bad form item definition. No attribute with path: " + path + " was found");
+			throw new RestartResponseException(getPageBase());
+		}
+
+		applyFormDefinition(itemWrapper, formField);
+		return itemWrapper;
+
+	}
+
+	private void applyFormDefinition(ItemWrapper itemWrapper, AbstractFormItemType formField) {
+
+		FormItemDisplayType displayType = formField.getDisplay();
+
+		if (displayType == null) {
+			return;
+		}
+
+		ItemDefinitionImpl itemDef = (ItemDefinitionImpl) itemWrapper.getItemDefinition();
+		if (StringUtils.isNotEmpty(displayType.getLabel())) {
+			itemDef.setDisplayName(displayType.getLabel());
+		}
+
+		if (StringUtils.isNotEmpty(displayType.getHelp())) {
+			itemDef.setHelp(displayType.getHelp());
+		}
+
+		if (StringUtils.isNotEmpty(displayType.getMaxOccurs())) {
+			itemDef.setMaxOccurs(XsdTypeMapper.multiplicityToInteger(displayType.getMaxOccurs()));
+		}
+
+		if (StringUtils.isNotEmpty(displayType.getMinOccurs())) {
+			itemDef.setMinOccurs(XsdTypeMapper.multiplicityToInteger(displayType.getMinOccurs()));
+		}
+
+	}
+
+	private List<AbstractFormItemType> getFormItems(List<JAXBElement<? extends AbstractFormItemType>> formItems) {
+		List<AbstractFormItemType> items = new ArrayList<>();
+		for (JAXBElement<? extends AbstractFormItemType> formItem : formItems) {
+			AbstractFormItemType item = formItem.getValue();
+			items.add(item);
+		}
+		return items;
+	}
+
+	public ObjectWrapper<O> getObjectWrapper() {
+		return getModelObject();
+	}
+
+
+}
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.html
@@ -0,0 +1,22 @@
+<!--
+  ~ Copyright (c) 2010-2016 Evolveum
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<!DOCTYPE html>
+<html xmlns:wicket="http://wicket.apache.org">
+<wicket:panel>
+	<div wicket:id="formFields"/>
+</wicket:panel>
+</html>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2010-2017 Evolveum
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.evolveum.midpoint.web.component.prism;
+
+import org.apache.wicket.model.IModel;
+
+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.WebModelServiceUtils;
+import com.evolveum.midpoint.prism.PrismObject;
+import com.evolveum.midpoint.prism.delta.ObjectDelta;
+import com.evolveum.midpoint.schema.result.OperationResult;
+import com.evolveum.midpoint.task.api.Task;
+import com.evolveum.midpoint.util.exception.SchemaException;
+import com.evolveum.midpoint.util.logging.Trace;
+import com.evolveum.midpoint.util.logging.TraceManager;
+import com.evolveum.midpoint.web.component.form.Form;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.FormDefinitionType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.FormType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
+
+public class DynamicFormPanel<O extends ObjectType> extends BasePanel<ObjectWrapper<O>> {
+
+	private static final long serialVersionUID = 1L;
+
+	private static final transient Trace LOGGER = TraceManager.getTrace(DynamicFormPanel.class);
+
+	private static final String DOT_CLASS = DynamicFormPanel.class.getName() + ".";
+	private static final String OPERATION_LOAD_FORM = DOT_CLASS + "loadForm";
+
+	private static final String ID_FORM_FIELDS = "formFields";
+
+	LoadableModel<ObjectWrapper<O>> wrapperModel = null;
+
+	public DynamicFormPanel(String id, final IModel<O> model, String formOid, Form<?> mainForm, boolean runPrivileged,
+			final PageBase parentPage) {
+
+		super(id);
+
+		wrapperModel = new LoadableModel<ObjectWrapper<O>>() {
+
+			private static final long serialVersionUID = 1L;
+
+			@Override
+			protected ObjectWrapper<O> load() {
+				ObjectWrapperFactory owf = new ObjectWrapperFactory(parentPage);
+				ObjectWrapper<O> objectWrapper = owf.createObjectWrapper("DisplayName", "description",
+						model.getObject().asPrismObject(), (model.getObject().getOid() == null) ? ContainerStatus.ADDING : ContainerStatus.MODIFYING);
+				objectWrapper.setShowEmpty(true);
+				return objectWrapper;
+			}
+		};
+
+
+		setParent(parentPage);
+
+		initLayout(formOid, runPrivileged, mainForm);
+	}
+
+	@Override
+	public IModel<ObjectWrapper<O>> getModel() {
+		return wrapperModel;
+	}
+
+	private void initLayout(String formOid, boolean runPrivileged, Form<?> mainForm) {
+
+		Task task = null;
+		if (runPrivileged) {
+			task = getPageBase().createAnonymousTask(OPERATION_LOAD_FORM);
+		} else {
+			task = getPageBase().createSimpleTask(OPERATION_LOAD_FORM);
+		}
+		OperationResult result = new OperationResult(OPERATION_LOAD_FORM);
+		PrismObject<FormType> prismForm = WebModelServiceUtils.loadObject(FormType.class, formOid,
+				getPageBase(), task, result);
+
+		if (prismForm == null) {
+			LOGGER.trace("No form defined, skipping denerating GUI form");
+			return;
+		}
+
+		FormType formType = prismForm.asObjectable();
+
+		FormDefinitionType formDefinitionType = formType.getFormDefinition();
+		if (formDefinitionType == null) {
+			LOGGER.trace("No form definition defined for dynamic form");
+		}
+
+		DynamicFieldGroupPanel<O> formFields = new DynamicFieldGroupPanel<O>(ID_FORM_FIELDS, getModel(), formDefinitionType, mainForm, getPageBase());
+		formFields.setOutputMarkupId(true);
+		add(formFields);
+
+	}
+
+	public ObjectDelta<O> getObjectDelta() throws SchemaException {
+		return wrapperModel.getObject().getObjectDelta();
+	}
+
+	public PrismObject<O> getObject() throws SchemaException {
+		ObjectDelta<O> delta = wrapperModel.getObject().getObjectDelta();
+		if (delta != null && delta.isAdd()) {
+			return delta.getObjectToAdd();
+		}
+		return wrapperModel.getObject().getObject();
+	}
+
+
+}